Merge pull request #6136 from vector-im/feature/adm/foss-avoid-gms-lo…

…cation-provider Excluding the gms play-service-location from maplibre for fdroid builds
element-hq · May 25, 2022 · ae9922a · ae9922a
2 parents e1dde0c + bec7226
commit ae9922a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/changelog.d/6100.misc 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
@@ -110,6 +110,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
@@ -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
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Excludes transitive optional non FOSS google location dependency from fdroid builds