diff --git a/.github/workflows/ios-build.yml b/.github/workflows/ios-build.yml index df2a39789a7..7f4d84c06a1 100644 --- a/.github/workflows/ios-build.yml +++ b/.github/workflows/ios-build.yml @@ -12,8 +12,7 @@ on: jobs: build: - # runs-on: macos-latest // issue: https://github.com/actions/virtual-environments/issues/4060 - runs-on: macos-11 + runs-on: macos-12 strategy: matrix: working-directory: [Example, FabricExample] diff --git a/.github/workflows/tv-os-build.yml b/.github/workflows/tv-os-build.yml index 8a15c52c315..ad7b3142d8c 100644 --- a/.github/workflows/tv-os-build.yml +++ b/.github/workflows/tv-os-build.yml @@ -10,7 +10,7 @@ on: workflow_dispatch: jobs: build: - runs-on: macos-latest + runs-on: macos-12 env: WORKING_DIRECTORY: TVOSExample concurrency: diff --git a/FabricExample/ios/Podfile.lock b/FabricExample/ios/Podfile.lock index 3030c320213..97ab4be40f4 100644 --- a/FabricExample/ios/Podfile.lock +++ b/FabricExample/ios/Podfile.lock @@ -625,26 +625,26 @@ PODS: - React-jsinspector (0.70.0-rc.2) - React-logger (0.70.0-rc.2): - glog - - react-native-safe-area-context (4.2.5): + - react-native-safe-area-context (4.3.3): - RCT-Folly - RCTRequired - RCTTypeSafety - - React - - react-native-safe-area-context/common (= 4.2.5) - - react-native-safe-area-context/fabric (= 4.2.5) + - React-Core + - react-native-safe-area-context/common (= 4.3.3) + - react-native-safe-area-context/fabric (= 4.3.3) - ReactCommon/turbomodule/core - - react-native-safe-area-context/common (4.2.5): + - react-native-safe-area-context/common (4.3.3): - RCT-Folly - RCTRequired - RCTTypeSafety - - React + - React-Core - ReactCommon/turbomodule/core - - react-native-safe-area-context/fabric (4.2.5): + - react-native-safe-area-context/fabric (4.3.3): - RCT-Folly - RCTRequired - RCTTypeSafety - - React - React-Codegen + - React-Core - react-native-safe-area-context/common - React-RCTFabric - ReactCommon/turbomodule/core @@ -757,7 +757,7 @@ PODS: - React-RCTText - ReactCommon/turbomodule/core - Yoga - - RNScreens (3.15.0): + - RNScreens (3.16.0): - RCT-Folly - RCTRequired - RCTTypeSafety @@ -765,8 +765,8 @@ PODS: - React-Codegen - React-RCTFabric - ReactCommon/turbomodule/core - - RNScreens/common (= 3.15.0) - - RNScreens/common (3.15.0): + - RNScreens/common (= 3.16.0) + - RNScreens/common (3.16.0): - RCT-Folly - RCTRequired - RCTTypeSafety @@ -991,7 +991,7 @@ SPEC CHECKSUMS: React-jsiexecutor: 12d1ed281abeda9428fb16c1026487542395c3b7 React-jsinspector: 49a8875f27791316bb0039fa7627b4c1f0578cc7 React-logger: 55ff3b00451ad1dc82654ba60134ec82ae4dbfed - react-native-safe-area-context: a9616f1fd257ff31946b518266a62f50dbcb3d5b + react-native-safe-area-context: 6ab17f921537d721f7315b198d82d6a65a2680f9 React-perflogger: f53712c718e55b63c34140834fea4e8775948930 React-RCTActionSheet: 476de07b325fcd61e89b5556125272b1fa7475e8 React-RCTAnimation: b6e0756c75e3eb88a3d353cf4e6f4fb64a0c95d4 @@ -1008,7 +1008,7 @@ SPEC CHECKSUMS: ReactCommon: e192c52229a978dc7ab7bfb21aa38c686005db31 RNGestureHandler: c2c12e610e4d94ea917bbd31801974edcee4dd94 RNReanimated: 10249ac81b456595273588ce2195198d85fcbd28 - RNScreens: 865ade69cfb9cc9d3bb3b42131dfa83855b5e7a0 + RNScreens: bb17bdc9eca378fefc6103fb52c35b4f7ef0a791 SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 Yoga: f2aa7bc41e39cbf8edc0251a86fa89193b51491b YogaKit: f782866e155069a2cca2517aafea43200b01fd5a diff --git a/FabricExample/package.json b/FabricExample/package.json index f87ba0f6de5..78a1e60f2c7 100644 --- a/FabricExample/package.json +++ b/FabricExample/package.json @@ -20,8 +20,8 @@ "react-native": "0.70.0-rc.2", "react-native-gesture-handler": "^2.5.0", "react-native-reanimated": "link:../", - "react-native-safe-area-context": "^4.2.5", - "react-native-screens": "^3.15.0" + "react-native-safe-area-context": "^4.3.3", + "react-native-screens": "software-mansion/react-native-screens#dfc90db38f849ca7e3a7895c4eb94bbfaee4f708" }, "devDependencies": { "@babel/core": "^7.17.5", diff --git a/FabricExample/patches/react-native-gesture-handler+2.5.0.patch b/FabricExample/patches/react-native-gesture-handler+2.5.0.patch index 19fcfcf74d1..d8beb009619 100644 --- a/FabricExample/patches/react-native-gesture-handler+2.5.0.patch +++ b/FabricExample/patches/react-native-gesture-handler+2.5.0.patch @@ -19,3 +19,30 @@ index 100d320..033dcd7 100644 s.dependency "RCTRequired" s.dependency "RCTTypeSafety" s.dependency "ReactCommon/turbomodule/core" +diff --git a/node_modules/react-native-gesture-handler/android/build.gradle b/node_modules/react-native-gesture-handler/android/build.gradle +index ad5845e..7318b1b 100644 +--- a/node_modules/react-native-gesture-handler/android/build.gradle ++++ b/node_modules/react-native-gesture-handler/android/build.gradle +@@ -59,6 +59,11 @@ def shouldUseCommonInterfaceFromReanimated() { + } + } + ++def reactNativeArchitectures() { ++ def value = project.getProperties().get("reactNativeArchitectures") ++ return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"] ++} ++ + repositories { + mavenCentral() + } +@@ -98,6 +103,10 @@ android { + } + } + } ++ ++ ndk { ++ abiFilters (*reactNativeArchitectures()) ++ } + } + + compileOptions { diff --git a/FabricExample/patches/react-native-safe-area-context+4.2.5.patch b/FabricExample/patches/react-native-safe-area-context+4.2.5.patch deleted file mode 100644 index b8e720623ff..00000000000 --- a/FabricExample/patches/react-native-safe-area-context+4.2.5.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/node_modules/react-native-safe-area-context/android/build.gradle b/node_modules/react-native-safe-area-context/android/build.gradle -index dac783d..104e85a 100644 ---- a/node_modules/react-native-safe-area-context/android/build.gradle -+++ b/node_modules/react-native-safe-area-context/android/build.gradle -@@ -29,6 +29,11 @@ if (isNewArchitectureEnabled()) { - apply plugin: "com.facebook.react" - } - -+def reactNativeArchitectures() { -+ def value = project.getProperties().get("reactNativeArchitectures") -+ return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"] -+} -+ - android { - compileSdkVersion getExtOrDefault('compileSdkVersion', 30) - -@@ -64,6 +69,9 @@ android { - targets "safeareacontext_modules" - } - } -+ ndk { -+ abiFilters (*reactNativeArchitectures()) -+ } - } - } - -diff --git a/node_modules/react-native-safe-area-context/android/src/main/jni/Android.mk b/node_modules/react-native-safe-area-context/android/src/main/jni/Android.mk -index 6166527..33a7e73 100644 ---- a/node_modules/react-native-safe-area-context/android/src/main/jni/Android.mk -+++ b/node_modules/react-native-safe-area-context/android/src/main/jni/Android.mk -@@ -20,7 +20,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(GENERATED_SRC_DIR)/codegen/jni - LOCAL_SHARED_LIBRARIES := libjsi \ - libfbjni \ - libglog \ -- libfolly_json \ -+ libfolly_runtime \ - libyoga \ - libreact_nativemodule_core \ - libturbomodulejsijni \ -@@ -28,7 +28,6 @@ LOCAL_SHARED_LIBRARIES := libjsi \ - libreact_render_core \ - libreact_render_graphics \ - libfabricjni \ -- libfolly_futures \ - libreact_debug \ - libreact_render_componentregistry \ - libreact_render_debug \ -diff --git a/node_modules/react-native-safe-area-context/common/cpp/Android.mk b/node_modules/react-native-safe-area-context/common/cpp/Android.mk -index a7680a6..69d86d6 100644 ---- a/node_modules/react-native-safe-area-context/common/cpp/Android.mk -+++ b/node_modules/react-native-safe-area-context/common/cpp/Android.mk -@@ -15,7 +15,7 @@ LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(LOCAL_PATH)/reac - - LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/react/renderer/components/safeareacontext - --LOCAL_SHARED_LIBRARIES := libjsi libglog libfolly_json libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libfbjni libturbomodulejsijni libreact_codegen_rncore libreact_debug libreact_render_debug libreact_render_mapbuffer libreact_codegen_safeareacontext -+LOCAL_SHARED_LIBRARIES := libjsi libglog libfolly_runtime libyoga libreact_nativemodule_core librrc_view libreact_render_core libreact_render_graphics libfbjni libturbomodulejsijni libreact_codegen_rncore libreact_debug libreact_render_debug libreact_render_mapbuffer libreact_codegen_safeareacontext - - LOCAL_CFLAGS := \ - -DLOG_TAG=\"ReactNative\" diff --git a/FabricExample/patches/react-native-screens+3.15.0.patch b/FabricExample/patches/react-native-screens+3.15.0.patch deleted file mode 100644 index c90a20bc465..00000000000 --- a/FabricExample/patches/react-native-screens+3.15.0.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/node_modules/react-native-screens/RNScreens.podspec b/node_modules/react-native-screens/RNScreens.podspec -index 5e43bf7..aed0cae 100644 ---- a/node_modules/react-native-screens/RNScreens.podspec -+++ b/node_modules/react-native-screens/RNScreens.podspec -@@ -6,7 +6,6 @@ fabric_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1' - - # folly_version must match the version used in React Native - # See folly_version in react-native/React/FBReactNativeSpec/FBReactNativeSpec.podspec --folly_version = '2021.06.28.00-v2' - folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' - - Pod::Spec.new do |s| -@@ -36,7 +35,7 @@ Pod::Spec.new do |s| - s.dependency "React" - s.dependency "React-RCTFabric" - s.dependency "React-Codegen" -- s.dependency "RCT-Folly", folly_version -+ s.dependency "RCT-Folly" - s.dependency "RCTRequired" - s.dependency "RCTTypeSafety" - s.dependency "ReactCommon/turbomodule/core" diff --git a/FabricExample/yarn.lock b/FabricExample/yarn.lock index 7d3778bf721..7afcc024d8a 100644 --- a/FabricExample/yarn.lock +++ b/FabricExample/yarn.lock @@ -6088,15 +6088,14 @@ react-native-gradle-plugin@^0.70.1: version "0.0.0" uid "" -react-native-safe-area-context@^4.2.5: - version "4.2.5" - resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-4.2.5.tgz#23006dc1a398bb825d7d795c27f1c46119efe8a5" - integrity sha512-nUil2de1gk/8ZB9IzIxFyGCiKeAYcHzJb/Tks2NzSkev1qH4MNR05DWYDSmW6vLT+y4mospLVyG/H5dyUd+KQQ== - -react-native-screens@^3.15.0: - version "3.15.0" - resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-3.15.0.tgz#78e42c8df72851b1ff235ddf5434b961ae123ca5" - integrity sha512-ezC5TibsUYyqPuuHpZoM3iEl6bRzCVBMJeGaFkn7xznuOt1VwkZVub0BvafIEYR/+AQC/RjxzMSQPs1qal0+wA== +react-native-safe-area-context@^4.3.3: + version "4.3.3" + resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-4.3.3.tgz#a0f1e3116ded39efc1b78a46a6d89c71169827e4" + integrity sha512-xwsloGLDUzeTN40TIh4Te/zRePSnBAuWlLIiEW3RYE9gHHYslqQWpfK7N24SdAQEH3tHZ+huoYNjo2GQJO/vnQ== + +react-native-screens@software-mansion/react-native-screens#dfc90db38f849ca7e3a7895c4eb94bbfaee4f708: + version "3.16.0" + resolved "https://codeload.github.com/software-mansion/react-native-screens/tar.gz/dfc90db38f849ca7e3a7895c4eb94bbfaee4f708" dependencies: react-freeze "^1.0.0" warn-once "^0.1.0"