Merge branch 'main' into renovate/mwader-static-ffmpeg-7.x

rob93c · web-flow · commit 0c08ba7b85a8 · 2025-05-20T09:22:29.000+02:00
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest, windows-latest, macos-13 ]
+        os: [ ubuntu-latest, windows-latest, macos-13 ] # pin macos to latest x64 image
     steps:
       - name: Checkout code changes
         uses: actions/checkout@v4
@@ -32,8 +32,8 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          distribution: temurin
-          java-version: 23
+          distribution: zulu
+          java-version: 24
 
       - name: Setup project and upload dependency graph
         uses: gradle/actions/setup-gradle@v4
diff --git a/Dockerfile b/Dockerfile
@@ -1,22 +1,27 @@
-FROM eclipse-temurin AS builder
+FROM azul/zulu-openjdk-alpine:24 AS builder
 
 # bump: libwebp /LIBWEBP_VERSION=([\d.]+)/ git:https://chromium.googlesource.com/webm/libwebp.git|^1
 # bump: libwebp after ./hashupdate Dockerfile LIBWEBP $LATEST
 ARG LIBWEBP_VERSION=1.5.0
-ARG LIBWEBP_URL="https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$LIBWEBP_VERSION-linux-x86-64.tar.gz"
 ARG LIBWEBP_SHA256=f4bf49f85991f50e86a5404d16f15b72a053bb66768ed5cc0f6d042277cc2bb8
+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 curl -L --fail --retry 3 --retry-delay 5 "$LIBWEBP_URL" -o libwebp.tar.gz && \
-    echo "$LIBWEBP_SHA256 libwebp.tar.gz" | sha256sum -c - && \
-    tar -xzf libwebp.tar.gz --one-top-level=libwebp --strip-components=1
+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"
+
+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 --no-daemon
+RUN --mount=type=cache,target=/home/gradle/.gradle/caches ./gradlew dependencies
 COPY . .
-RUN ./gradlew runtime --no-daemon
+RUN ./gradlew runtime
 
-FROM gcr.io/distroless/base-nossl:nonroot AS bot
+FROM alpine AS bot
 
 # bump: ffmpeg /static-ffmpeg:([\d.]+)/ docker:mwader/static-ffmpeg|~7.*
 COPY --from=mwader/static-ffmpeg:7.1.1 /ffmpeg /usr/local/bin/
@@ -28,4 +33,4 @@ COPY --from=builder /app/libwebp/bin/dwebp /usr/local/bin/
 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"]
+CMD ["jre/bin/java", "-Dcom.sksamuel.scrimage.webp.binary.dir=/usr/local/bin/", "-jar", "Stickerify.jar"]
diff --git a/PRIVACY_POLICY.md b/PRIVACY_POLICY.md
@@ -20,7 +20,7 @@ For the purposes of this Privacy Policy:
 - __Affiliate__ means an entity that controls, is controlled by or is under common control with a party, where "control" means ownership of 50% or more of the shares, equity interest or other securities entitled to vote for election of directors or other managing authority.
 - __Application__ refers to Stickerify, the software program provided by the Company.
 - __Company__ (referred to as either "the Company", "We", "Us" or "Our" in this Agreement) refers to Stickerify.
-- __Country__ refers to:  Italy
+- __Country__ refers to: Italy
 - __Device__ means any device that can access the Service such as a computer, a cellphone or a digital tablet.
 - __Personal Data__ is any information that relates to an identified or identifiable individual.
 - __Service__ refers to the Application.
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ to convert.
 
 Based on what you send, [Stickerify](https://t.me/StickerifyImageBot) will answer the following:
 
-* the converted media, if you sent a supported file (images, gifs, videos, and existing Telegram stickers are supported)
+* the converted media, if you sent a supported file (images, GIFs, videos, and existing Telegram stickers are supported)
   that needed conversion
 * no file, if you sent a media already suiting Telegram's requirements
 * an error message, if you sent either an unsupported or a corrupted file
@@ -55,11 +55,11 @@ And it's done!
 
 ## How to set up the project
 
-1. Install JDK 23 (or higher)
+1. Install JDK 24 (or higher)
 2. Clone the project and move into its folder
 3. Run the command `./gradlew build -x test`
 4. Import the project inside your IDE as a Gradle project
-5. Ensure your IDE is correctly configured to use a Java 23 (or higher) JDK
+5. Ensure your IDE is correctly configured to use a Java 24 (or higher) JDK
 
 ## How to run the bot locally
 
@@ -88,7 +88,7 @@ After you successfully set up the project, you will have to go through the follo
        docker pull rob93c/stickerify
        ```
 
-3. Now you just need to run the Docker image passing the token (`{{TOKEN}}`) retrieved
+3. Now you need to run the Docker image passing the token (`{{TOKEN}}`) retrieved
    from [BotFather](https://t.me/BotFather):
 
    ```shell
@@ -111,7 +111,7 @@ If you would like to improve [Stickerify](https://t.me/StickerifyImageBot) as pa
 the [contributing guidelines](CONTRIBUTING.md) and then consider opening a new issue _and/or_ pull request.
 
 If your pull request represents a valid contribution to the project, it will be marked as `hacktoberfest-accepted`,
-therefore counting towards the 4 contributions goal.
+therefore counting towards the four-contribution goal.
 
 ## Useful information
 
diff --git a/build.gradle b/build.gradle
@@ -44,7 +44,8 @@ description = 'Telegram bot to convert medias in the format required to be used
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(23)
+        languageVersion = JavaLanguageVersion.of(24)
+        vendor = JvmVendorSpec.AZUL
     }
 }
 
@@ -67,7 +68,7 @@ jacocoTestReport {
     reports {
         html.required = false
         xml.required = true
-        xml.outputLocation = file(".qodana/code-coverage/report.xml")
+        xml.outputLocation = file('.qodana/code-coverage/report.xml')
     }
 
     afterEvaluate {
@@ -94,7 +95,7 @@ shadowJar {
 }
 
 runtime {
-    options = ['--strip-debug', '--no-header-files', '--no-man-pages']
+    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']
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,21 +1,21 @@
 [versions]
-logback = "1.5.17"
-scrimage = "4.3.0"
+logback = "1.5.18"
+scrimage = "4.3.1"
 twelvemonkeys = "3.12.0"
 
 [libraries]
-batik = "org.apache.xmlgraphics:batik-transcoder:1.18"
-gson = "com.google.code.gson:gson:2.12.1"
+batik = "org.apache.xmlgraphics:batik-transcoder:1.19"
+gson = "com.google.code.gson:gson:2.13.1"
 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.12.1"
-junit-platform = "org.junit.platform:junit-platform-launcher:1.12.1"
+junit = "org.junit.jupiter:junit-jupiter:5.12.2"
+junit-platform = "org.junit.platform:junit-platform-launcher:1.12.2"
 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.0.0-alpha.14"
-okio = "com.squareup.okio:okio:3.10.2"
+okio = "com.squareup.okio:okio:3.11.0"
 scrimage-core = { module = "com.sksamuel.scrimage:scrimage-core", version.ref = "scrimage" }
 scrimage-formats-extra = { module = "com.sksamuel.scrimage:scrimage-formats-extra", version.ref = "scrimage" }
 scrimage-webp = { module = "com.sksamuel.scrimage:scrimage-webp", version.ref = "scrimage" }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/qodana.yaml b/qodana.yaml
@@ -4,5 +4,5 @@ profile:
 include:
   - name: VulnerableLibrariesGlobal
 # bump: qodana /qodana-jvm:([\d.]+)/ docker:jetbrains/qodana-jvm|/^[\d]{4}\.\d+$/|sort
-linter: jetbrains/qodana-jvm:2024.3
-projectJDK: temurin-23
+linter: jetbrains/qodana-jvm:2025.1
+projectJDK: zulu-24
diff --git a/settings.gradle b/settings.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
 }
 
 rootProject.name = 'Stickerify'
diff --git a/src/main/java/com/github/stickerifier/stickerify/logger/ExceptionHighlighter.java b/src/main/java/com/github/stickerifier/stickerify/logger/ExceptionHighlighter.java
@@ -12,7 +12,7 @@
 import ch.qos.logback.core.pattern.Converter;
 
 /**
- * Custom converter class to be used by Logback in order to highlight important substrings in exception logs.
+ * Custom converter class to be used by Logback to highlight important substrings in exception logs.
  *
  * @see Converter
  */
diff --git a/src/main/java/com/github/stickerifier/stickerify/logger/MessageHighlighter.java b/src/main/java/com/github/stickerifier/stickerify/logger/MessageHighlighter.java
@@ -15,7 +15,7 @@
 import ch.qos.logback.core.pattern.Converter;
 
 /**
- * Custom converter class to be used by Logback in order to highlight important substrings.
+ * Custom converter class to be used by Logback to highlight important substrings.
  *
  * @see Converter
  */
diff --git a/src/main/java/com/github/stickerifier/stickerify/media/MediaHelper.java b/src/main/java/com/github/stickerifier/stickerify/media/MediaHelper.java
@@ -92,7 +92,7 @@ public static File convert(File inputFile) throws MediaException {
 	}
 
 	/**
-	 * Analyses the file in order to detect its media type.
+	 * Analyzes the file to detect its media type.
 	 *
 	 * @param file the file sent to the bot
 	 * @return the MIME type of the passed-in file
@@ -113,7 +113,7 @@ private static String detectMimeType(File file) {
 
 	/**
 	 * Checks if the file is a {@code gzip} archive, then it reads its content and verifies if it's a valid JSON.
-	 * Once JSON information are retrieved, they are validated against Telegram's requirements.
+	 * Once JSON information is retrieved, they are validated against Telegram's requirements.
 	 *
 	 * @param file the file to check
 	 * @param mimeType the MIME type of the file
@@ -179,7 +179,7 @@ private static boolean isAnimationCompliant(AnimationDetails animation) {
 	}
 
 	/**
-	 * Checks that passed-in file's size does not exceed specified threshold.
+	 * Checks that passed-in file's size does not exceed the specified threshold.
 	 *
 	 * @param file the file to check
 	 * @param threshold max allowed file size
@@ -268,7 +268,7 @@ private static boolean isSizeCompliant(int width, int height) {
 	 *
 	 * @param image the image to convert to WebP
 	 * @return converted image
-	 * @throws MediaException if an error occurs creating the temp file or
+	 * @throws MediaException if an error occurred creating the temp file, or
 	 * if the image size could not be reduced enough to meet Telegram's requirements
 	 */
 	private static File createWebpFile(ImmutableImage image) throws MediaException {
@@ -295,7 +295,7 @@ private static File createWebpFile(ImmutableImage image) throws MediaException {
 	}
 
 	/**
-	 * Creates a new temp file with desired extension.
+	 * Creates a new temp file with the desired extension.
 	 *
 	 * @param fileExtension the extension of the new file
 	 * @return a new temp file
diff --git a/src/main/java/com/github/stickerifier/stickerify/process/ProcessHelper.java b/src/main/java/com/github/stickerifier/stickerify/process/ProcessHelper.java
@@ -66,7 +66,7 @@ private static String readStream(InputStream stream) throws IOException {
 	}
 
 	/**
-	 * Reads the content of the input stream of the process.
+	 * Reads the content of the input stream.
 	 * If the input stream is empty, the content of the error stream is returned.
 	 *
 	 * @param process the process

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,8 @@ description = 'Telegram bot to convert medias in the format required to be used`
`44`	`44`
`45`	`45`	`java {`
`46`	`46`	`toolchain {`
`47`		`- languageVersion = JavaLanguageVersion.of(23)`
	`47`	`+ languageVersion = JavaLanguageVersion.of(24)`
	`48`	`+ vendor = JvmVendorSpec.AZUL`
`48`	`49`	`}`
`49`	`50`	`}`
`50`	`51`
`@@ -67,7 +68,7 @@ jacocoTestReport {`
`67`	`68`	`reports {`
`68`	`69`	`html.required = false`
`69`	`70`	`xml.required = true`
`70`		`- xml.outputLocation = file(".qodana/code-coverage/report.xml")`
	`71`	`+ xml.outputLocation = file('.qodana/code-coverage/report.xml')`
`71`	`72`	`}`
`72`	`73`
`73`	`74`	`afterEvaluate {`
`@@ -94,7 +95,7 @@ shadowJar {`
`94`	`95`	`}`
`95`	`96`
`96`	`97`	`runtime {`
`97`		`- options = ['--strip-debug', '--no-header-files', '--no-man-pages']`
	`98`	`+ options = ['--strip-debug', '--no-header-files', '--no-man-pages'] // don't compress jre because final docker image will be larger`
`98`	`99`	`modules = ['java.desktop', 'java.instrument', 'java.naming', 'java.sql', 'jdk.crypto.ec', 'jdk.unsupported']`
`99`	`100`	`}`
`100`	`101`