TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-02-18 02:58:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Gradle 8.3

Browse Source
This commit is contained in:
LoveSy 2023-09-13 17:39:56 +08:00 committed by John Wu
parent 8a88d8465a
commit 877aeb66cb
5 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@ -3,5 +3,5 @@ plugins {
} }
tasks.register("clean", Delete::class) { tasks.register("clean", Delete::class) {
delete(rootProject.buildDir) delete(rootProject.layout.buildDirectory)
} }

24
buildSrc/src/main/java/Setup.kt
View File

@ -213,7 +213,7 @@ private fun Project.setupAppCommon() {
this.comment.set("version=${Config.version}\n" + this.comment.set("version=${Config.version}\n" +
"versionCode=${Config.versionCode}\n" + "versionCode=${Config.versionCode}\n" +
"stubVersion=${Config.stubVersion}\n") "stubVersion=${Config.stubVersion}\n")
this.outFolder.set(File(buildDir, "outputs/apk/${variant.name}")) this.outFolder.set(layout.buildDirectory.dir("outputs/apk/${variant.name}"))
} }
} }
} }
@ -318,8 +318,8 @@ fun Project.setupStub() {
project.tasks.register("${variantName}ManifestProducer", ManifestUpdater::class.java) { project.tasks.register("${variantName}ManifestProducer", ManifestUpdater::class.java) {
dependsOn("generate${variantCapped}ObfuscatedClass") dependsOn("generate${variantCapped}ObfuscatedClass")
applicationId.set(variant.applicationId) applicationId.set(variant.applicationId)
appClassDir.set(File(buildDir, "generated/source/app/$variantName")) appClassDir.set(layout.buildDirectory.dir("generated/source/app/$variantName"))
factoryClassDir.set(File(buildDir, "generated/source/factory/$variantName")) factoryClassDir.set(layout.buildDirectory.dir("generated/source/factory/$variantName"))
} }
variant.artifacts.use(manifestUpdater) variant.artifacts.use(manifestUpdater)
.wiredWithFiles( .wiredWithFiles(
@ -331,12 +331,12 @@ fun Project.setupStub() {
android.applicationVariants.all { android.applicationVariants.all {
val variantCapped = name.replaceFirstChar { it.uppercase() } val variantCapped = name.replaceFirstChar { it.uppercase() }
val variantLowered = name.lowercase() val variantLowered = name.lowercase()
val outFactoryClassDir = File(buildDir, "generated/source/factory/${variantLowered}") val outFactoryClassDir = layout.buildDirectory.file("generated/source/factory/${variantLowered}").get().asFile
val outAppClassDir = File(buildDir, "generated/source/app/${variantLowered}") val outAppClassDir = layout.buildDirectory.file("generated/source/app/${variantLowered}").get().asFile
val outResDir = File(buildDir, "generated/source/res/${variantLowered}") val outResDir = layout.buildDirectory.dir("generated/source/res/${variantLowered}").get().asFile
val aapt = File(android.sdkDirectory, "build-tools/${android.buildToolsVersion}/aapt2") val aapt = File(android.sdkDirectory, "build-tools/${android.buildToolsVersion}/aapt2")
val apk = File(buildDir, "intermediates/processed_res/" + val apk = layout.buildDirectory.file("intermediates/processed_res/" +
"${variantLowered}/out/resources-${variantLowered}.ap_") "${variantLowered}/out/resources-${variantLowered}.ap_").get().asFile
val genManifestTask = tasks.register("generate${variantCapped}ObfuscatedClass") { val genManifestTask = tasks.register("generate${variantCapped}ObfuscatedClass") {
inputs.property("seed", RAND_SEED) inputs.property("seed", RAND_SEED)
@ -377,10 +377,10 @@ fun Project.setupStub() {
registerJavaGeneratingTask(processResourcesTask, outResDir) registerJavaGeneratingTask(processResourcesTask, outResDir)
} }
// Override optimizeReleaseResources task // Override optimizeReleaseResources task
val apk = File(buildDir, "intermediates/processed_res/" + val apk = layout.buildDirectory.file("intermediates/processed_res/" +
"release/out/resources-release.ap_") "release/out/resources-release.ap_").get().asFile
val optRes = File(buildDir, "intermediates/optimized_processed_res/" + val optRes = layout.buildDirectory.file("intermediates/optimized_processed_res/" +
"release/resources-release-optimize.ap_") "release/resources-release-optimize.ap_").get().asFile
afterEvaluate { afterEvaluate {
tasks.named("optimizeReleaseResources") { tasks.named("optimizeReleaseResources") {
doLast { apk.copyTo(optRes, true) } doLast { apk.copyTo(optRes, true) }

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

3
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-rc-2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

8
gradlew vendored
View File

@ -83,7 +83,8 @@ done
# This is normally unused # This is normally unused
# shellcheck disable=SC2034 # shellcheck disable=SC2034
APP_BASE_NAME=${0##*/} APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value. # Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum MAX_FD=maximum
@ -130,10 +131,13 @@ location of your Java installation."
fi fi
else else
JAVACMD=java JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the Please set the JAVA_HOME variable in your environment to match the
location of your Java installation." location of your Java installation."
fi
fi fi
# Increase the maximum file descriptors if we can. # Increase the maximum file descriptors if we can.