From 881948554eed2f9af5cf597f289685545de5aef9 Mon Sep 17 00:00:00 2001 From: tarsin Date: Mon, 12 Jun 2023 12:05:05 +0800 Subject: [PATCH] Cleanup buildscript --- app/build.gradle.kts | 6 +++--- build.gradle.kts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 0f9bb3306..b61b71d48 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -273,9 +273,9 @@ cargo { } tasks.whenObjectAdded { - if ((this.name == "mergeDebugJniLibFolders" || this.name == "mergeReleaseJniLibFolders")) { - this.dependsOn("cargoBuild") + if ((name == "mergeDebugJniLibFolders" || name == "mergeReleaseJniLibFolders")) { + dependsOn("cargoBuild") // fix mergeDebugJniLibFolders UP-TO-DATE - this.inputs.dir(buildDir.resolve("rustJniLibs/android")) + inputs.dir(buildDir.resolve("rustJniLibs/android")) } } diff --git a/build.gradle.kts b/build.gradle.kts index 17b614e37..6fc4b00b9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,6 +4,7 @@ plugins { kotlin("plugin.serialization") version "1.9.0-Beta" apply false id("com.google.devtools.ksp") version "1.9.0-Beta-1.0.11" apply false id("com.mikepenz.aboutlibraries.plugin") version "10.7.0" apply false + id("org.mozilla.rust-android-gradle.rust-android") version "0.9.3" apply false } allprojects { @@ -17,6 +18,5 @@ tasks.register("Delete", Delete::class) { buildscript { dependencies { classpath("com.android.tools:r8:8.2.12-dev") - classpath("org.mozilla.rust-android-gradle:plugin:0.9.3") } }