Skip to content

Commit 96db001

Browse files
tbobaja1ns
tboba
authored and
ja1ns
committed
fix: Add submodules command in yarn, remove Flipper from Example (software-mansion#2092)
## Description This PR addresses latest errors on CI, regarding failing compile phases on iOS. It also adds `submodules` command to package.json, [previously](software-mansion@56ffac1) removed, since it was breaking other apps, as it was being executed as a postinstall step. ## Changes - Removed flipper from Example - Added submodules command to package.json ## Checklist - [x] Ensured that CI passes
1 parent e10aef3 commit 96db001

File tree

11 files changed

+4
-242
lines changed

11 files changed

+4
-242
lines changed

‎.github/workflows/android-e2e-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
node-version: 18
3737
cache: 'yarn'
3838
- name: Install root node dependencies
39-
run: yarn install
39+
run: yarn install && yarn submodules
4040
- name: Install node dependencies
4141
working-directory: ${{ env.WORKING_DIRECTORY }}
4242
run: yarn install

‎.github/workflows/ios-e2e-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- name: Install AppleSimulatorUtils
4040
run: brew tap wix/brew && brew install applesimutils
4141
- name: Install root node dependencies
42-
run: yarn
42+
run: yarn install && yarn submodules
4343
- name: Install node dependencies
4444
working-directory: ${{ env.WORKING_DIRECTORY }}
4545
run: yarn

‎Example/android/app/build.gradle‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,6 @@ dependencies {
125125
// The version of react-native is set by the React Native Gradle Plugin
126126
implementation("com.facebook.react:react-android")
127127

128-
debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
129-
debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
130-
exclude group:'com.squareup.okhttp3', module:'okhttp'
131-
}
132-
133-
debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}")
134128
if (hermesEnabled.toBoolean()) {
135129
implementation("com.facebook.react:hermes-android")
136130
} else {

‎Example/android/app/src/debug/java/com/swmansion/rnscreens/example/ReactNativeFlipper.java‎

Lines changed: 0 additions & 75 deletions
This file was deleted.

‎Example/android/app/src/main/java/com/swmansion/rnscreens/example/MainApplication.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,5 @@ public void onCreate() {
5858
// If you opted-in for the New Architecture, we load the native entry point for this app.
5959
DefaultNewArchitectureEntryPoint.load();
6060
}
61-
ReactNativeFlipper.initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
6261
}
6362
}

‎Example/android/app/src/release/java/com/swmansion/rnscreens/example/ReactNativeFlipper.java‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎Example/android/gradle.properties‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ android.useAndroidX=true
2424
# Automatically convert third-party libraries to use AndroidX
2525
android.enableJetifier=true
2626

27-
# Version of flipper SDK to use with React Native
28-
FLIPPER_VERSION=0.182.0
29-
3027
# Use this property to specify which architecture you want to build.
3128
# You can also override it from the CLI using
3229
# ./gradlew <task> -PreactNativeArchitectures=x86_64

‎Example/ios/Podfile‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,6 @@ require Pod::Executable.execute_command('node', ['-p',
88
platform :ios, min_ios_version_supported
99
prepare_react_native_project!
1010

11-
# If you are using a `react-native-flipper` your iOS build will fail when `NO_FLIPPER=1` is set.
12-
# because `react-native-flipper` depends on (FlipperKit,...) that will be excluded
13-
#
14-
# To fix this you can also exclude `react-native-flipper` using a `react-native.config.js`
15-
# ```js
16-
# module.exports = {
17-
# dependencies: {
18-
# ...(process.env.NO_FLIPPER ? { 'react-native-flipper': { platforms: { ios: null } } } : {}),
19-
# ```
20-
flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled
21-
2211
linkage = ENV['USE_FRAMEWORKS']
2312
if linkage != nil
2413
Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green
@@ -36,11 +25,6 @@ target 'ScreensExample' do
3625
# Hermes is now enabled by default. Disable by setting this flag to false.
3726
:hermes_enabled => flags[:hermes_enabled],
3827
:fabric_enabled => flags[:fabric_enabled],
39-
# Enables Flipper.
40-
#
41-
# Note that if you have use_frameworks! enabled, Flipper will not work and
42-
# you should disable the next line.
43-
:flipper_configuration => flipper_config,
4428
# An absolute path to your application root.
4529
:app_path => "#{Pod::Config.instance.installation_root}/.."
4630
)

‎Example/ios/Podfile.lock‎

Lines changed: 1 addition & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
PODS:
22
- boost (1.76.0)
3-
- CocoaAsyncSocket (7.6.5)
43
- DoubleConversion (1.1.6)
54
- FBLazyVector (0.72.4)
65
- FBReactNativeSpec (0.72.4):
@@ -10,71 +9,12 @@ PODS:
109
- React-Core (= 0.72.4)
1110
- React-jsi (= 0.72.4)
1211
- ReactCommon/turbomodule/core (= 0.72.4)
13-
- Flipper (0.182.0):
14-
- Flipper-Folly (~> 2.6)
15-
- Flipper-Boost-iOSX (1.76.0.1.11)
16-
- Flipper-DoubleConversion (3.2.0.1)
17-
- Flipper-Fmt (7.1.7)
18-
- Flipper-Folly (2.6.10):
19-
- Flipper-Boost-iOSX
20-
- Flipper-DoubleConversion
21-
- Flipper-Fmt (= 7.1.7)
22-
- Flipper-Glog
23-
- libevent (~> 2.1.12)
24-
- OpenSSL-Universal (= 1.1.1100)
25-
- Flipper-Glog (0.5.0.5)
26-
- Flipper-PeerTalk (0.0.4)
27-
- FlipperKit (0.182.0):
28-
- FlipperKit/Core (= 0.182.0)
29-
- FlipperKit/Core (0.182.0):
30-
- Flipper (~> 0.182.0)
31-
- FlipperKit/CppBridge
32-
- FlipperKit/FBCxxFollyDynamicConvert
33-
- FlipperKit/FBDefines
34-
- FlipperKit/FKPortForwarding
35-
- SocketRocket (~> 0.6.0)
36-
- FlipperKit/CppBridge (0.182.0):
37-
- Flipper (~> 0.182.0)
38-
- FlipperKit/FBCxxFollyDynamicConvert (0.182.0):
39-
- Flipper-Folly (~> 2.6)
40-
- FlipperKit/FBDefines (0.182.0)
41-
- FlipperKit/FKPortForwarding (0.182.0):
42-
- CocoaAsyncSocket (~> 7.6)
43-
- Flipper-PeerTalk (~> 0.0.4)
44-
- FlipperKit/FlipperKitHighlightOverlay (0.182.0)
45-
- FlipperKit/FlipperKitLayoutHelpers (0.182.0):
46-
- FlipperKit/Core
47-
- FlipperKit/FlipperKitHighlightOverlay
48-
- FlipperKit/FlipperKitLayoutTextSearchable
49-
- FlipperKit/FlipperKitLayoutIOSDescriptors (0.182.0):
50-
- FlipperKit/Core
51-
- FlipperKit/FlipperKitHighlightOverlay
52-
- FlipperKit/FlipperKitLayoutHelpers
53-
- YogaKit (~> 1.18)
54-
- FlipperKit/FlipperKitLayoutPlugin (0.182.0):
55-
- FlipperKit/Core
56-
- FlipperKit/FlipperKitHighlightOverlay
57-
- FlipperKit/FlipperKitLayoutHelpers
58-
- FlipperKit/FlipperKitLayoutIOSDescriptors
59-
- FlipperKit/FlipperKitLayoutTextSearchable
60-
- YogaKit (~> 1.18)
61-
- FlipperKit/FlipperKitLayoutTextSearchable (0.182.0)
62-
- FlipperKit/FlipperKitNetworkPlugin (0.182.0):
63-
- FlipperKit/Core
64-
- FlipperKit/FlipperKitReactPlugin (0.182.0):
65-
- FlipperKit/Core
66-
- FlipperKit/FlipperKitUserDefaultsPlugin (0.182.0):
67-
- FlipperKit/Core
68-
- FlipperKit/SKIOSNetworkPlugin (0.182.0):
69-
- FlipperKit/Core
70-
- FlipperKit/FlipperKitNetworkPlugin
7112
- fmt (6.2.1)
7213
- glog (0.3.5)
7314
- hermes-engine (0.72.4):
7415
- hermes-engine/Pre-built (= 0.72.4)
7516
- hermes-engine/Pre-built (0.72.4)
7617
- libevent (2.1.12)
77-
- OpenSSL-Universal (1.1.1100)
7818
- RCT-Folly (2021.07.22.00):
7919
- boost
8020
- DoubleConversion
@@ -502,46 +442,22 @@ PODS:
502442
- React-Core
503443
- SocketRocket (0.6.1)
504444
- Yoga (1.14.0)
505-
- YogaKit (1.18.1):
506-
- Yoga (~> 1.14)
507445

508446
DEPENDENCIES:
509447
- boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`)
510448
- DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
511449
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
512450
- FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
513-
- Flipper (= 0.182.0)
514-
- Flipper-Boost-iOSX (= 1.76.0.1.11)
515-
- Flipper-DoubleConversion (= 3.2.0.1)
516-
- Flipper-Fmt (= 7.1.7)
517-
- Flipper-Folly (= 2.6.10)
518-
- Flipper-Glog (= 0.5.0.5)
519-
- Flipper-PeerTalk (= 0.0.4)
520-
- FlipperKit (= 0.182.0)
521-
- FlipperKit/Core (= 0.182.0)
522-
- FlipperKit/CppBridge (= 0.182.0)
523-
- FlipperKit/FBCxxFollyDynamicConvert (= 0.182.0)
524-
- FlipperKit/FBDefines (= 0.182.0)
525-
- FlipperKit/FKPortForwarding (= 0.182.0)
526-
- FlipperKit/FlipperKitHighlightOverlay (= 0.182.0)
527-
- FlipperKit/FlipperKitLayoutPlugin (= 0.182.0)
528-
- FlipperKit/FlipperKitLayoutTextSearchable (= 0.182.0)
529-
- FlipperKit/FlipperKitNetworkPlugin (= 0.182.0)
530-
- FlipperKit/FlipperKitReactPlugin (= 0.182.0)
531-
- FlipperKit/FlipperKitUserDefaultsPlugin (= 0.182.0)
532-
- FlipperKit/SKIOSNetworkPlugin (= 0.182.0)
533451
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
534452
- hermes-engine (from `../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`)
535453
- libevent (~> 2.1.12)
536-
- OpenSSL-Universal (= 1.1.1100)
537454
- RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
538455
- RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
539456
- RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`)
540457
- React (from `../node_modules/react-native/`)
541458
- React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`)
542459
- React-Codegen (from `build/generated/ios`)
543460
- React-Core (from `../node_modules/react-native/`)
544-
- React-Core/DevSupport (from `../node_modules/react-native/`)
545461
- React-Core/RCTWebSocket (from `../node_modules/react-native/`)
546462
- React-CoreModules (from `../node_modules/react-native/React/CoreModules`)
547463
- React-cxxreact (from `../node_modules/react-native/ReactCommon/cxxreact`)
@@ -578,20 +494,9 @@ DEPENDENCIES:
578494

579495
SPEC REPOS:
580496
trunk:
581-
- CocoaAsyncSocket
582-
- Flipper
583-
- Flipper-Boost-iOSX
584-
- Flipper-DoubleConversion
585-
- Flipper-Fmt
586-
- Flipper-Folly
587-
- Flipper-Glog
588-
- Flipper-PeerTalk
589-
- FlipperKit
590497
- fmt
591498
- libevent
592-
- OpenSSL-Universal
593499
- SocketRocket
594-
- YogaKit
595500

596501
EXTERNAL SOURCES:
597502
boost:
@@ -688,23 +593,13 @@ EXTERNAL SOURCES:
688593

689594
SPEC CHECKSUMS:
690595
boost: 57d2868c099736d80fcd648bf211b4431e51a558
691-
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
692596
DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
693597
FBLazyVector: 5d4a3b7f411219a45a6d952f77d2c0a6c9989da5
694598
FBReactNativeSpec: 3fc2d478e1c4b08276f9dd9128f80ec6d5d85c1f
695-
Flipper: 6edb735e6c3e332975d1b17956bcc584eccf5818
696-
Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
697-
Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30
698-
Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b
699-
Flipper-Folly: 584845625005ff068a6ebf41f857f468decd26b3
700-
Flipper-Glog: 70c50ce58ddaf67dc35180db05f191692570f446
701-
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
702-
FlipperKit: 2efad7007d6745a3f95e4034d547be637f89d3f6
703599
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
704600
glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
705601
hermes-engine: 81191603c4eaa01f5e4ae5737a9efcf64756c7b2
706602
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
707-
OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
708603
RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1
709604
RCTRequired: c0569ecc035894e4a68baecb30fe6a7ea6e399f9
710605
RCTTypeSafety: e90354072c21236e0bcf1699011e39acd25fea2f
@@ -745,8 +640,7 @@ SPEC CHECKSUMS:
745640
RNVectorIcons: 31cebfcf94e8cf8686eb5303ae0357da64d7a5a4
746641
SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
747642
Yoga: 3efc43e0d48686ce2e8c60f99d4e6bd349aff981
748-
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
749643

750-
PODFILE CHECKSUM: 86e380a4262db238c7a45428750af2d88465585c
644+
PODFILE CHECKSUM: c60c99cda41cbbb3c2cf2a05cc397217a1b23498
751645

752646
COCOAPODS: 1.15.2

‎Example/ios/ScreensExample.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -522,16 +522,10 @@
522522
);
523523
inputPaths = (
524524
"${PODS_ROOT}/Target Support Files/Pods-ScreensExample/Pods-ScreensExample-frameworks.sh",
525-
"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion",
526-
"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-Glog/glog.framework/glog",
527-
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
528525
"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
529526
);
530527
name = "[CP] Embed Pods Frameworks";
531528
outputPaths = (
532-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/double-conversion.framework",
533-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/glog.framework",
534-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
535529
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
536530
);
537531
runOnlyForDeploymentPostprocessing = 0;
@@ -546,16 +540,10 @@
546540
);
547541
inputPaths = (
548542
"${PODS_ROOT}/Target Support Files/Pods-ScreensExample-ScreensExampleTests/Pods-ScreensExample-ScreensExampleTests-frameworks.sh",
549-
"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion",
550-
"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-Glog/glog.framework/glog",
551-
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
552543
"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
553544
);
554545
name = "[CP] Embed Pods Frameworks";
555546
outputPaths = (
556-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/double-conversion.framework",
557-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/glog.framework",
558-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
559547
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
560548
);
561549
runOnlyForDeploymentPostprocessing = 0;

0 commit comments

Comments
 (0)