M0 ios extension with merges changes from master in order to compile

.github/workflows/flutter_ci.yml

@@ -16,7 +16,7 @@ jobs:
         java-version: '12.x'
     - uses: subosito/flutter-action@v1
       with:
-        flutter-version: '1.26.0-17.5.pre'
+
         channel: beta
     - run: flutter pub get
     - name: Lint analysis
@@ -35,7 +35,6 @@ jobs:
         java-version: '12.x'
     - uses: subosito/flutter-action@v1
       with:
-        flutter-version: '1.26.0-17.5.pre'
         channel: beta
     - run: flutter pub get
     - name: Build example APK
@@ -55,7 +54,6 @@ jobs:
           java-version: '12.x'
       - uses: subosito/flutter-action@v1
         with:
-          flutter-version: '1.26.0-17.5.pre'
           channel: beta
       - run: flutter pub get
       - name: build iOS package
@@ -76,7 +74,6 @@ jobs:
         java-version: '12.x'
     - uses: subosito/flutter-action@v1
       with:
-        flutter-version: '1.26.0-17.5.pre'
         channel: beta
     - run: flutter config --enable-web
     - run: flutter pub get

README.md

@@ -1,6 +1,6 @@
 # Flutter Maplibre GL
 
-**This project is a fork of [https://github.com/tobrun/flutter-maplibre-gl](https://github.com/tobrun/flutter-maplibre-gl), aiming to replace its usage of Mapbox GL libraries with [Maplibre GL](https://github.com/maplibre) libraries.**
+**This project is a fork of [https://github.com/tobrun/flutter-mapbox-gl](https://github.com/tobrun/flutter-mapbox-gl), aiming to replace its usage of Mapbox GL libraries with [Maplibre GL](https://github.com/maplibre) libraries.**
 
 **This change isn't fully done, yet, and the project shouldn't be used at this time.**
 
@@ -19,13 +19,15 @@ This Flutter plugin allows to show embedded interactive and customizable vector
 
 ## Using the SDK in your project
 
-This project is not yet available on [pub.dev](https://pub.dev/).
+This project is not yet available on pub.dev.
 You can use it by referencing it in your pubspec.yaml like this:
 ```yaml
 dependencies:
     ...
     maplibre_gl:
-        git: https://github.com/m0nac0/flutter-maplibre-gl.git
+      git:
+        url: https://github.com/m0nac0/flutter-maplibre-gl.git
+        ref: main
 ```
 Compared to flutter-mapbox-gl, the only breaking API changes are: 
 - `MapboxMap` <--> `MaplibreMap`

ios/Classes/Constants.swift

@@ -1,5 +1,5 @@
 import Mapbox
-import MapboxAnnotationExtension
+import MapLibreAnnotationExtension
 
 /*
  * The mapping is based on the values defined here:

ios/Classes/Convert.swift

@@ -1,5 +1,5 @@
 import Mapbox
-import MapboxAnnotationExtension
+import MapLibreAnnotationExtension
 
 class Convert {
     class func interpretMapboxMapOptions(options: Any?, delegate: MapboxMapOptionsSink) {

ios/Classes/MapboxMapController.swift

@@ -1,7 +1,7 @@
 import Flutter
 import UIKit
 import Mapbox
-import MapboxAnnotationExtension
+import MapLibreAnnotationExtension
 
 class MapboxMapController: NSObject, FlutterPlatformView, MGLMapViewDelegate, MapboxMapOptionsSink, MGLAnnotationControllerDelegate {
 
@@ -30,8 +30,8 @@ class MapboxMapController: NSObject, FlutterPlatformView, MGLMapViewDelegate, Ma
 
     init(withFrame frame: CGRect, viewIdentifier viewId: Int64, arguments args: Any?, registrar: FlutterPluginRegistrar) {
         if let args = args as? [String: Any] {
-            if let token = args["accessToken"] as? NSString{
-                MGLAccountManager.accessToken = token
+            if let token = args["accessToken"]{
+                MGLAccountManager.accessToken = token as? String
             }
         }
         mapView = MGLMapView(frame: frame)

ios/maplibre_gl.podspec

@@ -15,8 +15,8 @@ A new Flutter plugin.
   s.source_files = 'Classes/**/*'
   s.public_header_files = 'Classes/**/*.h'
   s.dependency 'Flutter'
-  s.dependency 'MaplibreAnnotationExtension', '~> 0.0.1-beta.2'
-  s.dependency 'MapLibre', '~> 5.10.0'
+  s.dependency 'MapLibreAnnotationExtension', '~> 0.0.1-beta.2'
+  s.dependency 'MapLibre', '~> 5.11.0'
   s.swift_version = '4.2'
   s.ios.deployment_target = '9.0'
 end

maplibre_gl_web/pubspec.yaml

@@ -15,13 +15,14 @@ dependencies:
     sdk: flutter
   flutter_web_plugins:
     sdk: flutter
-  meta: ^1.1.7
+  meta: ^1.3.0
   maplibre_gl_platform_interface:
     git:
       url: https://github.com/m0nac0/flutter-maplibre-gl.git
       path: maplibre_gl_platform_interface
+      ref: main
   mapbox_gl_dart: ^0.1.5
-  image: ^2.1.12
+  image: ^3.0.1
 
 dependency_overrides:
   maplibre_gl_platform_interface:
@@ -32,5 +33,5 @@ dev_dependencies:
     sdk: flutter
 
 environment:
-  sdk: ">=2.1.0 <2.12.0"
+  sdk: ">=2.1.0 <3.0.0"
   flutter: ">=1.12.13+hotfix.4"

pubspec.yaml

@@ -9,11 +9,13 @@ dependencies:
   maplibre_gl_platform_interface:
     git:
       url: https://github.com/m0nac0/flutter-maplibre-gl.git
-      path: mpalibre_gl_platform_interface
+      path: maplibre_gl_platform_interface
+      ref: main
   maplibre_gl_web:
     git:
       url: https://github.com/m0nac0/flutter-maplibre-gl.git
       path: maplibre_gl_web
+      ref: main
 
 dependency_overrides:
   maplibre_gl_platform_interface:
@@ -33,6 +35,6 @@ flutter:
         default_package: mapbox_gl_web
 
 environment:
-  sdk: ">=2.1.0 <2.12.0"
+  sdk: ">=2.1.0 <3.0.0"
   # Flutter versions prior to 1.10 did not support the flutter.plugin.platforms map.
   flutter: ">=1.10.0"