diff --git a/build.gradle.kts b/build.gradle.kts index 80c8a198..e78ee814 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -49,7 +49,9 @@ cmaker { } buildTypes { if (it.name == "release") { - arguments += "-DDEBUG_SYMBOLS_PATH=${buildDir.absolutePath}/symbols" + arguments += "-DDEBUG_SYMBOLS_PATH=${ + layout.buildDirectory.dir("symbols").get().asFile.absolutePath + }" } } } @@ -73,7 +75,7 @@ val androidSourceCompatibility by extra(JavaVersion.VERSION_17) val androidTargetCompatibility by extra(JavaVersion.VERSION_17) tasks.register("Delete", Delete::class) { - delete(rootProject.buildDir) + delete(rootProject.layout.buildDirectory) } subprojects { diff --git a/daemon/build.gradle.kts b/daemon/build.gradle.kts index c10d67f8..5d97ed90 100644 --- a/daemon/build.gradle.kts +++ b/daemon/build.gradle.kts @@ -81,10 +81,13 @@ android.applicationVariants.all { val variantCapped = name.replaceFirstChar { it.uppercase() } val variantLowered = name.lowercase() - val outSrcDir = file("$buildDir/generated/source/signInfo/${variantLowered}") + val outSrcDir = + layout.buildDirectory.dir("generated/source/signInfo/${variantLowered}").get() val signInfoTask = tasks.register("generate${variantCapped}SignInfo") { dependsOn(":app:validateSigning${variantCapped}") - val sign = rootProject.project(":app").extensions.getByType(ApplicationExtension::class.java).buildTypes.named(variantLowered).get().signingConfig + val sign = rootProject.project(":app").extensions + .getByType(ApplicationExtension::class.java) + .buildTypes.named(variantLowered).get().signingConfig val outSrc = file("$outSrcDir/org/lsposed/lspd/util/SignInfo.java") outputs.file(outSrc) doLast { @@ -107,7 +110,7 @@ android.applicationVariants.all { ) } } - registerJavaGeneratingTask(signInfoTask, outSrcDir) + registerJavaGeneratingTask(signInfoTask, outSrcDir.asFile) } dependencies { diff --git a/magisk-loader/build.gradle.kts b/magisk-loader/build.gradle.kts index 11179ef3..3f783154 100644 --- a/magisk-loader/build.gradle.kts +++ b/magisk-loader/build.gradle.kts @@ -134,7 +134,7 @@ fun afterEval() = android.applicationVariants.forEach { variant -> val flavorCapped = variant.flavorName!!.replaceFirstChar { it.uppercase() } val flavorLowered = variant.flavorName!!.lowercase() - val magiskDir = "$buildDir/magisk/$variantLowered" + val magiskDir = layout.buildDirectory.dir("magisk/$variantLowered") val moduleId = "${flavorLowered}_$moduleBaseId" val zipFileName = "$moduleName-v$verName-$verCode-${flavorLowered}-$buildTypeLowered.zip" @@ -200,24 +200,25 @@ fun afterEval() = android.applicationVariants.forEach { variant -> rename(".*\\.apk", "daemon.apk") } into("lib") { - from("${buildDir}/intermediates/stripped_native_libs/$variantCapped/out/lib") { + from(layout.buildDirectory.dir("intermediates/stripped_native_libs/$variantCapped/out/lib")) { include("**/liblspd.so") } } into("bin") { - from("${project(":dex2oat").buildDir}/intermediates/cmake/$buildTypeLowered/obj") { + from(project(":dex2oat").layout.buildDirectory.dir("intermediates/cmake/$buildTypeLowered/obj")) { include("**/dex2oat") } } val dexOutPath = if (buildTypeLowered == "release") - "$buildDir/intermediates/dex/$variantCapped/minify${variantCapped}WithR8" else - "$buildDir/intermediates/dex/$variantCapped/mergeDex$variantCapped" + layout.buildDirectory.dir("intermediates/dex/$variantCapped/minify${variantCapped}WithR8") + else + layout.buildDirectory.dir("intermediates/dex/$variantCapped/mergeDex$variantCapped") into("framework") { from(dexOutPath) rename("classes.dex", "lspd.dex") } - val injected = objects.newInstance(magiskDir) + val injected = objects.newInstance(magiskDir.get().asFile.path) doLast { injected.factory.fileTree().from(injected.magiskDir).visit { if (isDirectory) return@visit @@ -275,7 +276,7 @@ val killLspd = task("killLspd") { val pushDaemon = task("pushDaemon") { group = "LSPosed" dependsOn(":daemon:assembleDebug") - workingDir("${project(":daemon").buildDir}/outputs/apk/debug") + workingDir(project(":daemon").layout.buildDirectory.dir("outputs/apk/debug")) commandLine(adb, "push", "daemon-debug.apk", "/data/local/tmp/daemon.apk") } val pushDaemonNative = task("pushDaemonNative") { @@ -289,7 +290,7 @@ val pushDaemonNative = task("pushDaemonNative") { } outputStream.toString().trim() } - workingDir("${project(":daemon").buildDir}/intermediates/stripped_native_libs/debug/out/lib/$abi") + workingDir(project(":daemon").layout.buildDirectory.dir("intermediates/stripped_native_libs/debug/out/lib/$abi")) } commandLine(adb, "push", "libdaemon.so", "/data/local/tmp/libdaemon.so") } @@ -307,7 +308,7 @@ val tmpApk = "/data/local/tmp/lsp.apk" val pushApk = task("pushApk") { group = "LSPosed" dependsOn(":app:assembleDebug") - workingDir("${project(":app").buildDir}/outputs/apk/debug") + workingDir(project(":app").layout.buildDirectory.dir("outputs/apk/debug")) commandLine(adb, "push", "app-debug.apk", tmpApk) } val openApp = task("openApp") {