Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6322863 authored by Fynn Godau's avatar Fynn Godau
Browse files

Merge branch 'epic67-maps-merge' into 'master' 

Merge epic

See merge request !67
parents c7a04895 376be0d7

play-services-maps-core-mapbox/build.gradle

+6 −3
Original line number Diff line number Diff line
@@ -20,12 +20,12 @@ apply plugin: 'kotlin-android' 
dependencies {

    implementation project(':play-services-maps')

    implementation project(':play-services-base-core')

    implementation("org.maplibre.gl:android-sdk:9.6.0") {

        exclude group: 'com.google.android.gms'

    }

    implementation("org.maplibre.gl:android-sdk:10.0.0")

    implementation("org.maplibre.gl:android-plugin-annotation-v9:1.0.0") {

        exclude group: 'com.google.android.gms'

    }

    implementation 'org.maplibre.gl:android-sdk-turf:5.9.0'



    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"

}
@@ -39,6 +39,9 @@ def execResult(...args) { 
}



def mapboxKey() {

    String environmentKey = System.getenv('MAPBOX_VECTOR_TILES_KEY')

    if (environmentKey != null) return environmentKey



    Properties properties = new Properties()

    try {

        properties.load(project.rootProject.file('local.properties').newDataInputStream())