Fix task dependencies (#16)

revonateB0T · web-flow · commit 5bca238df0d4 · 2026-04-26T23:41:18.000+08:00
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -28,15 +28,6 @@ android {
     }
 }
 
-androidComponents {
-    onVariants { variant ->
-        val variantName = variant.name.replaceFirstChar(Char::titlecase)
-        tasks
-            .matching { it.name == "compile${variantName}Kotlin" || it.name == "compile${variantName}JavaWithJavac" }
-            .configureEach { dependsOn("cargoBuild") }
-    }
-}
-
 kotlin {
     jvmToolchain(25)
 }
@@ -71,3 +62,8 @@ cargo {
     profile = "release"
 }
 
+val rustJniLibsDir = layout.buildDirectory.dir("rustJniLibs/android").get()!!
+tasks.matching { it.name.matches(Regex("merge.*JniLibFolders")) }.configureEach {
+    inputs.dir(rustJniLibsDir)
+    dependsOn("cargoBuild")
+}

Original file line number	Diff line number	Diff line change
`@@ -28,15 +28,6 @@ android {`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`
`31`		`-androidComponents {`
`32`		`- onVariants { variant ->`
`33`		`- val variantName = variant.name.replaceFirstChar(Char::titlecase)`
`34`		`- tasks`
`35`		`- .matching { it.name == "compile${variantName}Kotlin" \|\| it.name == "compile${variantName}JavaWithJavac" }`
`36`		`- .configureEach { dependsOn("cargoBuild") }`
`37`		`- }`
`38`		`-}`
`39`		`-`
`40`	`31`	`kotlin {`
`41`	`32`	`jvmToolchain(25)`
`42`	`33`	`}`
`@@ -71,3 +62,8 @@ cargo {`
`71`	`62`	`profile = "release"`
`72`	`63`	`}`
`73`	`64`
	`65`	`+val rustJniLibsDir = layout.buildDirectory.dir("rustJniLibs/android").get()!!`
	`66`	`+tasks.matching { it.name.matches(Regex("merge.*JniLibFolders")) }.configureEach {`
	`67`	`+ inputs.dir(rustJniLibsDir)`
	`68`	`+ dependsOn("cargoBuild")`
	`69`	`+}`