Update sbt to 1.10.0 (#189)

* Update sbt to 1.10.0 * try to fix tests * Update build.sbt * try to fix tests * Update h2-test.yml --------- Co-authored-by: scala-steward-asf[bot] <147768647+scala-steward-asf[bot]@users.noreply.github.com> Co-authored-by: PJ Fanning <[email protected]>
apache · May 14, 2024 · 018447e · 018447e
1 parent 0804936
commit 018447e
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 7 deletions.
diff --git a/.github/workflows/h2-test.yml b/.github/workflows/h2-test.yml
@@ -23,6 +23,9 @@ jobs:
           - { java-version: 11, scala-version: 2.12, sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
           - { java-version: 11, scala-version: 2.13, sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
           - { java-version: 11, scala-version: 3.3,  sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
+          - { java-version: 17, scala-version: 2.12, sbt-opts: '' }
+          - { java-version: 17, scala-version: 2.13, sbt-opts: '' }
+          - { java-version: 17, scala-version: 3.3,  sbt-opts: '' }
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -46,7 +49,7 @@ jobs:
         uses: coursier/cache-action@v6
 
       - name: Run tests with Scala ${{ matrix.scala-version }} and Java ${{ matrix.java-version }}
-        run: sbt "++${{ matrix.scala-version }} test" ${{ matrix.sbt-opts }}
+        run: sbt ++${{ matrix.scala-version }} "core/test; migrator/test" ${{ matrix.sbt-opts }}
 
       - name: Print logs on failure
         if: ${{ failure() }}

diff --git a/.github/workflows/mysql-tests.yml b/.github/workflows/mysql-tests.yml
@@ -46,7 +46,7 @@ jobs:
         run: ./scripts/launch-mysql.sh
 
       - name: Run Integration tests for  ${{ matrix.name }}
-        run: sbt "++2.13 integration/testOnly org.apache.pekko.persistence.jdbc.integration.MySQL*"  ${{ matrix.extraOpts }} -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler
+        run: sbt ++2.13 "integration/testOnly org.apache.pekko.persistence.jdbc.integration.MySQL*"  ${{ matrix.extraOpts }} -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler
 
       - name: Print logs on failure
         if: ${{ failure() }}

diff --git a/.github/workflows/oracle-tests.yml b/.github/workflows/oracle-tests.yml
@@ -46,7 +46,7 @@ jobs:
         run: ./scripts/launch-oracle.sh
 
       - name: Run Integration tests for  ${{ matrix.name }}
-        run: sbt "++2.13 integration/testOnly org.apache.pekko.persistence.jdbc.integration.Oracle*"  ${{ matrix.extraOpts }} -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler
+        run: sbt ++2.13 "integration/testOnly org.apache.pekko.persistence.jdbc.integration.Oracle*"  ${{ matrix.extraOpts }} -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler
 
       - name: Print logs on failure
         if: ${{ failure() }}

diff --git a/.github/workflows/postgres-tests.yml b/.github/workflows/postgres-tests.yml
@@ -46,7 +46,7 @@ jobs:
         run: ./scripts/launch-postgres.sh
 
       - name: Run Integration tests for  ${{ matrix.name }}
-        run: sbt "++2.13 integration/testOnly org.apache.pekko.persistence.jdbc.integration.Postgres*"  ${{ matrix.extraOpts }} -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler
+        run: sbt ++2.13 "integration/testOnly org.apache.pekko.persistence.jdbc.integration.Postgres*"  ${{ matrix.extraOpts }} -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler
 
       - name: Print logs on failure
         if: ${{ failure() }}

diff --git a/.github/workflows/sqlserver-tests.yml b/.github/workflows/sqlserver-tests.yml
@@ -46,7 +46,7 @@ jobs:
         run: ./scripts/launch-sqlserver.sh
 
       - name: Run Integration tests for  ${{ matrix.name }}
-        run: sbt "++2.13 integration/testOnly org.apache.pekko.persistence.jdbc.integration.SqlServer*"  ${{ matrix.extraOpts }} -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler
+        run: sbt ++2.13 "integration/testOnly org.apache.pekko.persistence.jdbc.integration.SqlServer*"  ${{ matrix.extraOpts }} -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler
 
       - name: Print logs on failure
         if: ${{ failure() }}

diff --git a/build.sbt b/build.sbt
@@ -25,7 +25,7 @@ lazy val `pekko-persistence-jdbc` = project
   .in(file("."))
   .enablePlugins(ScalaUnidocPlugin)
   .disablePlugins(MimaPlugin, SitePlugin)
-  .aggregate(core, docs, migrator)
+  .aggregate(core, migrator, integration, docs)
   .settings(
     name := "pekko-persistence-jdbc-root",
     publish / skip := true)

diff --git a/project/build.properties b/project/build.properties
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-sbt.version=1.9.9
+sbt.version=1.10.0