Skip to content

Commit

Permalink
Use jdk 21 in CI, pr feedback
Browse files Browse the repository at this point in the history
Also got rid of an extra signing block in the publishing task, which
is taken care of by jreleaser.
  • Loading branch information
milesziemer committed Jul 30, 2024
1 parent 05aadc9 commit e6a17bb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java: [8, 11, 17]
java: [21]
os: [ubuntu-latest, windows-latest, macos-latest]

steps:
Expand Down
16 changes: 4 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -139,16 +139,6 @@ publishing {
}
}
}

// Don't sign the artifacts if we didn't get a key and password to use.
if (project.hasProperty("signingKey") && project.hasProperty("signingPassword")) {
signing {
useInMemoryPgpKeys(
(String) project.property("signingKey"),
(String) project.property("signingPassword"))
sign(publishing.publications["mavenJava"])
}
}
}


Expand Down Expand Up @@ -209,8 +199,9 @@ tasks.named("checkstyleTest") {
}

java {
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
toolchain {
languageVersion = JavaLanguageVersion.of(21)
}
}

jar {
Expand All @@ -224,6 +215,7 @@ jar {
exclude "META-INF/*.DSA"
exclude "META-INF/*.RSA"
exclude "reflect.properties"
// Included by dependencies in later versions of java, causes duplicate entries in the output jar
exclude "**/module-info.class"
}
manifest {
Expand Down

0 comments on commit e6a17bb

Please sign in to comment.