fix: migrate to changes of patcher

mikjori · Jun 22, 2022 · b30c737 · b30c737
1 parent f694542
commit b30c737
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -32,7 +32,7 @@ dependencies {
  implementation(kotlin("stdlib"))
  implementation(kotlin("reflect"))
 
- implementation("app.revanced:revanced-patcher:1.4.0")
+ implementation("app.revanced:revanced-patcher:1.5.0")
  implementation("info.picocli:picocli:4.6.3")
  implementation("com.android.tools.build:apksig:7.2.1")
  implementation("com.github.revanced:jadb:master-SNAPSHOT") // updated fork

diff --git a/src/main/kotlin/app/revanced/cli/patcher/Patcher.kt b/src/main/kotlin/app/revanced/cli/patcher/Patcher.kt
@@ -30,7 +30,7 @@ internal object Patcher {
  ZipFileSystemUtils(inputFile, output).use { fileSystem ->
  // replace all dex files
  result.dexFiles.forEach {
- fileSystem.write(it.name, it.memoryDataStore.data)
+ fileSystem.write(it.name, it.dexFileInputStream.readAllBytes())
  }
 
  // inputFile being null implies resource patching being disabled

diff --git a/src/main/kotlin/app/revanced/utils/signature/Signature.kt b/src/main/kotlin/app/revanced/utils/signature/Signature.kt
@@ -1,7 +1,6 @@
 package app.revanced.utils.signature
 
 import app.revanced.patcher.Patcher
-import org.jf.dexlib2.iface.Method
 
 object Signature {
 
@@ -49,7 +48,7 @@ object Signature {
  */
  }
 
- private fun Method.toStr(): String {
- return "${this.name}(${this.parameterTypes.joinToString("")})${this.returnType}"
- }
+ //private fun Method.toStr(): String {
+ // return "${this.name}(${this.parameterTypes.joinToString("")})${this.returnType}"
+ //}
 }