@rnmapbox/maps 10.2.10 → 10.3.0-beta.1

package/README.md

@@ -56,11 +56,8 @@ _A community-supported, open-source React Native library for building maps with
 
 ---
 
-### Supported Implementations 
-At the moment we support Mapbox (v10) and Mapbox (v11) beta.
-We default to Mapbox (v10).
-
-_See [iOS](ios/install.md) & [Android](android/install.md) setup guide for using v11 beta_
+### Supported Implementations
+We support Mapbox Maps SDK v11. See [iOS](ios/install.md) & [Android](android/install.md) setup guides.
 
 
 
@@ -74,7 +71,7 @@ _See [iOS](ios/install.md) & [Android](android/install.md) setup guide for using
 
 - [node](https://nodejs.org)
 - [npm](https://www.npmjs.com/)
-- [React Native](https://facebook.github.io/react-native/) (0.70+, older versions from 0.64+ might or might not work)
+- [React Native](https://facebook.github.io/react-native/) (0.79+)
 
 
 ## Installation

package/android/build.gradle

@@ -14,13 +14,6 @@ def safeExtGet(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"
-}
 
 def getCoroutinesVersion(kotlinVersion) {
     return kotlinVersion >= '1.9' ? '1.8.0' : '1.6.4'
@@ -50,9 +43,7 @@ buildscript {
   }
 }
 
-if (isNewArchitectureEnabled()) {
-    apply plugin: 'com.facebook.react'
-}
+apply plugin: 'com.facebook.react'
 apply plugin: 'com.android.library'
 
 if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "mapbox") {
@@ -76,19 +67,22 @@ android {
         throw new GradleException(msg)
     }
     else if (safeExtGet("RNMapboxMapsImpl", defaultMapboxMapsImpl) == "mapbox") {
+        // Validate Mapbox version is v11+
+        def mapboxVersion = safeExtGet("RNMapboxMapsVersion", defaultMapboxMapsVersion)
+        def majorMapboxVersion = mapboxVersion.split("\\.")[0] as Integer
+        if (majorMapboxVersion < 11) {
+            def msg = """
+❌ ERROR: Mapbox v10 is no longer supported as of @rnmapbox/maps 10.3.0
+Please upgrade to Mapbox v11.x or use @rnmapbox/maps 10.2.x
+"""
+            logger.error(msg)
+            throw new GradleException(msg)
+        }
+
         sourceSets {
             main {
                 java.srcDirs = ['src/main/java']
-                def mapboxVersion = safeExtGet("RNMapboxMapsVersion", defaultMapboxMapsVersion)
-                def majorMapboxVersion = mapboxVersion.split("\\.")[0] as Integer
-                if (majorMapboxVersion >= 11) {
-                    java.srcDirs += 'src/main/mapbox-v11-compat/v11'
-                } else {
-                    logger.warn("⚠️ RNMapbox DEPRECATION WARNING: Mapbox v10.x is deprecated and will not receive active support.")
-                    logger.warn("⚠️ RNMapbox: Please upgrade to Mapbox v11.x for continued support and updates.")
-                    logger.warn("⚠️ RNMapbox: For sponsor-only support for v10.x: https://github.com/sponsors/rnmapbox")
-                    java.srcDirs += 'src/main/mapbox-v11-compat/v10'
-                }
+                java.srcDirs += 'src/main/mapbox-v11-compat/v11'
                 java.srcDirs += 'src/main/rn-compat/rn75'
 
                 // Adapted from react-native-screens for consistency
@@ -217,9 +211,6 @@ android {
                     }
                 }
 
-                if (safeExtGet("RNMapboxMapsUseV11", false)) {
-                    logger.warn("RNMapboxMapsUseV11 is deprecated, just set RNMapboxMapsVersion to 11.*")
-                }
             }
         }
 
@@ -236,17 +227,6 @@ android {
         throw new GradleException(msg)
     }
 
-    if (!isNewArchitectureEnabled()) {
-        logger.warn("⚠️ RNMapbox DEPRECATION WARNING: Old React Native Architecture (Paper/bridge) is deprecated and will not receive active support.")
-        logger.warn("⚠️ RNMapbox: Please upgrade to New Architecture (Fabric/TurboModules) for continued support and updates.")
-        logger.warn("⚠️ RNMapbox: For sponsor-only support for old architecture: https://github.com/sponsors/rnmapbox")
-        sourceSets {
-            main {
-                java.srcDirs += 'src/main/old-arch'
-            }
-        }
-    }
-
     compileSdkVersion safeExtGet("compileSdkVersion", 28)
     buildToolsVersion safeExtGet("buildToolsVersion", '28.0.3')
 
@@ -255,7 +235,6 @@ android {
         targetSdkVersion safeExtGet('targetSdkVersion', 26)
         versionCode 1
         versionName "1.0"
-        buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
     }
 
     compileOptions {

package/android/install.md

@@ -2,8 +2,7 @@
 
 ## Supported mapbox libraries
 
-We're only supporting mapbox 10.16* and 11.*. The default is 10.16*.
-Next release will be 11.* only so we recommend updatign to 11.*
+We support Mapbox Maps SDK v11.
 
 ### Adding mapbox maven repo
 
@@ -27,39 +26,14 @@ allprojects {
 
 ### Using non default mapbox version
 
-*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.
+*Warning*: If you set a custom version, make sure you revisit any time you update @rnmapbox/maps. Setting it to an earlier version than what we expect will likely result in a build error.
 
 Set `RNMapboxMapsVersion` in `android/build.gradle > buildscript > ext` section
 
-
-```groovy
-buildscript {
-    ext {
-        RNMapboxMapsVersion = '11.4.1'
-    }
-}
-```
-
-you can also customize all the libraries, should it be neccesary
-
-```groovy
-buildscript {
-    ext {
-        // ...
-        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'
-        }
-    }
-}
-```
-
-### Using v11
-
 ```groovy
 buildscript {
     ext {
-        RNMapboxMapsVersion = '11.4.1'
+        RNMapboxMapsVersion = '11.16.2'
     }
 }
 ```

package/android/src/main/java/com/rnmapbox/rnmbx/RNMBXPackage.kt

@@ -31,6 +31,7 @@ import com.rnmapbox.rnmbx.components.styles.layers.RNMBXCircleLayerManager
 import com.rnmapbox.rnmbx.components.styles.layers.RNMBXFillExtrusionLayerManager
 import com.rnmapbox.rnmbx.components.styles.layers.RNMBXFillLayerManager
 import com.rnmapbox.rnmbx.components.styles.layers.RNMBXHeatmapLayerManager
+import com.rnmapbox.rnmbx.components.styles.layers.RNMBXHillshadeLayerManager
 import com.rnmapbox.rnmbx.components.styles.layers.RNMBXLineLayerManager
 import com.rnmapbox.rnmbx.components.styles.layers.RNMBXModelLayerManager
 import com.rnmapbox.rnmbx.components.styles.layers.RNMBXRasterLayerManager
@@ -161,6 +162,7 @@ class RNMBXPackage : TurboReactPackage() {
         managers.add(RNMBXCircleLayerManager())
         managers.add(RNMBXSymbolLayerManager())
         managers.add(RNMBXRasterLayerManager())
+        managers.add(RNMBXHillshadeLayerManager())
         if (RNMBXRasterParticleLayerManager.isImplemented) {
             managers.add(RNMBXRasterParticleLayerManager())
         }
@@ -177,7 +179,6 @@ class RNMBXPackage : TurboReactPackage() {
         resetViewTagResolver()
         return ReactModuleInfoProvider {
             val moduleInfos: MutableMap<String, ReactModuleInfo> = HashMap()
-            val isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
             moduleInfos[RNMBXModule.REACT_CLASS] = ReactModuleInfo(
                 RNMBXModule.REACT_CLASS,
                 RNMBXModule.REACT_CLASS,
@@ -194,7 +195,7 @@ class RNMBXPackage : TurboReactPackage() {
                 false,  // needsEagerInit
                 true,  // hasConstants
                 false,  // isCxxModule
-                isTurboModule // isTurboModule
+                true // isTurboModule
             )
             moduleInfos[RNMBXOfflineModule.REACT_CLASS] = ReactModuleInfo(
                 RNMBXOfflineModule.REACT_CLASS,
@@ -248,7 +249,7 @@ class RNMBXPackage : TurboReactPackage() {
                 false,  // needsEagerInit
                 false,  // hasConstants
                 false,  // isCxxModule
-                isTurboModule // isTurboModule
+                true // isTurboModule
             )
             moduleInfos[RNMBXViewportModule.NAME] = ReactModuleInfo(
                 RNMBXViewportModule.NAME,
@@ -257,7 +258,7 @@ class RNMBXPackage : TurboReactPackage() {
                 false,  // needsEagerInit
                 false,  // hasConstants
                 false,  // isCxxModule
-                isTurboModule // isTurboModule
+                true // isTurboModule
             )
             moduleInfos[RNMBXCameraModule.NAME] = ReactModuleInfo(
                 RNMBXCameraModule.NAME,
@@ -266,7 +267,7 @@ class RNMBXPackage : TurboReactPackage() {
                 false,  // needsEagerInit
                 false,  // hasConstants
                 false,  // isCxxModule
-                isTurboModule // isTurboModule
+                true // isTurboModule
             )
             moduleInfos[RNMBXShapeSourceModule.NAME] = ReactModuleInfo(
                 RNMBXShapeSourceModule.NAME,
@@ -275,7 +276,7 @@ class RNMBXPackage : TurboReactPackage() {
                 false,  // needsEagerInit
                 false,  // hasConstants
                 false,  // isCxxModule
-                isTurboModule // isTurboModule
+                true // isTurboModule
             )
             moduleInfos[RNMBXImageModule.NAME] = ReactModuleInfo(
                 RNMBXImageModule.NAME,
@@ -284,7 +285,7 @@ class RNMBXPackage : TurboReactPackage() {
                 false,  // needsEagerInit
                 false,  // hasConstants
                 false,  // isCxxModule
-                isTurboModule // isTurboModule
+                true // isTurboModule
             )
             moduleInfos[RNMBXPointAnnotationModule.NAME] = ReactModuleInfo(
                 RNMBXPointAnnotationModule.NAME,
@@ -293,7 +294,7 @@ class RNMBXPackage : TurboReactPackage() {
                 false,  // needsEagerInit
                 false,  // hasConstants
                 false,  // isCxxModule
-                isTurboModule // isTurboModule
+                true // isTurboModule
             )
             moduleInfos[RNMBXMovePointShapeAnimatorModule.NAME] = ReactModuleInfo(
                 RNMBXMovePointShapeAnimatorModule.NAME,
@@ -302,7 +303,7 @@ class RNMBXPackage : TurboReactPackage() {
                 false,
                 false,
                 false,
-                isTurboModule
+                true // isTurboModule
             )
             moduleInfos[RNMBXChangeLineOffsetsShapeAnimatorModule.NAME] = ReactModuleInfo(
                 RNMBXChangeLineOffsetsShapeAnimatorModule.NAME,
@@ -311,7 +312,7 @@ class RNMBXPackage : TurboReactPackage() {
                 false,
                 false,
                 false,
-                isTurboModule
+                true // isTurboModule
             )
             moduleInfos
         }

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/RNMBXStyleFactory.kt

@@ -795,6 +795,8 @@ object RNMBXStyleFactory {
           val styleValue = style.getStyleValueForKey(styleKey)
 
           when (styleKey) {
+              "modelAllowDensityReduction" ->
+                setModelAllowDensityReduction(layer, styleValue)
               "visibility" ->
                 setVisibility(layer, styleValue)
               "modelId" ->
@@ -847,6 +849,8 @@ object RNMBXStyleFactory {
                 setModelHeightBasedEmissiveStrengthMultiplierTransition(layer, styleValue)
               "modelCutoffFadeRange" ->
                 setModelCutoffFadeRange(layer, styleValue)
+              "modelElevationReference" ->
+                setModelElevationReference(layer, styleValue)
           }
         } catch (e: MapboxStyleException) {
           Logger.e(LOG_TAG, "Failed to update: $styleKey ${e.message}")
@@ -4673,6 +4677,24 @@ object RNMBXStyleFactory {
       }
     }
 
+    fun setModelAllowDensityReduction(layer: ModelLayer, styleValue: RNMBXStyleValue ) {
+      if (styleValue.isExpression()) {
+        val expression = styleValue.getExpression()
+        if (expression != null) {
+          layer.modelAllowDensityReduction(expression)
+        } else {
+          Logger.e("RNMBXModel", "Expression for modelAllowDensityReduction is null")
+        }
+      } else {
+          val value = styleValue.getBoolean(VALUE_KEY)
+          if (value != null) {
+            layer.modelAllowDensityReduction(value)
+          } else {
+            Logger.e("RNMBXModel", "value for modelAllowDensityReduction is null")
+          }
+      }
+    }
+
     fun setVisibility(layer: ModelLayer, styleValue: RNMBXStyleValue ) {
         layer.visibility(Visibility.valueOf(styleValue.getEnumName()));
     }
@@ -5022,6 +5044,19 @@ object RNMBXStyleFactory {
       }
     }
 
+    fun setModelElevationReference(layer: ModelLayer, styleValue: RNMBXStyleValue ) {
+      if (styleValue.isExpression()) {
+        val expression = styleValue.getExpression()
+        if (expression != null) {
+          layer.modelElevationReference(expression)
+        } else {
+          Logger.e("RNMBXModel", "Expression for modelElevationReference is null")
+        }
+      } else {
+          layer.modelElevationReference(ModelElevationReference.valueOf(styleValue.getEnumName()))
+      }
+    }
+
     fun setVisibility(layer: BackgroundLayer, styleValue: RNMBXStyleValue ) {
         layer.visibility(Visibility.valueOf(styleValue.getEnumName()));
     }

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXHillshadeLayer.kt

@@ -0,0 +1,27 @@
+package com.rnmapbox.rnmbx.components.styles.layers
+
+import android.content.Context
+import com.mapbox.maps.extension.style.layers.generated.HillshadeLayer
+import com.rnmapbox.rnmbx.components.styles.RNMBXStyle
+import com.rnmapbox.rnmbx.components.styles.RNMBXStyleFactory
+import com.rnmapbox.rnmbx.utils.Logger
+
+class RNMBXHillshadeLayer(context: Context?) : RNMBXLayer<HillshadeLayer?>(
+    context!!
+) {
+    override fun makeLayer(): HillshadeLayer {
+        return HillshadeLayer(iD!!, mSourceID!!)
+    }
+
+    override fun addStyles() {
+        mLayer?.also {
+            RNMBXStyleFactory.setHillshadeLayerStyle(it, RNMBXStyle(context, mReactStyle, mMap!!))
+        } ?: run {
+            Logger.e("RNMBXHillshadeLayer", "mLayer is null")
+        }
+    }
+
+    fun setSourceLayerID(asString: String?) {
+        // no-op
+    }
+}

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/layers/RNMBXHillshadeLayerManager.kt

@@ -0,0 +1,84 @@
+package com.rnmapbox.rnmbx.components.styles.layers
+
+import com.facebook.react.bridge.Dynamic
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.RNMBXHillshadeLayerManagerInterface
+
+class RNMBXHillshadeLayerManager : ViewGroupManager<RNMBXHillshadeLayer>(),
+    RNMBXHillshadeLayerManagerInterface<RNMBXHillshadeLayer> {
+    override fun getName(): String {
+        return REACT_CLASS
+    }
+
+    override fun createViewInstance(reactContext: ThemedReactContext): RNMBXHillshadeLayer {
+        return RNMBXHillshadeLayer(reactContext)
+    }
+
+    // @{codepart-replace-start(LayerManagerCommonProps.codepart-kt.ejs,{layerType:"RNMBXHillshadeLayer"})}
+    @ReactProp(name = "id")
+    override fun setId(layer: RNMBXHillshadeLayer, id: Dynamic) {
+        layer.iD = id.asString()
+    }
+
+    @ReactProp(name = "existing")
+    override fun setExisting(layer: RNMBXHillshadeLayer, existing: Dynamic) {
+        layer.setExisting(existing.asBoolean())
+    }
+
+    @ReactProp(name = "sourceID")
+    override fun setSourceID(layer: RNMBXHillshadeLayer, sourceID: Dynamic) {
+        layer.setSourceID(sourceID.asString())
+    }
+
+    @ReactProp(name = "aboveLayerID")
+    override fun setAboveLayerID(layer: RNMBXHillshadeLayer, aboveLayerID: Dynamic) {
+        layer.setAboveLayerID(aboveLayerID.asString())
+    }
+
+    @ReactProp(name = "belowLayerID")
+    override fun setBelowLayerID(layer: RNMBXHillshadeLayer, belowLayerID: Dynamic) {
+        layer.setBelowLayerID(belowLayerID.asString())
+    }
+
+    @ReactProp(name = "layerIndex")
+    override fun setLayerIndex(layer: RNMBXHillshadeLayer, layerIndex: Dynamic) {
+        layer.setLayerIndex(layerIndex.asInt())
+    }
+
+    @ReactProp(name = "minZoomLevel")
+    override fun setMinZoomLevel(layer: RNMBXHillshadeLayer, minZoomLevel: Dynamic) {
+        layer.setMinZoomLevel(minZoomLevel.asDouble())
+    }
+
+    @ReactProp(name = "maxZoomLevel")
+    override fun setMaxZoomLevel(layer: RNMBXHillshadeLayer, maxZoomLevel: Dynamic) {
+        layer.setMaxZoomLevel(maxZoomLevel.asDouble())
+    }
+
+    @ReactProp(name = "reactStyle")
+    override fun setReactStyle(layer: RNMBXHillshadeLayer, style: Dynamic) {
+        layer.setReactStyle(style.asMap())
+    }
+
+    @ReactProp(name = "sourceLayerID")
+    override fun setSourceLayerID(layer: RNMBXHillshadeLayer, sourceLayerID: Dynamic) {
+        layer.setSourceLayerID(sourceLayerID.asString())
+    }
+
+    @ReactProp(name = "filter")
+    override fun setFilter(layer: RNMBXHillshadeLayer, filterList: Dynamic) {
+        layer.setFilter(filterList.asArray())
+    }
+
+    @ReactProp(name = "slot")
+    override fun setSlot(layer: RNMBXHillshadeLayer, slot: Dynamic) {
+        layer.setSlot(slot.asString())
+    }
+    // @{codepart-replace-end}
+
+    companion object {
+        const val REACT_CLASS = "RNMBXHillshadeLayer"
+    }
+}

package/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXShapeSourceModule.kt

@@ -4,11 +4,7 @@ import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.module.annotations.ReactModule
-import com.facebook.react.uimanager.UIManagerHelper
-import com.facebook.react.uimanager.common.UIManagerType
-import com.rnmapbox.rnmbx.BuildConfig
 import com.rnmapbox.rnmbx.NativeRNMBXShapeSourceModuleSpec
-import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
 import com.rnmapbox.rnmbx.utils.ViewRefTag
 import com.rnmapbox.rnmbx.utils.ViewTagResolver
 

package/android/src/main/java/com/rnmapbox/rnmbx/events/MapSteadyEvent.kt

@@ -7,7 +7,7 @@ import com.facebook.react.bridge.WritableMap
 /**
  * Direct event for CameraGestureObserver -> onMapSteady
  * JS registrationName: onMapSteady
- * Native event name (key): topOnMapSteady
+ * Native event name (key): onMapSteady
  */
 class MapSteadyEvent(
     view: View?,
@@ -16,7 +16,7 @@ class MapSteadyEvent(
     private val lastGestureType: String?
 ) : AbstractEvent(view, "mapSteady") {
     override val key: String
-        get() = "topOnMapSteady"
+        get() = "onMapSteady"
 
     override val payload: WritableMap
         get() = Arguments.createMap().apply {
@@ -34,6 +34,12 @@ class MapSteadyEvent(
             putDouble("timestamp", System.currentTimeMillis().toDouble())
         }
 
+    override fun toJSON(): WritableMap {
+        val map = Arguments.createMap()
+        map.merge(payload)
+        return map
+    }
+
     override fun canCoalesce(): Boolean {
         // Do not coalesce - each steady/timeout event is significant
         return false

package/android/src/main/java/com/rnmapbox/rnmbx/events/RNMBXCameraGestureObserver.kt

@@ -37,7 +37,6 @@ class RNMBXCameraGestureObserver(
     private var lastTransitionEndedAtMs: Double? = null
     private var quietRunnable: Runnable? = null
     private var timeoutRunnable: Runnable? = null
-    private var emittedForCurrentActivity: Boolean = false
 
     private val quietMs: Double get() = quietPeriodMs ?: 200.0
     private val maxMs: Double? get() = maxIntervalMs
@@ -84,9 +83,9 @@ class RNMBXCameraGestureObserver(
     }
 
     private fun scheduleQuietCheck() {
+        cancelQuietTimer()
         val delay = quietMs
         if (delay <= 0) {
-            cancelQuietTimer()
             maybeEmitSteady()
             return
         }
@@ -99,8 +98,10 @@ class RNMBXCameraGestureObserver(
     }
 
     private fun scheduleTimeout() {
+        if (timeoutRunnable != null) return
         val delay = maxMs ?: return
         val runnable = Runnable {
+            timeoutRunnable = null
             emitTimeout()
         }
         timeoutRunnable = scheduleTimer(delay, runnable)
@@ -108,7 +109,6 @@ class RNMBXCameraGestureObserver(
 
     private fun markActivity(gestureType: String? = null) {
         if (gestureType != null) lastGestureType = gestureType
-        emittedForCurrentActivity = false
         scheduleQuietCheck()
         scheduleTimeout()
     }
@@ -122,7 +122,6 @@ class RNMBXCameraGestureObserver(
     }
 
     private fun emitSteady(idleDurationMs: Double) {
-        if (emittedForCurrentActivity) return
         cancelQuietTimer()
         cancelTimeoutTimer()
         val gesture = lastGestureType
@@ -131,7 +130,6 @@ class RNMBXCameraGestureObserver(
             MapSteadyEvent.make(this, "steady", idleDurationMs, gesture)
         )
         lastGestureType = null
-        emittedForCurrentActivity = true
     }
 
     private fun emitTimeout() {

package/android/src/main/java/com/rnmapbox/rnmbx/events/RNMBXCameraGestureObserverManager.kt

@@ -65,7 +65,7 @@ class RNMBXCameraGestureObserverManager(private val mContext: ReactApplicationCo
 
     // Map the native event name to the JS registration name for direct events
     override fun customEvents(): Map<String, String> = mapOf(
-        "topOnMapSteady" to "onMapSteady"
+        "onMapSteady" to "onMapSteady"
     )
 
     companion object {

package/android/src/main/java/com/rnmapbox/rnmbx/modules/RNMBXLocationModule.kt

@@ -6,7 +6,6 @@ import com.facebook.react.module.annotations.ReactModule
 import com.rnmapbox.rnmbx.NativeRNMBXLocationModuleSpec
 import com.rnmapbox.rnmbx.location.LocationManager.OnUserLocationChange
 import com.rnmapbox.rnmbx.events.LocationEvent
-import com.rnmapbox.rnmbx.events.EventEmitter
 import com.rnmapbox.rnmbx.location.LocationManager.Companion.getInstance
 import java.lang.Exception
 
@@ -58,14 +57,7 @@ class RNMBXLocationModule(reactContext: ReactApplicationContext) :
             mLastLocation = location
             if (changed && (location != null) && shouldSendLocationEvent()) {
                 val locationEvent = LocationEvent(location)
-
-                if(mEventEmitterCallback != null){
-                    emitOnLocationUpdate(locationEvent.toJSON())
-                }else {
-                    // Emmit event for old architecture
-                    val emitter = EventEmitter.getModuleEmitter(reactApplicationContext)
-                    emitter?.emit(LOCATION_UPDATE, locationEvent.payload)
-                }
+                emitOnLocationUpdate(locationEvent.toJSON())
             }
         }
     }

package/android/src/main/java/com/rnmapbox/rnmbx/utils/ViewTagResolver.kt

@@ -7,7 +7,6 @@ import com.facebook.react.bridge.UIManager
 import com.facebook.react.uimanager.IllegalViewOperationException
 import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.common.UIManagerType
-import com.rnmapbox.rnmbx.BuildConfig
 
 data class ViewTagWaiter<V>(
     val fn: (V) -> Unit,
@@ -59,12 +58,7 @@ open class ViewTagResolver(val context: ReactApplicationContext) {
     }
 
     private val manager : UIManager
-        get() =
-            if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-                UIManagerHelper.getUIManager(context, UIManagerType.FABRIC)!!
-            } else {
-                UIManagerHelper.getUIManager(context, UIManagerType.DEFAULT)!!
-            }
+        get() = UIManagerHelper.getUIManager(context, UIManagerType.FABRIC)!!
 
     // calls on UiQueueThread with resolved view
     fun <V>withViewResolved(viewTag: Int, reject: Promise? = null, fn: (V) -> Unit) {

package/ios/RNMBX/Bridge/RNMBX.h

@@ -1,6 +1,5 @@
 /* Those will be available for Swift */
 #import <React/RCTEventEmitter.h>
-#import <React/RCTViewManager.h>
 #import <React/RCTImageLoaderProtocol.h>
 #import <React/RCTUIManager.h>
 

package/ios/RNMBX/CustomHttpHeaders.swift

@@ -10,7 +10,6 @@ struct CustomHttpHeadersMapValue {
 }
 
 class CustomHttpHeaders : HttpServiceInterceptorInterface {
-  #if RNMBX_11
   func onRequest(for request: HttpRequest, continuation: @escaping HttpServiceInterceptorRequestContinuation) {
     let request = onRequest(for: request)
     continuation(HttpRequestOrResponse.fromHttpRequest(request))
@@ -19,7 +18,6 @@ class CustomHttpHeaders : HttpServiceInterceptorInterface {
   func onResponse(for response: HttpResponse, continuation: @escaping HttpServiceInterceptorResponseContinuation) {
     continuation(response)
   }
-  #endif
 
   static var shared : CustomHttpHeaders = {
     let headers = CustomHttpHeaders()
@@ -30,20 +28,11 @@ class CustomHttpHeaders : HttpServiceInterceptorInterface {
   var customHeaders : [String:CustomHttpHeadersMapValue] = [:]
 
   func install() {
-    #if RNMBX_11
     HttpServiceFactory.setHttpServiceInterceptorForInterceptor(self)
-    #else
-    HttpServiceFactory.getInstance().setInterceptorForInterceptor(self)
-    #endif
   }
 
   func reset() {
-    #if RNMBX_11
     HttpServiceFactory.setHttpServiceInterceptorForInterceptor(nil)
-    #else
-    HttpServiceFactory.getInstance().setInterceptorForInterceptor(nil)
-
-    #endif
   }
 
   // MARK: - HttpServiceInterceptorInterface
@@ -76,14 +65,6 @@ class CustomHttpHeaders : HttpServiceInterceptorInterface {
     return request
   }
 
-  #if !RNMBX_11
-  func onDownload(forDownload download: DownloadOptions) -> DownloadOptions {
-    let customHeaders = getCustomRequestHeaders(for: download.request, with: customHeaders)
-    download.request.headers.merge(customHeaders) { (_, new) in new }
-    return download
-  }
-  #endif
-
   func onResponse(for response: HttpResponse) -> HttpResponse {
     return response
   }