Run tests with custom JRE (#339)

Co-authored-by: Enrico Martelli <[email protected]>

Author: rob93c

Dockerfile

@@ -12,8 +12,7 @@ RUN curl -L --fail --retry 3 --retry-delay 5 "$LIBWEBP_URL" -o libwebp.tar.gz &&
     tar -xzf libwebp.tar.gz --one-top-level=libwebp --strip-components=1
 COPY settings.gradle build.gradle gradlew ./
 COPY gradle ./gradle
-RUN --mount=type=cache,target=/home/gradle/.gradle/caches \
-    ./gradlew dependencies --no-daemon
+RUN --mount=type=cache,target=/home/gradle/.gradle/caches ./gradlew dependencies --no-daemon
 COPY . .
 RUN ./gradlew runtime --no-daemon
 
@@ -23,9 +22,10 @@ FROM gcr.io/distroless/base-nossl:nonroot AS bot
 COPY --from=mwader/static-ffmpeg:7.0.2 /ffmpeg /usr/local/bin/
 ENV FFMPEG_PATH=/usr/local/bin/ffmpeg
 
-COPY --from=builder /app/build/jre ./jre
-COPY --from=builder /app/build/libs/Stickerify-shadow.jar .
 COPY --from=builder /app/libwebp/bin/cwebp /usr/local/bin/
 COPY --from=builder /app/libwebp/bin/dwebp /usr/local/bin/
 
-CMD ["jre/bin/java", "-XX:+UseZGC", "-Dcom.sksamuel.scrimage.webp.binary.dir=/usr/local/bin/", "-jar", "Stickerify-shadow.jar"]
+COPY --from=builder /app/build/jre jre
+COPY --from=builder /app/build/libs/Stickerify-1.0-all.jar Stickerify.jar
+
+CMD ["jre/bin/java", "-XX:+UseZGC", "-Dcom.sksamuel.scrimage.webp.binary.dir=/usr/local/bin/", "-jar", "Stickerify.jar"]

build.gradle

@@ -1,3 +1,5 @@
+import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
+
 plugins {
     alias(libs.plugins.runtime)
     alias(libs.plugins.shadow)
@@ -36,24 +38,6 @@ dependencies {
     }
 }
 
-jacocoTestReport {
-    reports {
-        html.required = false
-        xml.required = true
-        xml.outputLocation = file(".qodana/code-coverage/report.xml")
-    }
-
-    afterEvaluate {
-        classDirectories = files(classDirectories.files.collect {
-            fileTree(dir: it, exclude: ['**/MediaConstraints.class',
-                                        '**/stickerify/exception/**',
-                                        '**/stickerify/process/**',
-                                        '**/stickerify/runner**',
-                                        '**/stickerify/telegram/**'])
-        })
-    }
-}
-
 group = 'com.github.stickerifier'
 version = '1.0'
 description = 'Telegram bot to convert medias in the format required to be used as Telegram stickers'
@@ -69,26 +53,49 @@ tasks.withType(JavaCompile).configureEach {
 }
 
 test {
+    dependsOn jre
+    inputs.dir tasks.jre.jreDir
+
+    def file = DefaultNativePlatform.currentOperatingSystem.isWindows() ? 'java.exe' : 'java'
+    executable = tasks.jre.jreDir.file('bin/' + file)
+
     useJUnitPlatform()
-    finalizedBy(jacocoTestReport)
+    finalizedBy jacocoTestReport
 }
 
-application {
-    mainClass = 'com.github.stickerifier.stickerify.runner.Main'
+jacocoTestReport {
+    reports {
+        html.required = false
+        xml.required = true
+        xml.outputLocation = file(".qodana/code-coverage/report.xml")
+    }
+
+    afterEvaluate {
+        classDirectories = files(classDirectories.files.collect {
+            fileTree(dir: it, exclude: ['**/MediaConstraints.class',
+                                        '**/stickerify/exception/**',
+                                        '**/stickerify/process/**',
+                                        '**/stickerify/runner**',
+                                        '**/stickerify/telegram/**'])
+        })
+    }
 }
 
-runtime {
-    options = ['--strip-debug', '--no-header-files', '--no-man-pages']
-    modules = ['java.desktop', 'java.naming', 'java.sql', 'jdk.crypto.ec', 'jdk.unsupported']
+application {
+    mainClass = 'com.github.stickerifier.stickerify.runner.Main'
 }
 
 shadowJar {
-    archiveBaseName = 'Stickerify'
-    archiveClassifier = 'shadow'
-    archiveVersion = ''
     mergeServiceFiles()
 
     dependencies {
         exclude('dist_webp_binaries/')
     }
 }
+
+runtime {
+    options = ['--strip-debug', '--no-header-files', '--no-man-pages']
+    modules = ['java.desktop', 'java.instrument', 'java.naming', 'java.sql', 'jdk.crypto.ec', 'jdk.unsupported']
+}
+
+suggestModules.dependsOn shadowJar

gradle/libs.versions.toml

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