refine gradle

build.gradle.kts

@@ -1,8 +1,6 @@
 import com.android.build.gradle.AppExtension
 import com.android.build.gradle.LibraryExtension
-import org.jetbrains.kotlin.daemon.common.toHexString
 import java.io.ByteArrayOutputStream
-import java.security.MessageDigest
 
 plugins {
     alias(libs.plugins.agp.app) apply false
@@ -33,18 +31,6 @@ val verCode by extra(gitCommitCount)
 val commitHash by extra(gitCommitHash)
 val abiList by extra(listOf("arm64-v8a", "x86_64"))
 
-fun calculateChecksum(): String {
-    return MessageDigest.getInstance("SHA-256").run {
-        update(moduleId.toByteArray(Charsets.UTF_8))
-        update(moduleName.toByteArray(Charsets.UTF_8))
-        update(verName.toByteArray(Charsets.UTF_8))
-        update(verCode.toString().toByteArray(Charsets.UTF_8))
-        update(author.toByteArray(Charsets.UTF_8))
-        update(description.toByteArray(Charsets.UTF_8))
-        digest().toHexString()
-    }
-}
-
 val androidMinSdkVersion by extra(31)
 val androidTargetSdkVersion by extra(34)
 val androidCompileSdkVersion by extra(34)

module/build.gradle.kts

@@ -60,11 +60,14 @@ dependencies {
     implementation(libs.cxx)
 }
 
-androidComponents.onVariants { variant ->
-    afterEvaluate {
+evaluationDependsOn(":service")
+
+afterEvaluate {
+    android.applicationVariants.forEach { variant ->
         val variantLowered = variant.name.lowercase()
         val variantCapped = variant.name.capitalizeUS()
-        val buildTypeLowered = variant.buildType?.lowercase()
+        val buildTypeCapped = variant.buildType.name.replaceFirstChar { it.uppercase() }
+        val buildTypeLowered = variant.buildType.name.lowercase()
         val supportedAbis = abiList.map {
             when (it) {
                 "arm64-v8a" -> "arm64"
@@ -81,7 +84,10 @@ androidComponents.onVariants { variant ->
 
         val prepareModuleFilesTask = task<Sync>("prepareModuleFiles$variantCapped") {
             group = "module"
-            dependsOn("assemble$variantCapped", ":service:assemble$variantCapped")
+            dependsOn(
+                "assemble$variantCapped",
+                ":service:package$buildTypeCapped"
+            )
             into(moduleDir)
             from(rootProject.layout.projectDirectory.file("README.md"))
             from(layout.projectDirectory.file("template")) {
@@ -110,8 +116,9 @@ androidComponents.onVariants { variant ->
                 filter<ReplaceTokens>("tokens" to tokens)
                 filter<FixCrLfFilter>("eol" to FixCrLfFilter.CrLf.newInstance("lf"))
             }
-            from(project(":service").layout.buildDirectory.file("outputs/apk/$variantLowered/service-$variantLowered.apk")) {
-                rename { "service.apk" }
+            from(project(":service").tasks.getByName("package$buildTypeCapped").outputs) {
+                include("*.apk")
+                rename(".*\\.apk", "service.apk")
             }
             from(layout.buildDirectory.file("intermediates/stripped_native_libs/$variantLowered/strip${variantCapped}DebugSymbols/out/lib")) {
                 exclude("**/libbinder.so", "**/libutils.so")

service/build.gradle.kts

@@ -84,8 +84,8 @@ dependencies {
     implementation(libs.bcpkix.jdk18on)
 }
 
-androidComponents.onVariants { variant ->
-    afterEvaluate {
+afterEvaluate {
+    android.applicationVariants.forEach { variant ->
         val variantLowered = variant.name.lowercase()
         val variantCapped = variant.name.capitalizeUS()
         val pushTask = task<Task>("pushService$variantCapped") {

settings.gradle.kts

@@ -15,8 +15,6 @@ dependencyResolutionManagement {
 }
 
 rootProject.name = "TrickyStore"
-include(
-    ":module"
-)
+include(":module")
 include(":service")
 include(":stub")