@rnmapbox/maps 10.0.15 → 10.1.0-beta.4

package/README.md

@@ -57,16 +57,10 @@ _A community-supported, open-source React Native library for building maps with
 ---
 
 ### Supported Implementations 
-At the moment, the following implementations are supported: 
+At the moment we support Mapbox (v10) and Mapbox (v11) beta.
+We default to Mapbox (v10).
 
-
-|*RNMapboxMapsImpl*|*Notes*|
-|----------------|-----|
-|mapbox|New [Mapbox v10](https://www.mapbox.com/mobile-maps-sdk) implementation - recommended|
-|maplibre|[MapLibre](https://github.com/maplibre/maplibre-gl-native) opensource fork of Mapbox SDKs - will be dropped in next version|
-|mapbox-gl|Legacy mapbox implementation [iOS](https://docs.mapbox.com/android/legacy/maps/guides/) [Android](https://docs.mapbox.com/ios/legacy/maps/guides/) - legacy, will be dropped in next version|
-
-_See [iOS](ios/install.md) & [Android](android/install.md) setup guide for more details on setting `RNMapboxMapsImpl`_
+_See [iOS](ios/install.md) & [Android](android/install.md) setup guide for using v11 beta_
 
 
 

package/android/build.gradle

@@ -1,10 +1,18 @@
-def defaultMapboxMapsImpl = "maplibre"
+def defaultMapboxMapsImpl = "mabpox"
 def defaultMapboxMapsVersion = "10.16.0"
 
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 
+def isNewArchitectureEnabled() {
+    // To opt-in for the New Architecture, you can either:
+    // - Set `newArchEnabled` to true inside the `gradle.properties` file
+    // - Invoke gradle with `-newArchEnabled=true`
+    // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true`
+    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
+}
+
 // expo plugin
 if (rootProject.ext.has('expoRNMapboxMapsImpl')) {
     rootProject.ext.set('RNMapboxMapsImpl', rootProject.ext.get('expoRNMapboxMapsImpl'))
@@ -25,6 +33,9 @@ buildscript {
   }
 }
 
+if (isNewArchitectureEnabled()) {
+    apply plugin: 'com.facebook.react'
+}
 apply plugin: 'com.android.library'
 
 if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "mapbox") {
@@ -33,25 +44,24 @@ if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "mapbox") {
 
 android {
     if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "maplibre") {
-        logger.warn('@rnmapbox/maps: Maplibre implementation is DEPRECATED and will be removed, set RNMapboxMapsImpl to mapbox- see https://github.com/rnmapbox/maps/wiki/Deprecated-RNMapboxImpl-Maplibre#android')
-        sourceSets {
-            main {
-                java.srcDirs = ['src/main/java-mapboxgl/common','src/main/java-mapboxgl/maplibre']
-            }
-        }
+        msg = '@rnmapbox/maps: Maplibre implementation has been removed, set RNMapboxMapsImpl to mapbox- see https://github.com/rnmapbox/maps/wiki/Deprecated-RNMapboxImpl-Maplibre#android'
+        logger.error(msg)
+        throw new GradleException(msg)
     }
     else if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "mapbox-gl") {
-        logger.warn('@rnmapbox/maps: Maplibre implementation is DEPRECATED and will be removed, set RNMapboxMapsImpl to mapbox  - see https://github.com/rnmapbox/maps/wiki/Deprecated-RNMapboxImpl-Maplibre#android')
-        sourceSets {
-            main {
-                java.srcDirs = ['src/main/java-mapboxgl/common','src/main/java-mapboxgl/mapbox']
-            }
-        }
+        msg = '@rnmapbox/maps: MapboxGL implementation is DEPRECATED has been removed, set RNMapboxMapsImpl to mapbox  - see https://github.com/rnmapbox/maps/wiki/Deprecated-RNMapboxImpl-Maplibre#android'
+        logger.error(msg)
+        throw new GradleException(msg)
     }
     else if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "mapbox") {
         sourceSets {
             main {
                 java.srcDirs = ['src/main/java-v10']
+                if (safeExtGet("RNMapboxMapsUseV11", false)) {
+                    java.srcDirs += 'src/main/mapbox-v11-compat/v11'
+                } else {
+                    java.srcDirs += 'src/main/mapbox-v11-compat/v10'
+                }
             }
         }
 
@@ -63,11 +73,19 @@ android {
         }
     }
     else {
-        msg = "RNMapboxMapsImpl should be one of: mapbox, mapbox-gl, maplibre got: ${safeExtGet("mapboxV10", defaultMapboxMapsImpl)}"
+        msg = "RNMapboxMapsImpl should be one of: mapbox, mapbox-gl, maplibre got: ${safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl)}"
         logger.error(msg)
         throw new GradleException(msg)
     }
 
+    if (!isNewArchitectureEnabled()) {
+        sourceSets {
+            main {
+                java.srcDirs += 'src/main/old-arch'
+            }
+        }
+    }
+
     compileSdkVersion safeExtGet("compileSdkVersion", 28)
     buildToolsVersion safeExtGet("buildToolsVersion", '28.0.3')
 
@@ -76,6 +94,7 @@ android {
         targetSdkVersion safeExtGet('targetSdkVersion', 26)
         versionCode 1
         versionName "1.0"
+        buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
     }
 
     compileOptions {
@@ -116,30 +135,14 @@ dependencies {
 
     // Mapbox SDK
     customizableDependencies('RNMapboxMapsLibs') {
-        if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "maplibre") {
-            implementation ("org.maplibre.gl:android-sdk:9.5.2")
-            implementation ("org.maplibre.gl:android-sdk-turf:5.9.0")
-
-            implementation ("org.maplibre.gl:android-plugin-localization-v9:1.0.0")
-            implementation ("org.maplibre.gl:android-plugin-annotation-v9:1.0.0")
-            implementation ("org.maplibre.gl:android-plugin-markerview-v9:1.0.0")
-        }
-        else if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "mapbox-gl") {
-            implementation 'com.mapbox.mapboxsdk:mapbox-sdk-services:5.1.0'
-            implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:9.1.0'
-            implementation 'com.mapbox.mapboxsdk:mapbox-android-telemetry:6.1.0'
-            implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v9:0.8.0'
-
-                // plugins
-            implementation 'com.mapbox.mapboxsdk:mapbox-android-gestures:0.6.0'
-            implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v9:0.12.0'
-            implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-markerview-v9:0.4.0'
-            implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:5.1.0'
-        }
-        else if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "mapbox") {
+        if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "mapbox") {
             implementation "com.mapbox.maps:android:${safeExtGet("RNMapboxMapsVersion", defaultMapboxMapsVersion)}"
             implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:6.11.0'
             implementation 'androidx.asynclayoutinflater:asynclayoutinflater:1.0.0'
+        } else {
+            msg = '@rnmapbox/maps: RNMapboxMapsImpl has invalid value - only mapbox supported - see https://github.com/rnmapbox/maps/wiki/Deprecated-RNMapboxImpl-Maplibre#android'
+            logger.error(msg)
+            throw new GradleException(msg) 
         }
     }
 

package/android/install.md

@@ -1,30 +1,8 @@
 # Android Installation
 
-## We're supporting 3 implementations at the moment:
+## Supported mapbox libraries
 
-  - mapbox: v10 latest mapbox implementation - *recommended*, not opensource requires access for download
-  - maplibre: *DEFAULT* open source fork of older open source mapbox libraries with many improvements, will be removed in next version
-  - mapbox-gl: classic mapbox libraries - should work but will be dropped, recent versions are not open source and requires access for download, will be removed in next version
-
-## Mapbox Maps SDK v10
-
-Add `RNMapboxMapsImpl = "mapbox"` to your gradle file - see bellow for details.
-
-### Setting RNMapboxMapsImpl to v10
-
-*Warning*: If you set a custom version, make sure you revisit, any time you update @rnmapbox/maps. Setting it to earlier version than what we exepect will likely result in a build error.
-
-Overwrite mapbox dependencies within your `android/build.gradle > buildscript > ext` section
-
-
-```groovy
-buildscript {
-    ext {
-        // ...
-        RNMapboxMapsImpl = "mapbox" // required for v10
-    }
-}
-```
+We're only supporting mabpox 10.0 releases. 11.0 beta has experimental support.
 
 ### Adding mapbox maven repo
 
@@ -67,124 +45,41 @@ Set `RNMapboxMapsLibs` in `android/build.gradle > buildscript > ext` section
 ```groovy
 buildscript {
     ext {
-        // ...
-        RNMapboxMapsImpl = "mapbox"
-
-        RNMapboxMapsLibs = { // optional - only required if you want to customize it
-            implementation 'com.mapbox.maps:android:10.6.0'
-            implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:5.4.1'
-        }
+        RNMapboxMapsVersion = '10.6.0'
     }
 }
 ```
 
-
-
-If you see `2 files found with path 'lib/arm64-v8a/libc++_shared.so' from inputs` issue see [possible workaround](#workaround-for-2-files-found-with-path-libarm64-v8alibc_sharedso-from-inputs).
-
-## Using MapLibre
-
-[MapLibre](https://github.com/maplibre/maplibre-gl-native) is an OSS fork of MapboxGL.
-This is the default, and should work without any changes in gradle files.
-
-### Custom versions
-
-Overwrite mapbox dependencies within your `android/build.gradle > buildscript > ext` section
+you can also customize all the libraries, should it be neccesary
 
 ```groovy
 buildscript {
     ext {
         // ...
-        RNMapboxMapsImpl = "maplibre" // optional - as this is the default
-
         RNMapboxMapsLibs = { // optional - only required if you want to customize it
-            implementation ("org.maplibre.gl:android-sdk:9.5.2")
-            implementation ("org.maplibre.gl:android-sdk-turf:5.9.0")
-
-            implementation ("org.maplibre.gl:android-plugin-localization-v9:1.0.0")
-            implementation ("org.maplibre.gl:android-plugin-annotation-v9:1.0.0")
-            implementation ("org.maplibre.gl:android-plugin-markerview-v9:1.0.0")
+            implementation 'com.mapbox.maps:android:10.6.0'
+            implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:5.4.1'
         }
     }
 }
 ```
 
-Feel free to check out the `/example` projects [`android/build.gradle`](https://github.com/rnmapbox/maps/blob/main/example/android/build.gradle) for inspiration!
-
-
-## Mapbox Maps GL Native SDK (pre v10)
-
-
-### Custom versions
-
-We've set up default Mapbox dependencies for you.  
-Feel free to check em out [here](https://github.com/rnmapbox/maps/blob/eca4858744cab134b06ae455bcdacc63233318a5/android/rctmgl/build.gradle#L55-L76)
-
-However, it is also possible to set a custom version of the [Mapbox SDK](https://github.com/mapbox/mapbox-gl-native-android)  
-Which will overwrite our defaults.
-
-Add something like the following to your `android/build.gradle > buildscript > ext` section:
+### Using v11
 
 ```groovy
-// android/build.gradle
-
 buildscript {
-    // ... stuff
     ext {
-        RNMapboxMapsImpl = "mapbox-gl"
-
-        // ... stuff
-        RNMapboxMapsLibs = {
-            implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:9.7.1'
-            implementation 'com.mapbox.mapboxsdk:mapbox-sdk-services:5.8.0'
-            implementation 'com.mapbox.mapboxsdk:mapbox-sdk-turf:5.8.0'
-            implementation 'com.mapbox.mapboxsdk:mapbox-android-gestures:0.7.0'
-
-            implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v9:0.8.0'
-            implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v9:0.14.0'
-            implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-markerview-v9:0.4.0'
-        }
-    // ... more stuff?
+        RNMapboxMapsUseV11 = true
+        RNMapboxMapsVersion = '10.6.0'
     }
 }
 ```
 
-NOTICE, If you are using newer versions of the SDK, you will need to authorize your download of the Maps SDK via a secret access token with the `DOWNLOADS:READ` scope.  
-This [guide](https://docs.mapbox.com/android/maps/guides/install/#configure-credentials) explains how to `Configure credentials` and `Configure your secret token`.
 
-Then under section `allprojects/repositories` add your data:
 
-```groovy
-// android/build.gradle
+# Trhoubleshooting
 
-allprojects {
-    repositories {
-        // ...other repos
-        maven {
-            url 'https://api.mapbox.com/downloads/v2/releases/maven'
-            authentication {
-                basic(BasicAuthentication)
-            }
-            credentials {
-                // Do not change the username below.
-                // This should always be `mapbox` (not your username).
-                username = 'mapbox'
-                // Use the secret token you stored in gradle.properties as the password
-                password = project.properties['MAPBOX_DOWNLOADS_TOKEN'] ?: ""
-            }
-        }
-        // ...even more repos?
-    }
-}
-```
-
-Feel free to check out the `/example` projects [`android/build.gradle`](https://github.com/rnmapbox/maps/blob/main/example/android/build.gradle) for inspiration!
-
-<br>
-
----
-
-<br>
+If you see `2 files found with path 'lib/arm64-v8a/libc++_shared.so' from inputs` issue see [possible workaround](#workaround-for-2-files-found-with-path-libarm64-v8alibc_sharedso-from-inputs).
 
 
 ### Workaround for 2 files found with path 'lib/arm64-v8a/libc++_shared.so' from inputs

package/android/src/main/java-v10/com/mapbox/rctmgl/RCTMGLPackage.java

@@ -1,14 +1,21 @@
 package com.mapbox.rctmgl;
 
+import androidx.annotation.Nullable;
+
 import com.facebook.react.ReactPackage;
+import com.facebook.react.TurboReactPackage;
 import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.module.model.ReactModuleInfo;
+import com.facebook.react.module.model.ReactModuleInfoProvider;
 import com.facebook.react.uimanager.ViewManager;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import com.mapbox.rctmgl.components.camera.RCTMGLCameraManager;
 
@@ -18,6 +25,7 @@ import com.mapbox.rctmgl.components.annotation.RCTMGLMarkerViewManager;
 import com.mapbox.rctmgl.components.images.RCTMGLImageManager;
 import com.mapbox.rctmgl.components.images.RCTMGLImagesManager;
 import com.mapbox.rctmgl.components.location.RCTMGLNativeUserLocationManager;
+import com.mapbox.rctmgl.components.mapview.NativeMapViewModule;
 import com.mapbox.rctmgl.components.mapview.RCTMGLMapViewManager;
 import com.mapbox.rctmgl.components.mapview.RCTMGLAndroidTextureMapViewManager;
 import com.mapbox.rctmgl.components.styles.atmosphere.RCTMGLAtmosphereManager;
@@ -49,20 +57,27 @@ import com.mapbox.rctmgl.modules.RCTMGLLocationModule;
 import com.mapbox.rctmgl.modules.RCTMGLModule;
 
 
-public class RCTMGLPackage implements ReactPackage {
+public class RCTMGLPackage extends TurboReactPackage {
 
+    @Nullable
     @Override
-    public List<NativeModule> createNativeModules(ReactApplicationContext reactApplicationContext) {
-        List<NativeModule> modules = new ArrayList<>();
-        modules.add(new RCTMGLModule(reactApplicationContext));
-        modules.add(new RCTMGLLocationModule(reactApplicationContext));
-
-        modules.add(new RCTMGLOfflineModule(reactApplicationContext));
-        modules.add(new RCTMGLSnapshotModule(reactApplicationContext));
-
-        modules.add(new RCTMGLLogging(reactApplicationContext));
-
-        return modules;
+    public NativeModule getModule(String s, ReactApplicationContext reactApplicationContext) {
+        switch (s) {
+            case RCTMGLModule.REACT_CLASS:
+                return new RCTMGLModule(reactApplicationContext);
+            case RCTMGLLocationModule.REACT_CLASS:
+                return new RCTMGLLocationModule(reactApplicationContext);
+            case RCTMGLOfflineModule.REACT_CLASS:
+                return new RCTMGLOfflineModule(reactApplicationContext);
+            case RCTMGLSnapshotModule.REACT_CLASS:
+                return new RCTMGLSnapshotModule(reactApplicationContext);
+            case RCTMGLLogging.REACT_CLASS:
+                return new RCTMGLLogging(reactApplicationContext);
+            case NativeMapViewModule.NAME:
+                return new NativeMapViewModule(reactApplicationContext);
+        }
+
+        return null;
     }
 
     @Deprecated
@@ -115,4 +130,86 @@ public class RCTMGLPackage implements ReactPackage {
 
         return managers;
     }
+
+    @Override
+    public ReactModuleInfoProvider getReactModuleInfoProvider() {
+        return () -> {
+            final Map<String, ReactModuleInfo> moduleInfos = new HashMap<>();
+            boolean isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
+
+            moduleInfos.put(
+                    RCTMGLModule.REACT_CLASS,
+                    new ReactModuleInfo(
+                            RCTMGLModule.REACT_CLASS,
+                            RCTMGLModule.REACT_CLASS,
+                            false, // canOverrideExistingModule
+                            false, // needsEagerInit
+                            true, // hasConstants
+                            false, // isCxxModule
+                            false // isTurboModule
+                    ));
+
+            moduleInfos.put(
+                    RCTMGLLocationModule.REACT_CLASS,
+                    new ReactModuleInfo(
+                            RCTMGLLocationModule.REACT_CLASS,
+                            RCTMGLLocationModule.REACT_CLASS,
+                            false, // canOverrideExistingModule
+                            false, // needsEagerInit
+                            true, // hasConstants
+                            false, // isCxxModule
+                            false // isTurboModule
+                    ));
+
+            moduleInfos.put(
+                    RCTMGLOfflineModule.REACT_CLASS,
+                    new ReactModuleInfo(
+                            RCTMGLOfflineModule.REACT_CLASS,
+                            RCTMGLOfflineModule.REACT_CLASS,
+                            false, // canOverrideExistingModule
+                            false, // needsEagerInit
+                            true, // hasConstants
+                            false, // isCxxModule
+                            false // isTurboModule
+                    ));
+
+            moduleInfos.put(
+                    RCTMGLSnapshotModule.REACT_CLASS,
+                    new ReactModuleInfo(
+                            RCTMGLSnapshotModule.REACT_CLASS,
+                            RCTMGLSnapshotModule.REACT_CLASS,
+                            false, // canOverrideExistingModule
+                            false, // needsEagerInit
+                            true, // hasConstants
+                            false, // isCxxModule
+                            false // isTurboModule
+                    ));
+
+            moduleInfos.put(
+                    RCTMGLLogging.REACT_CLASS,
+                    new ReactModuleInfo(
+                            RCTMGLLogging.REACT_CLASS,
+                            RCTMGLLogging.REACT_CLASS,
+                            false, // canOverrideExistingModule
+                            false, // needsEagerInit
+                            true, // hasConstants
+                            false, // isCxxModule
+                            false // isTurboModule
+                    ));
+
+            moduleInfos.put(
+                    NativeMapViewModule.NAME,
+                    new ReactModuleInfo(
+                            NativeMapViewModule.NAME,
+                            NativeMapViewModule.NAME,
+                            false, // canOverrideExistingModule
+                            false, // needsEagerInit
+                            false, // hasConstants
+                            false, // isCxxModule
+                            isTurboModule // isTurboModule
+                    ));
+
+            return moduleInfos;
+        };
+    }
 }

package/android/src/main/java-v10/com/mapbox/rctmgl/components/AbstractEventEmitter.kt

@@ -5,11 +5,10 @@ import android.view.ViewGroup
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.common.MapBuilder
 import com.facebook.react.uimanager.ThemedReactContext
-import com.facebook.react.uimanager.UIManagerModule
+import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.events.EventDispatcher
 import com.mapbox.rctmgl.events.IEvent
-import javax.annotation.Nonnull
 
 /**
  * Created by nickitaliano on 8/23/17.
@@ -47,7 +46,7 @@ abstract class AbstractEventEmitter<T : ViewGroup?>(reactApplicationContext: Rea
     }
 
     override fun addEventEmitters(context: ThemedReactContext, view: T) {
-        mEventDispatcher = context.getNativeModule(UIManagerModule::class.java)!!.eventDispatcher
+        mEventDispatcher = UIManagerHelper.getEventDispatcherForReactTag(context, view!!.id)
     }
 
     override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any>? {

package/android/src/main/java-v10/com/mapbox/rctmgl/components/annotation/RCTMGLPointAnnotation.kt

@@ -25,6 +25,8 @@ import com.mapbox.rctmgl.utils.BitmapUtils
 import com.mapbox.rctmgl.utils.LatLng
 import java.util.*
 
+import com.mapbox.rctmgl.v11compat.annotation.*;
+
 class RCTMGLPointAnnotation(private val mContext: Context, private val mManager: RCTMGLPointAnnotationManager) : AbstractMapFeature(mContext), View.OnLayoutChangeListener {
     var marker: PointAnnotation? = null
         private set
@@ -133,8 +135,8 @@ class RCTMGLPointAnnotation(private val mContext: Context, private val mManager:
 
     val latLng: LatLng?
         get() = mCoordinate?.let { GeoJSONUtils.toLatLng(it) }
-    val mapboxID: Long
-        get() = if (marker == null) -1 else marker!!.id
+    val mapboxID: AnnotationID
+        get() = if (marker == null) INVALID_ANNOTATION_ID else marker!!.id
 
     fun setCoordinate(point: Point) {
         mCoordinate = point

package/android/src/main/java-v10/com/mapbox/rctmgl/components/camera/CameraUpdateItem.kt

@@ -22,6 +22,8 @@ import com.mapbox.maps.plugin.animation.MapAnimationOptions.Companion.mapAnimati
 import com.mapbox.maps.plugin.animation.easeTo
 import com.mapbox.maps.plugin.animation.flyTo
 import com.mapbox.rctmgl.components.camera.constants.CameraMode
+import com.mapbox.rctmgl.v11compat.mapboxmap.easeToV11
+import com.mapbox.rctmgl.v11compat.mapboxmap.flyToV11
 import java.lang.ref.WeakReference
 import java.util.concurrent.ExecutionException
 import java.util.concurrent.RunnableFuture
@@ -78,16 +80,14 @@ class CameraUpdateItem(
             isCameraActionCancelled = true
             return
         }
-        val animationOptions = MapAnimationOptions.Builder().apply {
-            animatorListener(callback)
-        }
+        val animationOptions = MapAnimationOptions.Builder();
 
         // animateCamera / easeCamera only allows positive duration
         if (duration == 0 || mCameraMode == CameraMode.NONE) {
-            map.flyTo(mCameraUpdate, animationOptions.apply {
+            map.flyToV11(mCameraUpdate, animationOptions.apply {
                 duration(0)
-                animatorListener(callback)
-            }.build())
+            },
+            callback)
         }
 
         // On iOS a duration of -1 means default or dynamic duration (based on flight-path length)
@@ -96,16 +96,17 @@ class CameraUpdateItem(
             animationOptions.apply { duration(duration.toLong()) }
         }
         if (mCameraMode == CameraMode.FLIGHT) {
-            map.flyTo(mCameraUpdate, animationOptions.build())
+            map.flyToV11(mCameraUpdate, animationOptions, callback)
         } else if (mCameraMode == CameraMode.LINEAR) {
-            map.easeTo(
-                mCameraUpdate,
-                animationOptions.apply { interpolator(LinearInterpolator()) }.build()
+            map.easeToV11(
+                mCameraUpdate,animationOptions.apply { interpolator(LinearInterpolator()) },
+                callback
             )
         } else if (mCameraMode == CameraMode.EASE) {
-            map.easeTo(
+            map.easeToV11(
                 mCameraUpdate,
-                animationOptions.apply{ interpolator(AccelerateDecelerateInterpolator()) }.build()
+                animationOptions.apply{ interpolator(AccelerateDecelerateInterpolator()) },
+                callback
             )
         }
         null

package/android/src/main/java-v10/com/mapbox/rctmgl/components/camera/RCTMGLCamera.kt

@@ -16,9 +16,7 @@ import com.mapbox.maps.plugin.locationcomponent.OnIndicatorPositionChangedListen
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
 import com.mapbox.maps.*
-import com.mapbox.maps.plugin.PuckBearingSource
 import com.mapbox.maps.plugin.locationcomponent.location
-import com.mapbox.maps.plugin.locationcomponent.location2
 import com.mapbox.maps.plugin.viewport.ViewportStatus
 import com.mapbox.maps.plugin.viewport.ViewportStatusObserver
 import com.mapbox.maps.plugin.viewport.data.FollowPuckViewportStateBearing
@@ -36,6 +34,7 @@ import com.mapbox.rctmgl.location.*
 import com.mapbox.rctmgl.utils.Logger
 import com.mapbox.rctmgl.utils.writableMapOf
 
+import com.mapbox.rctmgl.v11compat.location.*;
 
 class RCTMGLCamera(private val mContext: Context, private val mManager: RCTMGLCameraManager) :
     AbstractMapFeature(

package/android/src/main/java-v10/com/mapbox/rctmgl/components/images/RCTMGLImage.kt

@@ -45,9 +45,11 @@ class RCTMGLImage(private val mContext: ReactApplicationContext, private val mMa
             return
         }
         val bitmap = BitmapUtils.viewToBitmap(v, left, top, right, bottom)
-        nativeImageUpdater?.let {
-            it.updateImage(name, bitmap, sdf, stretchX, stretchY, content, scale)
-            mBitmap = null;
+        bitmap?.let { bitmap ->
+            nativeImageUpdater?.let {
+                it.updateImage(name, bitmap, sdf, stretchX, stretchY, content, scale)
+                mBitmap = null;
+            }
         }
     }
 

package/android/src/main/java-v10/com/mapbox/rctmgl/components/images/RCTMGLImages.kt

@@ -27,13 +27,15 @@ import java.util.ArrayList
 import java.util.HashMap
 import java.util.HashSet
 
+import com.mapbox.rctmgl.v11compat.image.*;
+
 fun Style.addBitmapImage(imageId: String, bitmap: Bitmap, sdf: Boolean = false, stretchX: List<ImageStretches> = listOf(), stretchY: List<ImageStretches> = listOf(), content: ImageContent? = null, scale: Double = 1.0) : Expected<String, None> {
     val byteBuffer = ByteBuffer.allocate(bitmap.byteCount)
     bitmap.copyPixelsToBuffer(byteBuffer)
     return this.addStyleImage(
         imageId,
         (1.0/((160.0/bitmap.density)) * scale).toFloat() ,
-        Image(bitmap.width, bitmap.height, byteBuffer.array()),
+        Image(bitmap.width, bitmap.height, byteBuffer.array().toImageData()),
         sdf,
         stretchX,
         stretchY,