Update sbt to 2.0.1 (#634)

Author: scala-steward

.ci_scripts/validate.sh

@@ -76,6 +76,8 @@ fi
 
 export _JAVA_OPTIONS="$JVM_OPTS"
 
+export JDK_JAVA_OPTIONS="--add-opens java.base/java.lang=ALL-UNNAMED"
+
 SBT_OPTS="++$SCALA_VERSION"
 
 # Scalariform check
@@ -95,7 +97,7 @@ fi
 "${SBT_CMD_PREFIX[@]}" "$SBT_OPTS" ';error ;scalafmtCheckAll ;scalafmtSbtCheck'
 
 # MiMa, Tests
-SBT_CMD=";error ;test:compile ;doc ;mimaReportBinaryIssues; info"
+SBT_CMD=";error ;Test/compile ;doc ;mimaReportBinaryIssues; info"
 
 if [ "x$SBT_TEST_PROJECTS" = "x" ]; then
   SBT_CMD="$SBT_CMD ;testQuick -- stopOnFail"

.circleci/config.yml

@@ -6,7 +6,7 @@ commands:
     parameters:
       sbt_version:
         type: string
-        default: "1.11.4"
+        default: "2.0.1"
     steps:
       - restore_cache:
           keys:
@@ -67,14 +67,14 @@ commands:
                     exit 1
 
   build_n_test:
-    description: Build & Run tests
+    description: 'Build & Run tests'
     parameters:
       variant:
         type: string
         default: ""
       java_version:
         type: string
-        default: "openjdk8"
+        default: "openjdk26"
       scala_version:
         type: string
         default: "2.13"
@@ -159,7 +159,7 @@ commands:
         default: ""
       java_version:
         type: string
-        default: "openjdk8"
+        default: "openjdk26"
       scala_version:
         type: string
         default: "2.13"
@@ -214,7 +214,7 @@ commands:
 
       - run:
           name: Build example << parameters.module >>
-          command: cd examples && sbt +test:compile
+          command: cd examples && sbt +Test/compile
 
       - save_cache:
           paths:
@@ -285,9 +285,9 @@ commands:
 jobs:
   # --- Common tests --- #
 
-  common_scala211_jdk8:
+  common_scala211_jdk26:
     docker:
-      - image: cimg/openjdk:8.0
+      - image: cimg/openjdk:26.0
 
     working_directory: ~/repo
 
@@ -300,9 +300,9 @@ jobs:
           play_json_version: 2.6.7
           variant: Play 2.6, WS 1.1
 
-  common_scala212_play27_jdk8:
+  common_scala212_play27_jdk26:
     docker:
-      - image: cimg/openjdk:8.0
+      - image: cimg/openjdk:26.0
 
     working_directory: ~/repo
 
@@ -323,15 +323,14 @@ jobs:
           play_json_version: 2.9.1
           variant: Play 2.7, WS 2.0
 
-  common_scala213_play28_jdk9:
+  common_scala213_play28_jdk26:
     docker:
-      - image: circleci/openjdk:9-jdk
+      - image: cimg/openjdk:26.0
 
     working_directory: ~/repo
 
     steps:
       - test_suite:
-          java_version: openjdk9
           modules: core vfs play
           scala_version: "2.13"
           ws_version: 2.0.6
@@ -340,7 +339,6 @@ jobs:
           variant: Play 2.7, WS 2.0
 
       - test_suite:
-          java_version: openjdk9
           modules: core vfs play
           scala_version: "2.13"
           ws_version: 2.1.2
@@ -358,17 +356,17 @@ jobs:
       - test_suite:
           java_version: openjdk17
           modules: core vfs play
-          scala_version: 3.8.4
+          scala_version: 3.4.3
           ws_version: 2.2.11
           play_version: 2.9.5
           play_json_version: 2.10.6
           variant: Play 2.9, WS 2.2
 
   # --- Integration: S3/Google --- #
 
-  int_scala211_jdk8:
+  int_scala211_jdk26:
     docker:
-      - image: cimg/openjdk:8.0
+      - image: cimg/openjdk:26.0
       - image: minio/minio:RELEASE.2024-11-07T00-52-20Z
         environment:
           MINIO_ROOT_USER: minioadmin
@@ -423,9 +421,9 @@ jobs:
           play_json_version: 2.6.7
           variant: Play 2.6, WS 1.1
 
-  int_scala212_play27_jdk8:
+  int_scala212_play27_jdk26:
     docker:
-      - image: cimg/openjdk:8.0
+      - image: cimg/openjdk:26.0
       - image: minio/minio:RELEASE.2024-11-07T00-52-20Z
         environment:
           MINIO_ROOT_USER: minioadmin
@@ -540,15 +538,15 @@ jobs:
       - test_suite:
           java_version: openjdk17
           modules: s3 google
-          scala_version: 3.8.4
+          scala_version: 3.4.3
           ws_version: 2.2.11
           play_version: 2.9.5
           play_json_version: 2.10.6
           variant: Play 2.9, WS 2.2
 
-  gridfs_scala212_play27_jdk8:
+  gridfs_scala212_play27_jdk26:
     docker:
-      - image: cimg/openjdk:8.0
+      - image: cimg/openjdk:26.0
       - image: mongo:8.0.3
 
     working_directory: ~/repo
@@ -581,7 +579,7 @@ jobs:
           name: Build and Test GridFS (Scala 2.12)
           command: |
             export PATH="$HOME/sbt/bin:$PATH"
-            sbt -J-Xmx4g "++ 2.12.18; gridfs/test"
+            sbt -J-Xmx4g "++ 2.12.21; gridfs/test"
 
       - save_cache:
           paths:
@@ -593,7 +591,7 @@ jobs:
 
   publish_snapshots:
     docker:
-      - image: cimg/openjdk:8.0
+      - image: cimg/openjdk:26.0
 
     working_directory: ~/repo
 
@@ -631,7 +629,7 @@ jobs:
           ws_version: 2.2.11
           play_version: 2.9.5
           play_json_version: 2.10.6
-          scala_versions: "3.8.4"
+          scala_versions: "3.4.3"
       # TODO: play29
 
       - publish_snapshots:
@@ -650,7 +648,7 @@ jobs:
 
   examples:
     docker:
-      - image: cimg/openjdk:11.0
+      - image: cimg/openjdk:26.0
 
     working_directory: ~/repo
 
@@ -667,28 +665,28 @@ workflows:
   main_suite:
     jobs:
       # Common
-      - common_scala211_jdk8
-      - common_scala212_play27_jdk8
-      - common_scala213_play28_jdk9
+      - common_scala211_jdk26
+      - common_scala212_play27_jdk26
+      - common_scala213_play28_jdk26
       - common_scala3_play29_jdk17
 
       # S3/Google
-      - int_scala211_jdk8:
+      - int_scala211_jdk26:
           requires:
-            - common_scala211_jdk8
-      - int_scala212_play27_jdk8:
+            - common_scala211_jdk26
+      - int_scala212_play27_jdk26:
           requires:
-            - common_scala212_play27_jdk8
-            - int_scala211_jdk8
+            - common_scala212_play27_jdk26
+            - int_scala211_jdk26
       - int_scala3_play29_jdk17:
           requires:
             - common_scala3_play29_jdk17
-            - int_scala212_play27_jdk8
+            - int_scala212_play27_jdk26
 
       # GridFS
-      - gridfs_scala212_play27_jdk8:
+      - gridfs_scala212_play27_jdk26:
           requires:
-            - common_scala212_play27_jdk8
+            - common_scala212_play27_jdk26
 
       # Master
       - publish_snapshots:
@@ -697,10 +695,10 @@ workflows:
               only:
                 - master
           requires:
-            - int_scala211_jdk8
-            - int_scala212_play27_jdk8
+            - int_scala211_jdk26
+            - int_scala212_play27_jdk26
             - int_scala3_play29_jdk17
-            - gridfs_scala212_play27_jdk8
+            - gridfs_scala212_play27_jdk26
 
       - examples:
           filters:

build.sbt

@@ -14,7 +14,7 @@ lazy val core = project
   .settings(
     name := "benji-core",
     Compile / compile / scalacOptions ++= {
-      if (scalaBinaryVersion.value startsWith "3") {
+      if (scalaBinaryVersion.value.startsWith("3")) {
         Seq("-language:higherKinds")
       } else if (scalaBinaryVersion.value == "2.12") {
         Seq("-language:higherKinds")
@@ -77,7 +77,7 @@ lazy val core = project
 val scalaXmlVer = Def.setting[String] {
   val sv = scalaBinaryVersion.value
 
-  if (sv startsWith "3") "2.0.1"
+  if (sv.startsWith("3")) "2.0.1"
   else if (sv == "2.13") "1.3.0"
   else "1.0.6"
 }
@@ -276,7 +276,7 @@ lazy val gridfs = project
 
 lazy val playTest = Def.setting {
   val ver = {
-    if (scalaBinaryVersion.value startsWith "3") {
+    if (scalaBinaryVersion.value.startsWith("3")) {
       "2.8.11"
     } else if (
       scalaBinaryVersion.value == "2.13" && playVer.value.startsWith("2.7")
@@ -302,21 +302,21 @@ lazy val play = project
       val ver = (ThisBuild / version).value
       val playMajor = playVer.value.split("\\.").take(2).mkString
 
-      if (ver endsWith "-SNAPSHOT") {
+      if (ver.endsWith("-SNAPSHOT")) {
         s"${ver.dropRight(9)}-play${playMajor}-SNAPSHOT"
       } else {
         s"${ver}-play${playMajor}"
       }
     },
     Test / sourceDirectory := {
-      if (scalaBinaryVersion.value startsWith "3") {
+      if (scalaBinaryVersion.value.startsWith("3")) {
         baseDirectory.value / "no-test" // TODO
       } else {
         (Test / sourceDirectory).value
       }
     },
     Test / unmanagedSourceDirectories ++= {
-      if (scalaBinaryVersion.value startsWith "3") {
+      if (scalaBinaryVersion.value.startsWith("3")) {
         Seq.empty
       } else {
         val v = playVer.value.split("\\.").take(2).mkString(".")
@@ -342,7 +342,7 @@ lazy val play = project
     },
     libraryDependencies ++= {
       val exclude: ModuleID => ModuleID = {
-        if (scalaBinaryVersion.value startsWith "3") { (mid: ModuleID) =>
+        if (scalaBinaryVersion.value.startsWith("3")) { (mid: ModuleID) =>
           mid
             .exclude("com.typesafe.akka", "*")
             .exclude("org.scala-lang.modules", "*")
@@ -369,7 +369,7 @@ lazy val play = project
       ) % Provided
 
       val playDeps: Seq[ModuleID] = {
-        if (playVer.value startsWith "2.6") {
+        if (playVer.value.startsWith("2.6")) {
           Seq(playMain)
         } else if (
           scalaBinaryVersion.value == "2.13" && playVer.value.startsWith("2.7")
@@ -406,32 +406,32 @@ lazy val play = project
     Compile / doc / sources := {
       val compiled = (Compile / sources).value
 
-      compiled.filter { _.getName endsWith "NamedStorage.java" }
+      compiled.filter { _.getName.endsWith("NamedStorage.java") }
     }
   )
   .dependsOn(core % "test->test;compile->compile", vfs % "test->compile")
 
 mimaPreviousArtifacts := Set.empty
 
-lazy val benji = (project in file("."))
+lazy val benji = project
+  .in(file("."))
   .enablePlugins(ScalaUnidocPlugin)
   .settings(
-    Seq(
+    Publish.settings ++ Seq(
       libraryDependencies ++= Dependencies.playAhcWS.value,
       pomPostProcess := Common.transformPomDependencies { depSpec =>
         // Filter in POM the dependencies only required to compile sample in doc
 
-        if ((depSpec \ "artifactId").text startsWith "benji-") {
+        if ((depSpec \ "artifactId").text.startsWith("benji-")) {
           Some(depSpec)
         } else {
           Option.empty
         }
       },
-      doc / excludeFilter := "play",
-      Compile / doc / scalacOptions ++= List(
-        "-skip-packages",
-        "highlightextractor"
+      mimaPreviousArtifacts := Set(
+        /* organization.value %% name.value % previousRelease */
       ),
+      doc / excludeFilter := "play",
       ScalaUnidoc / unidoc / unidocAllSources ~= {
         _.map(_.filterNot { f =>
           val name = f.getName
@@ -442,7 +442,7 @@ lazy val benji = (project in file("."))
             f.getPath.indexOf("src_managed") != -1)
         })
       }
-    ) ++ Publish.settings
+    )
   )
   .dependsOn(s3, google, vfs, gridfs, play)
   .aggregate(core, s3, google, vfs, gridfs, play)

codestyle.sbt

@@ -4,7 +4,6 @@ ThisBuild / scalafmtOnCompile := true
 inThisBuild(
   List(
     // scalaVersion := "2.13.3",
-    semanticdbEnabled := true,
     semanticdbVersion := scalafixSemanticdb.revision,
     scalafixDependencies += "io.github.cchantep" %% "offler-rules" % "1.0.1-SNAPSHOT"
   )