From f97e2e5edc41f2e9eb19d20ddea83ba94e5dcf7a Mon Sep 17 00:00:00 2001 From: Hyo Date: Thu, 21 Jul 2022 23:32:40 +0900 Subject: [PATCH] Migrate proj to RN 0.69.2 (#26) * Upgrade react-native to 0.69.2 - Tested on iOS build * Upgrade reanimated to v3 for Android build - Related https://github.com/software-mansion/react-native-reanimated/issues/3310 * Update packages to recent - Tested on iOS, Android and web * Remove all useless tests for now * Add Sponsor page * Fix craco build - Related https://github.com/rails/webpacker/issues/3008 * Downgrade react-native-reanimated on deploy --- .github/workflows/deploy-pull-request.yml | 3 + .github/workflows/deploy.yml | 3 + .gitignore | 8 +- .ruby-version | 2 +- Gemfile | 2 +- android/app/build.gradle | 15 +- .../java/com/dooboolab/app/MainActivity.java | 7 + .../MainApplicationReactNativeHost.java | 4 +- android/app/src/main/jni/Android.mk | 3 +- android/build.gradle | 4 +- android/settings.gradle | 2 + babel.config.js | 3 + ios/Podfile | 12 +- ios/Podfile.lock | 489 ++-- ios/dooboolab.xcodeproj/project.pbxproj | 14 +- ios/dooboolab/AppDelegate.mm | 27 +- package.json | 59 +- src/apis/__tests__/sample.test.ts | 2 + src/assets/translations/ko.json | 20 + src/components/pages/Sponsor.web.tsx | 48 +- .../pages/__tests__/CodeOfConduct.test.tsx | 44 - .../pages/__tests__/FindPw.test.tsx | 66 - src/components/pages/__tests__/Main.test.tsx | 38 - .../pages/__tests__/ProfileEdit.test.tsx | 12 - .../pages/__tests__/SignIn.test.tsx | 68 - .../pages/__tests__/SignUp.test.tsx | 68 - .../pages/__tests__/Sponsor.test.tsx | 68 - src/components/pages/__tests__/Todo.test.tsx | 66 - .../pages/__tests__/VisionAndMission.test.tsx | 44 - .../pages/__tests__/WebView.test.tsx | 64 - .../__snapshots__/CodeOfConduct.test.tsx.snap | 29 - .../__snapshots__/FindPw.test.tsx.snap | 29 - .../__snapshots__/Main.test.tsx.snap | 15 - .../__snapshots__/SignIn.test.tsx.snap | 29 - .../__snapshots__/SignUp.test.tsx.snap | 29 - .../__snapshots__/Sponsor.test.tsx.snap | 29 - .../__snapshots__/Todo.test.tsx.snap | 29 - .../VisionAndMission.test.tsx.snap | 29 - .../__snapshots__/WebView.test.tsx.snap | 29 - .../__tests__/CommunitySection.test.tsx | 42 - .../__tests__/ContactSection.test.tsx | 54 - .../templates/__tests__/HeroSection.test.tsx | 44 - .../__tests__/PoweredBySection.test.tsx | 42 - .../templates/__tests__/StorySection.test.tsx | 42 - .../templates/__tests__/WorkSection.test.tsx | 42 - .../CommunitySection.test.tsx.snap | 29 - .../ContactSection.test.tsx.snap | 29 - .../__snapshots__/HeroSection.test.tsx.snap | 29 - .../PoweredBySection.test.tsx.snap | 29 - .../__snapshots__/StorySection.test.tsx.snap | 29 - .../__snapshots__/WorkSection.test.tsx.snap | 29 - .../uis/__tests__/CheckBox.test.tsx | 42 - src/components/uis/__tests__/Footer.test.tsx | 42 - .../__snapshots__/CheckBox.test.tsx.snap | 29 - .../__snapshots__/Footer.test.tsx.snap | 29 - src/providers/__tests__/AuthProvider.test.tsx | 55 - .../__snapshots__/AuthProvider.test.tsx.snap | 48 - src/utils/i18n/fbt/translatedFbts.json | 2 +- yarn.lock | 2473 ++++++++++------- 59 files changed, 1894 insertions(+), 2778 deletions(-) delete mode 100644 src/components/pages/__tests__/CodeOfConduct.test.tsx delete mode 100644 src/components/pages/__tests__/FindPw.test.tsx delete mode 100644 src/components/pages/__tests__/Main.test.tsx delete mode 100644 src/components/pages/__tests__/SignIn.test.tsx delete mode 100644 src/components/pages/__tests__/SignUp.test.tsx delete mode 100644 src/components/pages/__tests__/Sponsor.test.tsx delete mode 100644 src/components/pages/__tests__/Todo.test.tsx delete mode 100644 src/components/pages/__tests__/VisionAndMission.test.tsx delete mode 100644 src/components/pages/__tests__/WebView.test.tsx delete mode 100644 src/components/pages/__tests__/__snapshots__/CodeOfConduct.test.tsx.snap delete mode 100644 src/components/pages/__tests__/__snapshots__/FindPw.test.tsx.snap delete mode 100644 src/components/pages/__tests__/__snapshots__/Main.test.tsx.snap delete mode 100644 src/components/pages/__tests__/__snapshots__/SignIn.test.tsx.snap delete mode 100644 src/components/pages/__tests__/__snapshots__/SignUp.test.tsx.snap delete mode 100644 src/components/pages/__tests__/__snapshots__/Sponsor.test.tsx.snap delete mode 100644 src/components/pages/__tests__/__snapshots__/Todo.test.tsx.snap delete mode 100644 src/components/pages/__tests__/__snapshots__/VisionAndMission.test.tsx.snap delete mode 100644 src/components/pages/__tests__/__snapshots__/WebView.test.tsx.snap delete mode 100644 src/components/templates/__tests__/CommunitySection.test.tsx delete mode 100644 src/components/templates/__tests__/ContactSection.test.tsx delete mode 100644 src/components/templates/__tests__/HeroSection.test.tsx delete mode 100644 src/components/templates/__tests__/PoweredBySection.test.tsx delete mode 100644 src/components/templates/__tests__/StorySection.test.tsx delete mode 100644 src/components/templates/__tests__/WorkSection.test.tsx delete mode 100644 src/components/templates/__tests__/__snapshots__/CommunitySection.test.tsx.snap delete mode 100644 src/components/templates/__tests__/__snapshots__/ContactSection.test.tsx.snap delete mode 100644 src/components/templates/__tests__/__snapshots__/HeroSection.test.tsx.snap delete mode 100644 src/components/templates/__tests__/__snapshots__/PoweredBySection.test.tsx.snap delete mode 100644 src/components/templates/__tests__/__snapshots__/StorySection.test.tsx.snap delete mode 100644 src/components/templates/__tests__/__snapshots__/WorkSection.test.tsx.snap delete mode 100644 src/components/uis/__tests__/CheckBox.test.tsx delete mode 100644 src/components/uis/__tests__/Footer.test.tsx delete mode 100644 src/components/uis/__tests__/__snapshots__/CheckBox.test.tsx.snap delete mode 100644 src/components/uis/__tests__/__snapshots__/Footer.test.tsx.snap delete mode 100644 src/providers/__tests__/AuthProvider.test.tsx delete mode 100644 src/providers/__tests__/__snapshots__/AuthProvider.test.tsx.snap diff --git a/.github/workflows/deploy-pull-request.yml b/.github/workflows/deploy-pull-request.yml index 2521db2..3bd51e2 100644 --- a/.github/workflows/deploy-pull-request.yml +++ b/.github/workflows/deploy-pull-request.yml @@ -12,6 +12,9 @@ jobs: - name: Install packages run: yarn + - name: Downgrade reanimated + run: yarn add react-native-reanimated + - name: Build craco run: SKIP_PREFLIGHT_CHECK=true yarn build env: diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 8072f10..c8ce441 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -15,6 +15,9 @@ jobs: - name: Install packages run: yarn + - name: Downgrade reanimated + run: yarn add react-native-reanimated + - name: Build craco run: SKIP_PREFLIGHT_CHECK=true yarn build env: diff --git a/.gitignore b/.gitignore index 5d93603..65d8a5a 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,7 @@ DerivedData *.hmap *.ipa *.xcuserstate +ios/.xcode.env.local project.xcworkspace # Android/IntelliJ @@ -53,9 +54,10 @@ buck-out/ # For more information about the recommended setup visit: # https://docs.fastlane.tools/best-practices/source-control/ -*/fastlane/report.xml -*/fastlane/Preview.html -*/fastlane/screenshots +**/fastlane/report.xml +**/fastlane/Preview.html +**/fastlane/screenshots +**/fastlane/test_output # Bundle artifact *.jsbundle diff --git a/.ruby-version b/.ruby-version index a4dd9db..a603bb5 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.4 +2.7.5 diff --git a/Gemfile b/Gemfile index bbba14a..efd98ca 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ source 'https://rubygems.org' # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version -ruby '2.7.4' +ruby '2.7.5' gem 'cocoapods', '~> 1.11', '>= 1.11.2' \ No newline at end of file diff --git a/android/app/build.gradle b/android/app/build.gradle index 685e3ed..0ae9bf8 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -152,7 +152,8 @@ android { "GENERATED_SRC_DIR=$buildDir/generated/source", "PROJECT_BUILD_DIR=$buildDir", "REACT_ANDROID_DIR=$rootDir/../node_modules/react-native/ReactAndroid", - "REACT_ANDROID_BUILD_DIR=$rootDir/../node_modules/react-native/ReactAndroid/build" + "REACT_ANDROID_BUILD_DIR=$rootDir/../node_modules/react-native/ReactAndroid/build", + "NODE_MODULES_DIR=$rootDir/../node_modules" cFlags "-Wall", "-Werror", "-fexceptions", "-frtti", "-DWITH_INSPECTOR=1" cppFlags "-std=c++17" // Make sure this target name is the same you specify inside the @@ -272,9 +273,9 @@ dependencies { } if (enableHermes) { - def hermesPath = "../../node_modules/hermes-engine/android/"; - debugImplementation files(hermesPath + "hermes-debug.aar") - releaseImplementation files(hermesPath + "hermes-release.aar") + implementation("com.facebook.react:hermes-engine:+") { // From node_modules + exclude group:'com.facebook.fbjni' + } } else { implementation jscFlavor } @@ -287,7 +288,11 @@ if (isNewArchitectureEnabled()) { configurations.all { resolutionStrategy.dependencySubstitution { substitute(module("com.facebook.react:react-native")) - .using(project(":ReactAndroid")).because("On New Architecture we're building React Native from source") + .using(project(":ReactAndroid")) + .because("On New Architecture we're building React Native from source") + substitute(module("com.facebook.react:hermes-engine")) + .using(project(":ReactAndroid:hermes-engine")) + .because("On New Architecture we're building Hermes from source") } } } diff --git a/android/app/src/main/java/com/dooboolab/app/MainActivity.java b/android/app/src/main/java/com/dooboolab/app/MainActivity.java index f47b704..e9aea2a 100644 --- a/android/app/src/main/java/com/dooboolab/app/MainActivity.java +++ b/android/app/src/main/java/com/dooboolab/app/MainActivity.java @@ -54,6 +54,13 @@ protected ReactRootView createRootView() { reactRootView.setIsFabric(BuildConfig.IS_NEW_ARCHITECTURE_ENABLED); return reactRootView; } + + @Override + protected boolean isConcurrentRootEnabled() { + // If you opted-in for the New Architecture, we enable Concurrent Root (i.e. React 18). + // More on this on https://reactjs.org/blog/2022/03/29/react-v18.html + return BuildConfig.IS_NEW_ARCHITECTURE_ENABLED; + } } @Override diff --git a/android/app/src/main/java/com/dooboolab/app/newarchitecture/MainApplicationReactNativeHost.java b/android/app/src/main/java/com/dooboolab/app/newarchitecture/MainApplicationReactNativeHost.java index 150886b..05a0540 100644 --- a/android/app/src/main/java/com/dooboolab/app/newarchitecture/MainApplicationReactNativeHost.java +++ b/android/app/src/main/java/com/dooboolab/app/newarchitecture/MainApplicationReactNativeHost.java @@ -15,8 +15,8 @@ import com.facebook.react.bridge.UIManager; import com.facebook.react.fabric.ComponentFactory; import com.facebook.react.fabric.CoreComponentsRegistry; -import com.facebook.react.fabric.EmptyReactNativeConfig; import com.facebook.react.fabric.FabricJSIModuleProvider; +import com.facebook.react.fabric.ReactNativeConfig; import com.facebook.react.uimanager.ViewManagerRegistry; import com.dooboolab.app.BuildConfig; import com.dooboolab.app.newarchitecture.components.MainComponentsRegistry; @@ -92,7 +92,7 @@ public JSIModuleProvider getJSIModuleProvider() { return new FabricJSIModuleProvider( reactApplicationContext, componentFactory, - new EmptyReactNativeConfig(), + ReactNativeConfig.DEFAULT_CONFIG, viewManagerRegistry); } }); diff --git a/android/app/src/main/jni/Android.mk b/android/app/src/main/jni/Android.mk index 16862d9..2f4d183 100644 --- a/android/app/src/main/jni/Android.mk +++ b/android/app/src/main/jni/Android.mk @@ -21,8 +21,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) LOCAL_SHARED_LIBRARIES := \ libfabricjni \ libfbjni \ - libfolly_futures \ - libfolly_json \ + libfolly_runtime \ libglog \ libjsi \ libreact_codegen_rncore \ diff --git a/android/build.gradle b/android/build.gradle index dcbb153..9509b54 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -14,9 +14,9 @@ buildscript { mavenCentral() } dependencies { - classpath("com.android.tools.build:gradle:7.0.4") + classpath("com.android.tools.build:gradle:7.1.1") classpath("com.facebook.react:react-native-gradle-plugin") - classpath("de.undercouch:gradle-download-task:4.1.2") + classpath("de.undercouch:gradle-download-task:5.0.1") classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/android/settings.gradle b/android/settings.gradle index 52279e9..78c0d54 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -6,6 +6,8 @@ includeBuild('../node_modules/react-native-gradle-plugin') if (settings.hasProperty("newArchEnabled") && settings.newArchEnabled == "true") { include(":ReactAndroid") project(":ReactAndroid").projectDir = file('../node_modules/react-native/ReactAndroid') + include(":ReactAndroid:hermes-engine") + project(":ReactAndroid:hermes-engine").projectDir = file('../node_modules/react-native/ReactAndroid/hermes-engine') } include ':react-native-vector-icons' diff --git a/babel.config.js b/babel.config.js index 6e74b62..eebb6ed 100644 --- a/babel.config.js +++ b/babel.config.js @@ -24,6 +24,9 @@ const babel = { '@babel/plugin-syntax-class-properties', 'babel-plugin-styled-components', 'react-native-reanimated/plugin', + ['@babel/plugin-proposal-class-properties', {loose: true}], + ['@babel/plugin-proposal-private-methods', {loose: true}], + ['@babel/plugin-proposal-private-property-in-object', {loose: true}], ], }; diff --git a/ios/Podfile b/ios/Podfile index a88c18d..221c919 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -1,9 +1,11 @@ require_relative '../node_modules/react-native/scripts/react_native_pods' require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules' -platform :ios, '11.0' +platform :ios, '12.4' install! 'cocoapods', :deterministic_uuids => false +production = ENV["PRODUCTION"] == "1" + target 'dooboolab' do config = use_native_modules! @@ -13,8 +15,10 @@ target 'dooboolab' do use_react_native!( :path => config[:reactNativePath], # to enable hermes on iOS, change `false` to `true` and then install pods + :production => production, :hermes_enabled => flags[:hermes_enabled], :fabric_enabled => flags[:fabric_enabled], + :flipper_configuration => FlipperConfiguration.enabled, # An absolute path to your application root. :app_path => "#{Pod::Config.instance.installation_root}/.." ) @@ -24,12 +28,6 @@ target 'dooboolab' do # Pods for testing end - # Enables Flipper. - # - # Note that if you have use_frameworks! enabled, Flipper will not work and - # you should disable the next line. - use_flipper!() - post_install do |installer| react_native_post_install(installer) __apply_Xcode_12_5_M1_post_install_workaround(installer) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index a9c3a0c..c812ae6 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -2,19 +2,19 @@ PODS: - boost (1.76.0) - CocoaAsyncSocket (7.6.5) - DoubleConversion (1.1.6) - - FBLazyVector (0.68.2) - - FBReactNativeSpec (0.68.2): + - FBLazyVector (0.69.2) + - FBReactNativeSpec (0.69.2): - RCT-Folly (= 2021.06.28.00-v2) - - RCTRequired (= 0.68.2) - - RCTTypeSafety (= 0.68.2) - - React-Core (= 0.68.2) - - React-jsi (= 0.68.2) - - ReactCommon/turbomodule/core (= 0.68.2) + - RCTRequired (= 0.69.2) + - RCTTypeSafety (= 0.69.2) + - React-Core (= 0.69.2) + - React-jsi (= 0.69.2) + - ReactCommon/turbomodule/core (= 0.69.2) - Flipper (0.125.0): - Flipper-Folly (~> 2.6) - Flipper-RSocket (~> 1.4) - Flipper-Boost-iOSX (1.76.0.1.11) - - Flipper-DoubleConversion (3.2.0) + - Flipper-DoubleConversion (3.2.0.1) - Flipper-Fmt (7.1.7) - Flipper-Folly (2.6.10): - Flipper-Boost-iOSX @@ -23,7 +23,7 @@ PODS: - Flipper-Glog - libevent (~> 2.1.12) - OpenSSL-Universal (= 1.1.1100) - - Flipper-Glog (0.5.0.4) + - Flipper-Glog (0.5.0.5) - Flipper-PeerTalk (0.0.4) - Flipper-RSocket (1.4.3): - Flipper-Folly (~> 2.6) @@ -86,201 +86,203 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - RCTRequired (0.68.2) - - RCTTypeSafety (0.68.2): - - FBLazyVector (= 0.68.2) + - RCTRequired (0.69.2) + - RCTTypeSafety (0.69.2): + - FBLazyVector (= 0.69.2) + - RCTRequired (= 0.69.2) + - React-Core (= 0.69.2) + - React (0.69.2): + - React-Core (= 0.69.2) + - React-Core/DevSupport (= 0.69.2) + - React-Core/RCTWebSocket (= 0.69.2) + - React-RCTActionSheet (= 0.69.2) + - React-RCTAnimation (= 0.69.2) + - React-RCTBlob (= 0.69.2) + - React-RCTImage (= 0.69.2) + - React-RCTLinking (= 0.69.2) + - React-RCTNetwork (= 0.69.2) + - React-RCTSettings (= 0.69.2) + - React-RCTText (= 0.69.2) + - React-RCTVibration (= 0.69.2) + - React-bridging (0.69.2): - RCT-Folly (= 2021.06.28.00-v2) - - RCTRequired (= 0.68.2) - - React-Core (= 0.68.2) - - React (0.68.2): - - React-Core (= 0.68.2) - - React-Core/DevSupport (= 0.68.2) - - React-Core/RCTWebSocket (= 0.68.2) - - React-RCTActionSheet (= 0.68.2) - - React-RCTAnimation (= 0.68.2) - - React-RCTBlob (= 0.68.2) - - React-RCTImage (= 0.68.2) - - React-RCTLinking (= 0.68.2) - - React-RCTNetwork (= 0.68.2) - - React-RCTSettings (= 0.68.2) - - React-RCTText (= 0.68.2) - - React-RCTVibration (= 0.68.2) - - React-callinvoker (0.68.2) - - React-Codegen (0.68.2): - - FBReactNativeSpec (= 0.68.2) + - React-jsi (= 0.69.2) + - React-callinvoker (0.69.2) + - React-Codegen (0.69.2): + - FBReactNativeSpec (= 0.69.2) - RCT-Folly (= 2021.06.28.00-v2) - - RCTRequired (= 0.68.2) - - RCTTypeSafety (= 0.68.2) - - React-Core (= 0.68.2) - - React-jsi (= 0.68.2) - - React-jsiexecutor (= 0.68.2) - - ReactCommon/turbomodule/core (= 0.68.2) - - React-Core (0.68.2): + - RCTRequired (= 0.69.2) + - RCTTypeSafety (= 0.69.2) + - React-Core (= 0.69.2) + - React-jsi (= 0.69.2) + - React-jsiexecutor (= 0.69.2) + - ReactCommon/turbomodule/core (= 0.69.2) + - React-Core (0.69.2): - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/Default (= 0.68.2) - - React-cxxreact (= 0.68.2) - - React-jsi (= 0.68.2) - - React-jsiexecutor (= 0.68.2) - - React-perflogger (= 0.68.2) + - React-Core/Default (= 0.69.2) + - React-cxxreact (= 0.69.2) + - React-jsi (= 0.69.2) + - React-jsiexecutor (= 0.69.2) + - React-perflogger (= 0.69.2) - Yoga - - React-Core/CoreModulesHeaders (0.68.2): + - React-Core/CoreModulesHeaders (0.69.2): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.68.2) - - React-jsi (= 0.68.2) - - React-jsiexecutor (= 0.68.2) - - React-perflogger (= 0.68.2) + - React-cxxreact (= 0.69.2) + - React-jsi (= 0.69.2) + - React-jsiexecutor (= 0.69.2) + - React-perflogger (= 0.69.2) - Yoga - - React-Core/Default (0.68.2): + - React-Core/Default (0.69.2): - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-cxxreact (= 0.68.2) - - React-jsi (= 0.68.2) - - React-jsiexecutor (= 0.68.2) - - React-perflogger (= 0.68.2) + - React-cxxreact (= 0.69.2) + - React-jsi (= 0.69.2) + - React-jsiexecutor (= 0.69.2) + - React-perflogger (= 0.69.2) - Yoga - - React-Core/DevSupport (0.68.2): + - React-Core/DevSupport (0.69.2): - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/Default (= 0.68.2) - - React-Core/RCTWebSocket (= 0.68.2) - - React-cxxreact (= 0.68.2) - - React-jsi (= 0.68.2) - - React-jsiexecutor (= 0.68.2) - - React-jsinspector (= 0.68.2) - - React-perflogger (= 0.68.2) + - React-Core/Default (= 0.69.2) + - React-Core/RCTWebSocket (= 0.69.2) + - React-cxxreact (= 0.69.2) + - React-jsi (= 0.69.2) + - React-jsiexecutor (= 0.69.2) + - React-jsinspector (= 0.69.2) + - React-perflogger (= 0.69.2) - Yoga - - React-Core/RCTActionSheetHeaders (0.68.2): + - React-Core/RCTActionSheetHeaders (0.69.2): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.68.2) - - React-jsi (= 0.68.2) - - React-jsiexecutor (= 0.68.2) - - React-perflogger (= 0.68.2) + - React-cxxreact (= 0.69.2) + - React-jsi (= 0.69.2) + - React-jsiexecutor (= 0.69.2) + - React-perflogger (= 0.69.2) - Yoga - - React-Core/RCTAnimationHeaders (0.68.2): + - React-Core/RCTAnimationHeaders (0.69.2): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.68.2) - - React-jsi (= 0.68.2) - - React-jsiexecutor (= 0.68.2) - - React-perflogger (= 0.68.2) + - React-cxxreact (= 0.69.2) + - React-jsi (= 0.69.2) + - React-jsiexecutor (= 0.69.2) + - React-perflogger (= 0.69.2) - Yoga - - React-Core/RCTBlobHeaders (0.68.2): + - React-Core/RCTBlobHeaders (0.69.2): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.68.2) - - React-jsi (= 0.68.2) - - React-jsiexecutor (= 0.68.2) - - React-perflogger (= 0.68.2) + - React-cxxreact (= 0.69.2) + - React-jsi (= 0.69.2) + - React-jsiexecutor (= 0.69.2) + - React-perflogger (= 0.69.2) - Yoga - - React-Core/RCTImageHeaders (0.68.2): + - React-Core/RCTImageHeaders (0.69.2): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.68.2) - - React-jsi (= 0.68.2) - - React-jsiexecutor (= 0.68.2) - - React-perflogger (= 0.68.2) + - React-cxxreact (= 0.69.2) + - React-jsi (= 0.69.2) + - React-jsiexecutor (= 0.69.2) + - React-perflogger (= 0.69.2) - Yoga - - React-Core/RCTLinkingHeaders (0.68.2): + - React-Core/RCTLinkingHeaders (0.69.2): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.68.2) - - React-jsi (= 0.68.2) - - React-jsiexecutor (= 0.68.2) - - React-perflogger (= 0.68.2) + - React-cxxreact (= 0.69.2) + - React-jsi (= 0.69.2) + - React-jsiexecutor (= 0.69.2) + - React-perflogger (= 0.69.2) - Yoga - - React-Core/RCTNetworkHeaders (0.68.2): + - React-Core/RCTNetworkHeaders (0.69.2): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.68.2) - - React-jsi (= 0.68.2) - - React-jsiexecutor (= 0.68.2) - - React-perflogger (= 0.68.2) + - React-cxxreact (= 0.69.2) + - React-jsi (= 0.69.2) + - React-jsiexecutor (= 0.69.2) + - React-perflogger (= 0.69.2) - Yoga - - React-Core/RCTSettingsHeaders (0.68.2): + - React-Core/RCTSettingsHeaders (0.69.2): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.68.2) - - React-jsi (= 0.68.2) - - React-jsiexecutor (= 0.68.2) - - React-perflogger (= 0.68.2) + - React-cxxreact (= 0.69.2) + - React-jsi (= 0.69.2) + - React-jsiexecutor (= 0.69.2) + - React-perflogger (= 0.69.2) - Yoga - - React-Core/RCTTextHeaders (0.68.2): + - React-Core/RCTTextHeaders (0.69.2): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.68.2) - - React-jsi (= 0.68.2) - - React-jsiexecutor (= 0.68.2) - - React-perflogger (= 0.68.2) + - React-cxxreact (= 0.69.2) + - React-jsi (= 0.69.2) + - React-jsiexecutor (= 0.69.2) + - React-perflogger (= 0.69.2) - Yoga - - React-Core/RCTVibrationHeaders (0.68.2): + - React-Core/RCTVibrationHeaders (0.69.2): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.68.2) - - React-jsi (= 0.68.2) - - React-jsiexecutor (= 0.68.2) - - React-perflogger (= 0.68.2) + - React-cxxreact (= 0.69.2) + - React-jsi (= 0.69.2) + - React-jsiexecutor (= 0.69.2) + - React-perflogger (= 0.69.2) - Yoga - - React-Core/RCTWebSocket (0.68.2): + - React-Core/RCTWebSocket (0.69.2): - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/Default (= 0.68.2) - - React-cxxreact (= 0.68.2) - - React-jsi (= 0.68.2) - - React-jsiexecutor (= 0.68.2) - - React-perflogger (= 0.68.2) + - React-Core/Default (= 0.69.2) + - React-cxxreact (= 0.69.2) + - React-jsi (= 0.69.2) + - React-jsiexecutor (= 0.69.2) + - React-perflogger (= 0.69.2) - Yoga - - React-CoreModules (0.68.2): + - React-CoreModules (0.69.2): - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.68.2) - - React-Codegen (= 0.68.2) - - React-Core/CoreModulesHeaders (= 0.68.2) - - React-jsi (= 0.68.2) - - React-RCTImage (= 0.68.2) - - ReactCommon/turbomodule/core (= 0.68.2) - - React-cxxreact (0.68.2): + - RCTTypeSafety (= 0.69.2) + - React-Codegen (= 0.69.2) + - React-Core/CoreModulesHeaders (= 0.69.2) + - React-jsi (= 0.69.2) + - React-RCTImage (= 0.69.2) + - ReactCommon/turbomodule/core (= 0.69.2) + - React-cxxreact (0.69.2): - boost (= 1.76.0) - DoubleConversion - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-callinvoker (= 0.68.2) - - React-jsi (= 0.68.2) - - React-jsinspector (= 0.68.2) - - React-logger (= 0.68.2) - - React-perflogger (= 0.68.2) - - React-runtimeexecutor (= 0.68.2) - - React-jsi (0.68.2): + - React-callinvoker (= 0.69.2) + - React-jsi (= 0.69.2) + - React-jsinspector (= 0.69.2) + - React-logger (= 0.69.2) + - React-perflogger (= 0.69.2) + - React-runtimeexecutor (= 0.69.2) + - React-jsi (0.69.2): - boost (= 1.76.0) - DoubleConversion - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-jsi/Default (= 0.68.2) - - React-jsi/Default (0.68.2): + - React-jsi/Default (= 0.69.2) + - React-jsi/Default (0.69.2): - boost (= 1.76.0) - DoubleConversion - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-jsiexecutor (0.68.2): + - React-jsiexecutor (0.69.2): - DoubleConversion - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-cxxreact (= 0.68.2) - - React-jsi (= 0.68.2) - - React-perflogger (= 0.68.2) - - React-jsinspector (0.68.2) - - React-logger (0.68.2): + - React-cxxreact (= 0.69.2) + - React-jsi (= 0.69.2) + - React-perflogger (= 0.69.2) + - React-jsinspector (0.69.2) + - React-logger (0.69.2): - glog - react-native-fbt (0.0.7): - React @@ -292,82 +294,83 @@ PODS: - RCTTypeSafety - React - ReactCommon/turbomodule/core - - react-native-webview (11.22.2): + - react-native-webview (11.22.7): - React-Core - - React-perflogger (0.68.2) - - React-RCTActionSheet (0.68.2): - - React-Core/RCTActionSheetHeaders (= 0.68.2) - - React-RCTAnimation (0.68.2): + - React-perflogger (0.69.2) + - React-RCTActionSheet (0.69.2): + - React-Core/RCTActionSheetHeaders (= 0.69.2) + - React-RCTAnimation (0.69.2): - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.68.2) - - React-Codegen (= 0.68.2) - - React-Core/RCTAnimationHeaders (= 0.68.2) - - React-jsi (= 0.68.2) - - ReactCommon/turbomodule/core (= 0.68.2) - - React-RCTBlob (0.68.2): + - RCTTypeSafety (= 0.69.2) + - React-Codegen (= 0.69.2) + - React-Core/RCTAnimationHeaders (= 0.69.2) + - React-jsi (= 0.69.2) + - ReactCommon/turbomodule/core (= 0.69.2) + - React-RCTBlob (0.69.2): - RCT-Folly (= 2021.06.28.00-v2) - - React-Codegen (= 0.68.2) - - React-Core/RCTBlobHeaders (= 0.68.2) - - React-Core/RCTWebSocket (= 0.68.2) - - React-jsi (= 0.68.2) - - React-RCTNetwork (= 0.68.2) - - ReactCommon/turbomodule/core (= 0.68.2) - - React-RCTImage (0.68.2): + - React-Codegen (= 0.69.2) + - React-Core/RCTBlobHeaders (= 0.69.2) + - React-Core/RCTWebSocket (= 0.69.2) + - React-jsi (= 0.69.2) + - React-RCTNetwork (= 0.69.2) + - ReactCommon/turbomodule/core (= 0.69.2) + - React-RCTImage (0.69.2): - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.68.2) - - React-Codegen (= 0.68.2) - - React-Core/RCTImageHeaders (= 0.68.2) - - React-jsi (= 0.68.2) - - React-RCTNetwork (= 0.68.2) - - ReactCommon/turbomodule/core (= 0.68.2) - - React-RCTLinking (0.68.2): - - React-Codegen (= 0.68.2) - - React-Core/RCTLinkingHeaders (= 0.68.2) - - React-jsi (= 0.68.2) - - ReactCommon/turbomodule/core (= 0.68.2) - - React-RCTNetwork (0.68.2): + - RCTTypeSafety (= 0.69.2) + - React-Codegen (= 0.69.2) + - React-Core/RCTImageHeaders (= 0.69.2) + - React-jsi (= 0.69.2) + - React-RCTNetwork (= 0.69.2) + - ReactCommon/turbomodule/core (= 0.69.2) + - React-RCTLinking (0.69.2): + - React-Codegen (= 0.69.2) + - React-Core/RCTLinkingHeaders (= 0.69.2) + - React-jsi (= 0.69.2) + - ReactCommon/turbomodule/core (= 0.69.2) + - React-RCTNetwork (0.69.2): - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.68.2) - - React-Codegen (= 0.68.2) - - React-Core/RCTNetworkHeaders (= 0.68.2) - - React-jsi (= 0.68.2) - - ReactCommon/turbomodule/core (= 0.68.2) - - React-RCTSettings (0.68.2): + - RCTTypeSafety (= 0.69.2) + - React-Codegen (= 0.69.2) + - React-Core/RCTNetworkHeaders (= 0.69.2) + - React-jsi (= 0.69.2) + - ReactCommon/turbomodule/core (= 0.69.2) + - React-RCTSettings (0.69.2): - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.68.2) - - React-Codegen (= 0.68.2) - - React-Core/RCTSettingsHeaders (= 0.68.2) - - React-jsi (= 0.68.2) - - ReactCommon/turbomodule/core (= 0.68.2) - - React-RCTText (0.68.2): - - React-Core/RCTTextHeaders (= 0.68.2) - - React-RCTVibration (0.68.2): + - RCTTypeSafety (= 0.69.2) + - React-Codegen (= 0.69.2) + - React-Core/RCTSettingsHeaders (= 0.69.2) + - React-jsi (= 0.69.2) + - ReactCommon/turbomodule/core (= 0.69.2) + - React-RCTText (0.69.2): + - React-Core/RCTTextHeaders (= 0.69.2) + - React-RCTVibration (0.69.2): - RCT-Folly (= 2021.06.28.00-v2) - - React-Codegen (= 0.68.2) - - React-Core/RCTVibrationHeaders (= 0.68.2) - - React-jsi (= 0.68.2) - - ReactCommon/turbomodule/core (= 0.68.2) - - React-runtimeexecutor (0.68.2): - - React-jsi (= 0.68.2) - - ReactCommon/turbomodule/core (0.68.2): + - React-Codegen (= 0.69.2) + - React-Core/RCTVibrationHeaders (= 0.69.2) + - React-jsi (= 0.69.2) + - ReactCommon/turbomodule/core (= 0.69.2) + - React-runtimeexecutor (0.69.2): + - React-jsi (= 0.69.2) + - ReactCommon/turbomodule/core (0.69.2): - DoubleConversion - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-callinvoker (= 0.68.2) - - React-Core (= 0.68.2) - - React-cxxreact (= 0.68.2) - - React-jsi (= 0.68.2) - - React-logger (= 0.68.2) - - React-perflogger (= 0.68.2) - - RNCAsyncStorage (1.17.6): + - React-bridging (= 0.69.2) + - React-callinvoker (= 0.69.2) + - React-Core (= 0.69.2) + - React-cxxreact (= 0.69.2) + - React-jsi (= 0.69.2) + - React-logger (= 0.69.2) + - React-perflogger (= 0.69.2) + - RNCAsyncStorage (1.17.7): - React-Core - RNCMaskedView (0.1.11): - React - - RNGestureHandler (2.4.2): + - RNGestureHandler (2.5.0): - React-Core - - RNIap (8.2.1): + - RNIap (8.2.2): - React-Core - - RNReanimated (2.8.0): + - RNReanimated (3.0.0-rc.0): - DoubleConversion - FBLazyVector - FBReactNativeSpec @@ -394,12 +397,12 @@ PODS: - React-RCTText - ReactCommon/turbomodule/core - Yoga - - RNScreens (3.13.1): + - RNScreens (3.15.0): - React-Core - React-RCTImage - - RNSVG (12.3.0): + - RNSVG (12.4.0): - React-Core - - RNVectorIcons (9.1.0): + - RNVectorIcons (9.2.0): - React-Core - SocketRocket (0.6.0) - Yoga (1.14.0) @@ -413,10 +416,10 @@ DEPENDENCIES: - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`) - Flipper (= 0.125.0) - Flipper-Boost-iOSX (= 1.76.0.1.11) - - Flipper-DoubleConversion (= 3.2.0) + - Flipper-DoubleConversion (= 3.2.0.1) - Flipper-Fmt (= 7.1.7) - Flipper-Folly (= 2.6.10) - - Flipper-Glog (= 0.5.0.4) + - Flipper-Glog (= 0.5.0.5) - Flipper-PeerTalk (= 0.0.4) - Flipper-RSocket (= 1.4.3) - FlipperKit (= 0.125.0) @@ -438,6 +441,7 @@ DEPENDENCIES: - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`) - React (from `../node_modules/react-native/`) + - React-bridging (from `../node_modules/react-native/ReactCommon`) - React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`) - React-Codegen (from `build/generated/ios`) - React-Core (from `../node_modules/react-native/`) @@ -512,6 +516,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/Libraries/TypeSafety" React: :path: "../node_modules/react-native/" + React-bridging: + :path: "../node_modules/react-native/ReactCommon" React-callinvoker: :path: "../node_modules/react-native/ReactCommon/callinvoker" React-Codegen: @@ -584,63 +590,64 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost: a7c83b31436843459a1961bfd74b96033dc77234 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 - DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662 - FBLazyVector: a7a655862f6b09625d11c772296b01cd5164b648 - FBReactNativeSpec: 81ce99032d5b586fddd6a38d450f8595f7e04be4 + DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 + FBLazyVector: e3c1479be506060131807f2f2435af5107c58410 + FBReactNativeSpec: 1381e8c4230895b6c2d20cea6b216ac7096a95f0 Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0 Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c - Flipper-DoubleConversion: 3d3d04a078d4f3a1b6c6916587f159dc11f232c4 + Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30 Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b Flipper-Folly: 584845625005ff068a6ebf41f857f468decd26b3 - Flipper-Glog: 87bc98ff48de90cb5b0b5114ed3da79d85ee2dd4 + Flipper-Glog: 70c50ce58ddaf67dc35180db05f191692570f446 Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541 FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 - glog: 476ee3e89abb49e07f822b48323c51c57124b572 + glog: 3d02b25ca00c2d456734d0bcff864cbc62f6ae1a libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c - RCT-Folly: 4d8508a426467c48885f1151029bc15fa5d7b3b8 - RCTRequired: 3e917ea5377751094f38145fdece525aa90545a0 - RCTTypeSafety: c43c072a4bd60feb49a9570b0517892b4305c45e - React: 176dd882de001854ced260fad41bb68a31aa4bd0 - React-callinvoker: c2864d1818d6e64928d2faf774a3800dfc38fe1f - React-Codegen: 98b6f97f0a7abf7d67e4ce435c77c05b7a95cf05 - React-Core: fdaa2916b1c893f39f02cff0476d1fb0cab1e352 - React-CoreModules: fd8705b80699ec36c2cdd635c2ce9d874b9cfdfc - React-cxxreact: 1832d971f7b0cb2c7b943dc0ec962762c90c906e - React-jsi: 72af715135abe8c3f0dcf3b2548b71d048b69a7e - React-jsiexecutor: b7b553412f2ec768fe6c8f27cd6bafdb9d8719e6 - React-jsinspector: c5989c77cb89ae6a69561095a61cce56a44ae8e8 - React-logger: a0833912d93b36b791b7a521672d8ee89107aff1 + RCT-Folly: b9d9fe1fc70114b751c076104e52f3b1b5e5a95a + RCTRequired: b723d4d6da2795df58189a01f92856b6912cf256 + RCTTypeSafety: 3973d2fcf39f43f7819e840d56ea6b2fe45996a0 + React: 242d4ffb093ed57c4761307a69b23b2479930ae9 + React-bridging: 66938204bc9d703b9c357201a40bf498aeb14412 + React-callinvoker: bf0a87845bc3158eec32be848bd9546e79d6dd25 + React-Codegen: e5c04fc987e909433915f247699402ece1955aa0 + React-Core: 5acd5715010b56d23846859b3a68c316dad09d5b + React-CoreModules: 73db18e3aaf5e29f73e4b7c9ddf6ead823795d06 + React-cxxreact: 0fc57a199d2d69c0e0401c9eab944be9b972bf1b + React-jsi: f845df5e8fd5688cab3cdaaa06f5413e791a01bd + React-jsiexecutor: 7c23e92591431ac925f430b3118de934cb816ac0 + React-jsinspector: 31e53f048cc8f32605de36981903a7bbf9456892 + React-logger: 9a6c684d5cd56c4129e0c2842dba75c4bfb1e981 react-native-fbt: 7c322ac6bb32cd16525a908e9214feb445388ec9 react-native-image-picker: cffb727cf2f59bd5c0408e30b3dbe0b935f88835 react-native-safe-area-context: 6c12e3859b6f27b25de4fee8201cfb858432d8de - react-native-webview: 159034a856a6e95995f5bf2eed40d70b103d6572 - React-perflogger: a18b4f0bd933b8b24ecf9f3c54f9bf65180f3fe6 - React-RCTActionSheet: 547fe42fdb4b6089598d79f8e1d855d7c23e2162 - React-RCTAnimation: bc9440a1c37b06ae9ebbb532d244f607805c6034 - React-RCTBlob: a1295c8e183756d7ef30ba6e8f8144dfe8a19215 - React-RCTImage: a30d1ee09b1334067fbb6f30789aae2d7ac150c9 - React-RCTLinking: ffc6d5b88d1cb9aca13c54c2ec6507fbf07f2ac4 - React-RCTNetwork: f807a2facab6cf5cf36d592e634611de9cf12d81 - React-RCTSettings: 861806819226ed8332e6a8f90df2951a34bb3e7f - React-RCTText: f3fb464cc41a50fc7a1aba4deeb76a9ad8282cb9 - React-RCTVibration: 79040b92bfa9c3c2d2cb4f57e981164ec7ab9374 - React-runtimeexecutor: b960b687d2dfef0d3761fbb187e01812ebab8b23 - ReactCommon: 095366164a276d91ea704ce53cb03825c487a3f2 - RNCAsyncStorage: 466b9df1a14bccda91da86e0b7d9a345d78e1673 + react-native-webview: 227ba9205abb8579116b69ea5774d9744267c65a + React-perflogger: 281c34e42f13245c7a4d6932364d9182f8655e1a + React-RCTActionSheet: 92f4292754a1b4a0e42bf9b1489206a06f878929 + React-RCTAnimation: 2a5bb5549758e4e594481633f3db649d11519f75 + React-RCTBlob: cf573ac95fc612ed4440cad0b92161722430de87 + React-RCTImage: af8b9a46a743937db396fcb43320f57b570661dc + React-RCTLinking: 81029ed5767d2a2c13c03caeed32f87b72e73838 + React-RCTNetwork: 24c2b13acdcd43af39b2da90584c92e7799ee366 + React-RCTSettings: 028b0e20ff60d2c7ba47cedec8e99e69b6691c40 + React-RCTText: 6d17c2aead07b9de7ddc8765b580d0fb4b1d2e50 + React-RCTVibration: 0d07f00705b5f11e88aaaaf9131f5e1785d4bd6e + React-runtimeexecutor: 8030b9cf9b9e87b878d92da680b55b5e74c58e70 + ReactCommon: a9414b91f0d19de002b55d9f4f6cb176d6dd8452 + RNCAsyncStorage: d81ee5c3db1060afd49ea7045ad460eff82d2b7d RNCMaskedView: 0e1bc4bfa8365eba5fbbb71e07fbdc0555249489 - RNGestureHandler: 61628a2c859172551aa2100d3e73d1e57878392f - RNIap: 7b833f386ecee6e4ab3a5303332274bd6844e4d9 - RNReanimated: 64573e25e078ae6bec03b891586d50b9ec284393 - RNScreens: 40a2cb40a02a609938137a1e0acfbf8fc9eebf19 - RNSVG: 302bfc9905bd8122f08966dc2ce2d07b7b52b9f8 - RNVectorIcons: 7923e585eaeb139b9f4531d25a125a1500162a0b + RNGestureHandler: bad495418bcbd3ab47017a38d93d290ebd406f50 + RNIap: 16f7f865b36af4b4484fee57df67f78b19a21ce0 + RNReanimated: 89886d02e4748077c0dd3c645286b15a9bca097b + RNScreens: 4a1af06327774490d97342c00aee0c2bafb497b7 + RNSVG: 3dd44d99d1c18e1342aee4bfa53ab3f6a8c4865f + RNVectorIcons: fcc2f6cb32f5735b586e66d14103a74ce6ad61f8 SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 - Yoga: 99652481fcd320aefa4a7ef90095b95acd181952 + Yoga: 236056dd74cda4d9d76c20306fd8c20bb087614d YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: 5e79bdf2564f47340e62c45058a5f15947bcdd98 +PODFILE CHECKSUM: ef8d808269a3a6091c7df675c9209437bb94641e COCOAPODS: 1.11.3 diff --git a/ios/dooboolab.xcodeproj/project.pbxproj b/ios/dooboolab.xcodeproj/project.pbxproj index 9147291..da123af 100644 --- a/ios/dooboolab.xcodeproj/project.pbxproj +++ b/ios/dooboolab.xcodeproj/project.pbxproj @@ -256,13 +256,15 @@ files = ( ); inputPaths = ( + "$(SRCROOT)/.xcode.env.local", + "$(SRCROOT)/.xcode.env", ); name = "Bundle React Native code and images"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "set -e\n\nexport NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh\n"; + shellScript = "set -e\n\nWITH_ENVIRONMENT=\"../node_modules/react-native/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"../node_modules/react-native/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n"; }; 00EEFC60759A1932668264C0 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; @@ -436,7 +438,7 @@ "$(inherited)", ); INFOPLIST_FILE = dooboolabTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -460,7 +462,7 @@ BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; INFOPLIST_FILE = dooboolabTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -578,7 +580,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.4; LD_RUNPATH_SEARCH_PATHS = ( /usr/lib/swift, "$(inherited)", @@ -596,6 +598,7 @@ "-DFOLLY_MOBILE=1", "-DFOLLY_USE_LIBCPP=1", ); + REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; }; name = Debug; @@ -642,7 +645,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.4; LD_RUNPATH_SEARCH_PATHS = ( /usr/lib/swift, "$(inherited)", @@ -659,6 +662,7 @@ "-DFOLLY_MOBILE=1", "-DFOLLY_USE_LIBCPP=1", ); + REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; }; diff --git a/ios/dooboolab/AppDelegate.mm b/ios/dooboolab/AppDelegate.mm index e1748bb..ca79f71 100644 --- a/ios/dooboolab/AppDelegate.mm +++ b/ios/dooboolab/AppDelegate.mm @@ -16,6 +16,8 @@ #import +static NSString *const kRNConcurrentRoot = @"concurrentRoot"; + @interface AppDelegate () { RCTTurboModuleManager *_turboModuleManager; RCTSurfacePresenterBridgeAdapter *_bridgeAdapter; @@ -41,7 +43,8 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( bridge.surfacePresenter = _bridgeAdapter.surfacePresenter; #endif - UIView *rootView = RCTAppSetupDefaultRootView(bridge, @"dooboolab", nil); + NSDictionary *initProps = [self prepareInitialProps]; + UIView *rootView = RCTAppSetupDefaultRootView(bridge, @"dooboolab", initProps); if (@available(iOS 13.0, *)) { rootView.backgroundColor = [UIColor systemBackgroundColor]; @@ -57,6 +60,28 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( return YES; } +/// This method controls whether the `concurrentRoot`feature of React18 is turned on or off. +/// +/// @see: https://reactjs.org/blog/2022/03/29/react-v18.html +/// @note: This requires to be rendering on Fabric (i.e. on the New Architecture). +/// @return: `true` if the `concurrentRoot` feture is enabled. Otherwise, it returns `false`. +- (BOOL)concurrentRootEnabled +{ + // Switch this bool to turn on and off the concurrent root + return true; +} + +- (NSDictionary *)prepareInitialProps +{ + NSMutableDictionary *initProps = [NSMutableDictionary new]; + +#ifdef RCT_NEW_ARCH_ENABLED + initProps[kRNConcurrentRoot] = @([self concurrentRootEnabled]); +#endif + + return initProps; +} + - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge { #if DEBUG diff --git a/package.json b/package.json index ab58811..e77b128 100644 --- a/package.json +++ b/package.json @@ -45,52 +45,53 @@ "fbt:android": "babel-node src/utils/i18n/scripts/generate-android-localizables-executor.js" }, "dependencies": { - "@react-native-async-storage/async-storage": "^1.17.6", + "@react-native-async-storage/async-storage": "^1.17.7", "@react-native-community/masked-view": "^0.1.11", - "@react-navigation/core": "^6.2.1", - "@react-navigation/native": "^6.0.10", - "@react-navigation/stack": "^6.2.1", + "@react-navigation/core": "^6.2.2", + "@react-navigation/native": "^6.0.11", + "@react-navigation/stack": "^6.2.2", "Base64": "^1.1.0", "date-fns": "^2.28.0", "fbt": "^1.0.0", "firebase": "9.6.11", "immer": "^9.0.15", - "react": "17.0.2", - "react-native": "0.68.2", + "react": "18.0.0", + "react-native": "0.69.2", "react-native-dotenv": "^3.3.1", - "react-native-gesture-handler": "^2.4.2", - "react-native-iap": "^8.2.1", + "react-native-gesture-handler": "^2.5.0", + "react-native-iap": "^8.2.2", "react-native-image-picker": "^4.8.4", - "react-native-reanimated": "^2.8.0", + "react-native-reanimated": "^3.0.0-rc.0", "react-native-safe-area-context": "^4.3.1", - "react-native-screens": "^3.13.1", - "react-native-svg": "^12.3.0", - "react-native-vector-icons": "^9.1.0", - "react-native-web": "^0.18.1", + "react-native-screens": "^3.15.0", + "react-native-svg": "^12.4.0", + "react-native-vector-icons": "^9.2.0", + "react-native-web": "^0.18.7", "react-native-web-hooks": "^3.0.2", - "react-native-webview": "^11.22.2", + "react-native-webview": "^11.22.7", "react-responsive": "^8.2.0", "react-scripts": "4.0.3", "styled-components": "^5.3.5", "toggle-switch-react-native": "^3.3.0" }, "devDependencies": { - "@babel/cli": "^7.17.10", - "@babel/core": "^7.18.5", - "@babel/node": "^7.18.5", + "@babel/cli": "^7.18.9", + "@babel/core": "^7.18.9", + "@babel/node": "^7.18.9", + "@babel/plugin-proposal-private-methods": "^7.18.6", "@babel/plugin-syntax-class-properties": "^7.12.13", - "@babel/plugin-syntax-jsx": "^7.17.12", - "@babel/preset-typescript": "^7.17.12", - "@babel/runtime": "^7.18.3", - "@craco/craco": "^6.4.3", - "@dooboo/eslint-config": "^1.3.4", + "@babel/plugin-syntax-jsx": "^7.18.6", + "@babel/preset-typescript": "^7.18.6", + "@babel/runtime": "^7.18.9", + "@craco/craco": "^6.4.5", + "@dooboo/eslint-config": "^1.4.0", "@fbtjs/default-collection-transform": "^1.0.0", "@testing-library/jest-native": "^4.0.5", - "@testing-library/react-native": "^9.1.0", - "@types/jest": "^27.5.1", + "@testing-library/react-native": "^10.1.1", + "@types/jest": "^28.1.6", "@types/react": "*", "@types/react-native": "*", - "@types/react-native-vector-icons": "^6.4.10", + "@types/react-native-vector-icons": "^6.4.11", "@types/react-responsive": "^8.0.5", "@types/react-test-renderer": "^18.0.0", "@types/styled-components": "5.1.25", @@ -100,9 +101,9 @@ "babel-plugin-styled-components": "^2.0.7", "babel-preset-react-native": "^4.0.1", "codecov": "^3.8.3", - "eslint": "^8.18.0", + "eslint": "^8.20.0", "eslint-config-prettier": "^8.5.0", - "eslint-plugin-prettier": "^4.0.0", + "eslint-plugin-prettier": "^4.2.1", "fb-tiger-hash": "^1.0.0", "fbt-generate-translations": "^0.0.4", "jest-expo": "^45.0.1", @@ -115,8 +116,8 @@ "react-native-fbt": "https://github.com/hyochan/react-native-fbt#main", "react-test-renderer": "17.0.2", "shelljs": "^0.8.5", - "ts-jest": "^28.0.5", - "typescript": "4.6.4", + "ts-jest": "^28.0.7", + "typescript": "^4.7.4", "url-loader": "^4.1.1", "web": "^0.0.2" }, diff --git a/src/apis/__tests__/sample.test.ts b/src/apis/__tests__/sample.test.ts index c2e8014..5381a02 100644 --- a/src/apis/__tests__/sample.test.ts +++ b/src/apis/__tests__/sample.test.ts @@ -27,6 +27,7 @@ describe('testing sample api', () => { const onResponse = jest.fn(); const onError = jest.fn(); + // eslint-disable-next-line jest/valid-expect-in-promise sample(undefined) .then(onResponse) .catch(onError) @@ -45,6 +46,7 @@ describe('testing sample api', () => { const onResponse = jest.fn(); const onError = jest.fn(); + // eslint-disable-next-line jest/valid-expect-in-promise sample({}) .then(onResponse) .catch(onError) diff --git a/src/assets/translations/ko.json b/src/assets/translations/ko.json index 0372228..36def6a 100644 --- a/src/assets/translations/ko.json +++ b/src/assets/translations/ko.json @@ -1080,6 +1080,26 @@ "variations": {} } ] + }, + "12f9c55fc5c54eef23ce7a1bd3ef34bd": { + "tokens": [], + "types": [], + "translations": [ + { + "translation": "또는", + "variations": {} + } + ] + }, + "48db9ae207ffdc8353866a7cee3cd182": { + "tokens": [], + "types": [], + "translations": [ + { + "translation": "커뮤니티 후원", + "variations": {} + } + ] } } } \ No newline at end of file diff --git a/src/components/pages/Sponsor.web.tsx b/src/components/pages/Sponsor.web.tsx index 8445f76..27ebbfe 100644 --- a/src/components/pages/Sponsor.web.tsx +++ b/src/components/pages/Sponsor.web.tsx @@ -1,12 +1,13 @@ import IAPCard, {IAPCardProps} from '../uis/IAPCard'; import {IC_COFFEE, IC_DOOBOO_IAP, IC_LOGO} from '../../utils/Icons'; +import {Linking, Text, View} from 'react-native'; import RNIap, {Product, Subscription, useIAP} from 'react-native-iap'; import React, {FC, useCallback, useEffect, useState} from 'react'; -import {Text, View} from 'react-native'; import {Button} from '../uis/Button'; import Header from '../uis/Header'; import {RootStackNavigationProps} from '../navigations/RootStackNavigator'; +import {colors} from '../../utils/theme'; import {fbt} from 'fbt'; import styled from 'styled-components/native'; import {useNavigation} from '@react-navigation/core'; @@ -53,13 +54,51 @@ const Sponsor: FC = ({navigation}) => { Please try this in iOS or Android app. +