sbt 2.0.5

Build definitions are now compiled with Scala 3, and the launcher shipped in the
repo cannot boot sbt 2, so it is replaced with the 2.0.5 launcher.

Notable changes beyond the version bump:

- `test` now means what `testQuick` used to mean and its results are cached
  across `clean`, so a warm cache runs no tests at all. CI and the Makefile
  use `testFull` to always run the full suite.
- Task results must be serializable, so `externalResolvers` is wrapped in
  `Def.uncached`.
- The one-jar target read the runtime classpath with `export`, which now renders
  entries as virtual file refs rather than paths on disk. A
  `printRuntimeClasspath` task converts them back and the Makefile uses that.
- `Test / testForkedParallel` defaults to true in sbt 2, which would run the test
  classes for a project concurrently. It only applies to forked tests, which this
  build does not use, but it is pinned to false so the tests stay serial if
  forking is ever enabled.
- Scala 3 fixes in the build: `PathFinder.get()` and an explicit import for the
  String/URI to License conversion.
- The per-project scopes sbt-git sets up for `gitDescribedVersion` and
  `gitUncommittedChanges` are unused here and are now excluded from lintUnused.

Author: brharrington

.github/workflows/pr.yml

@@ -18,7 +18,7 @@ jobs:
           distribution: 'zulu'
           cache: 'sbt'
       - name: Build
-        run: cat /dev/null | project/sbt ++${{ matrix.scala }} clean test doc
+        run: cat /dev/null | project/sbt ++${{ matrix.scala }} clean testFull doc
   check:
     runs-on: ubuntu-latest
     steps:

.github/workflows/release.yml

@@ -34,7 +34,7 @@ jobs:
           PGP_PASSPHRASE: ${{ secrets.ORG_SIGNING_PASSWORD }}
         run: |
           git fetch --unshallow --tags
-          cat /dev/null | project/sbt ++2.13.18 clean test +publishSigned
+          cat /dev/null | project/sbt ++2.13.18 clean testFull +publishSigned
           cat /dev/null | project/sbt sonaRelease
 
   release-asset:

.github/workflows/snapshot.yml

@@ -32,4 +32,4 @@ jobs:
           PGP_PASSPHRASE: ${{ secrets.ORG_SIGNING_PASSWORD }}
         run: |
           git fetch --unshallow --tags
-          cat /dev/null | project/sbt ++2.13.18 clean test +publishSigned
+          cat /dev/null | project/sbt ++2.13.18 clean testFull +publishSigned

Makefile

@@ -15,14 +15,14 @@ LAUNCHER_JAR_URL := https://repo1.maven.org/maven2/com/netflix/iep/iep-launcher/
 .PHONY: build snapshot release clean format update-wiki publish-wiki
 
 build:
-	$(SBT) clean test checkLicenseHeaders scalafmtCheckAll
+	$(SBT) clean testFull checkLicenseHeaders scalafmtCheckAll
 
 snapshot:
 	# Travis uses a depth when fetching git data so the tags needed for versioning may not
 	# be available unless we explicitly fetch them
 	git fetch --unshallow --tags
 	$(SBT) storeBintrayCredentials
-	$(SBT) clean test checkLicenseHeaders publish
+	$(SBT) clean testFull checkLicenseHeaders publish
 
 release:
 	# Travis uses a depth when fetching git data so the tags needed for versioning may not
@@ -35,7 +35,7 @@ release:
 	# The storeBintrayCredentials still needs to be on the subsequent command or we get:
 	# [error] (iep-service/*:bintrayEnsureCredentials) java.util.NoSuchElementException: None.get
 	$(SBT) storeBintrayCredentials
-	$(SBT) clean test checkLicenseHeaders storeBintrayCredentials publish bintrayRelease
+	$(SBT) clean testFull checkLicenseHeaders storeBintrayCredentials publish bintrayRelease
 
 clean:
 	$(SBT) clean
@@ -62,7 +62,7 @@ publish-wiki: update-wiki
 one-jar:
 	mkdir -p target
 	curl -fL $(LAUNCHER_JAR_URL) -o target/iep-launcher.jar
-	classpath=`$(SBT) --error "export atlas-standalone/runtime:fullClasspath" | tr -d '\r' | tr ':' '\n' | grep '\.jar$$'`; \
-	test -n "$$classpath" || { echo "error: no jars in classpath from sbt export" >&2; exit 1; }; \
+	classpath=`$(SBT) --error "atlas-standalone/printRuntimeClasspath" | tr -d '\r' | grep '\.jar$$'`; \
+	test -n "$$classpath" || { echo "error: no jars in classpath from sbt" >&2; exit 1; }; \
 	java -classpath target/iep-launcher.jar com.netflix.iep.launcher.JarBuilder \
 		target/standalone.jar com.netflix.atlas.standalone.Main $$classpath

project/BuildSettings.scala

@@ -15,6 +15,9 @@ object BuildSettings {
   lazy val checkLicenseHeaders = taskKey[Unit]("Check the license headers for all source files.")
   lazy val formatLicenseHeaders = taskKey[Unit]("Fix the license headers for all source files.")
 
+  lazy val printRuntimeClasspath =
+    taskKey[Unit]("Print the runtime classpath, one absolute path per line.")
+
   lazy val baseSettings: Seq[Def.Setting[?]] = GitVersion.settings
 
   lazy val buildSettings: Seq[Def.Setting[?]] = baseSettings ++ Seq(
@@ -31,19 +34,32 @@ object BuildSettings {
     crossScalaVersions := Dependencies.Versions.crossScala,
     sourcesInBase := false,
     exportJars := true, // Needed for one-jar, with multi-project
-    externalResolvers := BuildSettings.resolvers,
+    externalResolvers := Def.uncached(BuildSettings.resolvers),
     // Evictions: https://github.com/sbt/sbt/issues/1636
     // Linting: https://github.com/sbt/sbt/pull/5153
     (update / evictionWarningOptions).withRank(KeyRanks.Invisible) := EvictionWarningOptions.empty,
     checkLicenseHeaders := LicenseCheck.checkLicenseHeaders(streams.value.log, sourceDirectory.value),
     formatLicenseHeaders := LicenseCheck.formatLicenseHeaders(streams.value.log, sourceDirectory.value),
+    // Used by the one-jar target in the Makefile. The classpath cannot be read with
+    // `export`, which renders the entries as virtual file refs under sbt 2, so convert
+    // them back to paths on disk here.
+    printRuntimeClasspath := Def.uncached {
+      val converter = fileConverter.value
+      (Runtime / fullClasspath).value.foreach { entry =>
+        println(converter.toPath(entry.data).toAbsolutePath.toString)
+      }
+    },
     packageBin / packageOptions += Package.ManifestAttributes(
       "Build-Date"   -> java.time.Instant.now().toString,
       "Build-Number" -> sys.env.getOrElse("GITHUB_RUN_ID", "unknown"),
       "Commit"       -> sys.env.getOrElse("GITHUB_SHA", "unknown")
     ),
     testFrameworks += new TestFramework("munit.Framework"),
-    Test / parallelExecution := false
+    Test / parallelExecution := false,
+
+    // Only takes effect if the tests are forked, which they are not today. sbt 2 flipped
+    // the default to true, so pin it to keep tests serial if forking is ever enabled.
+    Test / testForkedParallel := false
   )
 
   val commonDeps: Seq[ModuleID] = Seq(

project/GitVersion.scala

@@ -65,6 +65,11 @@ object GitVersion {
         case v                   => v
       }
     },
-    ThisBuild / versionScheme := Some("semver-spec")
+    ThisBuild / versionScheme := Some("semver-spec"),
+
+    // Only used at the build level to compute the version, the per-project scopes
+    // set up by sbt-git are unused and would otherwise be flagged by lintUnused.
+    Global / excludeLintKeys += git.gitDescribedVersion,
+    Global / excludeLintKeys += git.gitUncommittedChanges
   )
 }

project/LicenseCheck.scala

@@ -39,7 +39,7 @@ object LicenseCheck {
   """.stripMargin.trim
 
   def findFiles(dir: File): Seq[File] = {
-    (dir ** "*.scala").get ++ (dir ** "*.java").get
+    (dir ** "*.scala").get() ++ (dir ** "*.java").get()
   }
 
   def checkLicenseHeaders(log: Logger, srcDir: File): Unit = {

project/SonatypeSettings.scala

@@ -1,5 +1,6 @@
 import sbt.*
 import sbt.Keys.*
+import sbt.librarymanagement.syntax.given
 
 object SonatypeSettings {
 

project/build.properties

@@ -1 +1 @@
-sbt.version=1.12.9
+sbt.version=2.0.5

project/sbt

@@ -20,4 +20,4 @@ java \
   -Dsbt.ivy.home=${WORKSPACE:-$HOME}/.ivy2 \
   -Dsbt.gigahorse=false \
   $OPTIONS \
-  -jar `dirname $0`/sbt-launch-1.2.8.jar "$@"
+  -jar `dirname $0`/sbt-launch-2.0.5.jar "$@"