chore(release): 20.0.0-dev.2 [skip ci]

# [20.0.0-dev.2](https://github.com/ReVanced/revanced-patcher/compare/v20.0.0-dev.1...v20.0.0-dev.2) (2024-07-31) ### Bug Fixes * Downgrade smali to fix dex compilation issue ([714447d](714447de70)) * Merge all extensions before initializing lookup maps ([328aa87](328aa876d8)) * Use null for compatible package version when adding packages only ([a8e8fa4](a8e8fa4093))
fix: Downgrade smali to fix dex compilation issue
2025-09-10 05:30:49 +02:00 · 2024-07-31 00:27:24 +00:00 · 2024-07-31 02:25:32 +02:00 · 2024-07-26 04:45:31 +02:00 · 2024-07-26 03:41:32 +02:00 · 2024-07-26 03:10:08 +02:00
24 changed files with 1281 additions and 2440 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,9 +10,6 @@ on:
 jobs:
  release:
    name: Release
-    permissions:
-      contents: write
-      packages: write
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
@@ -49,5 +46,5 @@ jobs:

      - name: Release
        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }}
        run: npm exec semantic-release
--- a/.releaserc
+++ b/.releaserc
@@ -23,8 +23,7 @@
        "assets": [
          "CHANGELOG.md",
          "gradle.properties"
-        ],
-        "message": "chore: Release v${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
+        ]
      }
    ],
    [
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,88 +1,3 @@
-## [20.0.1](https://github.com/ReVanced/revanced-patcher/compare/v20.0.0...v20.0.1) (2024-10-13)
-
-
-### Bug Fixes
-
-* Check for class type exactly instead of with contains ([#310](https://github.com/ReVanced/revanced-patcher/issues/310)) ([69f2f20](https://github.com/ReVanced/revanced-patcher/commit/69f2f20fd99162f91cd9c531dfe47d00d3152ead))
-* Make it work on Android by not using APIs from JVM unavailable to Android. ([2be6e97](https://github.com/ReVanced/revanced-patcher/commit/2be6e97817437f40e17893dfff3bea2cd4c3ff9e))
-* Use non-nullable type for options ([ea6fc70](https://github.com/ReVanced/revanced-patcher/commit/ea6fc70caab055251ad4d0d3f1b5cf53865abb85))
-
-
-### Performance Improvements
-
-* Free memory earlier and remove negligible lookup maps ([d53aacd](https://github.com/ReVanced/revanced-patcher/commit/d53aacdad4ed3750ddae526fb307577ea36e6171))
-
-## [20.0.1-dev.5](https://github.com/ReVanced/revanced-patcher/compare/v20.0.1-dev.4...v20.0.1-dev.5) (2024-10-11)
-
-
-### Bug Fixes
-
-* Use non-nullable type for options ([ea6fc70](https://github.com/ReVanced/revanced-patcher/commit/ea6fc70caab055251ad4d0d3f1b5cf53865abb85))
-
-## [20.0.1-dev.4](https://github.com/ReVanced/revanced-patcher/compare/v20.0.1-dev.3...v20.0.1-dev.4) (2024-10-07)
-
-
-### Bug Fixes
-
-* Make it work on Android by not using APIs from JVM unavailable to Android. ([2be6e97](https://github.com/ReVanced/revanced-patcher/commit/2be6e97817437f40e17893dfff3bea2cd4c3ff9e))
-
-## [20.0.1-dev.3](https://github.com/ReVanced/revanced-patcher/compare/v20.0.1-dev.2...v20.0.1-dev.3) (2024-10-03)
-
-
-### Performance Improvements
-
-* Free memory earlier and remove negligible lookup maps ([d53aacd](https://github.com/ReVanced/revanced-patcher/commit/d53aacdad4ed3750ddae526fb307577ea36e6171))
-
-## [20.0.1-dev.2](https://github.com/ReVanced/revanced-patcher/compare/v20.0.1-dev.1...v20.0.1-dev.2) (2024-10-01)
-
-## [20.0.1-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v20.0.0...v20.0.1-dev.1) (2024-09-18)
-
-
-### Bug Fixes
-
-* Check for class type exactly instead of with contains ([#310](https://github.com/ReVanced/revanced-patcher/issues/310)) ([69f2f20](https://github.com/ReVanced/revanced-patcher/commit/69f2f20fd99162f91cd9c531dfe47d00d3152ead))
-
-# [20.0.0](https://github.com/ReVanced/revanced-patcher/compare/v19.3.1...v20.0.0) (2024-08-06)
-
-
-### Bug Fixes
-
-* Downgrade smali to fix dex compilation issue ([5227e98](https://github.com/ReVanced/revanced-patcher/commit/5227e98abfaa2ff1204eb20a0f2671f58c489930))
-* Improve exception message wording ([5481d0c](https://github.com/ReVanced/revanced-patcher/commit/5481d0c54ccecc91cd8d15af1ba2d3285a33e5ab))
-* Make constructor internal as supposed ([7f44174](https://github.com/ReVanced/revanced-patcher/commit/7f44174d91f0af0d50a83d80a7103c779241e094))
-* Merge all extensions before initializing lookup maps ([8c4dd5b](https://github.com/ReVanced/revanced-patcher/commit/8c4dd5b3a309077fa9a3827b4931fc28b0517809))
-* Use null for compatible package version when adding packages only ([736b3ee](https://github.com/ReVanced/revanced-patcher/commit/736b3eebbfdd7279b8d5fcfc5c46c9e3aadbee12))
-
-
-### Features
-
-* Add ability to create options outside of a patch ([d310246](https://github.com/ReVanced/revanced-patcher/commit/d310246852504b08a15f6376bbf25ac7c6fae76f))
-* Convert APIs to Kotlin DSL ([#298](https://github.com/ReVanced/revanced-patcher/issues/298)) ([11a911d](https://github.com/ReVanced/revanced-patcher/commit/11a911dc674eb0801649949dd3f28dfeb00efe97))
-
-
-### BREAKING CHANGES
-
-* Various old APIs are removed, and DSL APIs are added instead.
-
-# [20.0.0-dev.4](https://github.com/ReVanced/revanced-patcher/compare/v20.0.0-dev.3...v20.0.0-dev.4) (2024-08-06)
-
-
-### Bug Fixes
-
-* Improve exception message wording ([bd434ce](https://github.com/ReVanced/revanced-patcher/commit/bd434ceb3394d1d5292e8b94e5bfd6da0e4e9c72))
-
-# [20.0.0-dev.3](https://github.com/ReVanced/revanced-patcher/compare/v20.0.0-dev.2...v20.0.0-dev.3) (2024-08-01)
-
-
-### Bug Fixes
-
-* Make constructor internal as supposed ([e95fcd1](https://github.com/ReVanced/revanced-patcher/commit/e95fcd1c0b641164bbf0840ec7e562aeb3bacc3e))
-
-
-### Features
-
-* Add ability to create options outside of a patch ([b8d763a](https://github.com/ReVanced/revanced-patcher/commit/b8d763a66e0601627dd71c8c24247726aa300146))
-
 # [20.0.0-dev.2](https://github.com/ReVanced/revanced-patcher/compare/v20.0.0-dev.1...v20.0.0-dev.2) (2024-07-31)


--- a/api/revanced-patcher.api
+++ b/api/revanced-patcher.api
@@ -149,6 +149,7 @@ public final class app/revanced/patcher/patch/BytecodePatchBuilder : app/revance
 }

 public final class app/revanced/patcher/patch/BytecodePatchBuilder$InvokedFingerprint {
+	public fun <init> (Lapp/revanced/patcher/Fingerprint;)V
 	public final fun getValue (Ljava/lang/Void;Lkotlin/reflect/KProperty;)Lapp/revanced/patcher/Match;
 }

@@ -204,43 +205,25 @@ public final class app/revanced/patcher/patch/OptionException$ValueValidationExc

 public final class app/revanced/patcher/patch/OptionKt {
 	public static final fun booleanOption (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/lang/Boolean;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/Option;
-	public static final fun booleanOption (Ljava/lang/String;Ljava/lang/Boolean;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/Option;
 	public static synthetic fun booleanOption$default (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/lang/Boolean;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/Option;
-	public static synthetic fun booleanOption$default (Ljava/lang/String;Ljava/lang/Boolean;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/Option;
 	public static final fun booleansOption (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/Option;
-	public static final fun booleansOption (Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/Option;
 	public static synthetic fun booleansOption$default (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/Option;
-	public static synthetic fun booleansOption$default (Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/Option;
 	public static final fun floatOption (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/lang/Float;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/Option;
-	public static final fun floatOption (Ljava/lang/String;Ljava/lang/Float;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/Option;
 	public static synthetic fun floatOption$default (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/lang/Float;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/Option;
-	public static synthetic fun floatOption$default (Ljava/lang/String;Ljava/lang/Float;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/Option;
 	public static final fun floatsOption (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/Option;
 	public static synthetic fun floatsOption$default (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/Option;
 	public static final fun intOption (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/lang/Integer;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/Option;
-	public static final fun intOption (Ljava/lang/String;Ljava/lang/Integer;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/Option;
 	public static synthetic fun intOption$default (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/lang/Integer;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/Option;
-	public static synthetic fun intOption$default (Ljava/lang/String;Ljava/lang/Integer;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/Option;
 	public static final fun intsOption (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/Option;
-	public static final fun intsOption (Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/Option;
 	public static synthetic fun intsOption$default (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/Option;
-	public static synthetic fun intsOption$default (Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/Option;
 	public static final fun longOption (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/lang/Long;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/Option;
-	public static final fun longOption (Ljava/lang/String;Ljava/lang/Long;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/Option;
 	public static synthetic fun longOption$default (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/lang/Long;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/Option;
-	public static synthetic fun longOption$default (Ljava/lang/String;Ljava/lang/Long;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/Option;
 	public static final fun longsOption (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/Option;
-	public static final fun longsOption (Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/Option;
 	public static synthetic fun longsOption$default (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/Option;
-	public static synthetic fun longsOption$default (Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/Option;
 	public static final fun stringOption (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/Option;
-	public static final fun stringOption (Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/Option;
 	public static synthetic fun stringOption$default (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/Option;
-	public static synthetic fun stringOption$default (Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/Option;
 	public static final fun stringsOption (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/Option;
-	public static final fun stringsOption (Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/Option;
 	public static synthetic fun stringsOption$default (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/Option;
-	public static synthetic fun stringsOption$default (Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/Option;
 }

 public final class app/revanced/patcher/patch/Options : java/util/Map, kotlin/jvm/internal/markers/KMappedMarker {
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -36,21 +36,20 @@ repositories {
 }

 dependencies {
+    implementation(libs.kotlinx.coroutines.core)
+    implementation(libs.xpp3)
+    implementation(libs.smali)
+    implementation(libs.multidexlib2)
+    implementation(libs.apktool.lib)
+    implementation(libs.kotlin.reflect)
+
    // TODO: Convert project to KMP.
    compileOnly(libs.android) {
        // Exclude, otherwise the org.w3c.dom API breaks.
        exclude(group = "xerces", module = "xmlParserAPIs")
    }
-
-    implementation(libs.apktool.lib)
-    implementation(libs.kotlin.reflect)
-    implementation(libs.kotlinx.coroutines.core)
-    implementation(libs.multidexlib2)
-    implementation(libs.smali)
-    implementation(libs.xpp3)
-
-    testImplementation(libs.mockk)
    testImplementation(libs.kotlin.test)
+    testImplementation(libs.mockk)
 }

 kotlin {
--- a/docs/2_2_patch_anatomy.md
+++ b/docs/2_2_patch_anatomy.md
@@ -149,18 +149,6 @@ The type of an option can be obtained from the `type` property of the option:
 option.type // The KType of the option.
 ```

-Options can be declared outside of a patch and added to a patch manually:
-
-```kt
-val option = stringOption(key = "option")
-
-bytecodePatch(name = "Patch") {
-    val value by option()
-}
-```
-
-This is useful when the same option is referenced in multiple patches.
-
 ### 🧩 Extensions

 An extension is a precompiled DEX file merged into the patched app before a patch is executed.
--- a/docs/2_patches_intro.md
+++ b/docs/2_patches_intro.md
@@ -108,7 +108,7 @@ val rawResourcePatch = rawResourcePatch {
 }

@Surpress("unused")
-val resourcePatch = resourcePatch {
+val resourcePatch = rawResourcePatch {
    execute { 
        // TODO
    }
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.parallel = true
 org.gradle.caching = true
-version = 20.0.1
+version = 20.0.0-dev.2
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,6 @@
 [versions]
 android = "4.1.1.4"
 apktool-lib = "2.9.3"
-binary-compatibility-validator = "0.15.1"
 kotlin = "2.0.0"
 kotlinx-coroutines-core = "1.8.1"
 mockk = "1.13.10"
@@ -9,14 +8,15 @@ multidexlib2 = "3.0.3.r3"
 # Tracking https://github.com/google/smali/issues/64.
 #noinspection GradleDependency
 smali = "3.0.5"
+binary-compatibility-validator = "0.15.1"
 xpp3 = "1.1.4c"

 [libraries]
 android = { module = "com.google.android:android", version.ref = "android" }
-apktool-lib = { module = "app.revanced:apktool-lib", version.ref = "apktool-lib" }
 kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
-kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines-core" }
+apktool-lib = { module = "app.revanced:apktool-lib", version.ref = "apktool-lib" }
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
+kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines-core" }
 mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
 multidexlib2 = { module = "app.revanced:multidexlib2", version.ref = "multidexlib2" }
 smali = { module = "com.android.tools.smali:smali", version.ref = "smali" }
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,8 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
-networkTimeout=10000
-validateDistributionUrl=true
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dist
--- a/22
+++ b/22
@@ -15,8 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#

 ##############################################################################
 #
@@ -57,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       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/.
@@ -85,9 +83,7 @@ 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 -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -148,7 +144,7 @@ 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
+        # shellcheck disable=SC3045
        MAX_FD=$( ulimit -H -n ) ||
            warn "Could not query maximum file descriptor limit"
    esac
@@ -156,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
      '' | soft) :;; #(
      *)
        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
+        # shellcheck disable=SC3045
        ulimit -n "$MAX_FD" ||
            warn "Could not set maximum file descriptor limit to $MAX_FD"
    esac
@@ -205,11 +201,11 @@ 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.
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.

 set -- \
        "-Dorg.gradle.appname=$APP_BASE_NAME" \
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,8 +13,6 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@@ -45,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute

-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+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

@@ -59,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

 if exist "%JAVA_EXE%" goto execute

-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+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

--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
    "@saithodev/semantic-release-backmerge": "^4.0.1",
    "@semantic-release/changelog": "^6.0.3",
    "@semantic-release/git": "^10.0.1",
-    "gradle-semantic-release-plugin": "^1.10.1",
-    "semantic-release": "^24.1.2"
+    "gradle-semantic-release-plugin": "^1.9.1",
+    "semantic-release": "^23.0.2"
  }
 }
--- a/src/main/kotlin/app/revanced/patcher/Fingerprint.kt
+++ b/src/main/kotlin/app/revanced/patcher/Fingerprint.kt
@@ -3,7 +3,8 @@
 package app.revanced.patcher

 import app.revanced.patcher.extensions.InstructionExtensions.instructionsOrNull
-import app.revanced.patcher.patch.*
+import app.revanced.patcher.patch.BytecodePatchBuilder
+import app.revanced.patcher.patch.BytecodePatchContext
 import app.revanced.patcher.patch.BytecodePatchContext.LookupMaps.Companion.appendParameters
 import app.revanced.patcher.patch.MethodClassPairs
 import app.revanced.patcher.util.proxy.ClassProxy
@@ -66,15 +67,36 @@ class Fingerprint internal constructor(
        }

        // TODO: If only one string is necessary, why not use a single string for every fingerprint?
-        if (strings?.firstNotNullOfOrNull { lookupMaps.methodsByStrings[it] }?.let(::match) == true) {
+        fun Fingerprint.lookupByStrings() = strings?.firstNotNullOfOrNull { lookupMaps.methodsByStrings[it] }
+        if (lookupByStrings()?.let(::match) == true) {
            return true
        }

-        context.classes.forEach { classDef ->
-            if (match(context, classDef)) return true
-        }
+        // No strings declared or none matched (partial matches are allowed).
+        // Use signature matching.
+        fun Fingerprint.lookupBySignature(): MethodClassPairs {
+            if (accessFlags == null) return lookupMaps.allMethods

-        return false
+            var returnTypeValue = returnType
+            if (returnTypeValue == null) {
+                if (AccessFlags.CONSTRUCTOR.isSet(accessFlags)) {
+                    // Constructors always have void return type.
+                    returnTypeValue = "V"
+                } else {
+                    return lookupMaps.allMethods
+                }
+            }
+
+            val signature =
+                buildString {
+                    append(accessFlags)
+                    append(returnTypeValue.first())
+                    appendParameters(parameters ?: return@buildString)
+                }
+
+            return lookupMaps.methodsBySignature[signature] ?: return MethodClassPairs()
+        }
+        return match(lookupBySignature())
    }

    /**
@@ -107,7 +129,7 @@ class Fingerprint internal constructor(
    fun match(
        context: BytecodePatchContext,
        method: Method,
-    ) = match(context, method, context.classBy { method.definingClass == it.type }!!.immutableClass)
+    ) = match(context, method, context.classByType(method.definingClass)!!.immutableClass)

    /**
     * Match using a [Method].
--- a/src/main/kotlin/app/revanced/patcher/Patcher.kt
+++ b/src/main/kotlin/app/revanced/patcher/Patcher.kt
@@ -98,13 +98,15 @@ class Patcher(private val config: PatcherConfig) : Closeable {

        logger.info("Merging extensions")

-        with(context.bytecodeContext) {
-            context.executablePatches.mergeExtensions()
-
-            // Initialize lookup maps.
-           lookupMaps
+        context.executablePatches.forEachRecursively { patch ->
+            if (patch is BytecodePatch && patch.extension != null) {
+                context.bytecodeContext.merge(patch.extension)
+            }
        }

+        // Initialize lookup maps.
+        context.bytecodeContext.lookupMaps
+
        logger.info("Executing patches")

        val executedPatches = LinkedHashMap<Patch<*>, PatchResult>()
--- a/src/main/kotlin/app/revanced/patcher/PatcherConfig.kt
+++ b/src/main/kotlin/app/revanced/patcher/PatcherConfig.kt
@@ -20,7 +20,6 @@ class PatcherConfig(
    private val temporaryFilesPath: File = File("revanced-temporary-files"),
    aaptBinaryPath: String? = null,
    frameworkFileDirectory: String? = null,
-    @Deprecated("This is going to be removed in the future because it is not needed anymore.")
    internal val multithreadingDexFileWriter: Boolean = false,
 ) {
    private val logger = Logger.getLogger(PatcherConfig::class.java.name)
--- a/src/main/kotlin/app/revanced/patcher/patch/BytecodePatchContext.kt
+++ b/src/main/kotlin/app/revanced/patcher/patch/BytecodePatchContext.kt
@@ -21,6 +21,7 @@ import lanchon.multidexlib2.MultiDexIO
 import lanchon.multidexlib2.RawDexIO
 import java.io.Closeable
 import java.io.FileFilter
+import java.io.InputStream
 import java.util.*
 import java.util.logging.Logger

@@ -59,41 +60,40 @@ class BytecodePatchContext internal constructor(private val config: PatcherConfi
    internal val lookupMaps by lazy { LookupMaps(classes) }

    /**
-     * Merge the extensions for this set of patches.
+     * A map for lookup by [merge].
     */
-    internal fun Set<Patch<*>>.mergeExtensions() {
-        // Lookup map for fast checking if a class exists by its type.
-        val classesByType = mutableMapOf<String, ClassDef>().apply {
-            classes.forEach { classDef -> put(classDef.type, classDef) }
-        }
+    internal val classesByType = mutableMapOf<String, ClassDef>().apply {
+        classes.forEach { classDef -> put(classDef.type, classDef) }
+    }

-        forEachRecursively { patch ->
-            if (patch is BytecodePatch && patch.extension != null) {
+    /**
+     * Merge an extension to [classes].
+     *
+     * @param extensionInputStream The input stream of the extension to merge.
+     */
+    internal fun merge(extensionInputStream: InputStream) {
+        val extension = extensionInputStream.readAllBytes()

-                val extension = patch.extension.readAllBytes()
+        RawDexIO.readRawDexFile(extension, 0, null).classes.forEach { classDef ->
+            val existingClass = classesByType[classDef.type] ?: run {
+                logger.fine("Adding class \"$classDef\"")

-                RawDexIO.readRawDexFile(extension, 0, null).classes.forEach { classDef ->
-                    val existingClass = classesByType[classDef.type] ?: run {
-                        logger.fine("Adding class \"$classDef\"")
+                classes += classDef
+                classesByType[classDef.type] = classDef

-                        classes += classDef
-                        classesByType[classDef.type] = classDef
+                return@forEach
+            }

-                        return@forEach
-                    }
+            logger.fine("Class \"$classDef\" exists already. Adding missing methods and fields.")

-                    logger.fine("Class \"$classDef\" exists already. Adding missing methods and fields.")
-
-                    existingClass.merge(classDef, this@BytecodePatchContext).let { mergedClass ->
-                        // If the class was merged, replace the original class with the merged class.
-                        if (mergedClass === existingClass) {
-                            return@let
-                        }
-
-                        classes -= existingClass
-                        classes += mergedClass
-                    }
+            existingClass.merge(classDef, this@BytecodePatchContext).let { mergedClass ->
+                // If the class was merged, replace the original class with the merged class.
+                if (mergedClass === existingClass) {
+                    return@let
                }
+
+                classes -= existingClass
+                classes += mergedClass
            }
        }
    }
@@ -104,7 +104,6 @@ class BytecodePatchContext internal constructor(private val config: PatcherConfi
     * @param type The type of the class.
     * @return A proxy for the first class that matches the type.
     */
-    @Deprecated("Use classBy { type in it.type } instead.", ReplaceWith("classBy { type in it.type }"))
    fun classByType(type: String) = classBy { type in it.type }

    /**
@@ -145,9 +144,6 @@ class BytecodePatchContext internal constructor(private val config: PatcherConfi
    override fun get(): Set<PatcherResult.PatchedDexFile> {
        logger.info("Compiling patched dex files")

-        // Free up memory before compiling the dex files.
-        lookupMaps.close()
-
        val patchedDexFileResults =
            config.patchedFiles.resolve("dex").also {
                it.deleteRecursively() // Make sure the directory is empty.
@@ -181,6 +177,21 @@ class BytecodePatchContext internal constructor(private val config: PatcherConfi
     * @param classes The list of classes to create the lookup maps from.
     */
    internal class LookupMaps internal constructor(classes: List<ClassDef>) : Closeable {
+        /**
+         * Classes associated by their type.
+         */
+        internal val classesByType = classes.associateBy { it.type }.toMutableMap()
+
+        /**
+         * All methods and the class they are a member of.
+         */
+        internal val allMethods = MethodClassPairs()
+
+        /**
+         * Methods associated by its access flags, return type and parameter.
+         */
+        internal val methodsBySignature = MethodClassPairsLookupMap()
+
        /**
         * Methods associated by strings referenced in it.
         */
@@ -191,6 +202,22 @@ class BytecodePatchContext internal constructor(private val config: PatcherConfi
                classDef.methods.forEach { method ->
                    val methodClassPair: MethodClassPair = method to classDef

+                    // For fingerprints with no access or return type specified.
+                    allMethods += methodClassPair
+
+                    val accessFlagsReturnKey = method.accessFlags.toString() + method.returnType.first()
+
+                    // Add <access><returnType> as the key.
+                    methodsBySignature[accessFlagsReturnKey] = methodClassPair
+
+                    // Add <access><returnType>[parameters] as the key.
+                    methodsBySignature[
+                        buildString {
+                            append(accessFlagsReturnKey)
+                            appendParameters(method.parameterTypes)
+                        },
+                    ] = methodClassPair
+
                    // Add strings contained in the method as the key.
                    method.instructionsOrNull?.forEach instructions@{ instruction ->
                        if (instruction.opcode != Opcode.CONST_STRING && instruction.opcode != Opcode.CONST_STRING_JUMBO) {
@@ -231,12 +258,15 @@ class BytecodePatchContext internal constructor(private val config: PatcherConfi
        }

        override fun close() {
+            allMethods.clear()
+            methodsBySignature.clear()
            methodsByStrings.clear()
        }
    }

    override fun close() {
        lookupMaps.close()
+        classesByType.clear()
        classes.clear()
    }
 }
--- a/src/main/kotlin/app/revanced/patcher/patch/Option.kt
+++ b/src/main/kotlin/app/revanced/patcher/patch/Option.kt
--- a/src/main/kotlin/app/revanced/patcher/patch/Patch.kt
+++ b/src/main/kotlin/app/revanced/patcher/patch/Patch.kt
@@ -10,9 +10,6 @@ import lanchon.multidexlib2.BasicDexFileNamer
 import lanchon.multidexlib2.MultiDexIO
 import java.io.File
 import java.io.InputStream
-import java.lang.reflect.Member
-import java.lang.reflect.Method
-import java.lang.reflect.Modifier
 import java.net.URLClassLoader
 import java.util.jar.JarFile
 import kotlin.reflect.KProperty
@@ -51,9 +48,6 @@ sealed class Patch<C : PatchContext<*>>(
    // if a patch has a finalizing block in order to not emit it twice.
    internal var finalizeBlock: (Patch<C>.(C) -> Unit)?,
 ) {
-    /**
-     * The options of the patch.
-     */
    val options = Options(options)

    /**
@@ -399,7 +393,7 @@ class BytecodePatchBuilder internal constructor(
     */
    operator fun Fingerprint.invoke() = InvokedFingerprint(also { fingerprints.add(it) })

-    class InvokedFingerprint internal constructor(private val fingerprint: Fingerprint) {
+    class InvokedFingerprint(private val fingerprint: Fingerprint) {
        // The reason getValue isn't extending the Fingerprint class is
        // because delegating makes only sense if the fingerprint was previously added to the patch by invoking it.
        // It may be likely to forget invoking it. By wrapping the fingerprint into this class,
@@ -639,7 +633,7 @@ sealed class PatchLoader private constructor(
         */
        private val Class<*>.patchFields
            get() = fields.filter { field ->
-                field.type.isPatch && field.canAccess()
+                field.type.isPatch && field.canAccess(null)
            }.map { field ->
                field.get(null) as Patch<*>
            }
@@ -649,7 +643,7 @@ sealed class PatchLoader private constructor(
         */
        private val Class<*>.patchMethods
            get() = methods.filter { method ->
-                method.returnType.isPatch && method.parameterCount == 0 && method.canAccess()
+                method.returnType.isPatch && method.parameterCount == 0 && method.canAccess(null)
            }.map { method ->
                method.invoke(null) as Patch<*>
            }
@@ -673,12 +667,6 @@ sealed class PatchLoader private constructor(
                    it.name != null
                }.toSet()
            }
-
-        private fun Member.canAccess(): Boolean {
-            if (this is Method && parameterCount != 0) return false
-
-            return Modifier.isStatic(modifiers) && Modifier.isPublic(modifiers)
-        }
    }
 }

--- a/src/main/kotlin/app/revanced/patcher/util/ClassMerger.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/ClassMerger.kt
@@ -179,9 +179,7 @@ internal object ClassMerger {
            callback: MutableClass.() -> Unit,
        ) {
            callback(targetClass)
-
-            targetClass.superclass ?: return
-            this.classBy { targetClass.superclass == it.type }?.mutableClass?.let {
+            this.classByType(targetClass.superclass ?: return)?.mutableClass?.let {
                traverseClassHierarchy(it, callback)
            }
        }
--- a/src/test/kotlin/app/revanced/patcher/PatcherTest.kt
+++ b/src/test/kotlin/app/revanced/patcher/PatcherTest.kt
@@ -6,9 +6,7 @@ import app.revanced.patcher.util.ProxyClassList
 import com.android.tools.smali.dexlib2.immutable.ImmutableClassDef
 import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
 import io.mockk.every
-import io.mockk.just
 import io.mockk.mockk
-import io.mockk.runs
 import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.runBlocking
 import org.junit.jupiter.api.BeforeEach
@@ -195,7 +193,6 @@ internal object PatcherTest {
    private operator fun Set<Patch<*>>.invoke(): List<PatchResult> {
        every { patcher.context.executablePatches } returns toMutableSet()
        every { patcher.context.bytecodeContext.lookupMaps } returns LookupMaps(patcher.context.bytecodeContext.classes)
-        every { with(patcher.context.bytecodeContext) { any<Set<Patch<*>>>().mergeExtensions() } } just runs

        return runBlocking { patcher().toList() }
    }
--- a/src/test/kotlin/app/revanced/patcher/patch/options/OptionsTest.kt
+++ b/src/test/kotlin/app/revanced/patcher/patch/options/OptionsTest.kt
@@ -7,11 +7,7 @@ import kotlin.reflect.typeOf
 import kotlin.test.*

 internal object OptionsTest {
-    private val externalOption = stringOption("external", "default")
-
    private val optionsTestPatch = bytecodePatch {
-        externalOption()
-
        booleanOption("bool", true)

        stringOption("required", "default", required = true)
@@ -128,17 +124,5 @@ internal object OptionsTest {
        }
    }

-    @Test
-    fun `external option should be accessible`() {
-        assertDoesNotThrow {
-            externalOption.value = "test"
-        }
-    }
-
-    @Test
-    fun `should allow getting the external option from the patch`() {
-        assertEquals(optionsTestPatch.options["external"].value, externalOption.value)
-    }
-
    private fun options(block: Options.() -> Unit) = optionsTestPatch.options.let(block)
 }
Author	SHA1	Message	Date
semantic-release-bot	76c262ff12	chore(release): 20.0.0-dev.2 [skip ci] # [20.0.0-dev.2](https://github.com/ReVanced/revanced-patcher/compare/v20.0.0-dev.1...v20.0.0-dev.2) (2024-07-31) ### Bug Fixes * Downgrade smali to fix dex compilation issue ([`714447d`](`714447de70`)) * Merge all extensions before initializing lookup maps ([`328aa87`](`328aa876d8`)) * Use null for compatible package version when adding packages only ([`a8e8fa4`](`a8e8fa4093`))	2024-07-31 00:27:24 +00:00
oSumAtrIX	714447de70	fix: Downgrade smali to fix dex compilation issue	2024-07-31 02:25:32 +02:00
oSumAtrIX	328aa876d8	fix: Merge all extensions before initializing lookup maps	2024-07-26 04:45:31 +02:00
oSumAtrIX	a8e8fa4093	fix: Use null for compatible package version when adding packages only	2024-07-26 03:41:32 +02:00
oSumAtrIX	c482dff17c	refactor: Convert method bodies to single expression functions	2024-07-26 03:10:08 +02:00
oSumAtrIX	e6de1f6b4c	build(Needs bump): Bump dependencies	2024-07-26 03:09:32 +02:00
oSumAtrIX	82a2b3c371	docs: Fix syntax issues and improve wording	2024-07-23 19:55:30 +02:00
semantic-release-bot	9ce772a597	chore(release): 20.0.0-dev.1 [skip ci] # [20.0.0-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v19.3.1...v20.0.0-dev.1) (2024-07-22) ### Features * Convert APIs to Kotlin DSL ([#298](https://github.com/ReVanced/revanced-patcher/issues/298)) ([`3f9cbd2`](`3f9cbd2408`)) ### BREAKING CHANGES * Various old APIs are removed, and DSL APIs are added instead.	2024-07-22 01:11:38 +00:00
oSumAtrIX	3f9cbd2408	feat: Convert APIs to Kotlin DSL (#298 ) This commit converts various APIs to Kotlin DSL. BREAKING CHANGE: Various old APIs are removed, and DSL APIs are added instead.	2024-07-21 22:45:45 +02:00
oSumAtrIX	1ff0830249	ci: Correct usage of repository variable	2024-07-13 00:44:51 +02:00
oSumAtrIX	7be131d348	docs: Improve issue templates	2024-05-26 00:43:39 +02:00
oSumAtrIX	1d78d690bb	chore: Fix spelling mistake	2024-04-07 18:22:00 +02:00
Vologhat	042f554d75	refactor: Simplify mapping classes to their names (#290 ) Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>	2024-04-07 17:54:37 +02:00
oSumAtrIX	f63302feab	build: Publish sources	2024-03-14 12:21:48 +01:00
oSumAtrIX	1614d7f9f4	build: Set target bytecode level to JVM 11	2024-03-04 19:15:07 +01:00
oSumAtrIX	d64776c933	ci: Update action	2024-03-04 15:36:36 +01:00
oSumAtrIX	03cd9f7f54	chore: Lint code	2024-03-03 00:25:28 +01:00
oSumAtrIX	b69226dd26	build: Bump dependencies	2024-03-02 08:29:38 +01:00
oSumAtrIX	8e1117ed3f	refactor: Properly abstract `Patch#execute` function	2024-02-26 16:45:03 +01:00
oSumAtrIX	29adcd5aad	docs: Fix broken links	2024-02-26 04:37:45 +01:00
oSumAtrIX	6b2bc5ef4d	docs: Fix docs link [skip ci]	2024-02-25 19:49:40 +01:00
oSumAtrIX	d862d61386	docs: Un-indent markdown to fix rendering	2024-02-25 04:50:44 +01:00
oSumAtrIX	a4e18334bc	chore: Revert using a relative image path For some reason GitHub does not render them correctly	2024-02-25 03:40:20 +01:00
oSumAtrIX	5bef74adb5	build: Bump dependencies	2024-02-25 03:40:20 +01:00