Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -59,19 +59,19 @@ 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

- 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"

Expand All @@ -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
Expand Down
8 changes: 0 additions & 8 deletions .github/workflows/h2-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/headers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/link-validator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/mysql-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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() }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/oracle-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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() }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/postgres-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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() }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |-
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/sqlserver-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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() }}
Expand Down
3 changes: 1 addition & 2 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 4 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Loading