@rnmapbox/maps 10.2.10 → 10.3.0-beta.0

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/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/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/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
   }

package/ios/RNMBX/Offline/RNMBXOfflineModule.swift

@@ -31,19 +31,11 @@ class RNMBXOfflineModule: RCTEventEmitter {
   }
   
   lazy var offlineManager : OfflineManager = {
-    #if RNMBX_11
     return OfflineManager()
-    #else
-    return OfflineManager(resourceOptions: .init(accessToken: RNMBXModule.accessToken!))
-    #endif
   }()
-  
+
   lazy var offlineRegionManager: OfflineRegionManager = {
-    #if RNMBX_11
     return OfflineRegionManager()
-    #else
-    return OfflineRegionManager(resourceOptions: .init(accessToken: RNMBXModule.accessToken!))
-    #endif
   }()
 
   lazy var tileStore : TileStore = {
@@ -363,7 +355,6 @@ class RNMBXOfflineModule: RCTEventEmitter {
     
     let stylePackLoadOptions = StylePackLoadOptions(glyphsRasterizationMode: .ideographsRasterizedLocally, metadata: pack.metadata)!
     
-    #if RNMBX_11
     let threadedOfflineManager = OfflineManager()
     taskGroup.enter()
     let stylePackTask = threadedOfflineManager.loadStylePack(for: styleURI, loadOptions: stylePackLoadOptions) { progress in
@@ -391,20 +382,6 @@ class RNMBXOfflineModule: RCTEventEmitter {
     )
     let tilesetDescriptor = threadedOfflineManager.createTilesetDescriptor(for: descriptorOptions)
     let descriptors = [tilesetDescriptor]
-    #else
-    let descriptorOptions = TilesetDescriptorOptions(
-      styleURI: styleURI,
-      zoomRange: zoomRange,
-      stylePackOptions: stylePackLoadOptions
-    )
-    let descriptor = self.offlineManager.createTilesetDescriptor(for: descriptorOptions)
-    let tilesetDescriptorOptions = TilesetDescriptorOptionsForTilesets(tilesets: pack.tilesets, zoomRange: zoomRange)
-    let tilesetDescriptor = self.offlineManager.createTilesetDescriptorForTilesetDescriptorOptions(tilesetDescriptorOptions)
-    var descriptors = [descriptor]
-    if (!pack.tilesets.isEmpty) {
-      descriptors.append(tilesetDescriptor)
-    }
-    #endif
     
     let loadOptions = TileRegionLoadOptions(
       geometry: bounds, // RNMBXFeatureUtils.geometryToGeometry(bounds),
@@ -452,11 +429,7 @@ class RNMBXOfflineModule: RCTEventEmitter {
       self.tileRegionPacks[id]!.state = downloadError ? .inactive : .complete
     }
 
-    #if RNMBX_11
     self.tileRegionPacks[id]!.cancelables = [task, stylePackTask]
-    #else
-    self.tileRegionPacks[id]!.cancelables = [task]
-    #endif
   }
   
   func convertRegionsToJSON(regions: [TileRegion], resolve: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock) {

package/ios/RNMBX/Offline/RNMBXOfflineModuleLegacy.swift

@@ -6,11 +6,7 @@ class RNMBXOfflineModuleLegacy: RCTEventEmitter {
   final let CompleteRegionDownloadState = 2
   
   lazy var offlineRegionManager: OfflineRegionManager = {
-    #if RNMBX_11
     return OfflineRegionManager()
-    #else
-    return OfflineRegionManager(resourceOptions: .init(accessToken: RNMBXModule.accessToken!))
-    #endif
   }()
 
   @objc

package/ios/RNMBX/RNMBXAtmosphere.swift

@@ -1,8 +1,6 @@
 import MapboxMaps
 
-#if RNMBX_11
 public typealias Style = StyleManager
-#endif
 
 @objc(RNMBXAtmosphere)
 public class RNMBXAtmosphere : RNMBXSingletonLayer, RNMBXMapComponent, RNMBXSourceConsumer {

package/ios/RNMBX/RNMBXAtmosphereComponentView.h

@@ -1,4 +1,4 @@
-#ifdef RCT_NEW_ARCH_ENABLED
+#ifdef __cplusplus
 
 #import <UIKit/UIKit.h>
 
@@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
-
-#endif // RCT_NEW_ARCH_ENABLED
+#endif // __cplusplus

package/ios/RNMBX/RNMBXAtmosphereComponentView.mm

@@ -1,4 +1,3 @@
-#ifdef RCT_NEW_ARCH_ENABLED
 
 #import "RNMBXAtmosphereComponentView.h"
 #import "RNMBXFabricHelpers.h"
@@ -79,4 +78,3 @@ Class<RCTComponentViewProtocol> RNMBXAtmosphereCls(void)
   return RNMBXAtmosphereComponentView.class;
 }
 
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXBackgroundLayer.swift

@@ -6,10 +6,6 @@ public class RNMBXBackgroundLayer: RNMBXLayer {
 
   override func makeLayer(style: Style) throws -> Layer {
     var layer = LayerType(id: self.id!)
-    #if !RNMBX_11
-    layer.sourceLayer = self.sourceLayerID
-    layer.source = sourceID
-    #endif
     return layer
   }
 

package/ios/RNMBX/RNMBXBackgroundLayerComponentView.h

@@ -1,4 +1,4 @@
-#ifdef RCT_NEW_ARCH_ENABLED
+#ifdef __cplusplus
 
 #import <UIKit/UIKit.h>
 
@@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
-
-#endif // RCT_NEW_ARCH_ENABLED
+#endif // __cplusplus

package/ios/RNMBX/RNMBXBackgroundLayerComponentView.mm

@@ -1,4 +1,3 @@
-#ifdef RCT_NEW_ARCH_ENABLED
 
 #import "RNMBXBackgroundLayerComponentView.h"
 #import "RNMBXFabricHelpers.h"
@@ -74,4 +73,3 @@ Class<RCTComponentViewProtocol> RNMBXBackgroundLayerCls(void)
   return RNMBXBackgroundLayerComponentView.class;
 }
 
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXCalloutComponentView.h

@@ -1,4 +1,4 @@
-#ifdef RCT_NEW_ARCH_ENABLED
+#ifdef __cplusplus
 
 #import <UIKit/UIKit.h>
 
@@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
-
-#endif // RCT_NEW_ARCH_ENABLED
+#endif // __cplusplus

package/ios/RNMBX/RNMBXCalloutComponentView.mm

@@ -1,4 +1,3 @@
-#ifdef RCT_NEW_ARCH_ENABLED
 
 #import "RNMBXCalloutComponentView.h"
 #import "RNMBXFabricHelpers.h"
@@ -60,4 +59,3 @@ Class<RCTComponentViewProtocol> RNMBXCalloutCls(void)
   return RNMBXCalloutComponentView.class;
 }
 
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNMBX/RNMBXCamera.swift

@@ -2,14 +2,12 @@ import Foundation
 import MapboxMaps
 import Turf
 
-#if RNMBX_11
 extension NSNumber {
   /// Converts an `NSNumber` to a `CGFloat` value from its `Double` representation.
   internal var CGFloat: CGFloat {
     CoreGraphics.CGFloat(doubleValue)
   }
 }
-#endif
 
 public enum RemovalReason {
     case ViewRemoval, StyleChange, OnDestroy, ComponentChange, Reorder
@@ -368,9 +366,6 @@ open class RNMBXCamera : RNMBXMapAndMapViewComponentBase {
       if let locationModule = RNMBXLocationModule.shared {
         locationModule.override(for: map.location)
       }
-      #if !RNMBX_11
-      map.location.locationProvider.requestWhenInUseAuthorization()
-      #endif
       var trackingModeChanged = false
       var followOptions = FollowPuckViewportStateOptions()
       switch userTrackingMode {
@@ -518,11 +513,7 @@ open class RNMBXCamera : RNMBXMapAndMapViewComponentBase {
       }
       
       withMapView { map in
-        #if RNMBX_11
         let bounds = [sw, ne]
-        #else
-        let bounds = CoordinateBounds(southwest: sw, northeast: ne)
-        #endif
 
         camera = map.mapboxMap.camera(
           for: bounds,

package/ios/RNMBX/RNMBXCameraComponentView.h

@@ -1,4 +1,4 @@
-#ifdef RCT_NEW_ARCH_ENABLED
+#ifdef __cplusplus
 
 #import <UIKit/UIKit.h>
 
@@ -11,5 +11,4 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
-
-#endif // RCT_NEW_ARCH_ENABLED
+#endif // __cplusplus

package/ios/RNMBX/RNMBXCameraComponentView.mm

@@ -1,4 +1,3 @@
-#ifdef RCT_NEW_ARCH_ENABLED
 
 #import "RNMBXCameraComponentView.h"
 #import "RNMBXFabricHelpers.h"
@@ -148,4 +147,3 @@ Class<RCTComponentViewProtocol> RNMBXCameraCls(void)
   return RNMBXCameraComponentView.class;
 }
 
-#endif // RCT_NEW_ARCH_ENABLED