fix: Bump arsclib version, remove APKEditor

Author: wchill

build.gradle.kts

@@ -32,33 +32,13 @@ repositories {
     maven { url = uri("https://jitpack.io") }
 }
 
-val apkEditorLib by configurations.creating
-
-val strippedApkEditorLib by tasks.registering(org.gradle.jvm.tasks.Jar::class) {
-    archiveFileName.set("APKEditor-cli.jar")
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-    doFirst {
-        from(apkEditorLib.resolve().map { zipTree(it) })
-    }
-    exclude(
-        "org/xmlpull/**",
-        "antlr/**",
-        "org/antlr/**",
-        "com/beust/jcommander/**",
-        "javax/annotation/**",
-        "smali.properties",
-        "baksmali.properties"
-    )
-}
-
 dependencies {
     api(libs.morphe.patcher)
+    implementation(libs.arsclib)
     implementation(libs.morphe.library)
     implementation(libs.kotlinx.coroutines.core)
     implementation(libs.kotlinx.serialization.json)
     implementation(libs.picocli)
-    apkEditorLib(files("$rootDir/libs/APKEditor-1.4.7.jar"))
-    implementation(files(strippedApkEditorLib))
 
     testImplementation(libs.kotlin.test)
     testImplementation(libs.junit.params)

gradle/libs.versions.toml

@@ -4,10 +4,12 @@ junit = "5.11.0"
 kotlin = "2.3.0"
 kotlinx = "1.9.0"
 picocli = "4.7.7"
-morphe-patcher = "1.3.0-dev.2"
+arsclib = "9696ffecda"
+morphe-patcher = "1.3.0-dev.2" # TODO: Update to 1.3.0 before merging to prod
 morphe-library = "1.3.0"
 
 [libraries]
+arsclib = { module = "com.github.MorpheApp:ARSCLib", version.ref = "arsclib" }
 junit-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit" }
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx" }

libs/APKEditor-1.4.7.jar

@@ -2,6 +2,7 @@ rootProject.name = "morphe-cli"
 
 // Include morphe-patcher and morphe-library as composite builds if they exist locally
 mapOf(
+    "ARSCLib" to "com.github.MorpheApp:ARSCLib",
     "morphe-patcher" to "app.morphe:morphe-patcher",
     "morphe-library" to "app.morphe:morphe-library",
 ).forEach { (libraryPath, libraryName) ->

settings.gradle.kts

@@ -25,11 +25,11 @@ import app.morphe.patcher.apk.ApkUtils.applyTo
 import app.morphe.library.installation.installer.*
 import app.morphe.patcher.Patcher
 import app.morphe.patcher.PatcherConfig
+import app.morphe.patcher.apk.ApkMerger
+import app.morphe.patcher.logging.toMorpheLogger
 import app.morphe.patcher.patch.Patch
 import app.morphe.patcher.patch.loadPatchesFromJar
 import app.morphe.patcher.patch.setOptions
-import com.reandroid.apkeditor.merge.Merger
-import com.reandroid.apkeditor.merge.MergerOptions
 import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.json.Json
@@ -435,12 +435,11 @@ internal object PatchCommand : Callable<Int> {
                 val outputApk = outputFilePath.parentFile.resolve("${apk.nameWithoutExtension}-merged.apk")
 
                 // Use APKEditor's Merger directly (handles extraction and merging)
-                val mergerOptions = MergerOptions().apply {
-                    inputFile = apk  // Original APKM file
-                    outputFile = outputApk
-                    cleanMeta = true
-                }
-                Merger(mergerOptions).run()
+                ApkMerger(logger.toMorpheLogger()).merge(
+                    inputFile = apk,
+                    outputFile = outputApk,
+                    cleanMetaInf = true
+                )
 
                 mergedApkToCleanup = outputApk
                 outputApk