updated config for gradle 7.5

tesseract-one · Feb 25, 2023 · d9d79ad · d9d79ad
1 parent 4c1a376
commit d9d79ad
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/examples/app/build.gradle b/examples/app/build.gradle
@@ -38,10 +38,14 @@ android {
 
 apply plugin: 'org.mozilla.rust-android-gradle.rust-android'
 
-tasks.whenTaskAdded { task ->
-    if ((task.name == 'javaPreCompileDebug' || task.name == 'javaPreCompileRelease')) {
-        task.dependsOn 'cargoBuild'
-    }
+task fixNotCopyingRustJniLibs(type: Delete) {
+    delete layout.buildDirectory.dir("intermediates/merged_jni_libs")
+}
+
+project.afterEvaluate {
+    tasks.getByName("mergeDebugJniLibFolders").dependsOn("cargoBuild")
+    tasks.getByName("mergeReleaseJniLibFolders").dependsOn("cargoBuild")
+    tasks.getByName("cargoBuild").dependsOn("fixNotCopyingRustJniLibs")
 }
 
 cargo {

diff --git a/examples/wallet/build.gradle b/examples/wallet/build.gradle
@@ -38,10 +38,14 @@ android {
 
 apply plugin: 'org.mozilla.rust-android-gradle.rust-android'
 
-tasks.whenTaskAdded { task ->
-    if ((task.name == 'javaPreCompileDebug' || task.name == 'javaPreCompileRelease')) {
-        task.dependsOn 'cargoBuild'
-    }
+task fixNotCopyingRustJniLibs(type: Delete) {
+    delete layout.buildDirectory.dir("intermediates/merged_jni_libs")
+}
+
+project.afterEvaluate {
+    tasks.getByName("mergeDebugJniLibFolders").dependsOn("cargoBuild")
+    tasks.getByName("mergeReleaseJniLibFolders").dependsOn("cargoBuild")
+    tasks.getByName("cargoBuild").dependsOn("fixNotCopyingRustJniLibs")
 }
 
 cargo {