Skip to content

Commit d98fbdb

Browse files
committed
Remove Java 11 from CI configs, update Gradle to 8.10.1
1 parent db42eb3 commit d98fbdb

File tree

8 files changed

+15
-24
lines changed

8 files changed

+15
-24
lines changed

.github/workflows/gradle.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,14 @@ jobs:
2020
strategy:
2121
fail-fast: false
2222
matrix:
23-
java-version: [11, 17, 21]
23+
java-version: [17, 21]
2424
runs-on: ubuntu-latest
2525
steps:
2626
- uses: actions/checkout@v4
27-
- name: Set up JDK ${{ matrix.java-version }}
27+
- name: Set up JDK 21
2828
uses: actions/setup-java@v4
2929
with:
30-
java-version: ${{ matrix.java-version }}
31-
check-latest: true
30+
java-version: '21'
3231
distribution: 'zulu'
3332
architecture: 'x64'
3433
- name: Setup Gradle

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
java-version: '21'
4747
distribution: 'zulu'
4848
architecture: 'x64'
49-
- name: Update repository index
49+
- name: Update apt repository index
5050
run: sudo apt-get update
5151
- name: Install gettext
5252
run: sudo apt-get install -y gettext

.gitlab-ci.yml

+3-9
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@ stages:
44
- visualize
55
- package
66

7-
compile-jdk11:
8-
stage: verify
9-
image: amd64/openjdk:11-jdk-bullseye
10-
script:
11-
- ./gradlew build
12-
137
compile-jdk17:
148
stage: verify
159
image: amd64/openjdk:17-jdk-bullseye
@@ -24,10 +18,10 @@ compile-jdk21:
2418

2519
test:
2620
stage: validate
27-
image: amd64/openjdk:11-jdk-bullseye
21+
image: amd64/openjdk:17-jdk-bullseye
2822
script:
2923
- ./gradlew check jacocoTestReport
30-
needs: [ "compile-jdk11" ]
24+
needs: [ "compile-jdk17" ]
3125
artifacts:
3226
reports:
3327
junit: build/test-results/test/**/TEST-*.xml
@@ -50,7 +44,7 @@ coverage:
5044

5145
jar:
5246
stage: package
53-
image: amd64/openjdk:11-jdk-bullseye
47+
image: amd64/openjdk:17-jdk-bullseye
5448
script:
5549
- apt-get update
5650
- apt-get install -y gettext

build.gradle.kts

+5-2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,14 @@ plugins {
99

1010
java {
1111
toolchain {
12-
languageVersion = JavaLanguageVersion.of(17)
13-
vendor = JvmVendorSpec.AZUL
12+
languageVersion = JavaLanguageVersion.of(21)
1413
}
1514
}
1615

16+
tasks.compileJava {
17+
options.release = 17
18+
}
19+
1720
repositories {
1821
mavenCentral()
1922
maven {

gradle/wrapper/gradle-wrapper.jar

-42 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

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

gradlew

+2-5
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
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-
#
2018

2119
##############################################################################
2220
#
@@ -57,7 +55,7 @@
5755
# Darwin, MinGW, and NonStop.
5856
#
5957
# (3) This script is generated from the Groovy template
60-
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
58+
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
6159
# within the Gradle project.
6260
#
6361
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -86,8 +84,7 @@ done
8684
# shellcheck disable=SC2034
8785
APP_BASE_NAME=${0##*/}
8886
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89-
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90-
' "$PWD" ) || exit
87+
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
9188

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

gradlew.bat

-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
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
1816

1917
@if "%DEBUG%"=="" @echo off
2018
@rem ##########################################################################

0 commit comments

Comments
 (0)