diff --git a/.github/workflows/after_merge.yml b/.github/workflows/after_merge.yml index c259586..d28f3a1 100644 --- a/.github/workflows/after_merge.yml +++ b/.github/workflows/after_merge.yml @@ -31,7 +31,7 @@ jobs: printf "org.gradle.vfs.watch=false\n" >> ~/.gradle/gradle.properties shell: bash - - uses: gradle/gradle-build-action@v3 + - uses: gradle/actions/setup-gradle@v3 - run: ./gradlew assemble diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index 812c540..f7aefb9 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -45,7 +45,7 @@ jobs: 17 21 - - uses: gradle/gradle-build-action@v3 + - uses: gradle/actions/setup-gradle@v3 - uses: gradle/wrapper-validation-action@v1 @@ -64,3 +64,28 @@ jobs: with: name: test-results-${{ matrix.os }} path: "${{ github.workspace }}/**/build/reports" + + test-obfuscataion: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Write Gradle build properties to `~/.gradle/gradle.properties` + run: | + mkdir -p ~/.gradle + printf "org.gradle.jvmargs=-Xmx3G -XX:+UseParallelGC\n" >> ~/.gradle/gradle.properties + printf "org.gradle.vfs.watch=false\n" >> ~/.gradle/gradle.properties + shell: bash + + - uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: 21 + + - uses: gradle/actions/setup-gradle@v3 + + - run: cd testing && ./gradlew assemble + + - run: java -jar testing/proguard/build/libs/proguard-r8.jar diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml index fe732cf..67d8efc 100644 --- a/.github/workflows/dependencies.yml +++ b/.github/workflows/dependencies.yml @@ -37,7 +37,7 @@ jobs: distribution: 'temurin' java-version: 21 - - uses: gradle/gradle-build-action@v3 + - uses: gradle/actions/setup-gradle@v3 - run: ./gradlew assemble -m diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index d7b6707..0fd1ac6 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -33,7 +33,7 @@ jobs: distribution: 'temurin' java-version: 21 - - uses: gradle/gradle-build-action@v3 + - uses: gradle/actions/setup-gradle@v3 - run: ./gradlew assemble diff --git a/.github/workflows/run_diffuse.yml b/.github/workflows/run_diffuse.yml index 7699147..f3bc3f6 100644 --- a/.github/workflows/run_diffuse.yml +++ b/.github/workflows/run_diffuse.yml @@ -41,7 +41,7 @@ jobs: distribution: 'temurin' java-version: 21 - - uses: gradle/gradle-build-action@v3 + - uses: gradle/actions/setup-gradle@v3 - run: ./gradlew assemble diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a379481..f16bf9f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,10 +1,12 @@ [versions] gradle-starter = "0.69.0" gradle-doctor = "0.9.1" +gradle-johnrengelman-shadow = "8.1.1" maven-junit = "5.10.1" maven-assertj = "3.25.2" maven-binarycompatiblity = "0.13.2" maven-dokka = "1.9.10" +google-r8 = "8.2.42" [libraries] junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "maven-junit" } @@ -12,10 +14,12 @@ junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", vers junit-jupiter-platform = { module = "org.junit.platform:junit-platform-launcher" } assertj-core = { module = "org.assertj:assertj-core", version.ref = "maven-assertj" } jetbrains-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "maven-dokka" } +r8-core = { module = "com.android.tools:r8", version.ref = "google-r8" } [plugins] starter-config = { id = "com.starter.config", version.ref = "gradle-starter" } starter-versioning = { id = "com.starter.versioning", version.ref = "gradle-starter" } starter-library-kotlin = { id = "com.starter.library.kotlin", version.ref = "gradle-starter" } osacky-doctor = { id = "com.osacky.doctor", version.ref = "gradle-doctor" } +johnrengelman-shadow = { id = "com.github.johnrengelman.shadow", version.ref = "gradle-johnrengelman-shadow" } kotlinx-binarycompatibility = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "maven-binarycompatiblity" } diff --git a/testing/build.gradle b/testing/build.gradle new file mode 100644 index 0000000..e69de29 diff --git a/testing/gradle/wrapper/gradle-wrapper.jar b/testing/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..d64cd49 Binary files /dev/null and b/testing/gradle/wrapper/gradle-wrapper.jar differ diff --git a/testing/gradle/wrapper/gradle-wrapper.properties b/testing/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..1af9e09 --- /dev/null +++ b/testing/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/testing/gradlew b/testing/gradlew new file mode 100755 index 0000000..1aa94a4 --- /dev/null +++ b/testing/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/testing/gradlew.bat b/testing/gradlew.bat new file mode 100644 index 0000000..6689b85 --- /dev/null +++ b/testing/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/testing/proguard/build.gradle b/testing/proguard/build.gradle new file mode 100644 index 0000000..85c34bc --- /dev/null +++ b/testing/proguard/build.gradle @@ -0,0 +1,62 @@ +plugins { + alias(libs.plugins.starter.library.kotlin) + id "application" + alias(libs.plugins.johnrengelman.shadow) +} + +application { + mainClass.set("com.webp.imageio.testing.Main") +} + +configurations { + r8 +} + +def r8File = layout.buildDirectory.file("libs/${project.name}-r8.jar").get().asFile +def rulesFile = project.file("rules.pro") +def r8JarProvider = tasks.register('r8Jar', JavaExec) { task -> + task.javaLauncher.set(javaToolchains.launcherFor { spec -> + spec.languageVersion.set(JavaLanguageVersion.of(JavaVersion.VERSION_11.majorVersion)) + }) + def fatJar = shadowJar + def fatJarFile = fatJar.archiveFile + task.dependsOn(fatJar) + task.inputs.file(fatJarFile) + task.inputs.file(rulesFile) + task.outputs.file(r8File) + + task.classpath(configurations.r8) + task.mainClass.set('com.android.tools.r8.R8') + task.args = [ + '--release', + '--classfile', + '--output', r8File.toString(), + '--pg-conf', rulesFile.path, + '--lib', providers.systemProperty('java.home').get(), + fatJarFile.get().toString(), + ] +} +artifacts { + archives file: r8File, name: 'binary', type: 'jar', builtBy: r8JarProvider, classifier: 'diffuse' +} + +tasks.named("shadowJar") { + exclude '**/*.kotlin_metadata' + exclude '**/*.kotlin_module' + exclude '**/*.kotlin_builtins' + exclude '**/module-info.class' + exclude 'META-INF/maven/**' + exclude 'META-INF/*.version' + exclude '**/*.proto' + exclude '**/*.dex' + exclude 'LICENSE' + exclude 'NOTICE' + exclude 'r8-version.properties' + exclude 'migrateToAndroidx/*' + exclude 'DebugProbesKt.bin' +} + +dependencies { + r8(libs.r8.core) + runtimeOnly("com.github.usefulness:webp-imageio") +} diff --git a/testing/proguard/rules.pro b/testing/proguard/rules.pro new file mode 100644 index 0000000..e2afb9c --- /dev/null +++ b/testing/proguard/rules.pro @@ -0,0 +1,8 @@ +-dontobfuscate +-keepattributes SourceFile, LineNumberTable + +-allowaccessmodification + +-keep class com.webp.imageio.testing.Main { + public static void main(java.lang.String[]); +} diff --git a/testing/proguard/src/main/kotlin/com/webp/imageio/testing/Main.kt b/testing/proguard/src/main/kotlin/com/webp/imageio/testing/Main.kt new file mode 100644 index 0000000..0b46606 --- /dev/null +++ b/testing/proguard/src/main/kotlin/com/webp/imageio/testing/Main.kt @@ -0,0 +1,16 @@ +@file:JvmName("Main") + +package com.webp.imageio.testing + +import javax.imageio.ImageIO + +fun main() { + val input = getResourceStream("lossless.webp") + val image = ImageIO.read(input) + + if(image?.width == 400 && image.height == 301) { + println("All good 👍") + } else { + error("The image didn't load correctly. width=${image?.width}, height=${image?.height}") + } +} diff --git a/testing/proguard/src/main/kotlin/com/webp/imageio/testing/ResourcesLoader.kt b/testing/proguard/src/main/kotlin/com/webp/imageio/testing/ResourcesLoader.kt new file mode 100644 index 0000000..4dec470 --- /dev/null +++ b/testing/proguard/src/main/kotlin/com/webp/imageio/testing/ResourcesLoader.kt @@ -0,0 +1,7 @@ +package com.webp.imageio.testing + +private object ResourcesLoader + +internal fun getResourceStream(resource: String) = checkNotNull(ResourcesLoader::class.java.classLoader.getResourceAsStream(resource)) { + "Could not load resource $resource" +} diff --git a/testing/proguard/src/main/resources/lossless.webp b/testing/proguard/src/main/resources/lossless.webp new file mode 100644 index 0000000..ba39447 Binary files /dev/null and b/testing/proguard/src/main/resources/lossless.webp differ diff --git a/testing/settings.gradle b/testing/settings.gradle new file mode 100644 index 0000000..3542ce1 --- /dev/null +++ b/testing/settings.gradle @@ -0,0 +1,32 @@ +import org.gradle.api.initialization.resolve.RepositoriesMode + +pluginManagement { + repositories { // https://github.com/gradle/gradle/issues/20866 + gradlePluginPortal() + mavenCentral() + google() + } +} + + +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" +} + +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } + versionCatalogs { + create("libs") { + from(files("../gradle/libs.versions.toml")) + } + } +} + +rootProject.name = "com.github.usefulness.testing" + +include(":proguard") +includeBuild("..")