Skip to content

Commit

Permalink
fix(SmaliPatching): use forked diff lib
Browse files Browse the repository at this point in the history
This solves a bug where the diff is incorrectly parsed until my bugfix PR is merged into the upstream lib.
  • Loading branch information
rushiiMachine committed Dec 23, 2024
1 parent 3b8e034 commit 9864dd9
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
5 changes: 3 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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" }
Expand Down
4 changes: 4 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}
}

Expand Down

0 comments on commit 9864dd9

Please sign in to comment.