Skip to content

Commit d6afae7

Browse files
committed
Migrate from Java 17 to 21
Signed-off-by: Gopal S Akshintala <[email protected]>
1 parent 320db38 commit d6afae7

File tree

7 files changed

+10
-21
lines changed

7 files changed

+10
-21
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
- uses: actions/setup-java@v4
99
with:
1010
distribution: jetbrains
11-
java-version: 17
11+
java-version: 21
1212

1313
- name: 'Setup Gradle'
1414
uses: gradle/gradle-build-action@v3

.idea/misc.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CONTRIBUTING.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ endif::[]
2525

2626
=== Install Java
2727

28-
It needs JDK 17 installed in your system.
28+
It needs JDK 21 installed in your system.
2929
Recommendation is to do it via https://sdkman.io/install[SDKMAN].
3030
After you install SDKMAN,
3131
run `sdk list java` -> Pick Identifier for your favorite java distribution -> Run `sdk install java <Identifier-you-picked>`
3232
to install Java. For example:
3333

3434
[source,bash]
3535
----
36-
sdk install java 17.0.14-amzn
36+
sdk install java 21.0.8-amzn
3737
----
3838

3939
=== Build with Gradle

README.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ implementation("com.salesforce.revoman:revoman:{revoman-version}")
8989
----
9090

9191
[.lead]
92-
Minimum Java Version required = 17
92+
Minimum Java Version required = 21
9393

9494
toc::[]
9595

libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[versions]
2-
jdk = "17"
2+
jdk = "21"
33
kotlin = "2.2.0"
44
moshix = "0.31.0"
5-
http4k = "5.47.0.0" # Compatable with JDK 17
5+
http4k = "6.15.1.0"
66
immutables = "2.11.1"
77
arrow = "2.1.2"
88
graal = "24.2.2"

renovate.json

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,6 @@
1313
],
1414
"groupName": "all dependencies",
1515
"groupSlug": "all"
16-
},
17-
{
18-
"matchPackageNames": [
19-
"org.graalvm.sdk:graal-sdk",
20-
"org.graalvm.js:js",
21-
"org.http4k:http4k-bom",
22-
"org.http4k:http4k-core",
23-
"org.http4k:http4k-client-apache",
24-
"org.http4k:http4k-format-moshi"
25-
],
26-
"enabled": false
2716
}
2817
]
2918
}

src/test/java/com/salesforce/revoman/input/json/JsonPojoUtilsTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ void compositeGraphResponseDiMorphicMarshallUnmarshall() throws JSONException {
4646
final var successGraphResponse =
4747
JsonPojoUtils.jsonFileToPojo(
4848
jsonFileConfig.jsonFilePath("composite/graph/resp/graph-response-success.json").done());
49-
assertThat(successGraphResponse.getGraphs().get(0)).isInstanceOf(SuccessGraph.class);
49+
assertThat(successGraphResponse.getGraphs().getFirst()).isInstanceOf(SuccessGraph.class);
5050

5151
final var errorGraphResponse =
5252
JsonPojoUtils.jsonFileToPojo(
5353
jsonFileConfig.jsonFilePath("composite/graph/resp/graph-response-error.json").done());
54-
final var errorGraph = errorGraphResponse.getGraphs().get(0);
54+
final var errorGraph = errorGraphResponse.getGraphs().getFirst();
5555
assertThat(errorGraph).isInstanceOf(ErrorGraph.class);
5656
assertThat(((ErrorGraph) errorGraph).firstErrorResponseBody().getErrorCode())
5757
.isEqualTo("DUPLICATE_VALUE");

0 commit comments

Comments
 (0)