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))

.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

.releaserc

@@ -23,8 +23,7 @@
         "assets": [
           "CHANGELOG.md",
           "gradle.properties"
-        ],
-        "message": "chore: Release v${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
+        ]
       }
     ],
     [

CHANGELOG.md

@@ -1,53 +1,3 @@
-## [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)
 
 

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 {

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 {

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.

docs/2_patches_intro.md

@@ -108,7 +108,7 @@ val rawResourcePatch = rawResourcePatch {
 }
 
 @Surpress("unused")
-val resourcePatch = resourcePatch {
+val resourcePatch = rawResourcePatch {
     execute { 
         // TODO
     }

gradle.properties

@@ -1,3 +1,3 @@
 org.gradle.parallel = true
 org.gradle.caching = true
-version = 20.0.1-dev.2
+version = 20.0.0-dev.2

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" }

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

gradlew

@@ -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" \

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
 

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"
   }
 }

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
@@ -128,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].

src/main/kotlin/app/revanced/patcher/patch/BytecodePatchContext.kt

@@ -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 }
 
     /**

src/main/kotlin/app/revanced/patcher/patch/Option.kt

@@ -100,7 +100,7 @@ class Option<T> @PublishedApi internal constructor(
 }
 
 /**
- * A collection of [Option]s where options can be set and retrieved by their key.
+ * A collection of [Option]s where options can be set and retrieved by key.
  *
  * @param options The options.
  *
@@ -143,39 +143,6 @@ class Options internal constructor(
     override fun get(key: String) = options[key] ?: throw OptionException.OptionNotFoundException(key)
 }
 
-/**
- * Create a new [Option] with a string value.
- *
- * @param key The key.
- * @param default The default value.
- * @param values Eligible option values mapped to a human-readable name.
- * @param title The title.
- * @param description A description.
- * @param required Whether the option is required.
- * @param validator The function to validate the option value.
- *
- * @return The created [Option].
- *
- * @see Option
- */
-fun stringOption(
-    key: String,
-    default: String? = null,
-    values: Map<String, String?>? = null,
-    title: String? = null,
-    description: String? = null,
-    required: Boolean = false,
-    validator: Option<String>.(String?) -> Boolean = { true },
-) = option(
-    key,
-    default,
-    values,
-    title,
-    description,
-    required,
-    validator,
-)
-
 /**
  * Create a new [Option] with a string value and add it to the current [PatchBuilder].
  *
@@ -209,39 +176,6 @@ fun PatchBuilder<*>.stringOption(
     validator,
 )
 
-/**
- * Create a new [Option] with an integer value.
- *
- * @param key The key.
- * @param default The default value.
- * @param values Eligible option values mapped to a human-readable name.
- * @param title The title.
- * @param description A description.
- * @param required Whether the option is required.
- * @param validator The function to validate the option value.
- *
- * @return The created [Option].
- *
- * @see Option
- */
-fun intOption(
-    key: String,
-    default: Int? = null,
-    values: Map<String, Int?>? = null,
-    title: String? = null,
-    description: String? = null,
-    required: Boolean = false,
-    validator: Option<Int?>.(Int?) -> Boolean = { true },
-) = option(
-    key,
-    default,
-    values,
-    title,
-    description,
-    required,
-    validator,
-)
-
 /**
  * Create a new [Option] with an integer value and add it to the current [PatchBuilder].
  *
@@ -275,39 +209,6 @@ fun PatchBuilder<*>.intOption(
     validator,
 )
 
-/**
- * Create a new [Option] with a boolean value.
- *
- * @param key The key.
- * @param default The default value.
- * @param values Eligible option values mapped to a human-readable name.
- * @param title The title.
- * @param description A description.
- * @param required Whether the option is required.
- * @param validator The function to validate the option value.
- *
- * @return The created [Option].
- *
- * @see Option
- */
-fun booleanOption(
-    key: String,
-    default: Boolean? = null,
-    values: Map<String, Boolean?>? = null,
-    title: String? = null,
-    description: String? = null,
-    required: Boolean = false,
-    validator: Option<Boolean?>.(Boolean?) -> Boolean = { true },
-) = option(
-    key,
-    default,
-    values,
-    title,
-    description,
-    required,
-    validator,
-)
-
 /**
  * Create a new [Option] with a boolean value and add it to the current [PatchBuilder].
  *
@@ -341,39 +242,6 @@ fun PatchBuilder<*>.booleanOption(
     validator,
 )
 
-/**
- * Create a new [Option] with a float value.
- *
- * @param key The key.
- * @param default The default value.
- * @param values Eligible option values mapped to a human-readable name.
- * @param title The title.
- * @param description A description.
- * @param required Whether the option is required.
- * @param validator The function to validate the option value.
- *
- * @return The created [Option].
- *
- * @see Option
- */
-fun floatOption(
-    key: String,
-    default: Float? = null,
-    values: Map<String, Float?>? = null,
-    title: String? = null,
-    description: String? = null,
-    required: Boolean = false,
-    validator: Option<Float?>.(Float?) -> Boolean = { true },
-) = option(
-    key,
-    default,
-    values,
-    title,
-    description,
-    required,
-    validator,
-)
-
 /**
  * Create a new [Option] with a float value and add it to the current [PatchBuilder].
  *
@@ -407,39 +275,6 @@ fun PatchBuilder<*>.floatOption(
     validator,
 )
 
-/**
- * Create a new [Option] with a long value.
- *
- * @param key The key.
- * @param default The default value.
- * @param values Eligible option values mapped to a human-readable name.
- * @param title The title.
- * @param description A description.
- * @param required Whether the option is required.
- * @param validator The function to validate the option value.
- *
- * @return The created [Option].
- *
- * @see Option
- */
-fun longOption(
-    key: String,
-    default: Long? = null,
-    values: Map<String, Long?>? = null,
-    title: String? = null,
-    description: String? = null,
-    required: Boolean = false,
-    validator: Option<Long?>.(Long?) -> Boolean = { true },
-) = option(
-    key,
-    default,
-    values,
-    title,
-    description,
-    required,
-    validator,
-)
-
 /**
  * Create a new [Option] with a long value and add it to the current [PatchBuilder].
  *
@@ -473,39 +308,6 @@ fun PatchBuilder<*>.longOption(
     validator,
 )
 
-/**
- * Create a new [Option] with a string list value.
- *
- * @param key The key.
- * @param default The default value.
- * @param values Eligible option values mapped to a human-readable name.
- * @param title The title.
- * @param description A description.
- * @param required Whether the option is required.
- * @param validator The function to validate the option value.
- *
- * @return The created [Option].
- *
- * @see Option
- */
-fun stringsOption(
-    key: String,
-    default: List<String>? = null,
-    values: Map<String, List<String>?>? = null,
-    title: String? = null,
-    description: String? = null,
-    required: Boolean = false,
-    validator: Option<List<String>>.(List<String>?) -> Boolean = { true },
-) = option(
-    key,
-    default,
-    values,
-    title,
-    description,
-    required,
-    validator,
-)
-
 /**
  * Create a new [Option] with a string list value and add it to the current [PatchBuilder].
  *
@@ -539,39 +341,6 @@ fun PatchBuilder<*>.stringsOption(
     validator,
 )
 
-/**
- * Create a new [Option] with an integer list value.
- *
- * @param key The key.
- * @param default The default value.
- * @param values Eligible option values mapped to a human-readable name.
- * @param title The title.
- * @param description A description.
- * @param required Whether the option is required.
- * @param validator The function to validate the option value.
- *
- * @return The created [Option].
- *
- * @see Option
- */
-fun intsOption(
-    key: String,
-    default: List<Int>? = null,
-    values: Map<String, List<Int>?>? = null,
-    title: String? = null,
-    description: String? = null,
-    required: Boolean = false,
-    validator: Option<List<Int>>.(List<Int>?) -> Boolean = { true },
-) = option(
-    key,
-    default,
-    values,
-    title,
-    description,
-    required,
-    validator,
-)
-
 /**
  * Create a new [Option] with an integer list value and add it to the current [PatchBuilder].
  *
@@ -605,39 +374,6 @@ fun PatchBuilder<*>.intsOption(
     validator,
 )
 
-/**
- * Create a new [Option] with a boolean list value.
- *
- * @param key The key.
- * @param default The default value.
- * @param values Eligible option values mapped to a human-readable name.
- * @param title The title.
- * @param description A description.
- * @param required Whether the option is required.
- * @param validator The function to validate the option value.
- *
- * @return The created [Option].
- *
- * @see Option
- */
-fun booleansOption(
-    key: String,
-    default: List<Boolean>? = null,
-    values: Map<String, List<Boolean>?>? = null,
-    title: String? = null,
-    description: String? = null,
-    required: Boolean = false,
-    validator: Option<List<Boolean>>.(List<Boolean>?) -> Boolean = { true },
-) = option(
-    key,
-    default,
-    values,
-    title,
-    description,
-    required,
-    validator,
-)
-
 /**
  * Create a new [Option] with a boolean list value and add it to the current [PatchBuilder].
  *
@@ -704,39 +440,6 @@ fun PatchBuilder<*>.floatsOption(
     validator,
 )
 
-/**
- * Create a new [Option] with a long list value.
- *
- * @param key The key.
- * @param default The default value.
- * @param values Eligible option values mapped to a human-readable name.
- * @param title The title.
- * @param description A description.
- * @param required Whether the option is required.
- * @param validator The function to validate the option value.
- *
- * @return The created [Option].
- *
- * @see Option
- */
-fun longsOption(
-    key: String,
-    default: List<Long>? = null,
-    values: Map<String, List<Long>?>? = null,
-    title: String? = null,
-    description: String? = null,
-    required: Boolean = false,
-    validator: Option<List<Long>>.(List<Long>?) -> Boolean = { true },
-) = option(
-    key,
-    default,
-    values,
-    title,
-    description,
-    required,
-    validator,
-)
-
 /**
  * Create a new [Option] with a long list value and add it to the current [PatchBuilder].
  *
@@ -770,40 +473,6 @@ fun PatchBuilder<*>.longsOption(
     validator,
 )
 
-/**
- * Create a new [Option].
- *
- * @param key The key.
- * @param default The default value.
- * @param values Eligible option values mapped to a human-readable name.
- * @param title The title.
- * @param description A description.
- * @param required Whether the option is required.
- * @param validator The function to validate the option value.
- *
- * @return The created [Option].
- *
- * @see Option
- */
-inline fun <reified T> option(
-    key: String,
-    default: T? = null,
-    values: Map<String, T?>? = null,
-    title: String? = null,
-    description: String? = null,
-    required: Boolean = false,
-    noinline validator: Option<T>.(T?) -> Boolean = { true },
-) = Option(
-    key,
-    default,
-    values,
-    title,
-    description,
-    required,
-    typeOf<T>(),
-    validator,
-)
-
 /**
  * Create a new [Option] and add it to the current [PatchBuilder].
  *
@@ -827,13 +496,14 @@ inline fun <reified T> PatchBuilder<*>.option(
     description: String? = null,
     required: Boolean = false,
     noinline validator: Option<T>.(T?) -> Boolean = { true },
-) = app.revanced.patcher.patch.option(
+) = Option(
     key,
     default,
     values,
     title,
     description,
     required,
+    typeOf<T>(),
     validator,
 ).also { it() }
 
@@ -849,26 +519,30 @@ sealed class OptionException(errorMessage: String) : Exception(errorMessage, nul
      * @param invalidType The type of the value that was passed.
      * @param expectedType The type of the value that was expected.
      */
-    class InvalidValueTypeException(invalidType: String, expectedType: String) : OptionException("Type $expectedType was expected but received type $invalidType")
+    class InvalidValueTypeException(invalidType: String, expectedType: String) :
+        OptionException("Type $expectedType was expected but received type $invalidType")
 
     /**
      * An exception thrown when a value did not satisfy the value conditions specified by the [Option].
      *
      * @param value The value that failed validation.
      */
-    class ValueValidationException(value: Any?, option: Option<*>) : OptionException("The option value \"$value\" failed validation for ${option.key}")
+    class ValueValidationException(value: Any?, option: Option<*>) :
+        OptionException("The option value \"$value\" failed validation for ${option.key}")
 
     /**
      * An exception thrown when a value is required but null was passed.
      *
      * @param option The [Option] that requires a value.
      */
-    class ValueRequiredException(option: Option<*>) : OptionException("The option ${option.key} requires a value, but the value was null")
+    class ValueRequiredException(option: Option<*>) :
+        OptionException("The option ${option.key} requires a value, but null was passed")
 
     /**
      * An exception thrown when a [Option] is not found.
      *
      * @param key The key of the [Option].
      */
-    class OptionNotFoundException(key: String) : OptionException("No option with key $key")
+    class OptionNotFoundException(key: String) :
+        OptionException("No option with key $key")
 }

src/main/kotlin/app/revanced/patcher/patch/Patch.kt

@@ -48,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)
 
     /**
@@ -396,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,

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)
             }
         }

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)
 }