Skip to content

Commit

Permalink
chore: Drop JDK 8 (#461)
Browse files Browse the repository at this point in the history
  • Loading branch information
patriknw authored Oct 2, 2023
1 parent 2333441 commit 2ef021c
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ jobs:
- name: Cache Coursier cache
uses: coursier/[email protected]

- name: Set up JDK 8
- name: Set up JDK 11
uses: coursier/[email protected]
with:
jvm: temurin:1.8.0
jvm: temurin:1.11.0

- name: Code style check, compilation and binary-compatibility check
run: |-
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ jobs:
matrix:
include:
# cover relevant combinations when combined with the matrix Yugabyte tests
# { scalaVersion: "2.13", jdkVersion: "1.8.0", jvmName: "temurin:1.8.0", extraOpts: '', testCmd: "test"}
# { scalaVersion: "2.13", jdkVersion: "1.11.0", jvmName: "temurin:1.11.0", extraOpts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler', testCmd: "test"}
- { scalaVersion: "2.13", jdkVersion: "1.17.0", jvmName: "temurin:1.17.0", extraOpts: '', testCmd: "test"}
- { scalaVersion: "3.3", jdkVersion: "1.17.0", jvmName: "temurin:1.17.0", extraOpts: '', testCmd: "core/test"}
Expand Down Expand Up @@ -71,7 +70,6 @@ jobs:
matrix:
include:
# cover relevant combinations when combined with the matrix Postgres tests
- { scalaVersion: "2.13", jdkVersion: "1.8.0", jvmName: "temurin:1.8.0", extraOpts: '', testCmd: "test" }
- { scalaVersion: "2.13", jdkVersion: "1.11.0", jvmName: "temurin:1.11.0", extraOpts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler', testCmd: "test" }
# { scalaVersion: "2.13", jdkVersion: "1.17.0", jvmName: "temurin:1.17.0", extraOpts: '', testCmd: "test" }
- { scalaVersion: "3.3", jdkVersion: "1.17.0", jvmName: "temurin:1.17.0", extraOpts: '', testCmd: "core/test"}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ jobs:
- name: Cache Coursier cache
uses: coursier/[email protected]

- name: Set up JDK 8
- name: Set up JDK 11
uses: coursier/[email protected]
with:
jvm: adopt:1.8.0-275
jvm: temurin:1.11.0.17

- name: Publish
run: |-
Expand Down
10 changes: 9 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ def common: Seq[Setting[_]] =
scalafmtOnCompile := true,
sonatypeProfileName := "com.lightbend",
// Setting javac options in common allows IntelliJ IDEA to import them automatically
Compile / javacOptions ++= Seq("-encoding", "UTF-8", "-source", "1.8", "-target", "1.8"),
Compile / javacOptions ++= Seq("-encoding", "UTF-8", "--release", "11"),
Compile / scalacOptions ++= Seq("-release", "11"),
headerLicense := Some(
HeaderLicense.Custom("""Copyright (C) 2022 - 2023 Lightbend Inc. <https://www.lightbend.com>""")),
Test / logBuffered := false,
Expand Down Expand Up @@ -161,3 +162,10 @@ lazy val docs = project
resolvers += Resolver.jcenterRepo,
publishRsyncArtifacts += makeSite.value -> "www/",
publishRsyncHost := "[email protected]")

val isJdk11orHigher: Boolean = {
val result = VersionNumber(sys.props("java.specification.version")).matchesSemVer(SemanticSelector(">=11"))
if (!result)
throw new IllegalArgumentException("JDK 11 or higher is required")
result
}
2 changes: 1 addition & 1 deletion project/project-info.conf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
project-info {
version: "current"
shared-info {
jdk-versions: ["OpenJDK 8", "OpenJDK 11", "OpenJDK 17"]
jdk-versions: ["Eclipse Temurin JDK 11", "Eclipse Temurin JDK 17"]
issues: {
url: "https://github.com/akka/akka-persistence-r2dbc/issues"
text: "Github issues"
Expand Down

0 comments on commit 2ef021c

Please sign in to comment.