Cherry-pick upstream#710, #852, #904 + small fixes (#69)

* 710 (Get rid of MapboxGlPlatform.getInstance) flutter-mapbox-gl/maps#710 * 852( Android embedding fixes - migrate to maven) flutter-mapbox-gl/maps#852 was also required to fix compile time errors * a small fix for the platform dependency * Update CI flutter version * cherry-pick upstream#904 (fix android build issues) Co-authored-by: shroff <502644+shroff@users.noreply.github.com> Co-authored-by: Felix Horvat <24698503+felix-ht@users.noreply.github.com>
maplibre · May 13, 2022 · d23b229 · d23b229
1 parent d02cc3d
commit d23b229
Show file tree

Hide file tree

Showing 13 changed files with 125 additions and 180 deletions.
diff --git a/.github/workflows/flutter_ci.yml b/.github/workflows/flutter_ci.yml
@@ -4,7 +4,7 @@ on: [push, pull_request, workflow_dispatch]
 
 env:
   FLUTTER_CHANNEL: 'stable'
-  FLUTTER_VERSION: '2.5.3'
+  FLUTTER_VERSION: '2.10.5'
 
 jobs:
   format:

diff --git a/android/build.gradle b/android/build.gradle
@@ -4,7 +4,7 @@ version '1.0-SNAPSHOT'
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
@@ -15,15 +15,16 @@ buildscript {
 rootProject.allprojects {
     repositories {
         google()
-        jcenter()
         mavenCentral()
     }
 }
 
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
+
+    compileSdkVersion 31
+    ndkVersion "20.1.5948944"
 
     defaultConfig {
         minSdkVersion 20

diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -25,7 +25,8 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
+    ndkVersion "20.1.5948944"
 
     lintOptions {
         disable 'InvalidPackage'
@@ -35,7 +36,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.mapbox.mapboxglexample"
         minSdkVersion 20
-        targetSdkVersion 28
+        targetSdkVersion 31
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
@@ -5,12 +5,13 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
     <application
-        android:name="io.flutter.app.FlutterApplication"
+        android:name="${applicationName}"
         android:label="mapbox_gl_example"
         android:icon="@mipmap/ic_launcher">
 
         <activity
             android:name=".MainActivity"
+            android:exported="false"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density"

diff --git a/example/android/app/src/main/java/com/mapbox/mapboxglexample/EmbeddingV1Activity.java b/example/android/app/src/main/java/com/mapbox/mapboxglexample/EmbeddingV1Activity.java
diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
@@ -12,7 +12,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

diff --git a/example/lib/generated_plugin_registrant.dart b/example/lib/generated_plugin_registrant.dart
@@ -2,6 +2,7 @@
 // Generated file. Do not edit.
 //
 
+// ignore_for_file: directives_ordering
 // ignore_for_file: lines_longer_than_80_chars
 
 import 'package:location_web/location_web.dart';

diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -17,6 +17,8 @@ dependencies:
   path_provider: ^2.0.0
   http: ^0.13.0
   collection: ^1.0.0
+  # temporary fix:
+  platform: ^3.1.0
 
 dependency_overrides:
   maplibre_gl_platform_interface:
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ on: [push, pull_request, workflow_dispatch] @@
     env:
       FLUTTER_CHANNEL: 'stable'
-      FLUTTER_VERSION: '2.5.3'
+      FLUTTER_VERSION: '2.10.5'
     jobs:
       format:
@@ Expand Down @@