Skip to content

Commit

Permalink
feat!: migrate maplibre-native for android to version 11.0.0 (tak…
Browse files Browse the repository at this point in the history
…e 2) (maplibre#406)

This pull request updates the package to use version 11.0.0 of
maplibre-native for android. It superseeds
maplibre#403 to make it not
dependant on other pull requests.

If wanted, we can change the occurences of "Maplibre" to "MapLibre" to
be more in line with maplibre-native. (I'd prefer to do it in a
follow-up pr tho).
  • Loading branch information
josxha authored and remax21 committed Sep 6, 2024
1 parent 1dfd141 commit f4911e0
Show file tree
Hide file tree
Showing 21 changed files with 2,290 additions and 2,344 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
iOS Devices with an Apple A7 GPU or later are supported onwards. See the
[maplibre-native changelog](https://github.com/maplibre/maplibre-native/blob/main/platform/ios/CHANGELOG.md#600)
for more information.
* Updated maplibre-native for android to v11.0.0. This version uses
OpenGL ES 3.0.

## 0.19.0

Expand Down
12 changes: 6 additions & 6 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
group 'com.mapbox.mapboxgl'
group 'org.maplibre.maplibregl'
version '1.0-SNAPSHOT'

buildscript {
Expand All @@ -24,7 +24,7 @@ apply plugin: 'org.jetbrains.kotlin.android'

android {
if (project.android.hasProperty("namespace")) {
namespace 'com.mapbox.mapboxgl'
namespace 'org.maplibre.maplibregl'
}

compileSdkVersion 34
Expand All @@ -46,10 +46,10 @@ android {
jvmTarget = JavaVersion.VERSION_1_8
}
dependencies {
implementation 'org.maplibre.gl:android-sdk:10.2.0'
implementation 'org.maplibre.gl:android-plugin-annotation-v9:2.0.0'
implementation 'org.maplibre.gl:android-plugin-offline-v9:2.0.0'
implementation 'com.squareup.okhttp3:okhttp:4.10.0'
implementation 'org.maplibre.gl:android-sdk:11.0.0'
implementation 'org.maplibre.gl:android-plugin-annotation-v9:3.0.0'
implementation 'org.maplibre.gl:android-plugin-offline-v9:3.0.0'
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
}
}

Expand Down
2 changes: 1 addition & 1 deletion android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1 @@
rootProject.name = 'mapbox_gl'
rootProject.name = 'maplibre_gl'
2 changes: 1 addition & 1 deletion android/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.mapbox.mapboxgl">
package="org.maplibre.maplibregl">
</manifest>
12 changes: 0 additions & 12 deletions android/src/main/java/com/mapbox/mapboxgl/MapBoxUtils.java

This file was deleted.

Loading

0 comments on commit f4911e0

Please sign in to comment.