Merge pull request #12618 from mkurz/sbt_1.10.0

sbt 1.10.0
playframework · May 6, 2024 · 62e45e0 · 62e45e0
2 parents ece11dd + b063445
commit 62e45e0
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -45,7 +45,7 @@ jobs:
       cmd: |
         if [ "$CACHE_HIT_COURSIER" = "false" ]; then
           sbt +update                                             # Runs with adoptium:8 (default)
-          # sbt --sbt-version 1.9.9 +update                       # If we run scripted tests with multiple sbt versions, we could init that sbt installs here
+          # sbt --sbt-version 1.10.0 +update                      # If we run scripted tests with multiple sbt versions, we could init that sbt installs here
           sbt +mimaPreviousClassfiles                             # Fetches previous artifacts
           cd documentation && sbt +update && cd ..                # Fetches dependencies of the documentation project
           sbt -java-home `cs java-home --jvm adoptium:17` exit    # Init sbt with new JVM that will be downloaded
@@ -165,7 +165,7 @@ jobs:
       scala: 2.13.x, 3.x
       add-dimensions: >-
         {
-          "sbt": [ "1.9.9" ],
+          "sbt": [ "1.10.0" ],
           "sbt_steps": [ "*1of3", "*2of3", "*3of3" ]
         }
       exclude: >-

diff --git a/documentation/project/build.properties b/documentation/project/build.properties
@@ -1,4 +1,4 @@
 # Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
 
 # sync with project/build.properties
-sbt.version=1.9.9
+sbt.version=1.10.0
diff --git a/project/PlaySbtBuildBase.scala b/project/PlaySbtBuildBase.scala
@@ -13,7 +13,7 @@ object PlaySbtBuildBase extends AutoPlugin {
   override def projectSettings = Seq(
     scalaVersion                  := ScalaVersions.scala212,
     crossScalaVersions            := Seq(ScalaVersions.scala212),
-    pluginCrossBuild / sbtVersion := SbtVersions.sbt19,
+    pluginCrossBuild / sbtVersion := SbtVersions.sbt110,
     compile / javacOptions ++= Seq("--release", "17"),
     doc / javacOptions := Seq("-source", "17")
   )

diff --git a/project/Versions.scala b/project/Versions.scala
@@ -9,5 +9,5 @@ object ScalaVersions {
 }
 
 object SbtVersions {
-  val sbt19 = "1.9.9"
+  val sbt110 = "1.10.0"
 }
diff --git a/project/build.properties b/project/build.properties
@@ -1,4 +1,4 @@
 # Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
 
 # sync with documentation/project/build.properties
-sbt.version=1.9.9
+sbt.version=1.10.0