Skip to content

Commit 485e855

Browse files
authored
Merge pull request #120 from PhilanthropyDataCommons/upgrade-gradle-to-9-openjdk-to-25
Upgrade Gradle and OpenJDK
2 parents 50ac5a2 + d33b065 commit 485e855

6 files changed

Lines changed: 11 additions & 11 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
uses: actions/setup-java@v5
1919
with:
2020
distribution: 'zulu'
21-
java-version: '17'
21+
java-version: '25'
2222
- name: Build a shaded fat jar for Twilio integration.
2323
working-directory: twilio-keycloak-provider
2424
run: ../gradlew shadowJar

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
uses: actions/setup-java@v5
1919
with:
2020
distribution: 'zulu'
21-
java-version: '17'
21+
java-version: '25'
2222
- name: Run tests and code coverage report.
2323
working-directory: twilio-keycloak-provider
2424
run: ../gradlew test jacocoReport || grep -A 100 -i failed build/reports/tests/test/classes/*html
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

keycloak-required-action/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99
// We expect the current LTS version of the JDK for IDEs, compilation, etc.: 17.
1010
java {
1111
toolchain {
12-
languageVersion.set(JavaLanguageVersion.of(17))
12+
languageVersion.set(JavaLanguageVersion.of(25))
1313
}
1414
}
1515

@@ -24,7 +24,7 @@ repositories {
2424
}
2525

2626
ext {
27-
set("keycloakVersion", "22.0.1")
27+
set("keycloakVersion", "26.6.4")
2828
}
2929

3030
dependencies {

pdc-keycloak-theme/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ plugins {
66
`java-library`
77
}
88

9-
// We expect the current LTS version of the JDK for IDEs, compilation, etc.: 17.
9+
// We expect the current LTS version of the JDK for IDEs, compilation, etc.: 25.
1010
java {
1111
toolchain {
12-
languageVersion.set(JavaLanguageVersion.of(17))
12+
languageVersion.set(JavaLanguageVersion.of(25))
1313
}
1414
}
1515

1616
// We target the class version of the JRE used in the keycloak container: 11.
1717
tasks.compileJava {
18-
options.release.set(11)
18+
options.release.set(17)
1919
}
2020

2121
repositories {

twilio-keycloak-provider/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ plugins {
1414
id("com.gradleup.shadow") version "9.2.2"
1515
}
1616

17-
// We expect the current LTS version of the JDK for IDEs, compilation, etc.: 17.
17+
// We expect the current LTS version of the JDK for IDEs, compilation, etc.: 25.
1818
java {
1919
toolchain {
20-
languageVersion.set(JavaLanguageVersion.of(17))
20+
languageVersion.set(JavaLanguageVersion.of(25))
2121
}
2222
}
2323

@@ -31,7 +31,7 @@ repositories {
3131
}
3232

3333
ext {
34-
set("keycloakVersion", "26.2.5");
34+
set("keycloakVersion", "26.6.4");
3535
}
3636

3737
dependencies {

0 commit comments

Comments
 (0)