Skip to content

Commit 35bda60

Browse files
Make task cache-able and update to Gradle v9
1 parent 9f4c2f2 commit 35bda60

File tree

5 files changed

+18
-11
lines changed

5 files changed

+18
-11
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RUN curl -L --fail --retry 3 --retry-delay 5 "$LIBWEBP_URL" -O && \
1515
rm "$LIBWEBP_FILE"
1616

1717
ENV GRADLE_OPTS="-Dorg.gradle.daemon=false"
18-
COPY *.gradle gradle.* gradlew ./
18+
COPY settings.gradle build.gradle gradlew ./
1919
COPY gradle gradle
2020
RUN --mount=type=cache,target=/root/.gradle ./gradlew dependencies
2121
COPY . .

build.gradle

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,25 +54,32 @@ tasks.withType(JavaCompile).configureEach {
5454
}
5555

5656
def jreOutputDir = layout.buildDirectory.dir('jre')
57-
tasks.register("jre") {
57+
tasks.register('jre') {
58+
inputs.property('options', ['--strip-debug', '--no-header-files', '--no-man-pages'])
59+
inputs.property('modules', ['java.desktop', 'java.instrument', 'java.naming', 'java.sql', 'jdk.crypto.ec', 'jdk.unsupported'])
60+
5861
outputs.dir(jreOutputDir)
5962

60-
def toolchain = javaToolchains.launcherFor(java.toolchain)
63+
doFirst {
64+
delete(jreOutputDir)
65+
}
66+
67+
def javaLauncher = javaToolchains.launcherFor(java.toolchain)
6168

6269
doLast {
63-
def installationPath = toolchain.get().metadata.installationPath
64-
def jlink = installationPath.file('bin/jlink')
65-
def jmods = installationPath.dir('jmods')
70+
def installationPath = javaLauncher.get().metadata.installationPath
6671

67-
delete(jreOutputDir)
72+
def exe = Os.isFamily(Os.FAMILY_WINDOWS) ? 'bin\\jlink.exe' : 'bin/jlink'
73+
def jlink = installationPath.file(exe)
74+
def jmods = installationPath.dir('jmods')
6875

6976
def output = providers.exec {
7077
ignoreExitValue = true
7178
commandLine = [
7279
jlink.toString(), '-v',
73-
'--strip-debug', '--no-header-files', '--no-man-pages',
80+
*(inputs.properties['options'] as List),
7481
'--module-path', jmods.toString(),
75-
'--add-modules', ['java.desktop', 'java.instrument', 'java.naming', 'java.sql', 'jdk.crypto.ec', 'jdk.unsupported'].join(','),
82+
'--add-modules', (inputs.properties['modules'] as List).join(','),
7683
'--output', jreOutputDir.get().toString()
7784
]
7885
}

gradle/wrapper/gradle-wrapper.jar

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

gradlew

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)