rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6136 from vector-im/feature/adm/foss-avoid-gms-location-provider

Browse Source 
Excluding the gms play-service-location from maplibre for fdroid builds
This commit is contained in:
Adam Brown 2022-05-25 08:59:18 +01:00 committed by GitHub
commit ae9922a731
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/6100.misc Normal file
View File

@ -0,0 +1 @@
Excludes transitive optional non FOSS google location dependency from fdroid builds

4
dependencies.gradle
View File

@ -110,6 +110,10 @@ ext.libs = [
'mavericks' : "com.airbnb.android:mavericks:$mavericks", 'mavericks' : "com.airbnb.android:mavericks:$mavericks",
'mavericksTesting' : "com.airbnb.android:mavericks-testing:$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 : [
'mockk' : "io.mockk:mockk:$mockk", 'mockk' : "io.mockk:mockk:$mockk",
'mockkAndroid' : "io.mockk:mockk-android:$mockk" 'mockkAndroid' : "io.mockk:mockk-android:$mockk"

11
vector/build.gradle
View File

@ -507,9 +507,14 @@ dependencies {
implementation 'commons-codec:commons-codec:1.15' implementation 'commons-codec:commons-codec:1.15'
// MapTiler // MapTiler
implementation 'org.maplibre.gl:android-sdk:9.5.2' fdroidImplementation(libs.maplibre.androidSdk) {
implementation 'org.maplibre.gl:android-plugin-annotation-v9:1.0.0' 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 // TESTS
testImplementation libs.tests.junit testImplementation libs.tests.junit