From bec72264cda134bd99502b760c83581cd6b18aa4 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Tue, 24 May 2022 09:34:37 +0100 Subject: [PATCH] excluding the gms play-service-location optional transistive dependency for the fdroid variant - fixes fdroid being unable to compile the project due to a non foss dependency --- changelog.d/6100.misc | 1 + dependencies.gradle | 4 ++++ vector/build.gradle | 11 ++++++++--- 3 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 changelog.d/6100.misc diff --git a/changelog.d/6100.misc b/changelog.d/6100.misc new file mode 100644 index 0000000000..2fb5ecf34d --- /dev/null +++ b/changelog.d/6100.misc @@ -0,0 +1 @@ +Excludes transitive optional non FOSS google location dependency from fdroid builds diff --git a/dependencies.gradle b/dependencies.gradle index 47dc8ddc03..a0919371eb 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -107,6 +107,10 @@ ext.libs = [ 'mavericks' : "com.airbnb.android:mavericks:$mavericks", 'mavericksTesting' : "com.airbnb.android:mavericks-testing:$mavericks" ], + maplibre : [ + 'androidSdk' : "org.maplibre.gl:android-sdk:9.5.2", + 'pluginAnnotation' : "org.maplibre.gl:android-plugin-annotation-v9:1.0.0" + ], mockk : [ 'mockk' : "io.mockk:mockk:$mockk", 'mockkAndroid' : "io.mockk:mockk-android:$mockk" diff --git a/vector/build.gradle b/vector/build.gradle index 4ae6527e0b..51dfc2f962 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -507,9 +507,14 @@ dependencies { implementation 'commons-codec:commons-codec:1.15' // MapTiler - implementation 'org.maplibre.gl:android-sdk:9.5.2' - implementation 'org.maplibre.gl:android-plugin-annotation-v9:1.0.0' - + fdroidImplementation(libs.maplibre.androidSdk) { + exclude group: 'com.google.android.gms', module: 'play-services-location' + } + fdroidImplementation(libs.maplibre.pluginAnnotation) { + exclude group: 'com.google.android.gms', module: 'play-services-location' + } + gplayImplementation libs.maplibre.androidSdk + gplayImplementation libs.maplibre.pluginAnnotation // TESTS testImplementation libs.tests.junit