Create custom JRE manually and upgrade to Gradle 9 (#382)

Author: MartelliEnrico

Dockerfile

@@ -16,10 +16,10 @@ RUN curl -L --fail --retry 3 --retry-delay 5 "$LIBWEBP_URL" -O && \
 
 ENV GRADLE_OPTS="-Dorg.gradle.daemon=false"
 COPY settings.gradle build.gradle gradlew ./
-COPY gradle ./gradle
-RUN --mount=type=cache,target=/home/gradle/.gradle/caches ./gradlew dependencies
+COPY gradle gradle
+RUN --mount=type=cache,target=/root/.gradle ./gradlew dependencies
 COPY . .
-RUN ./gradlew runtime
+RUN --mount=type=cache,target=/root/.gradle ./gradlew jre shadowJar
 
 FROM alpine AS bot
 

build.gradle

@@ -1,8 +1,8 @@
-import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
+import org.apache.tools.ant.taskdefs.condition.Os
 
 plugins {
-    alias(libs.plugins.runtime)
     alias(libs.plugins.shadow)
+    id 'application'
     id 'java'
     id 'jacoco'
 }
@@ -53,12 +53,53 @@ tasks.withType(JavaCompile).configureEach {
     options.encoding = 'UTF-8'
 }
 
+def jreOutputDir = layout.buildDirectory.dir('jre')
+tasks.register('jre') {
+    inputs.property('options', ['--strip-debug', '--no-header-files', '--no-man-pages'])
+    inputs.property('modules', ['java.desktop', 'java.instrument', 'java.naming', 'java.sql', 'jdk.crypto.ec', 'jdk.unsupported'])
+
+    outputs.dir(jreOutputDir)
+
+    doFirst {
+        delete(jreOutputDir)
+    }
+
+    def javaLauncher = javaToolchains.launcherFor(java.toolchain)
+
+    doLast {
+        def installationPath = javaLauncher.get().metadata.installationPath
+
+        def jlink = installationPath.file(Os.isFamily(Os.FAMILY_WINDOWS) ? 'bin\\jlink.exe' : 'bin/jlink')
+        def jmods = installationPath.dir('jmods')
+
+        def output = providers.exec {
+            ignoreExitValue = true
+            commandLine = [
+                    jlink.toString(), '-v',
+                    *(inputs.properties['options'] as List),
+                    '--module-path', jmods.toString(),
+                    '--add-modules', (inputs.properties['modules'] as List).join(','),
+                    '--output', jreOutputDir.get().toString()
+            ]
+        }
+
+        def result = output.result.get()
+        if (result.exitValue == 0) {
+            logger.info(output.standardOutput.asText.get())
+        } else {
+            logger.log(LogLevel.ERROR, output.standardError.asText.get())
+        }
+
+        result.assertNormalExitValue()
+        result.rethrowFailure()
+    }
+}
+
 test {
-    dependsOn jre
-    inputs.dir tasks.jre.jreDir
+    dependsOn tasks.named('jre')
+    inputs.dir(jreOutputDir)
 
-    def file = DefaultNativePlatform.currentOperatingSystem.isWindows() ? 'java.exe' : 'java'
-    executable = tasks.jre.jreDir.file('bin/' + file)
+    executable = jreOutputDir.get().file(Os.isFamily(Os.FAMILY_WINDOWS) ? 'bin\\java.exe' : 'bin/java')
 
     useJUnitPlatform()
     finalizedBy jacocoTestReport
@@ -93,10 +134,3 @@ shadowJar {
         exclude('dist_webp_binaries/')
     }
 }
-
-runtime {
-    options = ['--strip-debug', '--no-header-files', '--no-man-pages'] // don't compress jre because final docker image will be larger
-    modules = ['java.desktop', 'java.instrument', 'java.naming', 'java.sql', 'jdk.crypto.ec', 'jdk.unsupported']
-}
-
-suggestModules.dependsOn shadowJar

gradle/libs.versions.toml

@@ -24,5 +24,4 @@ telegram-bot-api = "com.github.pengrad:java-telegram-bot-api:8.3.0"
 tika = "org.apache.tika:tika-core:3.2.1"
 
 [plugins]
-runtime = "com.dua3.gradle.runtime:1.13.1-patch-1"
 shadow = "com.gradleup.shadow:8.3.8"

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME