diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 21300bd..44ae59e 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -77,6 +77,6 @@ repositories { } afterEvaluate { - tasks["clean"].dependsOn(tasks["resetGolangMode"]) + tasks["clean"].dependsOn(tasks["resetGolangPathMode"]) tasks["preBuild"].dependsOn(tasks["extractSources"], tasks["downloadGeoipDatabase"]) } \ No newline at end of file diff --git a/core/clash.gradle.kts b/core/clash.gradle.kts index ffdd495..91bfe49 100644 --- a/core/clash.gradle.kts +++ b/core/clash.gradle.kts @@ -145,7 +145,7 @@ task("generateClashBindSources") { } } -task("bindClashCore") { +task("assembleClashCore") { dependsOn(tasks["generateClashBindSources"]) onlyIf { @@ -169,14 +169,8 @@ task("bindClashCore") { } task("extractSources", type = Copy::class) { - dependsOn(tasks["bindClashCore"]) + dependsOn(tasks["assembleClashCore"]) - doFirst { - buildDir.resolve(Constants.OUTPUT_PATH).apply { - resolve("jniLibs").deleteRecursively() - resolve("classes").deleteRecursively() - } - } from(zipTree(buildDir.resolve(Constants.GOLANG_OUTPUT))) { include("**/*.so") eachFile { @@ -192,6 +186,8 @@ task("extractSources", type = Copy::class) { } task("downloadGeoipDatabase") { + dependsOn(tasks["extractSources"]) + onlyIf { val file = buildDir.resolve(Constants.OUTPUT_PATH).resolve("assets/Country.mmdb") @@ -211,7 +207,7 @@ task("downloadGeoipDatabase") { } } -task("resetGolangMode", type = Exec::class) { +task("resetGolangPathMode", type = Exec::class) { onlyIf { !Os.isFamily(Os.FAMILY_WINDOWS) } diff --git a/gradle.properties b/gradle.properties index caa7234..82a7b0a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,4 +20,6 @@ android.enableJetifier=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -kapt.incremental.apt=false \ No newline at end of file +kapt.incremental.apt=false + +org.gradle.parallel=true \ No newline at end of file