Fix pack mmdb failure if downloadGepip before assembleClashCore

This commit is contained in:
Kr328 committed 2020-04-16 12:13:43 +08:00
1 parent c45f8ddfc3
commit 53b6a9dfc1
3 files changed
+9 -11

No files matched your search

+1 -1
View File
@@ -77,6 +77,6 @@ repositories {
}
afterEvaluate {
tasks["clean"].dependsOn(tasks["resetGolangMode"])
tasks["clean"].dependsOn(tasks["resetGolangPathMode"])
tasks["preBuild"].dependsOn(tasks["extractSources"], tasks["downloadGeoipDatabase"])
}
+5 -9
View File
@@ -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)
}
+3 -1
View File
@@ -20,4 +20,6 @@ android.enableJetifier=true
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
kapt.incremental.apt=false
kapt.incremental.apt=false
org.gradle.parallel=true