From 8a52041f6eb5e104f7c23555ea679bebf79db2f0 Mon Sep 17 00:00:00 2001 From: Joshua Gleitze Date: Wed, 2 Apr 2025 00:05:59 +0200 Subject: [PATCH] ci: test against latest Java versions --- .github/workflows/ci.yml | 6 +++--- .github/workflows/release.yml | 12 ++++++------ .sdkmanrc | 3 +++ build.gradle.kts | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 .sdkmanrc diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6956c04..9d6aace 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,7 +2,7 @@ name: CI on: push: - branches: [ master ] + branches: [ main ] pull_request: jobs: @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java-version: [ 8, 11, 16 ] + java-version: [ 8, 11, 17, 21, 23 ] steps: - name: Checkout uses: actions/checkout@v4 @@ -30,7 +30,7 @@ jobs: uses: actions/setup-java@v4 with: java-version: ${{ matrix.java-version }} - distribution: adopt + distribution: temurin - name: Prepare run: ./gradlew clean dependencies - name: Build diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b16c633..7c1142d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,11 +21,11 @@ jobs: restore-keys: | gradle-${{ runner.os }} gradle- - - name: Set up JDK 11 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: - java-version: 11 - distribution: adopt + java-version: 21 + distribution: temurin - name: Prepare run: ./gradlew clean dependencies - name: Assemble Artefacts @@ -58,11 +58,11 @@ jobs: restore-keys: | gradle-${{ runner.os }} gradle- - - name: Set up JDK 11 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: - java-version: 11 - distribution: adopt + java-version: 21 + distribution: temurin - name: Prepare run: ./gradlew clean dependencies - name: Generate Documentation diff --git a/.sdkmanrc b/.sdkmanrc new file mode 100644 index 0000000..79d039e --- /dev/null +++ b/.sdkmanrc @@ -0,0 +1,3 @@ +# Enable auto-env through the sdkman_auto_env config +# Add key=value pairs of SDKs to use below +java=23.0.2-tem diff --git a/build.gradle.kts b/build.gradle.kts index 1e88630..9321b79 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -73,7 +73,7 @@ tasks.withType { dokkaSourceSets.named("main") { sourceLink { localDirectory.set(file("src/main/kotlin")) - remoteUrl.set(uri("https://github.com/$githubRepository/blob/master/src/main/kotlin").toURL()) + remoteUrl.set(uri("https://github.com/$githubRepository/blob/main/src/main/kotlin").toURL()) remoteLineSuffix.set("#L") } }