gitea-mirror/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2026-04-28 12:03:09 -07:00
Code Issues Packages Projects Releases Wiki Activity

Build against API 37

Browse Source
This commit is contained in:
topjohnwu
2026-04-19 04:54:36 -07:00
committed by John Wu
parent 42fa348357
commit ee3ce37ae4
2 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/build-logic/src/main/java/Setup.kt
View File

@@ -14,7 +14,6 @@ import org.gradle.api.tasks.OutputDirectory
import org.gradle.api.tasks.StopExecutionException import org.gradle.api.tasks.StopExecutionException
import org.gradle.api.tasks.Sync import org.gradle.api.tasks.Sync
import org.gradle.kotlin.dsl.assign import org.gradle.kotlin.dsl.assign
import org.gradle.kotlin.dsl.exclude
import org.gradle.kotlin.dsl.filter import org.gradle.kotlin.dsl.filter
import org.gradle.kotlin.dsl.get import org.gradle.kotlin.dsl.get
import org.gradle.kotlin.dsl.register import org.gradle.kotlin.dsl.register
@@ -44,11 +43,9 @@ internal fun Project.androidAppComponents(configure: Action<ApplicationAndroidCo
fun Project.setupCommon() { fun Project.setupCommon() {
android { android {
compileSdk { compileSdk {
version = release(36) { version = release(37)
minorApiLevel = 1
}
} }
buildToolsVersion = "36.1.0" buildToolsVersion = "37.0.0"
ndkPath = "${androidComponents.sdkComponents.sdkDirectory.get().asFile}/ndk/magisk" ndkPath = "${androidComponents.sdkComponents.sdkDirectory.get().asFile}/ndk/magisk"
ndkVersion = "29.0.14206865" ndkVersion = "29.0.14206865"
@@ -142,10 +139,8 @@ fun Project.setupCoreLib() {
true true
} }
} }
variant.sources.jniLibs
variant.sources.jniLibs?.let { ?.addGeneratedSourceDirectory(syncLibs, SyncWithDir::outputFolder)
it.addGeneratedSourceDirectory(syncLibs, SyncWithDir::outputFolder)
}
val syncResources = tasks.register("sync${variantCapped}Resources", SyncWithDir::class) { val syncResources = tasks.register("sync${variantCapped}Resources", SyncWithDir::class) {
outputFolder.set(layout.buildDirectory.dir("$variantName/resources")) outputFolder.set(layout.buildDirectory.dir("$variantName/resources"))
@@ -160,10 +155,8 @@ fun Project.setupCoreLib() {
} }
} }
} }
variant.sources.resources
variant.sources.resources?.let { ?.addGeneratedSourceDirectory(syncResources, SyncWithDir::outputFolder)
it.addGeneratedSourceDirectory(syncResources, SyncWithDir::outputFolder)
}
val stubTask = tasks.getByPath(":stub:transform${variantCapped}Apk") val stubTask = tasks.getByPath(":stub:transform${variantCapped}Apk")
val syncAssets = tasks.register("sync${variantCapped}Assets", SyncWithDir::class) { val syncAssets = tasks.register("sync${variantCapped}Assets", SyncWithDir::class) {
@@ -197,10 +190,8 @@ fun Project.setupCoreLib() {
filter<FixCrLfFilter>("eol" to FixCrLfFilter.CrLf.newInstance("lf")) filter<FixCrLfFilter>("eol" to FixCrLfFilter.CrLf.newInstance("lf"))
} }
} }
variant.sources.assets
variant.sources.assets?.let { ?.addGeneratedSourceDirectory(syncAssets, SyncWithDir::outputFolder)
it.addGeneratedSourceDirectory(syncAssets, SyncWithDir::outputFolder)
}
} }
} }
} }
@@ -221,7 +212,7 @@ fun Project.setupAppCommon() {
} }
defaultConfig { defaultConfig {
targetSdk = 36 targetSdk = 37
proguardFiles( proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt") getDefaultProguardFile("proguard-android-optimize.txt")
) )
@@ -337,10 +328,7 @@ fun Project.setupTestApk() {
rename { "shamiko.zip" } rename { "shamiko.zip" }
} }
} }
variant.sources.assets?.addGeneratedSourceDirectory(dlTask, SyncWithDir::outputFolder)
variant.sources.assets?.let {
it.addGeneratedSourceDirectory(dlTask, SyncWithDir::outputFolder)
}
} }
} }
} }

2
app/core/src/main/java/com/topjohnwu/magisk/core/utils/TextHolder.kt
View File

@@ -39,4 +39,4 @@ abstract class TextHolder {
fun Int.asText(): TextHolder = TextHolder.Resource(this) fun Int.asText(): TextHolder = TextHolder.Resource(this)
fun Int.asText(vararg params: Any): TextHolder = TextHolder.ResourceArgs(this, *params) 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)