Skip to content

Commit 8c61de7

Browse files
kahgohkahgoh
committed
Update to JDK 25
Also updated to Gradle 9.1.0 to use a JDK 25 Docker image during the build (to use same version of the JDK).
1 parent bcca674 commit 8c61de7

File tree

9 files changed

+23
-19
lines changed

9 files changed

+23
-19
lines changed

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM gradle:8.12-jdk21 AS build
1+
FROM docker.io/library/gradle:9.1.0-jdk25 AS build
22

33
WORKDIR /app
44
COPY --chown=gradle:gradle . /app
55
RUN gradle -i --stacktrace clean build
66

7-
FROM eclipse-temurin:21
7+
FROM docker.io/library/eclipse-temurin:25_36-jdk
88

99
WORKDIR /opt/test-runner
1010
COPY bin/run.sh bin/run.sh

‎gradle/wrapper/gradle-wrapper.jar‎

130 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

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.12-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎gradlew‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,7 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
8890

8991
# Use the maximum available, or set MAX_FD != -1 to use that value.
9092
MAX_FD=maximum

‎gradlew.bat‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################

‎tests/solution-does-not-compile/expected_results.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"status" : "error",
3-
"message" : "./src/main/java/Leap.java:1: error: class, interface, enum, or record expected\nclassYY Leapy {@\n^./src/main/java/Leap.java:1: error: reached end of file while parsing\nclassYY Leapy {@\n ^./src/main/java/Leap.java:2: error: reached end of file while parsing\n",
3+
"message" : "./src/main/java/Leap.java:1: error: class, interface, annotation type, enum, record, method or field expected\nclassYY Leapy {@\n^./src/main/java/Leap.java:1: error: reached end of file while parsing\nclassYY Leapy {@\n ^./src/main/java/Leap.java:2: error: reached end of file while parsing\n",
44
"tests" : [ ],
55
"version" : 3
66
}

‎tests/solution-passes-no-tests/expected_results.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,47 +4,47 @@
44
"name" : "testYearNotDivBy4InCommonYear()",
55
"test_code" : "@Test\npublic void testYearNotDivBy4InCommonYear() {\n assertThat(leap.isLeapYear(2015)).isFalse();\n}",
66
"status" : "fail",
7-
"message" : "Message: \nExpecting value to be false but was true\nException: org.opentest4j.AssertionFailedError: \nExpecting value to be false but was true\n\tat java.base/jdk.internal.reflect.DirectConstructorHandleAccessor.newInstance(DirectConstructorHandleAccessor.java:62)\n\tat java.base/java.lang.reflect.Constructor.newInstanceWithCaller(Constructor.java:502)\n\tat LeapTest.testYearNotDivBy4InCommonYear(LeapTest.java:19)\n\tat java.base/java.lang.reflect.Method.invoke(Method.java:580)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1596)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1596)\n"
7+
"message" : "Message: \nExpecting value to be false but was true\nException: org.opentest4j.AssertionFailedError: \nExpecting value to be false but was true\n\tat java.base/jdk.internal.reflect.DirectConstructorHandleAccessor.newInstance(DirectConstructorHandleAccessor.java:62)\n\tat java.base/java.lang.reflect.Constructor.newInstanceWithCaller(Constructor.java:499)\n\tat LeapTest.testYearNotDivBy4InCommonYear(LeapTest.java:19)\n\tat java.base/java.lang.reflect.Method.invoke(Method.java:565)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1604)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1604)\n"
88
}, {
99
"name" : "testYearDivBy2NotDivBy4InCommonYear()",
1010
"test_code" : "@Test\npublic void testYearDivBy2NotDivBy4InCommonYear() {\n assertThat(leap.isLeapYear(1970)).isFalse();\n}",
1111
"status" : "fail",
12-
"message" : "Message: \nExpecting value to be false but was true\nException: org.opentest4j.AssertionFailedError: \nExpecting value to be false but was true\n\tat java.base/jdk.internal.reflect.DirectConstructorHandleAccessor.newInstance(DirectConstructorHandleAccessor.java:62)\n\tat java.base/java.lang.reflect.Constructor.newInstanceWithCaller(Constructor.java:502)\n\tat LeapTest.testYearDivBy2NotDivBy4InCommonYear(LeapTest.java:25)\n\tat java.base/java.lang.reflect.Method.invoke(Method.java:580)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1596)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1596)\n"
12+
"message" : "Message: \nExpecting value to be false but was true\nException: org.opentest4j.AssertionFailedError: \nExpecting value to be false but was true\n\tat java.base/jdk.internal.reflect.DirectConstructorHandleAccessor.newInstance(DirectConstructorHandleAccessor.java:62)\n\tat java.base/java.lang.reflect.Constructor.newInstanceWithCaller(Constructor.java:499)\n\tat LeapTest.testYearDivBy2NotDivBy4InCommonYear(LeapTest.java:25)\n\tat java.base/java.lang.reflect.Method.invoke(Method.java:565)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1604)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1604)\n"
1313
}, {
1414
"name" : "testYearDivBy4NotDivBy100InLeapYear()",
1515
"test_code" : "@Test\npublic void testYearDivBy4NotDivBy100InLeapYear() {\n assertThat(leap.isLeapYear(1996)).isTrue();\n}",
1616
"status" : "fail",
17-
"message" : "Message: \nExpecting value to be true but was false\nException: org.opentest4j.AssertionFailedError: \nExpecting value to be true but was false\n\tat java.base/jdk.internal.reflect.DirectConstructorHandleAccessor.newInstance(DirectConstructorHandleAccessor.java:62)\n\tat java.base/java.lang.reflect.Constructor.newInstanceWithCaller(Constructor.java:502)\n\tat LeapTest.testYearDivBy4NotDivBy100InLeapYear(LeapTest.java:31)\n\tat java.base/java.lang.reflect.Method.invoke(Method.java:580)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1596)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1596)\n"
17+
"message" : "Message: \nExpecting value to be true but was false\nException: org.opentest4j.AssertionFailedError: \nExpecting value to be true but was false\n\tat java.base/jdk.internal.reflect.DirectConstructorHandleAccessor.newInstance(DirectConstructorHandleAccessor.java:62)\n\tat java.base/java.lang.reflect.Constructor.newInstanceWithCaller(Constructor.java:499)\n\tat LeapTest.testYearDivBy4NotDivBy100InLeapYear(LeapTest.java:31)\n\tat java.base/java.lang.reflect.Method.invoke(Method.java:565)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1604)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1604)\n"
1818
}, {
1919
"name" : "testYearDivBy4And5InLeapYear()",
2020
"test_code" : "@Test\npublic void testYearDivBy4And5InLeapYear() {\n assertThat(leap.isLeapYear(1960)).isTrue();\n}",
2121
"status" : "fail",
22-
"message" : "Message: \nExpecting value to be true but was false\nException: org.opentest4j.AssertionFailedError: \nExpecting value to be true but was false\n\tat java.base/jdk.internal.reflect.DirectConstructorHandleAccessor.newInstance(DirectConstructorHandleAccessor.java:62)\n\tat java.base/java.lang.reflect.Constructor.newInstanceWithCaller(Constructor.java:502)\n\tat LeapTest.testYearDivBy4And5InLeapYear(LeapTest.java:37)\n\tat java.base/java.lang.reflect.Method.invoke(Method.java:580)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1596)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1596)\n"
22+
"message" : "Message: \nExpecting value to be true but was false\nException: org.opentest4j.AssertionFailedError: \nExpecting value to be true but was false\n\tat java.base/jdk.internal.reflect.DirectConstructorHandleAccessor.newInstance(DirectConstructorHandleAccessor.java:62)\n\tat java.base/java.lang.reflect.Constructor.newInstanceWithCaller(Constructor.java:499)\n\tat LeapTest.testYearDivBy4And5InLeapYear(LeapTest.java:37)\n\tat java.base/java.lang.reflect.Method.invoke(Method.java:565)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1604)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1604)\n"
2323
}, {
2424
"name" : "testYearDivBy100NotDivBy400InCommonYear()",
2525
"test_code" : "@Test\npublic void testYearDivBy100NotDivBy400InCommonYear() {\n assertThat(leap.isLeapYear(2100)).isFalse();\n}",
2626
"status" : "fail",
27-
"message" : "Message: \nExpecting value to be false but was true\nException: org.opentest4j.AssertionFailedError: \nExpecting value to be false but was true\n\tat java.base/jdk.internal.reflect.DirectConstructorHandleAccessor.newInstance(DirectConstructorHandleAccessor.java:62)\n\tat java.base/java.lang.reflect.Constructor.newInstanceWithCaller(Constructor.java:502)\n\tat LeapTest.testYearDivBy100NotDivBy400InCommonYear(LeapTest.java:43)\n\tat java.base/java.lang.reflect.Method.invoke(Method.java:580)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1596)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1596)\n"
27+
"message" : "Message: \nExpecting value to be false but was true\nException: org.opentest4j.AssertionFailedError: \nExpecting value to be false but was true\n\tat java.base/jdk.internal.reflect.DirectConstructorHandleAccessor.newInstance(DirectConstructorHandleAccessor.java:62)\n\tat java.base/java.lang.reflect.Constructor.newInstanceWithCaller(Constructor.java:499)\n\tat LeapTest.testYearDivBy100NotDivBy400InCommonYear(LeapTest.java:43)\n\tat java.base/java.lang.reflect.Method.invoke(Method.java:565)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1604)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1604)\n"
2828
}, {
2929
"name" : "testYearDivBy100NotDivBy3IsNotLeapYear()",
3030
"test_code" : "@Test\npublic void testYearDivBy100NotDivBy3IsNotLeapYear() {\n assertThat(leap.isLeapYear(1900)).isFalse();\n}",
3131
"status" : "fail",
32-
"message" : "Message: \nExpecting value to be false but was true\nException: org.opentest4j.AssertionFailedError: \nExpecting value to be false but was true\n\tat java.base/jdk.internal.reflect.DirectConstructorHandleAccessor.newInstance(DirectConstructorHandleAccessor.java:62)\n\tat java.base/java.lang.reflect.Constructor.newInstanceWithCaller(Constructor.java:502)\n\tat LeapTest.testYearDivBy100NotDivBy3IsNotLeapYear(LeapTest.java:49)\n\tat java.base/java.lang.reflect.Method.invoke(Method.java:580)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1596)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1596)\n"
32+
"message" : "Message: \nExpecting value to be false but was true\nException: org.opentest4j.AssertionFailedError: \nExpecting value to be false but was true\n\tat java.base/jdk.internal.reflect.DirectConstructorHandleAccessor.newInstance(DirectConstructorHandleAccessor.java:62)\n\tat java.base/java.lang.reflect.Constructor.newInstanceWithCaller(Constructor.java:499)\n\tat LeapTest.testYearDivBy100NotDivBy3IsNotLeapYear(LeapTest.java:49)\n\tat java.base/java.lang.reflect.Method.invoke(Method.java:565)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1604)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1604)\n"
3333
}, {
3434
"name" : "testYearDivBy400InLeapYear()",
3535
"test_code" : "@Test\npublic void testYearDivBy400InLeapYear() {\n assertThat(leap.isLeapYear(2000)).isTrue();\n}",
3636
"status" : "fail",
37-
"message" : "Message: \nExpecting value to be true but was false\nException: org.opentest4j.AssertionFailedError: \nExpecting value to be true but was false\n\tat java.base/jdk.internal.reflect.DirectConstructorHandleAccessor.newInstance(DirectConstructorHandleAccessor.java:62)\n\tat java.base/java.lang.reflect.Constructor.newInstanceWithCaller(Constructor.java:502)\n\tat LeapTest.testYearDivBy400InLeapYear(LeapTest.java:55)\n\tat java.base/java.lang.reflect.Method.invoke(Method.java:580)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1596)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1596)\n"
37+
"message" : "Message: \nExpecting value to be true but was false\nException: org.opentest4j.AssertionFailedError: \nExpecting value to be true but was false\n\tat java.base/jdk.internal.reflect.DirectConstructorHandleAccessor.newInstance(DirectConstructorHandleAccessor.java:62)\n\tat java.base/java.lang.reflect.Constructor.newInstanceWithCaller(Constructor.java:499)\n\tat LeapTest.testYearDivBy400InLeapYear(LeapTest.java:55)\n\tat java.base/java.lang.reflect.Method.invoke(Method.java:565)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1604)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1604)\n"
3838
}, {
3939
"name" : "testYearDivBy400NotDivBy125IsLeapYear()",
4040
"test_code" : "@Test\npublic void testYearDivBy400NotDivBy125IsLeapYear() {\n assertThat(leap.isLeapYear(2400)).isTrue();\n}",
4141
"status" : "fail",
42-
"message" : "Message: \nExpecting value to be true but was false\nException: org.opentest4j.AssertionFailedError: \nExpecting value to be true but was false\n\tat java.base/jdk.internal.reflect.DirectConstructorHandleAccessor.newInstance(DirectConstructorHandleAccessor.java:62)\n\tat java.base/java.lang.reflect.Constructor.newInstanceWithCaller(Constructor.java:502)\n\tat LeapTest.testYearDivBy400NotDivBy125IsLeapYear(LeapTest.java:61)\n\tat java.base/java.lang.reflect.Method.invoke(Method.java:580)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1596)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1596)\n"
42+
"message" : "Message: \nExpecting value to be true but was false\nException: org.opentest4j.AssertionFailedError: \nExpecting value to be true but was false\n\tat java.base/jdk.internal.reflect.DirectConstructorHandleAccessor.newInstance(DirectConstructorHandleAccessor.java:62)\n\tat java.base/java.lang.reflect.Constructor.newInstanceWithCaller(Constructor.java:499)\n\tat LeapTest.testYearDivBy400NotDivBy125IsLeapYear(LeapTest.java:61)\n\tat java.base/java.lang.reflect.Method.invoke(Method.java:565)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1604)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1604)\n"
4343
}, {
4444
"name" : "testYearDivBy200NotDivBy400InCommonYear()",
4545
"test_code" : "@Test\npublic void testYearDivBy200NotDivBy400InCommonYear() {\n assertThat(leap.isLeapYear(1800)).isFalse();\n}",
4646
"status" : "fail",
47-
"message" : "Message: \nExpecting value to be false but was true\nException: org.opentest4j.AssertionFailedError: \nExpecting value to be false but was true\n\tat java.base/jdk.internal.reflect.DirectConstructorHandleAccessor.newInstance(DirectConstructorHandleAccessor.java:62)\n\tat java.base/java.lang.reflect.Constructor.newInstanceWithCaller(Constructor.java:502)\n\tat LeapTest.testYearDivBy200NotDivBy400InCommonYear(LeapTest.java:67)\n\tat java.base/java.lang.reflect.Method.invoke(Method.java:580)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1596)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1596)\n"
47+
"message" : "Message: \nExpecting value to be false but was true\nException: org.opentest4j.AssertionFailedError: \nExpecting value to be false but was true\n\tat java.base/jdk.internal.reflect.DirectConstructorHandleAccessor.newInstance(DirectConstructorHandleAccessor.java:62)\n\tat java.base/java.lang.reflect.Constructor.newInstanceWithCaller(Constructor.java:499)\n\tat LeapTest.testYearDivBy200NotDivBy400InCommonYear(LeapTest.java:67)\n\tat java.base/java.lang.reflect.Method.invoke(Method.java:565)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1604)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1604)\n"
4848
} ],
4949
"version" : 3
5050
}

‎tests/solution-passes-some-tests/expected_results.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
"name" : "testYearDivBy400InLeapYear()",
2929
"test_code" : "@Test\npublic void testYearDivBy400InLeapYear() {\n assertThat(leap.isLeapYear(2000)).isTrue();\n}",
3030
"status" : "fail",
31-
"message" : "Message: \nExpecting value to be true but was false\nException: org.opentest4j.AssertionFailedError: \nExpecting value to be true but was false\n\tat java.base/jdk.internal.reflect.DirectConstructorHandleAccessor.newInstance(DirectConstructorHandleAccessor.java:62)\n\tat java.base/java.lang.reflect.Constructor.newInstanceWithCaller(Constructor.java:502)\n\tat LeapTest.testYearDivBy400InLeapYear(LeapTest.java:55)\n\tat java.base/java.lang.reflect.Method.invoke(Method.java:580)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1596)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1596)\n"
31+
"message" : "Message: \nExpecting value to be true but was false\nException: org.opentest4j.AssertionFailedError: \nExpecting value to be true but was false\n\tat java.base/jdk.internal.reflect.DirectConstructorHandleAccessor.newInstance(DirectConstructorHandleAccessor.java:62)\n\tat java.base/java.lang.reflect.Constructor.newInstanceWithCaller(Constructor.java:499)\n\tat LeapTest.testYearDivBy400InLeapYear(LeapTest.java:55)\n\tat java.base/java.lang.reflect.Method.invoke(Method.java:565)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1604)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1604)\n"
3232
}, {
3333
"name" : "testYearDivBy400NotDivBy125IsLeapYear()",
3434
"test_code" : "@Test\npublic void testYearDivBy400NotDivBy125IsLeapYear() {\n assertThat(leap.isLeapYear(2400)).isTrue();\n}",
3535
"status" : "fail",
36-
"message" : "Message: \nExpecting value to be true but was false\nException: org.opentest4j.AssertionFailedError: \nExpecting value to be true but was false\n\tat java.base/jdk.internal.reflect.DirectConstructorHandleAccessor.newInstance(DirectConstructorHandleAccessor.java:62)\n\tat java.base/java.lang.reflect.Constructor.newInstanceWithCaller(Constructor.java:502)\n\tat LeapTest.testYearDivBy400NotDivBy125IsLeapYear(LeapTest.java:61)\n\tat java.base/java.lang.reflect.Method.invoke(Method.java:580)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1596)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1596)\n"
36+
"message" : "Message: \nExpecting value to be true but was false\nException: org.opentest4j.AssertionFailedError: \nExpecting value to be true but was false\n\tat java.base/jdk.internal.reflect.DirectConstructorHandleAccessor.newInstance(DirectConstructorHandleAccessor.java:62)\n\tat java.base/java.lang.reflect.Constructor.newInstanceWithCaller(Constructor.java:499)\n\tat LeapTest.testYearDivBy400NotDivBy125IsLeapYear(LeapTest.java:61)\n\tat java.base/java.lang.reflect.Method.invoke(Method.java:565)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1604)\n\tat java.base/java.util.ArrayList.forEach(ArrayList.java:1604)\n"
3737
}, {
3838
"name" : "testYearDivBy200NotDivBy400InCommonYear()",
3939
"test_code" : "@Test\npublic void testYearDivBy200NotDivBy400InCommonYear() {\n assertThat(leap.isLeapYear(1800)).isFalse();\n}",

0 commit comments

Comments
 (0)