Merge pull request #10701 from SethTisue/merge-2.12-to-2.13-20240223

Merge 2.12.x to 2.13.x [ci: last-only]

.travis.yml

@@ -1,7 +1,3 @@
-# `-Dsbt.io.jdktimestamps=true` is used to work around
-# this bug in sbt 1.9.8: https://github.com/sbt/sbt/issues/7463
-# we can remove it once we're on an sbt version with a fix.
-
 version: ~> 1.0 # needed for imports
 import: scala/scala-dev:travis/default.yml
 
@@ -31,9 +27,9 @@ templates: # this has no effect on travis, it's just a place to put our template
     name: build, publishLocal, build again
     script:
       - set -e
-      - sbt -Dsbt.io.jdktimestamps=true setupPublishCore generateBuildCharacterPropertiesFile headerCheck publishLocal
+      - sbt setupPublishCore generateBuildCharacterPropertiesFile headerCheck publishLocal
       - STARR=$(sed -n 's/^maven\.version\.number=//p' buildcharacter.properties) && echo $STARR
-      - sbt -Dsbt.io.jdktimestamps=true -Dstarr.version=$STARR setupValidateTest compile
+      - sbt -Dstarr.version=$STARR setupValidateTest compile
     workspaces:
       create:
         name: bootstrapped
@@ -57,7 +53,7 @@ templates: # this has no effect on travis, it's just a place to put our template
     script:
       - set -e
       - STARR=$(sed -n 's/^maven\.version\.number=//p' buildcharacter.properties) && echo $STARR
-      - sbt -Dsbt.io.jdktimestamps=true -Dstarr.version=$STARR setupValidateTest Test/compile testAll1
+      - sbt -Dstarr.version=$STARR setupValidateTest Test/compile testAll1
 
   test2: &test2
     stage: test
@@ -67,7 +63,7 @@ templates: # this has no effect on travis, it's just a place to put our template
     script:
       - set -e
       - STARR=$(sed -n 's/^maven\.version\.number=//p' buildcharacter.properties) && echo $STARR
-      - sbt -Dsbt.io.jdktimestamps=true -Dstarr.version=$STARR setupValidateTest testAll2
+      - sbt -Dstarr.version=$STARR setupValidateTest testAll2
 
 jobs:
   include:
@@ -117,7 +113,7 @@ jobs:
       script:
         - set -e
         - STARR=$(sed -n 's/^maven\.version\.number=//p' buildcharacter.properties) && echo $STARR
-        - sbt -Dsbt.io.jdktimestamps=true -Dscala.build.compileWithDotty=true library/compile
+        - sbt -Dscala.build.compileWithDotty=true library/compile
 
     - name: build benchmarks
       if: type = pull_request OR repo != scala/scala
@@ -126,7 +122,7 @@ jobs:
       script:
         - set -e
         - STARR=$(sed -n 's/^maven\.version\.number=//p' buildcharacter.properties) && echo $STARR
-        - sbt -Dsbt.io.jdktimestamps=true bench/Jmh/compile
+        - sbt bench/Jmh/compile
 
     - stage: build
       if: type = pull_request OR type = push

build.sbt

@@ -970,9 +970,6 @@ lazy val sbtTest = project.in(file("test") / "sbt-test")
     scriptedBufferLog := true,
 
     scriptedLaunchOpts ++= Seq(
-      // work around https://github.com/sbt/sbt/issues/7463
-      // we can remove it once we're on an sbt version with a fix.
-      "-Dsbt.io.jdktimestamps=true",
       "-Dplugin.scalaVersion=" + version.value,
       "-Dsbt.boot.directory=" + (target.value / ".sbt-scripted").getAbsolutePath, // Workaround sbt/sbt#3469
       "-Dscripted.common=" + (baseDirectory.value / "common.sbt.template").getAbsolutePath,

project/build.properties

@@ -1 +1 @@
-sbt.version=1.9.8
+sbt.version=1.9.9

scripts/common

@@ -13,9 +13,7 @@ fi
 SBT_VERSION=`grep sbt.version $WORKSPACE/project/build.properties | sed -n 's/sbt.version=\(.*\)/\1/p'`
 
 SBT_CMD=${SBT_CMD-sbt}
-# the jdktimestamps thing is to work around https://github.com/sbt/sbt/issues/7463 --
-# it can be removed again once we're on an sbt version with a fix
-SBT_CMD="$SBT_CMD -Dsbt.io.jdktimestamps=true -sbt-version $SBT_VERSION"
+SBT_CMD="$SBT_CMD -sbt-version $SBT_VERSION"
 
 # repo to publish builds
 integrationRepoUrl=${integrationRepoUrl-"https://scala-ci.typesafe.com/artifactory/scala-integration/"}