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

Unverified Commit 16af655d authored by Fynn Godau's avatar Fynn Godau Committed by Marvin W.
Browse files

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

Merge epic

See merge request !67
parent d831bbc7
Loading
Loading
Loading
Loading
+4 −4
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"
}

@@ -46,7 +46,7 @@ android {
        versionName version
        minSdkVersion androidMinSdk
        targetSdkVersion androidTargetSdk
        buildConfigField "String", "MAPBOX_KEY", "\"${localProperties.getProperty("mapbox.key", "")}\""
        buildConfigField "String", "MAPBOX_KEY", "\"${localProperties.getProperty("mapbox.key", System.getenv('MAPBOX_VECTOR_TILES_KEY') ?: "")}\""

        ndk {
            abiFilters "armeabi", "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@
    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>

    <uses-sdk tools:overrideLibrary="com.mapbox.mapboxsdk" />

    <application />

</manifest>
+13845 −0

File added.

Preview size limit exceeded, changes collapsed.

+4392 −0

File added.

Preview size limit exceeded, changes collapsed.

+3489 −0

File added.

Preview size limit exceeded, changes collapsed.

Loading