Update to SBT 2.0.1

Author: cchantep

.circleci/config.yml

@@ -6,7 +6,7 @@ commands:
     parameters:
       sbt_version:
         type: string
-        default: "1.10.7"
+        default: "2.0.1"
     steps:
       - restore_cache:
           keys:
@@ -60,9 +60,9 @@ commands:
           when: always
 
 jobs:
-  scala211_jdk8:
+  scala211_jdk17:
     docker:
-      - image: cimg/openjdk:8.0
+      - image: cimg/openjdk:17.0
 
     working_directory: ~/repo
 
@@ -77,9 +77,9 @@ jobs:
       - store_test_results:
           path: test-reports
 
-  scala212_jdk11:
+  scala212_jdk26:
     docker:
-      - image: cimg/openjdk:11.0
+      - image: cimg/openjdk:26.0
 
     working_directory: ~/repo
 
@@ -94,9 +94,9 @@ jobs:
       - store_test_results:
           path: test-reports
 
-  scala213_jdk8:
+  scala213_jdk26:
     docker:
-      - image: cimg/openjdk:11.0
+      - image: cimg/openjdk:26.0
 
     working_directory: ~/repo
 
@@ -111,9 +111,9 @@ jobs:
       - store_test_results:
           path: test-reports
 
-  scala3_jdk10:
+  scala3_jdk26:
     docker:
-      - image: cimg/openjdk:11.0
+      - image: cimg/openjdk:26.0
 
     working_directory: ~/repo
 
@@ -184,7 +184,7 @@ jobs:
 
   publish_snapshots:
     docker:
-      - image: cimg/openjdk:8.0
+      - image: cimg/openjdk:26.0
 
     working_directory: ~/repo
 
@@ -201,34 +201,33 @@ jobs:
               exit 0
             fi
 
-            V=`sbt 'show version' | tail -n 1 | cut -d ']' -f 2 | perl -pe 's/^[ \t]+//;s/[ \t]+$//'`
-    
-            if [ `echo "$V" | grep -- '-SNAPSHOT' | wc -l` -eq 0 ]; then
-              echo "Cannot publish release $V"
+            if [ "x$PUBLISH_USER" = "x" -o "x$PUBLISH_PASS" = "x" ]; then
+              echo "Missing publication credentials"
+              exit 1
+            fi
+
+            V=$(sbt --server 'show version' 2>&1 | sed 's/\x1b\[0[Jm]//g' | grep --color=never '[0-9]\+\.[0-9]\+' | tail -1 | sed 's/\[info\]//' | xargs | tr -cd '[:alnum:]._-')
+
+            if [[ "$V" != *SNAPSHOT* ]]; then
+              echo "Skip non snapshot: $V"
               exit 0
             fi
 
             export PUBLISH_REPO_NAME="Sonatype Nexus Repository Manager"
             export PUBLISH_REPO_ID="central.sonatype.com"
             export PUBLISH_REPO_URL="https://central.sonatype.com/repository/maven-snapshots/"
 
-            if [ "x$PUBLISH_USER" = "x" -o "x$PUBLISH_PASS" = "x" ]; then
-              echo "Missing publication credentials"
-              exit 1
-            fi
-
             sbt +publish
 
-
 workflows:
   version: 2
 
   main_suite:
     jobs:
-      - scala211_jdk8
-      - scala212_jdk11
-      - scala213_jdk8
-      - scala3_jdk10
+      - scala211_jdk17
+      - scala212_jdk26
+      - scala213_jdk26
+      - scala3_jdk26
 
       - jdbc_mcp_jdk11
 
@@ -238,7 +237,7 @@ workflows:
               only:
                 - master
           requires:
-            - scala211_jdk8
-            - scala212_jdk11
-            - scala213_jdk8
-            - scala3_jdk10
+            - scala211_jdk17
+            - scala212_jdk26
+            - scala213_jdk26
+            - scala3_jdk26

.jvmopts

@@ -32,7 +32,7 @@ ThisBuild / scalacOptions ++= Seq(
 )
 
 ThisBuild / scalacOptions ++= {
-  if (scalaBinaryVersion.value startsWith "2.") {
+  if (scalaBinaryVersion.value.startsWith("2.")) {
     Seq(
       "-Xfatal-warnings",
       "-Xlint",

compiler.sbt

@@ -14,6 +14,6 @@ class JdbcJava8(jdbcDriver: Project) {
         libraryDependencies += ("org.specs2" %% "specs2-core" % specsVer.value % Test),
         crossPaths := false
       )
-      .dependsOn(jdbcDriver)
+      .dependsOn(sbt.projectToLocalProject(jdbcDriver))
 
 }

project/JdbcJava8.scala

@@ -26,7 +26,7 @@ final class JdbcScala(jdbcDriver: Project) {
           )
         }
       )
-      .dependsOn(jdbcDriver)
+      .dependsOn(sbt.projectToLocalProject(jdbcDriver))
 
   // Source generator
   private def generateRowClasses(

project/JdbcScala.scala

@@ -41,5 +41,5 @@ class PlayJdbc(jdbcScala: Project) {
           )
         }
       )
-      .dependsOn(jdbcScala)
+      .dependsOn(sbt.projectToLocalProject(jdbcScala))
 }

project/PlayJdbc.scala

@@ -20,9 +20,11 @@ object Publish {
       Credentials(repoName, repoId, repoUser, repoPass)
     ),
     ThisBuild / pomIncludeRepository := { _ => false },
+
     ThisBuild / licenses := Seq(
-      "GNU Lesser General Public License, Version 2.1" ->
-        url("https://raw.github.com/cchantep/acolyte/master/LICENSE.txt")
+      License(
+        "GNU Lesser General Public License, Version 2.1",
+        url("https://raw.github.com/cchantep/acolyte/master/LICENSE.txt"))
     ),
     ThisBuild / homepage := Some(url(siteUrl)),
     ThisBuild / autoAPIMappings := true,

project/Publish.scala

@@ -59,7 +59,7 @@ final class ReactiveMongo { self =>
                 case ("", _) =>
                   s"${v}-${playVar}"
 
-                case (a, "") if (a startsWith "RC") =>
+                case (a, "") if (a.startsWith("RC")) =>
                   s"${v}-${playVar}-${a}"
 
                 case (a, b) =>
@@ -84,6 +84,6 @@ final class ReactiveMongo { self =>
           ) ++ iteratees
         }
       )
-      .dependsOn(self.project)
+      .dependsOn(sbt.projectToLocalProject(self.project))
 
 }

project/ReactiveMongo.scala

@@ -1 +1 @@
-sbt.version=1.12.13
+sbt.version=2.0.1

project/build.properties

@@ -8,8 +8,8 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.6")
 
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.1")
 
-addSbtPlugin("cchantep" % "sbt-hl-compiler" % "0.8")
+addSbtPlugin("cchantep" % "sbt-hl-compiler" % "0.12")
 
-addSbtPlugin("cchantep" % "sbt-scaladoc-compiler" % "0.2")
+addSbtPlugin("cchantep" % "sbt-scaladoc-compiler" % "0.8")
 
 addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.1.1")