Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Gradle to 8.5 #22

Merged
merged 6 commits into from
Dec 12, 2023
Merged

Update Gradle to 8.5 #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5a1c395
Update Gradle to 8.5
shartte Dec 12, 2023
8c670be
Also bump the Github workflow.
shartte Dec 12, 2023
c1f961e
Adapt release workflow to JDK 17 and add warning-mode fail.
shartte Dec 12, 2023
9549418
Use Eclipse Temurin
shartte Dec 12, 2023
cf79a6f
Add JDK 21, run release on latest LTS.
shartte Dec 12, 2023
10e891a
Fixed deprecations.
shartte Dec 12, 2023
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
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ jobs:
build:
strategy:
matrix:
java: [8-jdk, 11-jdk, 15-jdk]
runs-on: ubuntu-20.04
java: [8-jdk, 11-jdk, 17-jdk, 21-jdk]
runs-on: ubuntu-22.04
container:
image: openjdk:${{ matrix.java }}
image: eclipse-temurin:${{ matrix.java }}
options: --user root
steps:
- uses: actions/checkout@v1
- uses: gradle/wrapper-validation-action@v1
- run: ./gradlew build --stacktrace
- run: ./gradlew build --stacktrace --warning-mode fail
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ name: Release
on: [workflow_dispatch] # Manual trigger
jobs:
build:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
container:
image: openjdk:15-jdk
image: eclipse-temurin:21-jdk
options: --user root
steps:
- uses: actions/checkout@v1
- uses: gradle/wrapper-validation-action@v1
- run: ./gradlew build publish --stacktrace
- run: ./gradlew build publish --stacktrace --warning-mode fail
env:
MAVEN_URL: ${{ secrets.MAVEN_URL }}
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
10 changes: 7 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ allprojects {
version = "2.3.0"
version = version + (ENV.GITHUB_ACTIONS ? "" : "+local")

sourceCompatibility = 1.8
targetCompatibility = 1.8

repositories {
mavenCentral()
}
Expand All @@ -31,6 +28,11 @@ allprojects {
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.+'
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.+'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.+'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.+'
}

test {
useJUnitPlatform()
}

tasks.withType(JavaCompile).configureEach {
Expand All @@ -43,6 +45,8 @@ allprojects {

java {
withSourcesJar()
sourceCompatibility = 1.8
targetCompatibility = 1.8
}

task javadocJar(type: Jar, dependsOn: javadoc) {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading