diff --git a/.github/workflows/build-example-ios.yml b/.github/workflows/build-example-ios.yml index d056a793..77fe95fa 100644 --- a/.github/workflows/build-example-ios.yml +++ b/.github/workflows/build-example-ios.yml @@ -75,17 +75,38 @@ jobs: - name: Build JS run: yarn run bob build - - name: 1/2 - Run `pod-install` (fabric, static library) + - name: 1/4 - Run `pod-install` (fabric, static library) run: yarn pod-install:new-static - - name: 1/2 - Build example (fabric, static library) + - name: 1/4 - Build example (fabric, static library) run: yarn run build:ios - name: Clear/reset example pods run: yarn run nuke:example-pods - - name: 2/2 - Run `pod-install` (paper, static library) + - name: 2/4 - Run `pod-install` (paper, static library) run: yarn pod-install:old-static - - name: 2/2 - Build example (paper, static library) - run: yarn run build:ios \ No newline at end of file + - name: 2/4 - Build example (paper, static library) + run: yarn run build:ios + + - name: Clear/reset example pods + run: yarn run nuke:example-pods + + - name: 3/4 - Run `pod-install` (fabric, dynamic library) + run: yarn pod-install:new-dynamic + + - name: 3/4 - Build example (fabric, dynamic library) + run: yarn run build:ios + + - name: Clear/reset example pods + run: yarn run nuke:example-pods + + - name: 4/4 - Run `pod-install` (paper, dynamic library) + run: yarn pod-install:old-dynamic + + - name: 4/4 - Build example (paper, dynamic library) + run: yarn run build:ios + + - name: Clear/reset example pods + run: yarn run nuke:example-pods diff --git a/ios/RNIContextMenuButton/RNIContextMenuButton.h b/ios/RNIContextMenuButton/RNIContextMenuButton.h index 038953ac..6b142bea 100644 --- a/ios/RNIContextMenuButton/RNIContextMenuButton.h +++ b/ios/RNIContextMenuButton/RNIContextMenuButton.h @@ -5,7 +5,11 @@ // Created by Dominic Go on 8/24/24. // +#if __has_include() +#import +#else #import +#endif #if RCT_NEW_ARCH_ENABLED #import diff --git a/ios/RNIContextMenuButton/RNIContextMenuButton.mm b/ios/RNIContextMenuButton/RNIContextMenuButton.mm index aaed9ddd..34e470dc 100644 --- a/ios/RNIContextMenuButton/RNIContextMenuButton.mm +++ b/ios/RNIContextMenuButton/RNIContextMenuButton.mm @@ -7,18 +7,33 @@ #import "RNIContextMenuButton.h" +#if __has_include() +#import "react_native_ios_context_menu/Swift.h" + +#import +#import +#import +#import + +#else #import "react-native-ios-context-menu/Swift.h" #import #import #import #import +#endif #if RCT_NEW_ARCH_ENABLED #include "RNIContextMenuButtonComponentDescriptor.h" +#if __has_include( +#include +#else #include #include +#endif #import #import diff --git a/ios/RNIContextMenuButton/RNIContextMenuButtonViewManager.mm b/ios/RNIContextMenuButton/RNIContextMenuButtonViewManager.mm index 408201bf..64090934 100644 --- a/ios/RNIContextMenuButton/RNIContextMenuButtonViewManager.mm +++ b/ios/RNIContextMenuButton/RNIContextMenuButtonViewManager.mm @@ -8,7 +8,12 @@ #import "RNIContextMenuButton.h" #import +#if __has_include() +#import + +#else #import +#endif #import "RCTBridge.h" #import diff --git a/ios/RNIContextMenuView/RNIContextMenuView.h b/ios/RNIContextMenuView/RNIContextMenuView.h index 51ec1b4b..feb721a2 100644 --- a/ios/RNIContextMenuView/RNIContextMenuView.h +++ b/ios/RNIContextMenuView/RNIContextMenuView.h @@ -5,7 +5,11 @@ // Created by Dominic Go on 8/24/24. // +#if __has_include() +#import +#else #import +#endif #if RCT_NEW_ARCH_ENABLED #import diff --git a/ios/RNIContextMenuView/RNIContextMenuView.mm b/ios/RNIContextMenuView/RNIContextMenuView.mm index 5dfe216e..60323013 100644 --- a/ios/RNIContextMenuView/RNIContextMenuView.mm +++ b/ios/RNIContextMenuView/RNIContextMenuView.mm @@ -7,18 +7,33 @@ #import "RNIContextMenuView.h" +#if __has_include() +#import "react_native_ios_context_menu/Swift.h" + +#import +#import +#import +#import +#else #import "react-native-ios-context-menu/Swift.h" #import #import #import #import +#endif #if RCT_NEW_ARCH_ENABLED #include "RNIContextMenuViewComponentDescriptor.h" +#if __has_include() +#include +#include + +#else #include #include +#endif #import #import diff --git a/ios/RNIContextMenuView/RNIContextMenuViewManager.mm b/ios/RNIContextMenuView/RNIContextMenuViewManager.mm index bf104359..0f08da35 100644 --- a/ios/RNIContextMenuView/RNIContextMenuViewManager.mm +++ b/ios/RNIContextMenuView/RNIContextMenuViewManager.mm @@ -8,7 +8,12 @@ #import "RNIContextMenuView.h" #import +#if __has_include() +#import + +#else #import +#endif #import "RCTBridge.h" #import diff --git a/ios/Swift.h b/ios/Swift.h index 20777661..347c66cf 100644 --- a/ios/Swift.h +++ b/ios/Swift.h @@ -9,7 +9,7 @@ // the module. // Otherwise, it's available only locally with double-quoted imports. #if __has_include() -#import "" +#import #else #import "react_native_ios_context_menu-Swift.h" #endif