From 6b4175238a0f5f4db89b8ee1d222455bc35bd1ea Mon Sep 17 00:00:00 2001 From: Parisa Tejari Date: Mon, 8 Jan 2024 11:30:08 +0100 Subject: [PATCH 1/2] upgrade - gradle 8.4 to 8.5 - java 17 to 20 --- buildSrc/src/main/kotlin/springboot-conventions.gradle.kts | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- lib/clearinghouse/build.gradle.kts | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/kotlin/springboot-conventions.gradle.kts b/buildSrc/src/main/kotlin/springboot-conventions.gradle.kts index 7413f41b..6832a460 100644 --- a/buildSrc/src/main/kotlin/springboot-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/springboot-conventions.gradle.kts @@ -7,7 +7,7 @@ plugins { id("formatting-conventions") } -java { sourceCompatibility = JavaVersion.VERSION_17 } +java { sourceCompatibility = JavaVersion.VERSION_21 } configurations { compileOnly { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3fa8f862..1af9e093 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/lib/clearinghouse/build.gradle.kts b/lib/clearinghouse/build.gradle.kts index 1dd62ff9..bc074851 100644 --- a/lib/clearinghouse/build.gradle.kts +++ b/lib/clearinghouse/build.gradle.kts @@ -13,8 +13,8 @@ repositories { } java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } dependencies { From 28d2a0762026dcefa3f47888143b172b6456ec39 Mon Sep 17 00:00:00 2001 From: Parisa Tejari Date: Mon, 8 Jan 2024 14:16:22 +0100 Subject: [PATCH 2/2] upgrade JDK version in workflows --- .github/workflows/build-and-test.yml | 2 +- .github/workflows/check-formatting.yml | 2 +- .github/workflows/codeql.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index dc5a4e57..509af079 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -25,7 +25,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '17' + java-version: '21' - name: Cache gradle packages uses: actions/cache@v3 diff --git a/.github/workflows/check-formatting.yml b/.github/workflows/check-formatting.yml index 0dab050a..32afcf13 100644 --- a/.github/workflows/check-formatting.yml +++ b/.github/workflows/check-formatting.yml @@ -25,7 +25,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '17' + java-version: '21' - uses: actions/cache@v3 with: diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 96c29931..2ae90ed7 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -79,7 +79,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '17' + java-version: '21' - name: Cache gradle packages uses: actions/cache@v3