chore: Merge branch dev to main

.github/workflows/build_pull_request.yml

@@ -8,23 +8,40 @@
 
 jobs:
   build:
-    name: Build (${{ matrix.os }})
+    name: Build (${{ matrix.os }}, JDK ${{ matrix.jdk }})
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
+        # JDK version the test suite is executed against. Gradle itself always runs
+        # on JDK 17 (last in the setup-java list); tests fork onto the matrix JDK.
+        jdk: [11, 17, 25]
     steps:
       - name: Checkout
         uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
+      - name: Set up JDKs
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          # 17 is listed last so JAVA_HOME (used to run Gradle) points to JDK 17.
+          java-version: |
+            ${{ matrix.jdk }}
+            17
+
       - name: Cache Gradle
         uses: burrunan/gradle-cache-action@v3
 
       - name: Build
         shell: bash
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew build --no-daemon
+        # Run tests against the matrix JDK via a Gradle toolchain, discovered from the
+        # JDKs that setup-java installed (both x64 and arm64 runners are covered).
+        run: >-
+          ./gradlew build --no-daemon
+          -PtestJavaVersion=${{ matrix.jdk }}
+          "-Porg.gradle.java.installations.fromEnv=JAVA_HOME_11_X64,JAVA_HOME_17_X64,JAVA_HOME_25_X64,JAVA_HOME_11_ARM64,JAVA_HOME_17_ARM64,JAVA_HOME_25_ARM64"

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.5.3-dev.1](https://github.com/MorpheApp/morphe-patcher/compare/v1.5.2...v1.5.3-dev.1) (2026-06-20)
+
+
+### Bug Fixes
+
+* Show more verbose exception if an instruction from the immutable method is passed to mutable method in `addInstructionsWithLabels()`. Fix wrong label can be used if multiple labels are specified ([d955d8a](https://github.com/MorpheApp/morphe-patcher/commit/d955d8abda5b2624985dd3620a52a83baac10113))
+
 ## [1.5.2](https://github.com/MorpheApp/morphe-patcher/compare/v1.5.1...v1.5.2) (2026-06-10)
 
 

api/morphe-patcher.api

@@ -439,6 +439,7 @@ public final class app/morphe/patcher/dex/SdkDexVerifier$Companion {
 public final class app/morphe/patcher/environment/EnvironmentUtils {
 	public static final field INSTANCE Lapp/morphe/patcher/environment/EnvironmentUtils;
 	public final fun isAndroidEnvironment ()Z
+	public final fun isWindowsEnvironment ()Z
 }
 
 public final class app/morphe/patcher/extensions/ExtensionsKt {
@@ -613,9 +614,7 @@ public final class app/morphe/patcher/patch/Compatibility {
 	public final fun component6 ()Ljava/util/Set;
 	public final fun component7 ()Ljava/util/List;
 	public final synthetic fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lapp/morphe/patcher/patch/ApkFileType;Ljava/lang/Integer;Ljava/util/Set;Ljava/util/List;)Lapp/morphe/patcher/patch/Compatibility;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lapp/morphe/patcher/patch/ApkFileType;Ljava/lang/Integer;Ljava/util/Set;Ljava/util/List;Z)Lapp/morphe/patcher/patch/Compatibility;
 	public static synthetic fun copy$default (Lapp/morphe/patcher/patch/Compatibility;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lapp/morphe/patcher/patch/ApkFileType;Ljava/lang/Integer;Ljava/util/Set;Ljava/util/List;ILjava/lang/Object;)Lapp/morphe/patcher/patch/Compatibility;
-	public static synthetic fun copy$default (Lapp/morphe/patcher/patch/Compatibility;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lapp/morphe/patcher/patch/ApkFileType;Ljava/lang/Integer;Ljava/util/Set;Ljava/util/List;ZILjava/lang/Object;)Lapp/morphe/patcher/patch/Compatibility;
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun excluding ([Ljava/lang/String;)Lapp/morphe/patcher/patch/Compatibility;
 	public final fun getApkFileType ()Lapp/morphe/patcher/patch/ApkFileType;
@@ -967,11 +966,11 @@ public final class app/morphe/patcher/resource/coder/ArsclibResourceCoder : app/
 	public fun decodeResources ()Lapp/morphe/patcher/PackageMetadata;
 	public fun deleteFile (Ljava/lang/String;Ljava/lang/String;)V
 	public fun encodeResources (Ljava/io/File;)Ljava/io/File;
-	public fun getDeletedFiles ()Ljava/util/Set;
+	public fun getDeletedFiles (Lapp/morphe/patcher/resource/ResourceMode;)Ljava/util/Set;
 	public fun getFile (Ljava/lang/String;Ljava/lang/String;Z)Ljava/io/File;
 	public fun getOtherResourceFiles (Ljava/io/File;Lapp/morphe/patcher/resource/ResourceMode;)Ljava/io/File;
 	public fun getPackageMetadata ()Lapp/morphe/patcher/PackageMetadata;
-	public fun getUncompressedFiles ()Ljava/util/Set;
+	public fun getUncompressedFiles (Lapp/morphe/patcher/resource/ResourceMode;)Ljava/util/Set;
 }
 
 public final class app/morphe/patcher/resource/coder/ArsclibResourceCoder$PackageInfo {
@@ -991,12 +990,12 @@ public abstract interface class app/morphe/patcher/resource/coder/ResourceCoder
 	public abstract fun deleteFile (Ljava/lang/String;Ljava/lang/String;)V
 	public static synthetic fun deleteFile$default (Lapp/morphe/patcher/resource/coder/ResourceCoder;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)V
 	public abstract fun encodeResources (Ljava/io/File;)Ljava/io/File;
-	public abstract fun getDeletedFiles ()Ljava/util/Set;
+	public abstract fun getDeletedFiles (Lapp/morphe/patcher/resource/ResourceMode;)Ljava/util/Set;
 	public abstract fun getFile (Ljava/lang/String;Ljava/lang/String;Z)Ljava/io/File;
 	public static synthetic fun getFile$default (Lapp/morphe/patcher/resource/coder/ResourceCoder;Ljava/lang/String;Ljava/lang/String;ZILjava/lang/Object;)Ljava/io/File;
 	public abstract fun getOtherResourceFiles (Ljava/io/File;Lapp/morphe/patcher/resource/ResourceMode;)Ljava/io/File;
 	public abstract fun getPackageMetadata ()Lapp/morphe/patcher/PackageMetadata;
-	public abstract fun getUncompressedFiles ()Ljava/util/Set;
+	public abstract fun getUncompressedFiles (Lapp/morphe/patcher/resource/ResourceMode;)Ljava/util/Set;
 }
 
 public final class app/morphe/patcher/resource/coder/ResourceCoder$DefaultImpls {

build.gradle.kts

@@ -80,6 +80,7 @@ dependencies {
 
     testImplementation(libs.mockk)
     testImplementation(libs.kotlin.test)
+    testImplementation(libs.junit.jupiter.params)
 }
 
 kotlin {
@@ -91,6 +92,17 @@ kotlin {
 }
 
 tasks.withType<Test> {
+    // Allow running the test suite against a specific JDK (e.g. -PtestJavaVersion=11)
+    // while Gradle itself keeps running on JDK 17+. Used by CI to verify the library
+    // works across the JDK versions it supports.
+    providers.gradleProperty("testJavaVersion").orNull?.let { testJavaVersion ->
+        javaLauncher.set(
+            javaToolchains.launcherFor {
+                languageVersion.set(JavaLanguageVersion.of(testJavaVersion.toInt()))
+            },
+        )
+    }
+
     testLogging {
         // Uncomment to show println and exception stack traces in unit tests.
         // showStandardStreams = true

gradle.properties

@@ -1,3 +1,3 @@
 org.gradle.parallel = true
 org.gradle.caching = true
-version = 1.5.2
+version = 1.5.3-dev.1

gradle/libs.versions.toml

@@ -5,6 +5,7 @@ arsclib = "a28c6fb2a7"
 bcpkix-jdk18on = "1.77"
 binary-compatibility-validator = "0.18.1"
 guava = "33.5.0-jre"
+junit = "5.10.1"
 kotlin = "2.2.21"
 kotlinx-coroutines-core = "1.10.2"
 kotlinx-serialization = "1.7.1"
@@ -23,6 +24,7 @@ kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref =
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines-core" }
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
+junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit" }
 mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
 smali = { module = "com.github.MorpheApp.smali:smali", version.ref = "smali" }