diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index b3e21d5..e1b0c47 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -26,15 +26,14 @@ android {
     buildFeatures {
         compose = true
     }
-}
 
-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") }
-    }
+	libraryVariants.all {
+		val variantName = name.replaceFirstChar(Char::titlecase)
+
+		tasks.named("merge${variantName}JniLibFolders").configure {
+			dependsOn("cargoBuild")
+		}
+	}
 }
 
 kotlin {