Merge pull request #8 from huanli233/apkmixin-fix

java30433 · web-flow · commit 2f6f28929696 · 2025-04-13T10:29:49.000+08:00
ApkMixin fix
diff --git a/.github/workflows/android_build.yml b/.github/workflows/android_build.yml
@@ -0,0 +1,30 @@
+name: Android CI
+
+on:
+  push:
+    branches: [ "main" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: set up JDK 17
+      uses: actions/setup-java@v4
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+        cache: gradle
+
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Build with Gradle
+      run: ./gradlew MixinApk-release
+
+    - name: Upload a Build Artifact
+      uses: actions/upload-artifact@v4.6.2
+      with:
+        name: QQPro
+        path: app/dist/QQPro.*.apk
diff --git a/.github/workflows/pr_android.yml b/.github/workflows/pr_android.yml
@@ -0,0 +1,24 @@
+name: Pull Requests build
+
+on:
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: set up JDK 17
+      uses: actions/setup-java@v4
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+        cache: gradle
+
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Build with Gradle
+      run: ./gradlew MixinApk-release
diff --git a/ApkMixin/src/main/java/momoi/plugin/apkmixin/MixinPlugin.kt b/ApkMixin/src/main/java/momoi/plugin/apkmixin/MixinPlugin.kt
@@ -3,6 +3,7 @@ package momoi.plugin.apkmixin
 import com.android.apksigner.ApkSignerTool
 import com.wind.meditor.ManifestEditorMain
 import momoi.plugin.apkmixin.utils.child
+import momoi.plugin.apkmixin.utils.lifecycle
 import org.gradle.api.DefaultTask
 import org.gradle.api.Plugin
 import org.gradle.api.Project
@@ -33,7 +34,7 @@ class MixinPlugin : Plugin<Project> {
     private fun createMixinBaseTask(project: Project) {
         project.tasks.register("MixinApk", MixinApkTask::class.java) {
             val targetApkName = extension.targetApk ?: throw IllegalArgumentException("targetApk must not be null")
-            it.mixinAppDex = project.fileTree("build/intermediates/dex/release/mergeDexRelease")
+            it.mixinAppDex = project.layout.buildDirectory.dir("intermediates/dex/release/mergeDexRelease").get().asFileTree
             it.targetAppFile = project.layout.projectDirectory.dir("mixin").file(targetApkName)
             it.doLast {
                 createMetadata(project)
@@ -47,7 +48,7 @@ class MixinPlugin : Plugin<Project> {
             it.doLast {
                 processManifest(project, isDebug = true)
                 sign(project)
-                createMetadata(project, extension.output.signedFileName)
+                createMetadata(project, if (extension.signing.enabled) extension.output.signedFileName else extension.output.unsignedFileName)
             }
         }
     }
@@ -58,12 +59,13 @@ class MixinPlugin : Plugin<Project> {
             it.doLast {
                 processManifest(project, isDebug = false)
                 sign(project)
-                createMetadata(project, extension.output.signedFileName)
+                createMetadata(project, if (extension.signing.enabled) extension.output.signedFileName else extension.output.unsignedFileName)
             }
         }
     }
 
     private fun processManifest(project: Project, isDebug: Boolean) {
+        lifecycle("Processing manifest...")
         ManifestEditorMain.main(
             project.outputDir(extension).child(extension.output.mixinApkFileName).absolutePath,
             "-o",
@@ -76,15 +78,18 @@ class MixinPlugin : Plugin<Project> {
 
     private fun sign(project: Project) {
         if (extension.signing.enabled) {
+            lifecycle("Signing...")
             val unsignedApkFile = project.outputDir(extension).child(extension.output.unsignedFileName)
+            val signedApkFile = project.outputDir(extension).child(extension.output.signedFileName)
             ApkSignerTool.main(arrayOf(
                 "sign",
                 "--key", extension.signing.keyFile?.absolutePath,
                 "--cert", extension.signing.certFile?.absolutePath,
-                "--out", project.outputDir(extension).child(extension.output.signedFileName).absolutePath,
+                "--out", signedApkFile.absolutePath,
                 unsignedApkFile.absolutePath
             ))
             unsignedApkFile.delete()
+            lifecycle("Signed: ${signedApkFile.absolutePath}")
         }
     }
 
@@ -97,7 +102,7 @@ class MixinPlugin : Plugin<Project> {
     }
 
     private fun createRedirectFile(project: Project) {
-        project.projectDir.child("build/intermediates/apk_ide_redirect_file/debug/createDebugApkListingFileRedirect/redirect.txt")
+        project.layout.buildDirectory.file("intermediates/apk_ide_redirect_file/debug/createDebugApkListingFileRedirect/redirect.txt").get().asFile
             .writeText("""
                 #- File Locator -
                 listingFile=../../../../../dist/output-metadata.json
@@ -108,7 +113,7 @@ class MixinPlugin : Plugin<Project> {
         project: Project,
         fileName: String
     ) {
-        project.projectDir.child("dist/output-metadata.json").writeText("""
+        project.outputDir(extension).child("output-metadata.json").writeText("""
             {
               "version": 3,
               "artifactType": {
@@ -133,14 +138,17 @@ class MixinPlugin : Plugin<Project> {
 }
 
 abstract class MixinApkTask: DefaultTask() {
+
+    private val extension = project.extensions.findByType(ApkMixinExtension::class.java) ?: ApkMixinExtension()
+
     @get:InputFiles
     abstract var mixinAppDex: FileCollection
 
     @get:InputFile
     abstract var targetAppFile: RegularFile
 
     @get:OutputFile
-    val outputFile: RegularFile = project.layout.projectDirectory.file("dist/${DEFAULT_MIXIN_APK_NAME}")
+    val outputMixinFile: RegularFile = project.layout.projectDirectory.dir(extension.output.outputDir).file(extension.output.mixinApkFileName)
 
     init {
         dependsOn("mergeDexRelease")
diff --git a/ApkMixin/src/main/java/momoi/plugin/apkmixin/MixinProcessor.kt b/ApkMixin/src/main/java/momoi/plugin/apkmixin/MixinProcessor.kt
@@ -25,13 +25,14 @@ import momoi.plugin.apkmixin.utils.toSmali
 import org.gradle.api.Project
 import java.io.File
 import java.io.FileNotFoundException
+import java.io.IOException
 import java.util.concurrent.TimeUnit
 import java.util.zip.ZipFile
 import kotlin.getValue
 
 class MixinProcessor(
     private val project: Project,
-    private val inputDexDir: File = project.projectDir.child("build/intermediates/dex/release/mergeDexRelease"),
+    private val inputDexDir: File = project.layout.buildDirectory.dir("intermediates/dex/release/mergeDexRelease").get().asFile,
     private val targetApkFile: File = project.projectDir.child("mixin").child(extension.targetApk.orEmpty()),
     private val extension: ApkMixinExtension = project.extensions.getByType(ApkMixinExtension::class.java)
 ) {
@@ -49,7 +50,7 @@ class MixinProcessor(
     private fun loadDexFiles(): Triple<DexFile, DexFile, ZipFile> {
         val srcDex = MultiDexIO.readDexFile(
             /* multiDex = */ true,
-            /* file = */ File(project.projectDir, "build/intermediates/dex/release/mergeDexRelease"),
+            /* file = */ inputDexDir,
             /* namer = */ BasicDexFileNamer(),
             /* opcodes = */ null,
             /* logger = */ null
@@ -179,7 +180,11 @@ class MixinProcessor(
         lifecycle("Writing dex...")
         val stopWatchWriteDex = Stopwatch.createStarted()
         val namer = BasicDexFileNamer()
-        val outputDexDir = project.projectDir.child("build/mixinDex")
+        val outputDexDir = project.layout.buildDirectory.dir("mixinDex").get().asFile.also {
+            if (!it.isDirectory && ((it.exists() && !it.delete()) || !it.mkdirs())) {
+                throw IOException("Failed to create ${it.absolutePath}")
+            }
+        }
         
         MultiDexIO.writeDexFile(
             /* multiDex = */ true,
@@ -194,18 +199,19 @@ class MixinProcessor(
         stopWatchWriteDex.stop()
         lifecycle("Dex written in ${stopWatchWriteDex.elapsed(TimeUnit.MILLISECONDS)}ms")
 
-        lifecycle("Zip to mixin.apk...")
+        lifecycle("Zip to mixin apk...")
         val stopWatchZipToApk = Stopwatch.createStarted()
-        val mixinApkFile = project.projectDir.child("dist/mixin.apk")
-        if (mixinApkFile.length() != targetApkFile.length())
+        val mixinApkFile = project.outputDir(extension).child(extension.output.mixinApkFileName)
+        if (mixinApkFile.length() != targetApkFile.length()) {
             targetApkFile.copyTo(mixinApkFile, overwrite = true)
+        }
         ZipUtil.addOrReplaceFilesInZip(
             mixinApkFile,
             outputDexDir.listFiles()?.associateBy { it.name } ?: emptyMap()
         )
 
         stopWatchZipToApk.stop()
-        lifecycle("Mixin.apk written in ${stopWatchZipToApk.elapsed(TimeUnit.MILLISECONDS)}ms")
+        lifecycle("Mixin apk written in ${stopWatchZipToApk.elapsed(TimeUnit.MILLISECONDS)}ms")
     }
 
     private fun createDexRewriter(newClassesDex: DexFile, modifiedClasses: Map<String, ClassDef>): DexRewriter {
