Upgrade ConanAndroidGradlePlugin to 0.9.1. This allows removing local…

…ly saved coan_android_toolchain.cmake
opendocument-app · Aug 9, 2024 · fbc9e6f · fbc9e6f
1 parent cd2ef81
commit fbc9e6f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 19 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -42,7 +42,7 @@ android {
             cmake {
                 targets "odr-core"
                 arguments(
-                    "-DCMAKE_TOOLCHAIN_FILE=conan_android_toolchain.cmake",
+                    "-DCMAKE_TOOLCHAIN_FILE=build/conan/android_toolchain.cmake",
                     "-DCMAKE_BUILD_TYPE=RelWithDebInfo",
                 )
             }

diff --git a/app/conan_android_toolchain.cmake b/app/conan_android_toolchain.cmake
diff --git a/build.gradle b/build.gradle
@@ -2,5 +2,5 @@ plugins {
     id 'com.android.application' version '8.4.1' apply false
     id 'com.google.gms.google-services'version '4.4.1' apply false
     id 'com.google.firebase.crashlytics' version '3.0.1' apply false
-    id 'app.opendocument.conanandroidgradleplugin' version "0.9.0" apply false
+    id 'app.opendocument.conanandroidgradleplugin' version "0.9.1" apply false
 }