Merge pull request #370 from opendocument-app/conangradleplugin-091

ViliusSutkus89 · web-flow · commit 4d7a4e710045 · 2024-08-09T04:34:02.000+03:00
Upgrade ConanAndroidGradlePlugin to 0.9.1
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
 }

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ android {`
`42`	`42`	`cmake {`
`43`	`43`	`targets "odr-core"`
`44`	`44`	`arguments(`
`45`		`- "-DCMAKE_TOOLCHAIN_FILE=conan_android_toolchain.cmake",`
	`45`	`+ "-DCMAKE_TOOLCHAIN_FILE=build/conan/android_toolchain.cmake",`
`46`	`46`	`"-DCMAKE_BUILD_TYPE=RelWithDebInfo",`
`47`	`47`	`)`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@ plugins {`
`2`	`2`	`id 'com.android.application' version '8.4.1' apply false`
`3`	`3`	`id 'com.google.gms.google-services'version '4.4.1' apply false`
`4`	`4`	`id 'com.google.firebase.crashlytics' version '3.0.1' apply false`
`5`		`- id 'app.opendocument.conanandroidgradleplugin' version "0.9.0" apply false`
	`5`	`+ id 'app.opendocument.conanandroidgradleplugin' version "0.9.1" apply false`
`6`	`6`	`}`