chore: Merge branch dev to main (#92)

Author: LisoUseInAIKyrios

CHANGELOG.md

@@ -1,3 +1,31 @@
+## [1.6.3-dev.4](https://github.com/MorpheApp/morphe-cli/compare/v1.6.3-dev.3...v1.6.3-dev.4) (2026-03-28)
+
+
+### Bug Fixes
+
+* Handle patching XAPK files ([#93](https://github.com/MorpheApp/morphe-cli/issues/93)) ([5d18490](https://github.com/MorpheApp/morphe-cli/commit/5d18490305f10949bf5407bc7167549e3a1cc8f4))
+
+## [1.6.3-dev.3](https://github.com/MorpheApp/morphe-cli/compare/v1.6.3-dev.2...v1.6.3-dev.3) (2026-03-28)
+
+
+### Bug Fixes
+
+* Handle running CLI in headless environment ([#95](https://github.com/MorpheApp/morphe-cli/issues/95)) ([70f2952](https://github.com/MorpheApp/morphe-cli/commit/70f2952b09de57ad7c06bd92365025d38164ed26))
+
+## [1.6.3-dev.2](https://github.com/MorpheApp/morphe-cli/compare/v1.6.3-dev.1...v1.6.3-dev.2) (2026-03-24)
+
+
+### Bug Fixes
+
+* Update to latest Patcher ([fbc6c9e](https://github.com/MorpheApp/morphe-cli/commit/fbc6c9e2dbab2db9b46f442feeec1a2df565114e))
+
+## [1.6.3-dev.1](https://github.com/MorpheApp/morphe-cli/compare/v1.6.2...v1.6.3-dev.1) (2026-03-23)
+
+
+### Bug Fixes
+
+* Update to Patcher 1.3.3 ([ca579fb](https://github.com/MorpheApp/morphe-cli/commit/ca579fbc8afa32b98a77475ae4db0792d1165a3d))
+
 ## [1.6.2](https://github.com/MorpheApp/morphe-cli/compare/v1.6.1...v1.6.2) (2026-03-22)
 
 

gradle.properties

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

gradle/libs.versions.toml

@@ -7,7 +7,7 @@ kotlin = "2.3.0"
 # CLI
 picocli = "4.7.7"
 arsclib = "9696ffecda"
-morphe-patcher = "1.3.2"
+morphe-patcher = "1.3.3"
 morphe-library = "1.3.0"
 
 # Compose Desktop

src/main/kotlin/app/morphe/MorpheLauncher.kt

@@ -6,12 +6,19 @@
 package app.morphe
 
 import app.morphe.library.logging.Logger
+import java.awt.GraphicsEnvironment
 
 fun main(args: Array<String>) {
-    if (args.isEmpty()) {
+    if (args.isEmpty() && !GraphicsEnvironment.isHeadless()) {
         app.morphe.gui.launchGui(args)
     } else {
         Logger.setDefault()
+
+        if (GraphicsEnvironment.isHeadless()){
+            val logger = java.util.logging.Logger.getLogger("app.morphe.MorpheLauncher")
+            logger.info("Running in Headless environment, falling back to CLI mode.")
+        }
+
         picocli.CommandLine(app.morphe.cli.command.MainCommand)
             .execute(*args)
             .let(System::exit)

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

@@ -431,9 +431,11 @@ internal object PatchCommand : Callable<Int> {
 
             val patcherTemporaryFilesPath = temporaryFilesPath.resolve("patcher")
 
-            // Checking if the file is in apkm format (like reddit)
-            val inputApk = if (apk.extension.equals("apkm", ignoreCase = true)) {
-                logger.info("Merging APKM bundle")
+            // We need to check for apkm (like reddit), xapk and apks formats here
+
+            val inputApk = if (apk.extension.lowercase() in  setOf("apkm", "xapk", "apks")) {
+
+                logger.info("Merging split APK bundle")
 
                 // Save merged APK to output directory (will be cleaned up after patching)
                 val outputApk = outputFilePath.parentFile.resolve("${apk.nameWithoutExtension}-merged.apk")
@@ -752,7 +754,7 @@ internal object PatchCommand : Callable<Int> {
                 purge(temporaryFilesPath)
             }
 
-            // Clean up merged APK if we created one from APKM
+            // Clean up merged apk if we created one from apkm, xapk or apks
             mergedApkToCleanup?.let {
                 if (!it.delete()) {
                     logger.warning("Could not clean up merged APK: ${it.path}")