chore: Merge branch dev to main

Author: AzyrRuthless

CHANGELOG.md

@@ -1,3 +1,18 @@
+# 1.0.0-dev.1 (2026-01-11)
+
+
+### Bug Fixes
+
+* Migrate to new package, use maven patcher dependency ([0b50811](https://github.com/AzyrRuthless/morphe-cli/commit/0b50811a5a2a0a574538b2fbffe027c04613db6c))
+* Use patcher / library 1.0.1 release ([0ca02e9](https://github.com/AzyrRuthless/morphe-cli/commit/0ca02e920b9e3189ac2b3a18587f0fb9efd0de4e))
+* Use repo library release ([0e4fae1](https://github.com/AzyrRuthless/morphe-cli/commit/0e4fae1b24bb21baa5004126df364b736d84270b))
+
+
+### Features
+
+* add command option `unsigned` ([#20](https://github.com/AzyrRuthless/morphe-cli/issues/20)) ([4505091](https://github.com/AzyrRuthless/morphe-cli/commit/4505091624b854706b39656bae642e5dc1132dcd))
+* Initial release ([874ecbc](https://github.com/AzyrRuthless/morphe-cli/commit/874ecbce34d6499882f7a5cf648bd828c823935a))
+
 # [1.1.0](https://github.com/MorpheApp/morphe-cli/compare/v1.0.0...v1.1.0) (2026-01-10)
 
 

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 1.1.0
+version = 1.0.0-dev.1

src/main/kotlin/app/morphe/cli/command/PatchCommand.kt

@@ -15,9 +15,15 @@ import picocli.CommandLine.Help.Visibility.ALWAYS
 import picocli.CommandLine.Model.CommandSpec
 import picocli.CommandLine.Spec
 import java.io.File
+import java.io.FileOutputStream
 import java.io.PrintWriter
 import java.io.StringWriter
+import java.nio.file.Files
+import java.nio.file.StandardCopyOption
 import java.util.logging.Logger
+import java.util.zip.ZipEntry
+import java.util.zip.ZipFile
+import java.util.zip.ZipOutputStream
 
 @CommandLine.Command(
     name = "patch",
@@ -174,13 +180,32 @@ internal object PatchCommand : Runnable {
 
     private var aaptBinaryPath: File? = null
 
+    @CommandLine.Option(
+        names = ["--custom-zipalign-binary"],
+        description = ["Path to a custom zipalign binary."],
+    )
+    private var zipalignBinaryPath: File? = null
+
     @CommandLine.Option(
         names = ["--purge"],
         description = ["Purge temporary files directory after patching."],
         showDefaultValue = ALWAYS,
     )
     private var purge: Boolean = false
 
+    @CommandLine.Option(
+        names = ["--rip-lib"],
+        description = ["Remove native libraries for specific architectures (e.g., x86, x86_64)."],
+    )
+    private var ripLibs: List<String> = emptyList()
+
+    @CommandLine.Option(
+        names = ["--unsigned"],
+        description = ["Don't sign the patched APK file."],
+        showDefaultValue = ALWAYS,
+    )
+    private var unsigned: Boolean = false
+
     @CommandLine.Parameters(
         description = ["APK file to patch."],
         arity = "1",
@@ -228,12 +253,6 @@ internal object PatchCommand : Runnable {
         this.aaptBinaryPath = aaptBinaryPath
     }
 
-    @CommandLine.Option(
-        names = ["--unsigned"],
-        description = ["Disable signing of the final apk."],
-    )
-    private var unsigned: Boolean = false
-    
     override fun run() {
         // region Setup
 
@@ -338,6 +357,36 @@ internal object PatchCommand : Runnable {
         apk.copyTo(temporaryFilesPath.resolve(apk.name), overwrite = true).apply {
             patcherResult.applyTo(this)
         }.let { patchedApkFile ->
+
+            if (ripLibs.isNotEmpty()) {
+                ripLibraries(patchedApkFile, ripLibs)
+            }
+
+            // zipalign logic start
+            if (!mount) {
+                logger.info("Running zipalign")
+                val alignedApk = File.createTempFile("aligned", ".apk", temporaryFilesPath)
+                val zipalign = zipalignBinaryPath?.absolutePath ?: "zipalign"
+
+                val process = ProcessBuilder(
+                    zipalign, "-p", "-f", "4",
+                    patchedApkFile.absolutePath,
+                    alignedApk.absolutePath
+                ).redirectErrorStream(true).start()
+
+                // Consume output to prevent buffer blocking and for debug logging
+                val output = process.inputStream.bufferedReader().use { it.readText() }
+                val exitCode = process.waitFor()
+
+                if (exitCode != 0) {
+                    throw RuntimeException("zipalign failed (exit code $exitCode):\n$output")
+                }
+
+                Files.move(alignedApk.toPath(), patchedApkFile.toPath(), StandardCopyOption.REPLACE_EXISTING)
+                logger.info("zipalign completed")
+            }
+            // zipalign logic end
+
             if (!mount && !unsigned) {
                 ApkUtils.signApk(
                     patchedApkFile,
@@ -456,4 +505,42 @@ internal object PatchCommand : Runnable {
             }
         logger.info(result)
     }
+
+    private fun ripLibraries(apkFile: File, archsToRemove: List<String>) {
+        if (archsToRemove.isEmpty()) return
+
+        logger.info("Ripping libraries for architectures: $archsToRemove")
+
+        val tempFile = File.createTempFile("temp-rip", ".apk", apkFile.parentFile)
+
+        ZipFile(apkFile).use { zip ->
+            ZipOutputStream(FileOutputStream(tempFile)).use { out ->
+                val entries = zip.entries()
+                while (entries.hasMoreElements()) {
+                    val entry = entries.nextElement()
+                    var shouldRemove = false
+
+                    for (arch in archsToRemove) {
+                        if (entry.name.startsWith("lib/$arch/")) {
+                            shouldRemove = true
+                            break
+                        }
+                    }
+
+                    if (!shouldRemove) {
+                        out.putNextEntry(ZipEntry(entry.name))
+                        zip.getInputStream(entry).copyTo(out)
+                        out.closeEntry()
+                    }
+                }
+            }
+        }
+
+        if (apkFile.delete()) {
+            tempFile.renameTo(apkFile)
+        } else {
+            tempFile.copyTo(apkFile, overwrite = true)
+            tempFile.delete()
+        }
+    }
 }