From 2d0d879b48ff6241be562a14be17833a4824dd82 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <99822064+revonateB0T@users.noreply.github.com>
Date: Sun, 26 Apr 2026 21:27:08 +0800
Subject: [PATCH 1/2] Fix task dependencies

---
 core/build.gradle.kts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index b3e21d5..edcca2b 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -31,9 +31,9 @@ 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") }
+        tasks.named("merge${variantName}JniLibFolders").configure {
+			dependsOn("cargoBuild")
+		}
     }
 }
 

From f91cd3da008ce9c79867b55dd8d0066705915ed3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <99822064+revonateB0T@users.noreply.github.com>
Date: Sun, 26 Apr 2026 22:08:34 +0800
Subject: [PATCH 2/2] Try fix again

---
 core/build.gradle.kts | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index edcca2b..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.named("merge${variantName}JniLibFolders").configure {
+	libraryVariants.all {
+		val variantName = name.replaceFirstChar(Char::titlecase)
+
+		tasks.named("merge${variantName}JniLibFolders").configure {
 			dependsOn("cargoBuild")
 		}
-    }
+	}
 }
 
 kotlin {