From 54bd6fafbac13e4b7cb94b2ab711a51616d6d752 Mon Sep 17 00:00:00 2001 From: Sean Gilligan Date: Wed, 18 Sep 2024 14:05:18 -0700 Subject: [PATCH] GitHub gradle.yml workflow: use JDK 23 Our Gradle wrapper is already using Gradle 8.10, so JDK 23 is supported. Use `-PjavaToolchainVersion=23` on the Gradle command line in gradle.yml and leave the default value of javaToolchainVersion=22 (gradle.properties) for people using Nix or other environments that don't have JDK 23 available yet. --- .github/workflows/gradle.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index acff564..af95aa8 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -10,7 +10,7 @@ jobs: os: [ubuntu-latest, macOS-latest] distribution: ['temurin'] fail-fast: false - name: ${{ matrix.os }} JDK 22 + name: ${{ matrix.os }} JDK 23 steps: - name: Git checkout uses: actions/checkout@v4 @@ -18,11 +18,9 @@ jobs: uses: actions/setup-java@v4 with: distribution: ${{ matrix.distribution }} - # Setup JDK 21 & JDK 22 to make JDK 22 available to the Gradle Java Toolchains feature # When installing multiple JDKs, the last JDK installed is the default and will be used to run Gradle itself java-version: | - 22 - 21 + 23 - name: Cache Gradle packages uses: actions/cache@v4 with: @@ -36,6 +34,6 @@ jobs: - name: Install secp256k1 with Nix run: nix profile install nixpkgs#secp256k1 - name: Build with Gradle - run: ./gradlew build + run: ./gradlew -PjavaToolchainVersion=23 build - name: Run Java & Kotlin Examples - run: ./gradlew run runEcdsa + run: ./gradlew -PjavaToolchainVersion=23 run runEcdsa