From 09a294c219894da93fbb8bc6e22050190d54ef25 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Tue, 11 May 2021 18:40:30 -0700
Subject: [PATCH] Fix release builds

---
 app/build.gradle.kts |  2 ++
 build.gradle.kts     | 31 ++++---------------------------
 2 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index bef8dbbd3..4c50bed2b 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -183,6 +183,8 @@ android.applicationVariants.all {
 dependencies {
     implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
     implementation(kotlin("stdlib"))
+    // Some dependencies request JDK 8 stdlib, specify manually here to prevent version mismatch
+    implementation(kotlin("stdlib-jdk8"))
     implementation(project(":app:shared"))
 
     implementation("com.github.topjohnwu:jtar:1.0.0")
diff --git a/build.gradle.kts b/build.gradle.kts
index 9d08ec14f..babb37940 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,4 @@
 import com.android.build.gradle.BaseExtension
-import java.nio.file.Paths
 
 plugins {
     id("MagiskPlugin")
@@ -30,24 +29,8 @@ tasks.register("clean", Delete::class) {
     delete(rootProject.buildDir)
 }
 
-val Project.android get() = extensions.getByName<BaseExtension>("android")
-
-fun Task.applyOptimize() = doLast {
-    val aapt2 = Paths.get(project.android.sdkDirectory.path,
-        "build-tools", project.android.buildToolsVersion, "aapt2")
-    val zip = Paths.get(project.buildDir.path, "intermediates",
-        "shrunk_processed_res", "release", "resources-release-stripped.ap_")
-    val optimized = File("${zip}.opt")
-    val cmd = exec {
-        commandLine(aapt2, "optimize", "--collapse-resource-names",
-            "--shorten-resource-paths", "-o", optimized, zip)
-        isIgnoreExitValue = true
-    }
-    if (cmd.exitValue == 0) {
-        zip.toFile().delete()
-        optimized.renameTo(zip.toFile())
-    }
-}
+fun Project.android(configuration: BaseExtension.() -> Unit) =
+    extensions.getByName<BaseExtension>("android").configuration()
 
 subprojects {
     repositories {
@@ -59,7 +42,7 @@ subprojects {
     afterEvaluate {
         if (plugins.hasPlugin("com.android.library") ||
             plugins.hasPlugin("com.android.application")) {
-            android.apply {
+            android {
                 compileSdkVersion(30)
                 buildToolsVersion = "30.0.3"
                 ndkPath = "${System.getenv("ANDROID_SDK_ROOT")}/ndk/magisk"
@@ -86,14 +69,8 @@ subprojects {
             }
         }
 
-        tasks.whenTaskAdded {
-            if (name == "shrinkReleaseRes") {
-                finalizedBy(tasks.create("optimizeReleaseRes").applyOptimize())
-            }
-        }
-
         if (name == "app" || name == "stub") {
-            android.apply {
+            android {
                 signingConfigs {
                     create("config") {
                         Config["keyStore"]?.also {