From ee3ce37ae4fea351f43a46d310147436df83925d Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Sun, 19 Apr 2026 04:54:36 -0700
Subject: [PATCH] Build against API 37

---
 app/build-logic/src/main/java/Setup.kt        | 32 ++++++-------------
 .../topjohnwu/magisk/core/utils/TextHolder.kt |  2 +-
 2 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/app/build-logic/src/main/java/Setup.kt b/app/build-logic/src/main/java/Setup.kt
index 77613e2a2..dd0f76b35 100644
--- a/app/build-logic/src/main/java/Setup.kt
+++ b/app/build-logic/src/main/java/Setup.kt
@@ -14,7 +14,6 @@ import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.StopExecutionException
 import org.gradle.api.tasks.Sync
 import org.gradle.kotlin.dsl.assign
-import org.gradle.kotlin.dsl.exclude
 import org.gradle.kotlin.dsl.filter
 import org.gradle.kotlin.dsl.get
 import org.gradle.kotlin.dsl.register
@@ -44,11 +43,9 @@ internal fun Project.androidAppComponents(configure: Action<ApplicationAndroidCo
 fun Project.setupCommon() {
     android {
         compileSdk {
-            version = release(36) {
-                minorApiLevel = 1
-            }
+            version = release(37)
         }
-        buildToolsVersion = "36.1.0"
+        buildToolsVersion = "37.0.0"
         ndkPath = "${androidComponents.sdkComponents.sdkDirectory.get().asFile}/ndk/magisk"
         ndkVersion = "29.0.14206865"
 
@@ -142,10 +139,8 @@ fun Project.setupCoreLib() {
                     true
                 }
             }
-
-            variant.sources.jniLibs?.let {
-                it.addGeneratedSourceDirectory(syncLibs, SyncWithDir::outputFolder)
-            }
+            variant.sources.jniLibs
+                ?.addGeneratedSourceDirectory(syncLibs, SyncWithDir::outputFolder)
 
             val syncResources = tasks.register("sync${variantCapped}Resources", SyncWithDir::class) {
                 outputFolder.set(layout.buildDirectory.dir("$variantName/resources"))
@@ -160,10 +155,8 @@ fun Project.setupCoreLib() {
                     }
                 }
             }
-
-            variant.sources.resources?.let {
-                it.addGeneratedSourceDirectory(syncResources, SyncWithDir::outputFolder)
-            }
+            variant.sources.resources
+                ?.addGeneratedSourceDirectory(syncResources, SyncWithDir::outputFolder)
 
             val stubTask = tasks.getByPath(":stub:transform${variantCapped}Apk")
             val syncAssets = tasks.register("sync${variantCapped}Assets", SyncWithDir::class) {
@@ -197,10 +190,8 @@ fun Project.setupCoreLib() {
                     filter<FixCrLfFilter>("eol" to FixCrLfFilter.CrLf.newInstance("lf"))
                 }
             }
-
-            variant.sources.assets?.let {
-                it.addGeneratedSourceDirectory(syncAssets, SyncWithDir::outputFolder)
-            }
+            variant.sources.assets
+                ?.addGeneratedSourceDirectory(syncAssets, SyncWithDir::outputFolder)
         }
     }
 }
@@ -221,7 +212,7 @@ fun Project.setupAppCommon() {
         }
 
         defaultConfig {
-            targetSdk = 36
+            targetSdk = 37
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt")
             )
@@ -337,10 +328,7 @@ fun Project.setupTestApk() {
                     rename { "shamiko.zip" }
                 }
             }
-
-            variant.sources.assets?.let {
-                it.addGeneratedSourceDirectory(dlTask, SyncWithDir::outputFolder)
-            }
+            variant.sources.assets?.addGeneratedSourceDirectory(dlTask, SyncWithDir::outputFolder)
         }
     }
 }
diff --git a/app/core/src/main/java/com/topjohnwu/magisk/core/utils/TextHolder.kt b/app/core/src/main/java/com/topjohnwu/magisk/core/utils/TextHolder.kt
index aadca8bab..486727933 100644
--- a/app/core/src/main/java/com/topjohnwu/magisk/core/utils/TextHolder.kt
+++ b/app/core/src/main/java/com/topjohnwu/magisk/core/utils/TextHolder.kt
@@ -39,4 +39,4 @@ abstract class TextHolder {
 
 fun Int.asText(): TextHolder = TextHolder.Resource(this)
 fun Int.asText(vararg params: Any): TextHolder = TextHolder.ResourceArgs(this, *params)
-fun String.asText(): TextHolder = TextHolder.Str(this.toString())
+fun String.asText(): TextHolder = TextHolder.Str(this)