From 746544f9d51d1013bb160075709cd26bffd425b3 Mon Sep 17 00:00:00 2001 From: aAbed <39409020+TheAabedKhan@users.noreply.github.com> Date: Thu, 3 Aug 2023 17:27:00 +0545 Subject: [PATCH 1/4] fix: clear method lookup maps before initializing them (#210) Co-authored-by: oSumAtrIX --- src/main/kotlin/app/revanced/patcher/Patcher.kt | 2 +- .../patcher/fingerprint/method/impl/MethodFingerprint.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/app/revanced/patcher/Patcher.kt b/src/main/kotlin/app/revanced/patcher/Patcher.kt index a0bf713..60bdf65 100644 --- a/src/main/kotlin/app/revanced/patcher/Patcher.kt +++ b/src/main/kotlin/app/revanced/patcher/Patcher.kt @@ -392,4 +392,4 @@ class Patcher(private val options: PatcherOptions) { * @param patchInstance The instance of the [Patch] that was applied. * @param success The result of the [Patch]. */ -internal data class ExecutedPatch(val patchInstance: Patch, val success: Boolean) \ No newline at end of file +internal data class ExecutedPatch(val patchInstance: Patch, val success: Boolean) diff --git a/src/main/kotlin/app/revanced/patcher/fingerprint/method/impl/MethodFingerprint.kt b/src/main/kotlin/app/revanced/patcher/fingerprint/method/impl/MethodFingerprint.kt index 3921827..3cd2212 100644 --- a/src/main/kotlin/app/revanced/patcher/fingerprint/method/impl/MethodFingerprint.kt +++ b/src/main/kotlin/app/revanced/patcher/fingerprint/method/impl/MethodFingerprint.kt @@ -99,7 +99,7 @@ abstract class MethodFingerprint( methodClassPairs!!.add(methodClassPair) } - if (methods.isNotEmpty()) throw PatchResultError("Map already initialized") + if (methods.isNotEmpty()) MethodFingerprint.clearFingerprintResolutionLookupMaps() context.classes.classes.forEach { classDef -> classDef.methods.forEach { method -> @@ -510,4 +510,4 @@ data class MethodFingerprintResult( ) } } -} \ No newline at end of file +} From 53f2a6140983b145c5acee6a3e4d10e2260699ba Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 3 Aug 2023 11:43:51 +0000 Subject: [PATCH 2/4] chore(release): 12.1.1-dev.1 [skip ci] ## [12.1.1-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v12.1.0...v12.1.1-dev.1) (2023-08-03) ### Bug Fixes * clear method lookup maps before initializing them ([#210](https://github.com/ReVanced/revanced-patcher/issues/210)) ([746544f](https://github.com/ReVanced/revanced-patcher/commit/746544f9d51d1013bb160075709cd26bffd425b3)) --- CHANGELOG.md | 7 +++++++ gradle.properties | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f12636..1e91fa3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [12.1.1-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v12.1.0...v12.1.1-dev.1) (2023-08-03) + + +### Bug Fixes + +* clear method lookup maps before initializing them ([#210](https://github.com/ReVanced/revanced-patcher/issues/210)) ([746544f](https://github.com/ReVanced/revanced-patcher/commit/746544f9d51d1013bb160075709cd26bffd425b3)) + # [12.1.0](https://github.com/ReVanced/revanced-patcher/compare/v12.0.0...v12.1.0) (2023-08-03) diff --git a/gradle.properties b/gradle.properties index 380eec9..c561e4a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ org.gradle.parallel = true org.gradle.caching = true kotlin.code.style = official -version = 12.1.0 +version = 12.1.1-dev.1 From 8df11552152545751785630381c0245b7aeaf33e Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Thu, 3 Aug 2023 20:13:38 +0200 Subject: [PATCH 3/4] build(Needs bump): Bump compatibility --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 27d0712..1f70773 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -23,7 +23,7 @@ dependencies { implementation("xpp3:xpp3:1.1.4c") implementation("app.revanced:smali:2.5.3-a3836654") implementation("app.revanced:multidexlib2:2.5.3-a3836654") - implementation("app.revanced:apktool-lib:2.8.3") + implementation("app.revanced:apktool-lib:2.8.2-1") implementation("org.jetbrains.kotlin:kotlin-reflect:1.8.22") testImplementation("org.jetbrains.kotlin:kotlin-test:1.8.20-RC") From ddb51a1c45e4c54d3d5c0e69e636be4e60499001 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 3 Aug 2023 18:16:10 +0000 Subject: [PATCH 4/4] chore(release): 12.1.1-dev.2 [skip ci] ## [12.1.1-dev.2](https://github.com/ReVanced/revanced-patcher/compare/v12.1.1-dev.1...v12.1.1-dev.2) (2023-08-03) --- CHANGELOG.md | 2 ++ gradle.properties | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e91fa3..76daa03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +## [12.1.1-dev.2](https://github.com/ReVanced/revanced-patcher/compare/v12.1.1-dev.1...v12.1.1-dev.2) (2023-08-03) + ## [12.1.1-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v12.1.0...v12.1.1-dev.1) (2023-08-03) diff --git a/gradle.properties b/gradle.properties index c561e4a..76868e7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ org.gradle.parallel = true org.gradle.caching = true kotlin.code.style = official -version = 12.1.1-dev.1 +version = 12.1.1-dev.2