Skip to content

chore(ios): remove old architecture code #4130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mfazekas wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

chore(ios): remove old architecture code #4130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ios/RNMBX/Bridge/RNMBX.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>

Expand Down
2 changes: 0 additions & 2 deletions ios/RNMBX/RNMBXAtmosphereComponentView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#ifdef RCT_NEW_ARCH_ENABLED

#import <UIKit/UIKit.h>

Expand All @@ -12,4 +11,3 @@ NS_ASSUME_NONNULL_BEGIN

NS_ASSUME_NONNULL_END

#endif // RCT_NEW_ARCH_ENABLED
2 changes: 0 additions & 2 deletions ios/RNMBX/RNMBXAtmosphereComponentView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#ifdef RCT_NEW_ARCH_ENABLED

#import "RNMBXAtmosphereComponentView.h"
#import "RNMBXFabricHelpers.h"
Expand Down Expand Up @@ -79,4 +78,3 @@ - (void)prepareForRecycle
return RNMBXAtmosphereComponentView.class;
}

#endif // RCT_NEW_ARCH_ENABLED
8 changes: 0 additions & 8 deletions ios/RNMBX/RNMBXAtmosphereViewManager.m
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions ios/RNMBX/RNMBXAtmosphereViewManager.swift
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions ios/RNMBX/RNMBXBackgroundLayerComponentView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#ifdef RCT_NEW_ARCH_ENABLED

#import <UIKit/UIKit.h>

Expand All @@ -12,4 +11,3 @@ NS_ASSUME_NONNULL_BEGIN

NS_ASSUME_NONNULL_END

#endif // RCT_NEW_ARCH_ENABLED
2 changes: 0 additions & 2 deletions ios/RNMBX/RNMBXBackgroundLayerComponentView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#ifdef RCT_NEW_ARCH_ENABLED

#import "RNMBXBackgroundLayerComponentView.h"
#import "RNMBXFabricHelpers.h"
Expand Down Expand Up @@ -74,4 +73,3 @@ - (void)prepareForRecycle
return RNMBXBackgroundLayerComponentView.class;
}

#endif // RCT_NEW_ARCH_ENABLED
9 changes: 0 additions & 9 deletions ios/RNMBX/RNMBXBackgroundLayerViewManager.m
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions ios/RNMBX/RNMBXBackgroundLayerViewManager.swift
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions ios/RNMBX/RNMBXCalloutComponentView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#ifdef RCT_NEW_ARCH_ENABLED

#import <UIKit/UIKit.h>

Expand All @@ -12,4 +11,3 @@ NS_ASSUME_NONNULL_BEGIN

NS_ASSUME_NONNULL_END

#endif // RCT_NEW_ARCH_ENABLED
2 changes: 0 additions & 2 deletions ios/RNMBX/RNMBXCalloutComponentView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#ifdef RCT_NEW_ARCH_ENABLED

#import "RNMBXCalloutComponentView.h"
#import "RNMBXFabricHelpers.h"
Expand Down Expand Up @@ -60,4 +59,3 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &
return RNMBXCalloutComponentView.class;
}

#endif // RCT_NEW_ARCH_ENABLED
8 changes: 0 additions & 8 deletions ios/RNMBX/RNMBXCalloutViewManager.m
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions ios/RNMBX/RNMBXCalloutViewManager.swift
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions ios/RNMBX/RNMBXCameraComponentView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#ifdef RCT_NEW_ARCH_ENABLED

#import <UIKit/UIKit.h>

Expand All @@ -12,4 +11,3 @@ NS_ASSUME_NONNULL_BEGIN

NS_ASSUME_NONNULL_END

#endif // RCT_NEW_ARCH_ENABLED
2 changes: 0 additions & 2 deletions ios/RNMBX/RNMBXCameraComponentView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#ifdef RCT_NEW_ARCH_ENABLED

#import "RNMBXCameraComponentView.h"
#import "RNMBXFabricHelpers.h"
Expand Down Expand Up @@ -148,4 +147,3 @@ - (void)prepareForRecycle
return RNMBXCameraComponentView.class;
}

#endif // RCT_NEW_ARCH_ENABLED
2 changes: 0 additions & 2 deletions ios/RNMBX/RNMBXCameraGestureObserverComponentView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#ifdef RCT_NEW_ARCH_ENABLED

#import <UIKit/UIKit.h>

Expand All @@ -12,4 +11,3 @@ NS_ASSUME_NONNULL_BEGIN

NS_ASSUME_NONNULL_END

#endif // RCT_NEW_ARCH_ENABLED
2 changes: 0 additions & 2 deletions ios/RNMBX/RNMBXCameraGestureObserverComponentView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#ifdef RCT_NEW_ARCH_ENABLED

#import "RNMBXCameraGestureObserverComponentView.h"
#import "RNMBXFabricHelpers.h"
Expand Down Expand Up @@ -116,4 +115,3 @@ - (void)prepareForRecycle
return RNMBXCameraGestureObserverComponentView.class;
}

#endif // RCT_NEW_ARCH_ENABLED
11 changes: 1 addition & 10 deletions ios/RNMBX/RNMBXCameraModule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,9 @@
#import <UIKit/UIKit.h>
#import "RNMBXViewResolver.h"

#ifdef RCT_NEW_ARCH_ENABLED
#import "rnmapbox_maps_specs.h"
#else
#import <React/RCTBridge.h>
#endif

@interface RNMBXCameraModule : NSObject
#ifdef RCT_NEW_ARCH_ENABLED
<NativeRNMBXCameraModuleSpec, RNMBXViewResolverDelegate>
#else
<RCTBridgeModule, RNMBXViewResolverDelegate>
#endif
@interface RNMBXCameraModule : NSObject <NativeRNMBXCameraModuleSpec, RNMBXViewResolverDelegate>

@end

7 changes: 0 additions & 7 deletions ios/RNMBX/RNMBXCameraModule.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,15 @@
#import <React/RCTUIManagerUtils.h>

#import "RNMBXCameraModule.h"
#ifdef RCT_NEW_ARCH_ENABLED
#import "RNMBXCameraComponentView.h"
#endif // RCT_NEW_ARCH_ENABLED

#import "rnmapbox_maps-Swift.pre.h"

@implementation RNMBXCameraModule

RCT_EXPORT_MODULE();

#ifdef RCT_NEW_ARCH_ENABLED
@synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED;
#endif // RCT_NEW_ARCH_ENABLED
@synthesize bridge = _bridge;

- (dispatch_queue_t)methodQueue
Expand All @@ -25,14 +21,11 @@ - (dispatch_queue_t)methodQueue
return RCTGetUIManagerQueue();
}

// Thanks to this guard, we won't compile this code when we build for the old architecture.
#ifdef RCT_NEW_ARCH_ENABLED
- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
(const facebook::react::ObjCTurboModule::InitParams &)params
{
return std::make_shared<facebook::react::NativeRNMBXCameraModuleSpecJSI>(params);
}
#endif // RCT_NEW_ARCH_ENABLED

- (void)withCamera:(nonnull NSNumber*)viewRef block:(void (^)(RNMBXCamera *))block reject:(RCTPromiseRejectBlock)reject methodName:(NSString *)methodName
{
Expand Down
27 changes: 0 additions & 27 deletions ios/RNMBX/RNMBXCameraViewManager.m
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions ios/RNMBX/RNMBXCameraViewManager.swift
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions ios/RNMBX/RNMBXCircleLayerComponentView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#ifdef RCT_NEW_ARCH_ENABLED

#import <UIKit/UIKit.h>

Expand All @@ -12,4 +11,3 @@ NS_ASSUME_NONNULL_BEGIN

NS_ASSUME_NONNULL_END

#endif // RCT_NEW_ARCH_ENABLED
2 changes: 0 additions & 2 deletions ios/RNMBX/RNMBXCircleLayerComponentView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#ifdef RCT_NEW_ARCH_ENABLED

#import "RNMBXCircleLayerComponentView.h"
#import "RNMBXFabricHelpers.h"
Expand Down Expand Up @@ -73,4 +72,3 @@ - (void)prepareForRecycle
return RNMBXCircleLayerComponentView.class;
}

#endif // RCT_NEW_ARCH_ENABLED
14 changes: 0 additions & 14 deletions ios/RNMBX/RNMBXCircleLayerViewManager.m
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions ios/RNMBX/RNMBXCircleLayerViewManager.swift
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions ios/RNMBX/RNMBXCustomLocationProviderComponentView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#ifdef RCT_NEW_ARCH_ENABLED

#import <UIKit/UIKit.h>

Expand All @@ -12,4 +11,3 @@ NS_ASSUME_NONNULL_BEGIN

NS_ASSUME_NONNULL_END

#endif // RCT_NEW_ARCH_ENABLED
2 changes: 0 additions & 2 deletions ios/RNMBX/RNMBXCustomLocationProviderComponentView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#ifdef RCT_NEW_ARCH_ENABLED

#import "RNMBXCustomLocationProviderComponentView.h"
#import "RNMBXFabricHelpers.h"
Expand Down Expand Up @@ -80,4 +79,3 @@ - (void)prepareForRecycle
return RNMBXCustomLocationProviderComponentView.class;
}

#endif // RCT_NEW_ARCH_ENABLED
13 changes: 0 additions & 13 deletions ios/RNMBX/RNMBXCustomLocationProviderVIewManager.swift
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions ios/RNMBX/RNMBXCustomLocationProviderViewManager.m
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions ios/RNMBX/RNMBXFabricPropConvert.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#ifdef RCT_NEW_ARCH_ENABLED

#import <React/RCTConversions.h>
#import <React/RCTFabricComponentsPlugins.h>
#import <React/RCTBridge+Private.h>
Expand Down Expand Up @@ -156,5 +154,3 @@ id RNMBXPropConvert_Optional_ExpressionDouble(const folly::dynamic &dyn, NSStrin
NSArray<NSNumber*> * RNMBXPropConvert_Optional_NumberArray(const folly::dynamic &dyn, NSString* propertyName) {
return RNMBXPropConvert_ID(dyn);
}

#endif
2 changes: 0 additions & 2 deletions ios/RNMBX/RNMBXFillExtrusionLayerComponentView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#ifdef RCT_NEW_ARCH_ENABLED

#import <UIKit/UIKit.h>

Expand All @@ -12,4 +11,3 @@ NS_ASSUME_NONNULL_BEGIN

NS_ASSUME_NONNULL_END

#endif // RCT_NEW_ARCH_ENABLED
Loading
Loading