From 9864dd9db802400ba1ae1a1b3d1451efe824e28d Mon Sep 17 00:00:00 2001
From: rushiiMachine <33725716+rushiiMachine@users.noreply.github.com>
Date: Sun, 22 Dec 2024 23:50:53 -0800
Subject: [PATCH] fix(SmaliPatching): use forked diff lib

This solves a bug where the diff is incorrectly parsed until my bugfix PR is merged into the upstream lib.
---
 .../aliucord/manager/patcher/steps/patch/SmaliPatchStep.kt   | 2 +-
 gradle/libs.versions.toml                                    | 5 +++--
 settings.gradle.kts                                          | 4 ++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/SmaliPatchStep.kt b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/SmaliPatchStep.kt
index ad3d9ac..676687d 100644
--- a/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/SmaliPatchStep.kt
+++ b/app/src/main/kotlin/com/aliucord/manager/patcher/steps/patch/SmaliPatchStep.kt
@@ -80,7 +80,7 @@ class SmaliPatchStep : Step(), IDexProvider, KoinComponent {
                         /* dexFile = */ dexFile,
                         /* outputDir = */ smaliDir,
                         /* jobs = */ coreCount - 1,
-                        /* options = */ BaksmaliOptions(),
+                        /* options = */ BaksmaliOptions().apply { localsDirective = true },
                         /* classes = */ patches.map { "L${it.fullClassName};" },
                     )
                 } catch (t: Throwable) {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 70dc188..703630c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -14,7 +14,7 @@ compose = "1.5.4"
 compose-compiler = "1.5.8"
 compose-tracing = "1.0.0-beta01"
 compose-material3 = "1.2.0-rc01"
-diff = "4.12"
+#diff = "4.12"
 koin = "3.5.3"
 kotlin = "1.9.22"
 kotlinx-immutable = "0.3.7"
@@ -75,7 +75,8 @@ axml = { module = "com.aliucord:axml", version.ref = "axml" }
 binaryResources = { module = "com.aliucord:binary-resources", version.ref = "binary-resources" }
 bouncycastle = { module = "org.bouncycastle:bcpkix-jdk15on", version.ref = "bouncycastle" }
 coil = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
-diff = { module = "io.github.java-diff-utils:java-diff-utils", version.ref = "diff" }
+#diff = { module = "io.github.java-diff-utils:java-diff-utils", version.ref = "diff" }
+diff = "com.github.Aliucord:java-diff-utils:a0002d1d40" # TODO: remove when https://github.com/java-diff-utils/java-diff-utils/pull/198 is merged
 microg = { module = "org.microg.gms:play-services-safetynet", version.ref = "microg" }
 smali = { module = "com.android.tools.smali:smali", version.ref = "smali" }
 baksmali = { module = "com.android.tools.smali:smali-baksmali", version.ref = "smali" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 3c84f8a..4422588 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -17,6 +17,10 @@ dependencyResolutionManagement {
             name = "aliucord"
             url = uri("https://maven.aliucord.com/snapshots")
         }
+        maven { // TODO: remove, refer to libs.versions.toml
+            name = "jitpack"
+            url = uri("https://jitpack.io")
+        }
     }
 }