Refactor build configuration and improve Dockerfile

Author: MartelliEnrico

Dockerfile

@@ -8,16 +8,16 @@ ARG LIBWEBP_FILE="libwebp-$LIBWEBP_VERSION-linux-x86-64.tar.gz"
 ARG LIBWEBP_URL="https://storage.googleapis.com/downloads.webmproject.org/releases/webp/$LIBWEBP_FILE"
 
 WORKDIR /app
-RUN apk --no-cache add binutils curl tar
-RUN curl -L --fail --retry 3 --retry-delay 5 "$LIBWEBP_URL" -O && \
-    echo "$LIBWEBP_SHA256 $LIBWEBP_FILE" | sha256sum -c - && \
-    tar -xzf "$LIBWEBP_FILE" --one-top-level=libwebp --strip-components=1 && \
-    rm "$LIBWEBP_FILE"
+ADD --checksum=sha256:$LIBWEBP_SHA256 $LIBWEBP_URL $LIBWEBP_FILE
+RUN apk --no-cache --update add binutils tar
+RUN tar -xzf $LIBWEBP_FILE --one-top-level=libwebp --strip-components=1 && rm $LIBWEBP_FILE
 
 COPY . .
 RUN --mount=type=cache,target=/root/.gradle ./gradlew jlink shadowJar
 
-FROM alpine AS bot
+# bump: alpine /FROM alpine:([\d.]+)/ docker:alpine|^3
+# bump: alpine link "Release notes" https://alpinelinux.org/posts/Alpine-$LATEST-released.html
+FROM alpine:3.22.1 AS bot
 
 # bump: ffmpeg /static-ffmpeg:([\d.]+)/ docker:mwader/static-ffmpeg|~7.0
 COPY --from=mwader/static-ffmpeg:7.0.2 /ffmpeg /usr/local/bin/

build.gradle

@@ -1,11 +1,13 @@
 import com.github.stickerifier.stickerify.JlinkJavaLauncher
 import com.github.stickerifier.stickerify.JlinkTask
+import org.gradle.api.plugins.jvm.JvmTestSuite
+import org.gradle.buildconfiguration.tasks.UpdateDaemonJvm
 
 plugins {
-    alias(libs.plugins.shadow)
     id 'application'
     id 'java'
     id 'jacoco'
+    alias(libs.plugins.shadow)
 }
 
 repositories {
@@ -27,11 +29,6 @@ dependencies {
     implementation libs.telegram.bot.api
     implementation libs.tika
 
-    testRuntimeOnly libs.junit.platform
-    testImplementation libs.hamcrest
-    testImplementation libs.junit
-    testImplementation libs.mockwebserver
-
     constraints {
         implementation(libs.okio) {
             because 'CVE-2023-3635: Okio Signed to Unsigned Conversion Error vulnerability'
@@ -43,11 +40,14 @@ group = 'com.github.stickerifier'
 version = '1.0'
 description = 'Telegram bot to convert medias in the format required to be used as Telegram stickers'
 
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(24)
-        vendor = JvmVendorSpec.AZUL
-    }
+java.toolchain {
+    languageVersion = JavaLanguageVersion.of(24)
+    vendor = JvmVendorSpec.AZUL
+}
+
+tasks.named('updateDaemonJvm', UpdateDaemonJvm) {
+    languageVersion = JavaLanguageVersion.of(24)
+    vendor = JvmVendorSpec.AZUL
 }
 
 def jlink = tasks.register('jlink', JlinkTask) {
@@ -58,12 +58,28 @@ def jlink = tasks.register('jlink', JlinkTask) {
     description = 'Generates a minimal JRE for the project.'
 }
 
-test {
-    inputs.dir jlink.get().outputDirectory
-    javaLauncher = new JlinkJavaLauncher(jlink.get())
-
-    useJUnitPlatform()
-    finalizedBy jacocoTestReport
+testing {
+    suites {
+        named('test', JvmTestSuite) {
+            useJUnitJupiter(libs.versions.junit)
+
+            dependencies {
+                implementation libs.hamcrest
+                implementation libs.mockwebserver
+            }
+
+            targets {
+                configureEach {
+                    testTask.configure { Test test ->
+                        test.inputs.dir jlink.get().outputDirectory
+                        test.javaLauncher = new JlinkJavaLauncher(jlink.get())
+
+                        test.finalizedBy jacocoTestReport
+                    }
+                }
+            }
+        }
+    }
 }
 
 jacocoTestReport {

buildSrc/src/main/java/com/github/stickerifier/stickerify/JlinkJavaLauncher.java

@@ -7,15 +7,9 @@
 import org.gradle.jvm.toolchain.JavaLauncher;
 import org.jetbrains.annotations.NotNull;
 
-public record JlinkJavaLauncher(
-		Provider<JavaInstallationMetadata> metadata,
-		Provider<RegularFile> executablePath
-) implements JavaLauncher {
+public record JlinkJavaLauncher(Provider<JavaInstallationMetadata> metadata, Provider<RegularFile> executablePath) implements JavaLauncher {
 	public JlinkJavaLauncher(JlinkTask task) {
-		this(
-				task.getJavaCompiler().map(JavaCompiler::getMetadata),
-				task.getOutputDirectory().file("jre/bin/java")
-		);
+		this(task.getJavaCompiler().map(JavaCompiler::getMetadata), task.getOutputDirectory().file("jre/bin/java"));
 	}
 
 	@Override

gradle.properties

@@ -1,3 +1,3 @@
-org.gradle.cache = true
-org.gradle.configuration-cache = true
+org.gradle.cache=true
+org.gradle.configuration-cache=true
 org.gradle.jvmargs=-Dfile.encoding=UTF-8

gradle/gradle-daemon-jvm.properties

@@ -0,0 +1,12 @@
+#This file is generated by updateDaemonJvm
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/d898567da69cac7b9b75d8d74e577e7a/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/902ef81bafffcd1670604d74b6c7a6b0/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/d898567da69cac7b9b75d8d74e577e7a/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/902ef81bafffcd1670604d74b6c7a6b0/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/4175090548a4792cf1cef411becfba0f/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/50df1a9c218487a6519e22a0d29e6215/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/d898567da69cac7b9b75d8d74e577e7a/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/902ef81bafffcd1670604d74b6c7a6b0/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/f55af862790b0c395d3f70e23016df3d/redirect
+toolchainVendor=AZUL
+toolchainVersion=24

gradle/libs.versions.toml

@@ -2,6 +2,7 @@
 logback = "1.5.18"
 scrimage = "4.3.3"
 twelvemonkeys = "3.12.0"
+junit = "5.13.4"
 
 [libraries]
 batik = "org.apache.xmlgraphics:batik-transcoder:1.19"
@@ -10,8 +11,6 @@ hamcrest = "org.hamcrest:hamcrest-core:3.0"
 imageio-batik = { module = "com.twelvemonkeys.imageio:imageio-batik", version.ref = "twelvemonkeys" }
 imageio-psd = { module = "com.twelvemonkeys.imageio:imageio-psd", version.ref = "twelvemonkeys" }
 jave = "ws.schild:jave-core:3.5.0"
-junit = "org.junit.jupiter:junit-jupiter:5.13.4"
-junit-platform = "org.junit.platform:junit-platform-launcher:1.13.4"
 logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
 logback-core = { module = "ch.qos.logback:logback-core", version.ref = "logback" }
 mockwebserver = "com.squareup.okhttp3:mockwebserver3-junit5:5.1.0"

src/main/java/com/github/stickerifier/stickerify/logger/HighlightHelper.java

@@ -37,4 +37,8 @@ static String retrieveMimeType(final String message) {
 	static String replaceFirst(String message, String textToReplace, String replacement) {
 		return message.replaceFirst(Pattern.quote(textToReplace), replacement);
 	}
+
+	private HighlightHelper() {
+		throw new UnsupportedOperationException();
+	}
 }

src/main/java/com/github/stickerifier/stickerify/media/MediaHelper.java

@@ -200,9 +200,8 @@ private static boolean isFileSizeLowerThan(File file, long threshold) throws Fil
 	 *
 	 * @param file the file to read
 	 * @return the image, if supported by {@link ImageIO}
-	 * @throws FileOperationException if an error occurred processing passed-in file
 	 */
-	private static ImmutableImage toImage(File file) throws FileOperationException {
+	private static ImmutableImage toImage(File file) {
 		try {
 			return ImmutableImage.loader().fromFile(file);
 		} catch (IOException _) {

src/test/java/com/github/stickerifier/stickerify/media/MediaHelperTest.java

@@ -37,7 +37,7 @@
 class MediaHelperTest {
 
 	@Test
-	void resizeImage() throws Exception {
+	void resizeRectangularImage() throws Exception {
 		var jpgImage = loadResource("big.jpg");
 		var result = MediaHelper.convert(jpgImage);
 
@@ -60,14 +60,6 @@ private static String getExtension(File file) {
 		return file.getName().substring(file.getName().lastIndexOf('.'));
 	}
 
-	@Test
-	void resizeRectangularImage() throws Exception {
-		var jpgImage = loadResource("big.jpg");
-		var result = MediaHelper.convert(jpgImage);
-
-		assertImageConsistency(result, 512, 341);
-	}
-
 	@Test
 	void resizeSmallImage() throws Exception {
 		var pngImage = loadResource("small_image.png");