diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index edfc9206..814ae20b 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -27,11 +27,11 @@ jobs: git fetch origin pull/${{ github.event.pull_request.number }}/merge:scratch git checkout scratch - - name: Setup Java 11 + - name: Setup Java 17 uses: actions/setup-java@v5 with: distribution: temurin - java-version: 11 + java-version: 17 - name: Install sbt uses: sbt/setup-sbt@17575ea4e18dd928fe5968dbe32294b97923d65b # v1.1.13 @@ -59,11 +59,11 @@ jobs: git fetch origin pull/${{ github.event.pull_request.number }}/merge:scratch git checkout scratch - - name: Setup Java 11 + - name: Setup Java 17 uses: actions/setup-java@v5 with: distribution: temurin - java-version: 11 + java-version: 17 - name: Install sbt uses: sbt/setup-sbt@17575ea4e18dd928fe5968dbe32294b97923d65b # v1.1.13 @@ -71,7 +71,7 @@ jobs: - name: Cache Coursier cache uses: coursier/cache-action@4e2615869d13561d626ed48655e1a39e5b192b3c # v6.4.7 - - name: Compile all code with fatal warnings for Java 11, Scala 2.12, Scala 2.13 and Scala 3 + - name: Compile all code with fatal warnings for Java 11, Scala 2.13 and Scala 3 # Run locally with: sbt 'clean ; +Test/compile' run: sbt "; +Test/compile" @@ -91,11 +91,11 @@ jobs: git fetch origin pull/${{ github.event.pull_request.number }}/merge:scratch git checkout scratch - - name: Setup Java 11 + - name: Setup Java 17 uses: actions/setup-java@v5 with: distribution: temurin - java-version: 11 + java-version: 17 - name: Install sbt uses: sbt/setup-sbt@17575ea4e18dd928fe5968dbe32294b97923d65b # v1.1.13 diff --git a/.github/workflows/h2-test.yml b/.github/workflows/h2-test.yml index 737d0c51..4ad04a7f 100644 --- a/.github/workflows/h2-test.yml +++ b/.github/workflows/h2-test.yml @@ -17,16 +17,8 @@ jobs: fail-fast: false matrix: include: - - { java-version: 8, scala-version: 2.12, sbt-opts: '' } - - { java-version: 8, scala-version: 2.13, sbt-opts: '' } - - { java-version: 8, scala-version: 3.3, sbt-opts: '' } - - { 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: '' } - - { java-version: 21, scala-version: 2.12, sbt-opts: '' } - { java-version: 21, scala-version: 2.13, sbt-opts: '' } - { java-version: 21, scala-version: 3.3, sbt-opts: '' } steps: diff --git a/.github/workflows/headers.yml b/.github/workflows/headers.yml index 5fc04fee..9a38e9f2 100644 --- a/.github/workflows/headers.yml +++ b/.github/workflows/headers.yml @@ -13,11 +13,11 @@ jobs: - name: Checkout uses: actions/checkout@v5 - - name: Setup Java 11 + - name: Setup Java 17 uses: actions/setup-java@v5 with: distribution: temurin - java-version: 11 + java-version: 17 - name: Install sbt uses: sbt/setup-sbt@17575ea4e18dd928fe5968dbe32294b97923d65b # v1.1.13 diff --git a/.github/workflows/link-validator.yml b/.github/workflows/link-validator.yml index ee37e88e..e93678fa 100644 --- a/.github/workflows/link-validator.yml +++ b/.github/workflows/link-validator.yml @@ -17,11 +17,11 @@ jobs: fetch-depth: 0 fetch-tags: true - - name: Setup Java 11 + - name: Setup Java 17 uses: actions/setup-java@v5 with: distribution: temurin - java-version: 11 + java-version: 17 - name: Install sbt uses: sbt/setup-sbt@17575ea4e18dd928fe5968dbe32294b97923d65b # v1.1.13 diff --git a/.github/workflows/mysql-tests.yml b/.github/workflows/mysql-tests.yml index 5831d2a5..423148f5 100644 --- a/.github/workflows/mysql-tests.yml +++ b/.github/workflows/mysql-tests.yml @@ -33,11 +33,11 @@ jobs: git fetch origin pull/${{ github.event.pull_request.number }}/merge:scratch git checkout scratch - - name: Setup Java 11 + - name: Setup Java 17 uses: actions/setup-java@v5 with: distribution: temurin - java-version: 11 + java-version: 17 - name: Install sbt uses: sbt/setup-sbt@17575ea4e18dd928fe5968dbe32294b97923d65b # v1.1.13 @@ -49,11 +49,11 @@ 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 }} - name: Run Migrator Integration tests for ${{ matrix.name }} if: matrix.name == 'MySQL' - run: sbt ++2.13 "migratorIntegration/testOnly org.apache.pekko.persistence.jdbc.migrator.integration.MySQL*" ${{ matrix.extraOpts }} -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler + run: sbt ++2.13 "migratorIntegration/testOnly org.apache.pekko.persistence.jdbc.migrator.integration.MySQL*" ${{ matrix.extraOpts }} - name: Print logs on failure if: ${{ failure() }} diff --git a/.github/workflows/oracle-tests.yml b/.github/workflows/oracle-tests.yml index af3e3dfa..66895f68 100644 --- a/.github/workflows/oracle-tests.yml +++ b/.github/workflows/oracle-tests.yml @@ -33,11 +33,11 @@ jobs: git fetch origin pull/${{ github.event.pull_request.number }}/merge:scratch git checkout scratch - - name: Setup Java 11 + - name: Setup Java 17 uses: actions/setup-java@v5 with: distribution: temurin - java-version: 11 + java-version: 17 - name: Install sbt uses: sbt/setup-sbt@17575ea4e18dd928fe5968dbe32294b97923d65b # v1.1.13 @@ -49,11 +49,11 @@ 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 }} - name: Run Migrator Integration tests for ${{ matrix.name }} if: matrix.name == 'Oracle' - run: sbt ++2.13 "migratorIntegration/testOnly org.apache.pekko.persistence.jdbc.migrator.integration.Oracle*" ${{ matrix.extraOpts }} -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler + run: sbt ++2.13 "migratorIntegration/testOnly org.apache.pekko.persistence.jdbc.migrator.integration.Oracle*" ${{ matrix.extraOpts }} - name: Print logs on failure if: ${{ failure() }} diff --git a/.github/workflows/postgres-tests.yml b/.github/workflows/postgres-tests.yml index 88923bb8..cbddc9ef 100644 --- a/.github/workflows/postgres-tests.yml +++ b/.github/workflows/postgres-tests.yml @@ -33,11 +33,11 @@ jobs: git fetch origin pull/${{ github.event.pull_request.number }}/merge:scratch git checkout scratch - - name: Setup Java 11 + - name: Setup Java 17 uses: actions/setup-java@v5 with: distribution: temurin - java-version: 11 + java-version: 17 - name: Install sbt uses: sbt/setup-sbt@17575ea4e18dd928fe5968dbe32294b97923d65b # v1.1.13 @@ -49,11 +49,11 @@ 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 }} - name: Run Migrator Integration tests for ${{ matrix.name }} if: matrix.name == 'Postgres' - run: sbt ++2.13 "migratorIntegration/testOnly org.apache.pekko.persistence.jdbc.migrator.integration.Postgres*" ${{ matrix.extraOpts }} -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler + run: sbt ++2.13 "migratorIntegration/testOnly org.apache.pekko.persistence.jdbc.migrator.integration.Postgres*" ${{ matrix.extraOpts }} - name: Print logs on failure if: ${{ failure() }} diff --git a/.github/workflows/publish-nightly.yml b/.github/workflows/publish-nightly.yml index cd6ffa75..4fe3e2b6 100644 --- a/.github/workflows/publish-nightly.yml +++ b/.github/workflows/publish-nightly.yml @@ -24,11 +24,11 @@ jobs: fetch-depth: 0 fetch-tags: true - - name: Setup Java 8 + - name: Setup Java 17 uses: actions/setup-java@v5 with: distribution: temurin - java-version: 8 + java-version: 17 - name: Publish Jars to Apache Maven Repository run: |- diff --git a/.github/workflows/sqlserver-tests.yml b/.github/workflows/sqlserver-tests.yml index 4283881f..0d9afc6e 100644 --- a/.github/workflows/sqlserver-tests.yml +++ b/.github/workflows/sqlserver-tests.yml @@ -33,11 +33,11 @@ jobs: git fetch origin pull/${{ github.event.pull_request.number }}/merge:scratch git checkout scratch - - name: Setup Java 11 + - name: Setup Java 17 uses: actions/setup-java@v5 with: distribution: temurin - java-version: 11 + java-version: 17 - name: Install sbt uses: sbt/setup-sbt@v1 @@ -52,11 +52,11 @@ 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 }} - name: Run Migrator Integration tests for ${{ matrix.name }} if: matrix.name == 'SqlServer' - run: sbt ++2.13 "migratorIntegration/testOnly org.apache.pekko.persistence.jdbc.migrator.integration.SqlServer*" ${{ matrix.extraOpts }} -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler + run: sbt ++2.13 "migratorIntegration/testOnly org.apache.pekko.persistence.jdbc.migrator.integration.SqlServer*" ${{ matrix.extraOpts }} - name: Print logs on failure if: ${{ failure() }} diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 492af7a3..bf965170 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -11,10 +11,9 @@ import sbt._ object Dependencies { // Keep in sync with .github CI build - val Scala212 = "2.12.20" val Scala213 = "2.13.16" val Scala3 = "3.3.6" - val ScalaVersions = Seq(Scala212, Scala213, Scala3) + val ScalaVersions = Seq(Scala213, Scala3) val PekkoVersion = PekkoCoreDependency.version diff --git a/project/plugins.sbt b/project/plugins.sbt index aca596e5..5fc17d20 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -18,9 +18,10 @@ addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.1.1") addSbtPlugin("net.bzzt" % "sbt-reproducible-builds" % "0.32") addSbtPlugin("com.github.pjfanning" % "sbt-pekko-build" % "0.4.5") addSbtPlugin("com.github.pjfanning" % "sbt-source-dist" % "0.1.12") + // docs -addSbtPlugin(("com.github.sbt" % "sbt-site-paradox" % "1.7.0").excludeAll( - "com.lightbend.paradox", "sbt-paradox")) addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.6.0") - addSbtPlugin("org.apache.pekko" % "pekko-sbt-paradox" % "1.0.1") +addSbtPlugin("com.github.sbt" % "sbt-site-paradox" % "1.7.0") +addSbtPlugin("com.lightbend.paradox" % "sbt-paradox-theme" % "0.10.7") +addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.7")