jfinn
/
jitsi_corner9
Следить 1
В избранное 0
Форкнуть 0
Код Задачи 0 Pull Request'ы 0 Релизы 0 Вики Активность
Просмотр исходного кода

feat(rn) update React Native to version 0.66

master
Saúl Ibarra Corretgé 3 лет назад
Родитель
53158410dc
Сommit
d121a63341
21 измененных файлов: 3497 добавлений и 4165 удалений
Разделённый вид Показать статистику Diff
  1. 7
    1
      android/app/build.gradle
  2. 14
    6
      android/build.gradle
  3. 1
    2
      android/gradle/wrapper/gradle-wrapper.properties
  4. 2
    0
      android/gradlew
  5. 4
    18
      android/gradlew.bat
  6. 9
    2
      android/sdk/build.gradle
  7. 8
    0
      android/sdk/src/debug/AndroidManifest.xml
  8. 0
    2
      android/sdk/src/main/AndroidManifest.xml
  9. 12
    1
      android/sdk/src/main/java/org/jitsi/meet/sdk/AudioModeModule.java
  10. 11
    2
      android/sdk/src/main/java/org/jitsi/meet/sdk/ExternalAPIModule.java
  11. 10
    0
      android/sdk/src/main/java/org/jitsi/meet/sdk/RNConnectionService.java
  12. 5
    1
      ios/Podfile
  13. 275
    230
      ios/Podfile.lock
  14. 2
    0
      ios/app/app.xcodeproj/project.pbxproj
  15. 2
    0
      ios/sdk/sdk.xcodeproj/project.pbxproj
  16. 1
    1
      metro.config.js
  17. 3117
    3870
      package-lock.json
  18. 5
    5
      package.json
  19. 5
    5
      patches/react-native+0.66.4.patch
  20. 4
    19
      react/features/mobile/polyfills/browser.js
  21. 3
    0
      react/index.native.js

+ 7
- 1
android/app/build.gradle Просмотреть файл 

@@ -76,7 +76,13 @@ android {
76 76
77 77 
 dependencies {
78 78 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
79 
-    implementation 'androidx.appcompat:appcompat:1.2.0'
79 
+    // https://github.com/facebook/react-native/issues/31572
80 
+    // We can update past 1.4.0 on RN 0.68
81 
+    implementation ('androidx.appcompat:appcompat:1.3.1') {
82 
+        version {
83 
+            strictly '1.3.1'
84 
+        }
85 
+    }
80 86
81 87 
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
82 88

+ 14
- 6
android/build.gradle Просмотреть файл 

@@ -7,12 +7,12 @@ import org.gradle.util.VersionNumber
7 7 
 buildscript {
8 8 
     repositories {
9 9 
         google()
10 
-        jcenter()
10 
+        mavenCentral()
11 11 
     }
12 12 
     dependencies {
13 
-        classpath 'com.android.tools.build:gradle:4.1.2'
14 
-        classpath 'com.google.gms:google-services:4.3.4'
15 
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1'
13 
+        classpath 'com.android.tools.build:gradle:4.2.2'
14 
+        classpath 'com.google.gms:google-services:4.3.10'
15 
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
16 16 
     }
17 17 
 }
18 18 
 
@@ -22,6 +22,7 @@ ext {
22 22 
     minSdkVersion    = 23
23 23 
     targetSdkVersion = 31
24 24 
     supportLibVersion = "28.0.0"
25 
+    ndkVersion = "21.4.7075529"
25 26
26 27 
     // The Maven artifact groupdId of the third-party react-native modules which
27 28 
     // Jitsi Meet SDK for Android depends on and which are not available in
 
@@ -42,13 +43,20 @@ ext {
42 43
43 44 
 allprojects {
44 45 
     repositories {
46 
+        mavenCentral()
45 47 
         google()
46 
-        jcenter()
47 
-        maven { url 'https://www.jitpack.io' }
48 48 
         // React Native (JS, Obj-C sources, Android binaries) is installed from npm.
49 49 
         maven { url "$rootDir/../node_modules/react-native/android" }
50 50 
         // Android JSC is installed from npm.
51 51 
         maven { url("$rootDir/../node_modules/jsc-android/dist") }
52 
+        maven { url 'https://www.jitpack.io' }
53 
+        // https://github.com/react-native-video/react-native-video/issues/2454
54 
+        //noinspection JcenterRepositoryObsolete
55 
+        jcenter() {
56 
+            content {
57 
+                includeModule("com.yqritc", "android-scalablevideoview")
58 
+            }
59 
+        }
52 60 
     }
53 61
54 62 
     // Make sure we use the react-native version in node_modules and not the one

+ 1
- 2
android/gradle/wrapper/gradle-wrapper.properties Просмотреть файл 

@@ -1,6 +1,5 @@
1 
-#Wed Sep 23 11:48:00 EEST 2020
2 1 
 distributionBase=GRADLE_USER_HOME
3 2 
 distributionPath=wrapper/dists
3 
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
4 4 
 zipStoreBase=GRADLE_USER_HOME
5 5 
 zipStorePath=wrapper/dists
6 
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip

+ 2
- 0
android/gradlew Просмотреть файл 

@@ -82,6 +82,7 @@ esac
82 82
83 83 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
84 84
85 
+
85 86 
 # Determine the Java command to use to start the JVM.
86 87 
 if [ -n "$JAVA_HOME" ] ; then
87 88 
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
 
@@ -129,6 +130,7 @@ fi
129 130 
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
130 131 
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
131 132 
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
133 
+
132 134 
     JAVACMD=`cygpath --unix "$JAVACMD"`
133 135
134 136 
     # We build the pattern for arguments to be converted via cygpath

+ 4
- 18
android/gradlew.bat Просмотреть файл 

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
40 40
41 41 
 set JAVA_EXE=java.exe
42 42 
 %JAVA_EXE% -version >NUL 2>&1
43 
-if "%ERRORLEVEL%" == "0" goto init
43 
+if "%ERRORLEVEL%" == "0" goto execute
44 44
45 45 
 echo.
46 46 
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
@@ -54,7 +54,7 @@ goto fail
54 54 
 set JAVA_HOME=%JAVA_HOME:"=%
55 55 
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
56 56
57 
-if exist "%JAVA_EXE%" goto init
57 
+if exist "%JAVA_EXE%" goto execute
58 58
59 59 
 echo.
60 60 
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
 
@@ -64,28 +64,14 @@ echo location of your Java installation.
64 64
65 65 
 goto fail
66 66
67 
-:init
68 
-@rem Get command-line arguments, handling Windows variants
69 
-
70 
-if not "%OS%" == "Windows_NT" goto win9xME_args
71 
-
72 
-:win9xME_args
73 
-@rem Slurp the command line arguments.
74 
-set CMD_LINE_ARGS=
75 
-set _SKIP=2
76 
-
77 
-:win9xME_args_slurp
78 
-if "x%~1" == "x" goto execute
79 
-
80 
-set CMD_LINE_ARGS=%*
81 
-
82 67 
 :execute
83 68 
 @rem Setup the command line
84 69
85 70 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
86 71
72 
+
87 73 
 @rem Execute Gradle
88 
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
74 
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
89 75
90 76 
 :end
91 77 
 @rem End local scope for the variables with windows NT shell

+ 9
- 2
android/sdk/build.gradle Просмотреть файл 

@@ -3,6 +3,7 @@ apply plugin: 'maven-publish'
3 3
4 4 
 android {
5 5 
     compileSdkVersion rootProject.ext.compileSdkVersion
6 
+    ndkVersion rootProject.ext.ndkVersion
6 7
7 8 
     defaultConfig {
8 9 
         minSdkVersion rootProject.ext.minSdkVersion
 
@@ -34,8 +35,14 @@ android {
34 35 
 dependencies {
35 36 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
36 37
37 
-    implementation 'androidx.appcompat:appcompat:1.2.0'
38 
-    implementation 'androidx.fragment:fragment:1.2.5'
38 
+    // https://github.com/facebook/react-native/issues/31572
39 
+    // We can update past 1.4.0 on RN 0.68
40 
+    implementation ('androidx.appcompat:appcompat:1.3.1') {
41 
+        version {
42 
+            strictly '1.3.1'
43 
+        }
44 
+    }
45 
+    implementation 'androidx.fragment:fragment:1.4.0'
39 46 
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
40 47 
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
41 48

+ 8
- 0
android/sdk/src/debug/AndroidManifest.xml Просмотреть файл 

@@ -0,0 +1,8 @@
1 
+<?xml version="1.0" encoding="utf-8"?>
2 
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
3 
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
4 
+
5 
+    <application android:usesCleartextTraffic="true">
6 
+        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
7 
+    </application>
8 
+</manifest>

+ 0
- 2
android/sdk/src/main/AndroidManifest.xml Просмотреть файл 

@@ -10,7 +10,6 @@
10 10 
     <uses-permission android:name="android.permission.MANAGE_OWN_CALLS" />
11 11 
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
12 12 
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
13 
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
14 13 
     <uses-permission android:name="android.permission.WAKE_LOCK" />
15 14 
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
16 15 
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
@@ -36,7 +35,6 @@
36 35 
             android:resizeableActivity="true"
37 36 
             android:supportsPictureInPicture="true"
38 37 
             android:windowSoftInputMode="adjustResize"/>
39 
-        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
40 38
41 39 
         <service
42 40 
             android:name=".ConnectionService"

+ 12
- 1
android/sdk/src/main/java/org/jitsi/meet/sdk/AudioModeModule.java Просмотреть файл 

@@ -16,6 +16,7 @@
16 16
17 17 
 package org.jitsi.meet.sdk;
18 18
19 
+import android.annotation.SuppressLint;
19 20 
 import android.app.Activity;
20 21 
 import android.content.Context;
21 22 
 import android.media.AudioManager;
 
@@ -54,6 +55,7 @@ import java.util.concurrent.Executors;
54 55 
  * Before a call has started and after it has ended the
55 56 
  * {@code AudioModeModule.DEFAULT} mode should be used.
56 57 
  */
58 
+@SuppressLint("AnnotateVersionCheck")
57 59 
 @ReactModule(name = AudioModeModule.NAME)
58 60 
 class AudioModeModule extends ReactContextBaseJavaModule {
59 61 
     public static final String NAME = "AudioMode";
 
@@ -79,7 +81,6 @@ class AudioModeModule extends ReactContextBaseJavaModule {
79 81 
     /**
80 82 
      * Whether or not the ConnectionService is used for selecting audio devices.
81 83 
      */
82 
-
83 84 
     private static final boolean supportsConnectionService = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
84 85 
     private static boolean useConnectionService_ = supportsConnectionService;
85 86 
 
@@ -148,6 +149,16 @@ class AudioModeModule extends ReactContextBaseJavaModule {
148 149 
         audioManager = (AudioManager)reactContext.getSystemService(Context.AUDIO_SERVICE);
149 150 
     }
150 151
152 
+    @ReactMethod
153 
+    public void addListener(String eventName) {
154 
+        // Keep: Required for RN built in Event Emitter Calls.
155 
+    }
156 
+
157 
+    @ReactMethod
158 
+    public void removeListeners(Integer count) {
159 
+        // Keep: Required for RN built in Event Emitter Calls.
160 
+    }
161 
+
151 162 
     /**
152 163 
      * Gets a mapping with the constants this module is exporting.
153 164 
      *

+ 11
- 2
android/sdk/src/main/java/org/jitsi/meet/sdk/ExternalAPIModule.java Просмотреть файл 

@@ -31,8 +31,7 @@ import java.util.Map;
31 31 
  * Module implementing an API for sending events from JavaScript to native code.
32 32 
  */
33 33 
 @ReactModule(name = ExternalAPIModule.NAME)
34 
-class ExternalAPIModule
35 
-    extends ReactContextBaseJavaModule {
34 
+class ExternalAPIModule extends ReactContextBaseJavaModule {
36 35
37 36 
     public static final String NAME = "ExternalAPI";
38 37 
 
@@ -57,6 +56,16 @@ class ExternalAPIModule
57 56 
         ParticipantsService.init(reactContext);
58 57 
     }
59 58
59 
+    @ReactMethod
60 
+    public void addListener(String eventName) {
61 
+        // Keep: Required for RN built in Event Emitter Calls.
62 
+    }
63 
+
64 
+    @ReactMethod
65 
+    public void removeListeners(Integer count) {
66 
+        // Keep: Required for RN built in Event Emitter Calls.
67 
+    }
68 
+
60 69 
     /**
61 70 
      * Gets the name of this module to be used in the React Native bridge.
62 71 
      *

+ 10
- 0
android/sdk/src/main/java/org/jitsi/meet/sdk/RNConnectionService.java Просмотреть файл 

@@ -59,6 +59,16 @@ class RNConnectionService extends ReactContextBaseJavaModule {
59 59 
         super(reactContext);
60 60 
     }
61 61
62 
+    @ReactMethod
63 
+    public void addListener(String eventName) {
64 
+        // Keep: Required for RN built in Event Emitter Calls.
65 
+    }
66 
+
67 
+    @ReactMethod
68 
+    public void removeListeners(Integer count) {
69 
+        // Keep: Required for RN built in Event Emitter Calls.
70 
+    }
71 
+
62 72 
     /**
63 73 
      * Starts a new outgoing call.
64 74 
      *

+ 5
- 1
ios/Podfile Просмотреть файл 

@@ -21,7 +21,10 @@ target 'JitsiMeetSDK' do
21 21 
   #
22 22
23 23 
   config = use_native_modules!
24 
-  use_react_native!(:path => config["reactNativePath"])
24 
+  use_react_native!(
25 
+    :path => config["reactNativePath"],
26 
+    :hermes_enabled => false
27 
+  )
25 28
26 29 
   # Native pod dependencies
27 30 
   #
 
@@ -31,6 +34,7 @@ target 'JitsiMeetSDK' do
31 34 
 end
32 35
33 36 
 post_install do |installer|
37 
+  react_native_post_install(installer)
34 38 
   installer.pods_project.targets.each do |target|
35 39 
     target.build_configurations.each do |config|
36 40 
       config.build_settings['ENABLE_BITCODE'] = 'YES'

+ 275
- 230
ios/Podfile.lock Просмотреть файл 

@@ -8,19 +8,19 @@ PODS:
8 8 
     - AppAuth/ExternalUserAgent (= 1.4.0)
9 9 
   - AppAuth/Core (1.4.0)
10 10 
   - AppAuth/ExternalUserAgent (1.4.0)
11 
-  - boost-for-react-native (1.63.0)
11 
+  - boost (1.76.0)
12 12 
   - CocoaLumberjack (3.5.3):
13 13 
     - CocoaLumberjack/Core (= 3.5.3)
14 14 
   - CocoaLumberjack/Core (3.5.3)
15 15 
   - DoubleConversion (1.1.6)
16 
-  - FBLazyVector (0.63.4)
17 
-  - FBReactNativeSpec (0.63.4):
18 
-    - Folly (= 2020.01.13.00)
19 
-    - RCTRequired (= 0.63.4)
20 
-    - RCTTypeSafety (= 0.63.4)
21 
-    - React-Core (= 0.63.4)
22 
-    - React-jsi (= 0.63.4)
23 
-    - ReactCommon/turbomodule/core (= 0.63.4)
16 
+  - FBLazyVector (0.66.4)
17 
+  - FBReactNativeSpec (0.66.4):
18 
+    - RCT-Folly (= 2021.06.28.00-v2)
19 
+    - RCTRequired (= 0.66.4)
20 
+    - RCTTypeSafety (= 0.66.4)
21 
+    - React-Core (= 0.66.4)
22 
+    - React-jsi (= 0.66.4)
23 
+    - ReactCommon/turbomodule/core (= 0.66.4)
24 24 
   - Firebase/Analytics (6.33.0):
25 25 
     - Firebase/Core
26 26 
   - Firebase/Core (6.33.0):
 
@@ -65,15 +65,7 @@ PODS:
65 65 
     - GoogleUtilities/Environment (~> 6.7)
66 66 
     - GoogleUtilities/UserDefaults (~> 6.7)
67 67 
     - PromisesObjC (~> 1.2)
68 
-  - Folly (2020.01.13.00):
69 
-    - boost-for-react-native
70 
-    - DoubleConversion
71 
-    - Folly/Default (= 2020.01.13.00)
72 
-    - glog
73 
-  - Folly/Default (2020.01.13.00):
74 
-    - boost-for-react-native
75 
-    - DoubleConversion
76 
-    - glog
68 
+  - fmt (6.2.1)
77 69 
   - glog (0.3.5)
78 70 
   - GoogleAppMeasurement (6.8.3):
79 71 
     - GoogleUtilities/AppDelegateSwizzler (~> 6.7)
 
@@ -117,172 +109,204 @@ PODS:
117 109 
   - nanopb/encode (1.30906.0)
118 110 
   - ObjectiveDropboxOfficial (6.1.0)
119 111 
   - PromisesObjC (1.2.12)
120 
-  - RCTRequired (0.63.4)
121 
-  - RCTTypeSafety (0.63.4):
122 
-    - FBLazyVector (= 0.63.4)
123 
-    - Folly (= 2020.01.13.00)
124 
-    - RCTRequired (= 0.63.4)
125 
-    - React-Core (= 0.63.4)
126 
-  - React (0.63.4):
127 
-    - React-Core (= 0.63.4)
128 
-    - React-Core/DevSupport (= 0.63.4)
129 
-    - React-Core/RCTWebSocket (= 0.63.4)
130 
-    - React-RCTActionSheet (= 0.63.4)
131 
-    - React-RCTAnimation (= 0.63.4)
132 
-    - React-RCTBlob (= 0.63.4)
133 
-    - React-RCTImage (= 0.63.4)
134 
-    - React-RCTLinking (= 0.63.4)
135 
-    - React-RCTNetwork (= 0.63.4)
136 
-    - React-RCTSettings (= 0.63.4)
137 
-    - React-RCTText (= 0.63.4)
138 
-    - React-RCTVibration (= 0.63.4)
139 
-  - React-callinvoker (0.63.4)
140 
-  - React-Core (0.63.4):
141 
-    - Folly (= 2020.01.13.00)
112 
+  - RCT-Folly (2021.06.28.00-v2):
113 
+    - boost
114 
+    - DoubleConversion
115 
+    - fmt (~> 6.2.1)
142 116 
     - glog
143 
-    - React-Core/Default (= 0.63.4)
144 
-    - React-cxxreact (= 0.63.4)
145 
-    - React-jsi (= 0.63.4)
146 
-    - React-jsiexecutor (= 0.63.4)
117 
+    - RCT-Folly/Default (= 2021.06.28.00-v2)
118 
+  - RCT-Folly/Default (2021.06.28.00-v2):
119 
+    - boost
120 
+    - DoubleConversion
121 
+    - fmt (~> 6.2.1)
122 
+    - glog
123 
+  - RCTRequired (0.66.4)
124 
+  - RCTTypeSafety (0.66.4):
125 
+    - FBLazyVector (= 0.66.4)
126 
+    - RCT-Folly (= 2021.06.28.00-v2)
127 
+    - RCTRequired (= 0.66.4)
128 
+    - React-Core (= 0.66.4)
129 
+  - React (0.66.4):
130 
+    - React-Core (= 0.66.4)
131 
+    - React-Core/DevSupport (= 0.66.4)
132 
+    - React-Core/RCTWebSocket (= 0.66.4)
133 
+    - React-RCTActionSheet (= 0.66.4)
134 
+    - React-RCTAnimation (= 0.66.4)
135 
+    - React-RCTBlob (= 0.66.4)
136 
+    - React-RCTImage (= 0.66.4)
137 
+    - React-RCTLinking (= 0.66.4)
138 
+    - React-RCTNetwork (= 0.66.4)
139 
+    - React-RCTSettings (= 0.66.4)
140 
+    - React-RCTText (= 0.66.4)
141 
+    - React-RCTVibration (= 0.66.4)
142 
+  - React-callinvoker (0.66.4)
143 
+  - React-Core (0.66.4):
144 
+    - glog
145 
+    - RCT-Folly (= 2021.06.28.00-v2)
146 
+    - React-Core/Default (= 0.66.4)
147 
+    - React-cxxreact (= 0.66.4)
148 
+    - React-jsi (= 0.66.4)
149 
+    - React-jsiexecutor (= 0.66.4)
150 
+    - React-perflogger (= 0.66.4)
147 151 
     - Yoga
148 
-  - React-Core/CoreModulesHeaders (0.63.4):
149 
-    - Folly (= 2020.01.13.00)
152 
+  - React-Core/CoreModulesHeaders (0.66.4):
150 153 
     - glog
154 
+    - RCT-Folly (= 2021.06.28.00-v2)
151 155 
     - React-Core/Default
152 
-    - React-cxxreact (= 0.63.4)
153 
-    - React-jsi (= 0.63.4)
154 
-    - React-jsiexecutor (= 0.63.4)
156 
+    - React-cxxreact (= 0.66.4)
157 
+    - React-jsi (= 0.66.4)
158 
+    - React-jsiexecutor (= 0.66.4)
159 
+    - React-perflogger (= 0.66.4)
155 160 
     - Yoga
156 
-  - React-Core/Default (0.63.4):
157 
-    - Folly (= 2020.01.13.00)
161 
+  - React-Core/Default (0.66.4):
158 162 
     - glog
159 
-    - React-cxxreact (= 0.63.4)
160 
-    - React-jsi (= 0.63.4)
161 
-    - React-jsiexecutor (= 0.63.4)
163 
+    - RCT-Folly (= 2021.06.28.00-v2)
164 
+    - React-cxxreact (= 0.66.4)
165 
+    - React-jsi (= 0.66.4)
166 
+    - React-jsiexecutor (= 0.66.4)
167 
+    - React-perflogger (= 0.66.4)
162 168 
     - Yoga
163 
-  - React-Core/DevSupport (0.63.4):
164 
-    - Folly (= 2020.01.13.00)
169 
+  - React-Core/DevSupport (0.66.4):
165 170 
     - glog
166 
-    - React-Core/Default (= 0.63.4)
167 
-    - React-Core/RCTWebSocket (= 0.63.4)
168 
-    - React-cxxreact (= 0.63.4)
169 
-    - React-jsi (= 0.63.4)
170 
-    - React-jsiexecutor (= 0.63.4)
171 
-    - React-jsinspector (= 0.63.4)
171 
+    - RCT-Folly (= 2021.06.28.00-v2)
172 
+    - React-Core/Default (= 0.66.4)
173 
+    - React-Core/RCTWebSocket (= 0.66.4)
174 
+    - React-cxxreact (= 0.66.4)
175 
+    - React-jsi (= 0.66.4)
176 
+    - React-jsiexecutor (= 0.66.4)
177 
+    - React-jsinspector (= 0.66.4)
178 
+    - React-perflogger (= 0.66.4)
172 179 
     - Yoga
173 
-  - React-Core/RCTActionSheetHeaders (0.63.4):
174 
-    - Folly (= 2020.01.13.00)
180 
+  - React-Core/RCTActionSheetHeaders (0.66.4):
175 181 
     - glog
182 
+    - RCT-Folly (= 2021.06.28.00-v2)
176 183 
     - React-Core/Default
177 
-    - React-cxxreact (= 0.63.4)
178 
-    - React-jsi (= 0.63.4)
179 
-    - React-jsiexecutor (= 0.63.4)
184 
+    - React-cxxreact (= 0.66.4)
185 
+    - React-jsi (= 0.66.4)
186 
+    - React-jsiexecutor (= 0.66.4)
187 
+    - React-perflogger (= 0.66.4)
180 188 
     - Yoga
181 
-  - React-Core/RCTAnimationHeaders (0.63.4):
182 
-    - Folly (= 2020.01.13.00)
189 
+  - React-Core/RCTAnimationHeaders (0.66.4):
183 190 
     - glog
191 
+    - RCT-Folly (= 2021.06.28.00-v2)
184 192 
     - React-Core/Default
185 
-    - React-cxxreact (= 0.63.4)
186 
-    - React-jsi (= 0.63.4)
187 
-    - React-jsiexecutor (= 0.63.4)
193 
+    - React-cxxreact (= 0.66.4)
194 
+    - React-jsi (= 0.66.4)
195 
+    - React-jsiexecutor (= 0.66.4)
196 
+    - React-perflogger (= 0.66.4)
188 197 
     - Yoga
189 
-  - React-Core/RCTBlobHeaders (0.63.4):
190 
-    - Folly (= 2020.01.13.00)
198 
+  - React-Core/RCTBlobHeaders (0.66.4):
191 199 
     - glog
200 
+    - RCT-Folly (= 2021.06.28.00-v2)
192 201 
     - React-Core/Default
193 
-    - React-cxxreact (= 0.63.4)
194 
-    - React-jsi (= 0.63.4)
195 
-    - React-jsiexecutor (= 0.63.4)
202 
+    - React-cxxreact (= 0.66.4)
203 
+    - React-jsi (= 0.66.4)
204 
+    - React-jsiexecutor (= 0.66.4)
205 
+    - React-perflogger (= 0.66.4)
196 206 
     - Yoga
197 
-  - React-Core/RCTImageHeaders (0.63.4):
198 
-    - Folly (= 2020.01.13.00)
207 
+  - React-Core/RCTImageHeaders (0.66.4):
199 208 
     - glog
209 
+    - RCT-Folly (= 2021.06.28.00-v2)
200 210 
     - React-Core/Default
201 
-    - React-cxxreact (= 0.63.4)
202 
-    - React-jsi (= 0.63.4)
203 
-    - React-jsiexecutor (= 0.63.4)
211 
+    - React-cxxreact (= 0.66.4)
212 
+    - React-jsi (= 0.66.4)
213 
+    - React-jsiexecutor (= 0.66.4)
214 
+    - React-perflogger (= 0.66.4)
204 215 
     - Yoga
205 
-  - React-Core/RCTLinkingHeaders (0.63.4):
206 
-    - Folly (= 2020.01.13.00)
216 
+  - React-Core/RCTLinkingHeaders (0.66.4):
207 217 
     - glog
218 
+    - RCT-Folly (= 2021.06.28.00-v2)
208 219 
     - React-Core/Default
209 
-    - React-cxxreact (= 0.63.4)
210 
-    - React-jsi (= 0.63.4)
211 
-    - React-jsiexecutor (= 0.63.4)
220 
+    - React-cxxreact (= 0.66.4)
221 
+    - React-jsi (= 0.66.4)
222 
+    - React-jsiexecutor (= 0.66.4)
223 
+    - React-perflogger (= 0.66.4)
212 224 
     - Yoga
213 
-  - React-Core/RCTNetworkHeaders (0.63.4):
214 
-    - Folly (= 2020.01.13.00)
225 
+  - React-Core/RCTNetworkHeaders (0.66.4):
215 226 
     - glog
227 
+    - RCT-Folly (= 2021.06.28.00-v2)
216 228 
     - React-Core/Default
217 
-    - React-cxxreact (= 0.63.4)
218 
-    - React-jsi (= 0.63.4)
219 
-    - React-jsiexecutor (= 0.63.4)
229 
+    - React-cxxreact (= 0.66.4)
230 
+    - React-jsi (= 0.66.4)
231 
+    - React-jsiexecutor (= 0.66.4)
232 
+    - React-perflogger (= 0.66.4)
220 233 
     - Yoga
221 
-  - React-Core/RCTSettingsHeaders (0.63.4):
222 
-    - Folly (= 2020.01.13.00)
234 
+  - React-Core/RCTSettingsHeaders (0.66.4):
223 235 
     - glog
236 
+    - RCT-Folly (= 2021.06.28.00-v2)
224 237 
     - React-Core/Default
225 
-    - React-cxxreact (= 0.63.4)
226 
-    - React-jsi (= 0.63.4)
227 
-    - React-jsiexecutor (= 0.63.4)
238 
+    - React-cxxreact (= 0.66.4)
239 
+    - React-jsi (= 0.66.4)
240 
+    - React-jsiexecutor (= 0.66.4)
241 
+    - React-perflogger (= 0.66.4)
228 242 
     - Yoga
229 
-  - React-Core/RCTTextHeaders (0.63.4):
230 
-    - Folly (= 2020.01.13.00)
243 
+  - React-Core/RCTTextHeaders (0.66.4):
231 244 
     - glog
245 
+    - RCT-Folly (= 2021.06.28.00-v2)
232 246 
     - React-Core/Default
233 
-    - React-cxxreact (= 0.63.4)
234 
-    - React-jsi (= 0.63.4)
235 
-    - React-jsiexecutor (= 0.63.4)
247 
+    - React-cxxreact (= 0.66.4)
248 
+    - React-jsi (= 0.66.4)
249 
+    - React-jsiexecutor (= 0.66.4)
250 
+    - React-perflogger (= 0.66.4)
236 251 
     - Yoga
237 
-  - React-Core/RCTVibrationHeaders (0.63.4):
238 
-    - Folly (= 2020.01.13.00)
252 
+  - React-Core/RCTVibrationHeaders (0.66.4):
239 253 
     - glog
254 
+    - RCT-Folly (= 2021.06.28.00-v2)
240 255 
     - React-Core/Default
241 
-    - React-cxxreact (= 0.63.4)
242 
-    - React-jsi (= 0.63.4)
243 
-    - React-jsiexecutor (= 0.63.4)
256 
+    - React-cxxreact (= 0.66.4)
257 
+    - React-jsi (= 0.66.4)
258 
+    - React-jsiexecutor (= 0.66.4)
259 
+    - React-perflogger (= 0.66.4)
244 260 
     - Yoga
245 
-  - React-Core/RCTWebSocket (0.63.4):
246 
-    - Folly (= 2020.01.13.00)
261 
+  - React-Core/RCTWebSocket (0.66.4):
247 262 
     - glog
248 
-    - React-Core/Default (= 0.63.4)
249 
-    - React-cxxreact (= 0.63.4)
250 
-    - React-jsi (= 0.63.4)
251 
-    - React-jsiexecutor (= 0.63.4)
263 
+    - RCT-Folly (= 2021.06.28.00-v2)
264 
+    - React-Core/Default (= 0.66.4)
265 
+    - React-cxxreact (= 0.66.4)
266 
+    - React-jsi (= 0.66.4)
267 
+    - React-jsiexecutor (= 0.66.4)
268 
+    - React-perflogger (= 0.66.4)
252 269 
     - Yoga
253 
-  - React-CoreModules (0.63.4):
254 
-    - FBReactNativeSpec (= 0.63.4)
255 
-    - Folly (= 2020.01.13.00)
256 
-    - RCTTypeSafety (= 0.63.4)
257 
-    - React-Core/CoreModulesHeaders (= 0.63.4)
258 
-    - React-jsi (= 0.63.4)
259 
-    - React-RCTImage (= 0.63.4)
260 
-    - ReactCommon/turbomodule/core (= 0.63.4)
261 
-  - React-cxxreact (0.63.4):
262 
-    - boost-for-react-native (= 1.63.0)
270 
+  - React-CoreModules (0.66.4):
271 
+    - FBReactNativeSpec (= 0.66.4)
272 
+    - RCT-Folly (= 2021.06.28.00-v2)
273 
+    - RCTTypeSafety (= 0.66.4)
274 
+    - React-Core/CoreModulesHeaders (= 0.66.4)
275 
+    - React-jsi (= 0.66.4)
276 
+    - React-RCTImage (= 0.66.4)
277 
+    - ReactCommon/turbomodule/core (= 0.66.4)
278 
+  - React-cxxreact (0.66.4):
279 
+    - boost (= 1.76.0)
263 280 
     - DoubleConversion
264 
-    - Folly (= 2020.01.13.00)
265 281 
     - glog
266 
-    - React-callinvoker (= 0.63.4)
267 
-    - React-jsinspector (= 0.63.4)
268 
-  - React-jsi (0.63.4):
269 
-    - boost-for-react-native (= 1.63.0)
282 
+    - RCT-Folly (= 2021.06.28.00-v2)
283 
+    - React-callinvoker (= 0.66.4)
284 
+    - React-jsi (= 0.66.4)
285 
+    - React-jsinspector (= 0.66.4)
286 
+    - React-logger (= 0.66.4)
287 
+    - React-perflogger (= 0.66.4)
288 
+    - React-runtimeexecutor (= 0.66.4)
289 
+  - React-jsi (0.66.4):
290 
+    - boost (= 1.76.0)
270 291 
     - DoubleConversion
271 
-    - Folly (= 2020.01.13.00)
272 292 
     - glog
273 
-    - React-jsi/Default (= 0.63.4)
274 
-  - React-jsi/Default (0.63.4):
275 
-    - boost-for-react-native (= 1.63.0)
293 
+    - RCT-Folly (= 2021.06.28.00-v2)
294 
+    - React-jsi/Default (= 0.66.4)
295 
+  - React-jsi/Default (0.66.4):
296 
+    - boost (= 1.76.0)
276 297 
     - DoubleConversion
277 
-    - Folly (= 2020.01.13.00)
278 298 
     - glog
279 
-  - React-jsiexecutor (0.63.4):
299 
+    - RCT-Folly (= 2021.06.28.00-v2)
300 
+  - React-jsiexecutor (0.66.4):
280 301 
     - DoubleConversion
281 
-    - Folly (= 2020.01.13.00)
282 302 
     - glog
283 
-    - React-cxxreact (= 0.63.4)
284 
-    - React-jsi (= 0.63.4)
285 
-  - React-jsinspector (0.63.4)
303 
+    - RCT-Folly (= 2021.06.28.00-v2)
304 
+    - React-cxxreact (= 0.66.4)
305 
+    - React-jsi (= 0.66.4)
306 
+    - React-perflogger (= 0.66.4)
307 
+  - React-jsinspector (0.66.4)
308 
+  - React-logger (0.66.4):
309 
+    - glog
286 310 
   - react-native-background-timer (2.4.1):
287 311 
     - React-Core
288 312 
   - react-native-get-random-values (1.7.2):
 
@@ -310,66 +334,71 @@ PODS:
310 334 
     - React-Core
311 335 
   - react-native-webview (11.15.1):
312 336 
     - React-Core
313 
-  - React-RCTActionSheet (0.63.4):
314 
-    - React-Core/RCTActionSheetHeaders (= 0.63.4)
315 
-  - React-RCTAnimation (0.63.4):
316 
-    - FBReactNativeSpec (= 0.63.4)
317 
-    - Folly (= 2020.01.13.00)
318 
-    - RCTTypeSafety (= 0.63.4)
319 
-    - React-Core/RCTAnimationHeaders (= 0.63.4)
320 
-    - React-jsi (= 0.63.4)
321 
-    - ReactCommon/turbomodule/core (= 0.63.4)
322 
-  - React-RCTBlob (0.63.4):
323 
-    - FBReactNativeSpec (= 0.63.4)
324 
-    - Folly (= 2020.01.13.00)
325 
-    - React-Core/RCTBlobHeaders (= 0.63.4)
326 
-    - React-Core/RCTWebSocket (= 0.63.4)
327 
-    - React-jsi (= 0.63.4)
328 
-    - React-RCTNetwork (= 0.63.4)
329 
-    - ReactCommon/turbomodule/core (= 0.63.4)
330 
-  - React-RCTImage (0.63.4):
331 
-    - FBReactNativeSpec (= 0.63.4)
332 
-    - Folly (= 2020.01.13.00)
333 
-    - RCTTypeSafety (= 0.63.4)
334 
-    - React-Core/RCTImageHeaders (= 0.63.4)
335 
-    - React-jsi (= 0.63.4)
336 
-    - React-RCTNetwork (= 0.63.4)
337 
-    - ReactCommon/turbomodule/core (= 0.63.4)
338 
-  - React-RCTLinking (0.63.4):
339 
-    - FBReactNativeSpec (= 0.63.4)
340 
-    - React-Core/RCTLinkingHeaders (= 0.63.4)
341 
-    - React-jsi (= 0.63.4)
342 
-    - ReactCommon/turbomodule/core (= 0.63.4)
343 
-  - React-RCTNetwork (0.63.4):
344 
-    - FBReactNativeSpec (= 0.63.4)
345 
-    - Folly (= 2020.01.13.00)
346 
-    - RCTTypeSafety (= 0.63.4)
347 
-    - React-Core/RCTNetworkHeaders (= 0.63.4)
348 
-    - React-jsi (= 0.63.4)
349 
-    - ReactCommon/turbomodule/core (= 0.63.4)
350 
-  - React-RCTSettings (0.63.4):
351 
-    - FBReactNativeSpec (= 0.63.4)
352 
-    - Folly (= 2020.01.13.00)
353 
-    - RCTTypeSafety (= 0.63.4)
354 
-    - React-Core/RCTSettingsHeaders (= 0.63.4)
355 
-    - React-jsi (= 0.63.4)
356 
-    - ReactCommon/turbomodule/core (= 0.63.4)
357 
-  - React-RCTText (0.63.4):
358 
-    - React-Core/RCTTextHeaders (= 0.63.4)
359 
-  - React-RCTVibration (0.63.4):
360 
-    - FBReactNativeSpec (= 0.63.4)
361 
-    - Folly (= 2020.01.13.00)
362 
-    - React-Core/RCTVibrationHeaders (= 0.63.4)
363 
-    - React-jsi (= 0.63.4)
364 
-    - ReactCommon/turbomodule/core (= 0.63.4)
365 
-  - ReactCommon/turbomodule/core (0.63.4):
337 
+  - React-perflogger (0.66.4)
338 
+  - React-RCTActionSheet (0.66.4):
339 
+    - React-Core/RCTActionSheetHeaders (= 0.66.4)
340 
+  - React-RCTAnimation (0.66.4):
341 
+    - FBReactNativeSpec (= 0.66.4)
342 
+    - RCT-Folly (= 2021.06.28.00-v2)
343 
+    - RCTTypeSafety (= 0.66.4)
344 
+    - React-Core/RCTAnimationHeaders (= 0.66.4)
345 
+    - React-jsi (= 0.66.4)
346 
+    - ReactCommon/turbomodule/core (= 0.66.4)
347 
+  - React-RCTBlob (0.66.4):
348 
+    - FBReactNativeSpec (= 0.66.4)
349 
+    - RCT-Folly (= 2021.06.28.00-v2)
350 
+    - React-Core/RCTBlobHeaders (= 0.66.4)
351 
+    - React-Core/RCTWebSocket (= 0.66.4)
352 
+    - React-jsi (= 0.66.4)
353 
+    - React-RCTNetwork (= 0.66.4)
354 
+    - ReactCommon/turbomodule/core (= 0.66.4)
355 
+  - React-RCTImage (0.66.4):
356 
+    - FBReactNativeSpec (= 0.66.4)
357 
+    - RCT-Folly (= 2021.06.28.00-v2)
358 
+    - RCTTypeSafety (= 0.66.4)
359 
+    - React-Core/RCTImageHeaders (= 0.66.4)
360 
+    - React-jsi (= 0.66.4)
361 
+    - React-RCTNetwork (= 0.66.4)
362 
+    - ReactCommon/turbomodule/core (= 0.66.4)
363 
+  - React-RCTLinking (0.66.4):
364 
+    - FBReactNativeSpec (= 0.66.4)
365 
+    - React-Core/RCTLinkingHeaders (= 0.66.4)
366 
+    - React-jsi (= 0.66.4)
367 
+    - ReactCommon/turbomodule/core (= 0.66.4)
368 
+  - React-RCTNetwork (0.66.4):
369 
+    - FBReactNativeSpec (= 0.66.4)
370 
+    - RCT-Folly (= 2021.06.28.00-v2)
371 
+    - RCTTypeSafety (= 0.66.4)
372 
+    - React-Core/RCTNetworkHeaders (= 0.66.4)
373 
+    - React-jsi (= 0.66.4)
374 
+    - ReactCommon/turbomodule/core (= 0.66.4)
375 
+  - React-RCTSettings (0.66.4):
376 
+    - FBReactNativeSpec (= 0.66.4)
377 
+    - RCT-Folly (= 2021.06.28.00-v2)
378 
+    - RCTTypeSafety (= 0.66.4)
379 
+    - React-Core/RCTSettingsHeaders (= 0.66.4)
380 
+    - React-jsi (= 0.66.4)
381 
+    - ReactCommon/turbomodule/core (= 0.66.4)
382 
+  - React-RCTText (0.66.4):
383 
+    - React-Core/RCTTextHeaders (= 0.66.4)
384 
+  - React-RCTVibration (0.66.4):
385 
+    - FBReactNativeSpec (= 0.66.4)
386 
+    - RCT-Folly (= 2021.06.28.00-v2)
387 
+    - React-Core/RCTVibrationHeaders (= 0.66.4)
388 
+    - React-jsi (= 0.66.4)
389 
+    - ReactCommon/turbomodule/core (= 0.66.4)
390 
+  - React-runtimeexecutor (0.66.4):
391 
+    - React-jsi (= 0.66.4)
392 
+  - ReactCommon/turbomodule/core (0.66.4):
366 393 
     - DoubleConversion
367 
-    - Folly (= 2020.01.13.00)
368 394 
     - glog
369 
-    - React-callinvoker (= 0.63.4)
370 
-    - React-Core (= 0.63.4)
371 
-    - React-cxxreact (= 0.63.4)
372 
-    - React-jsi (= 0.63.4)
395 
+    - RCT-Folly (= 2021.06.28.00-v2)
396 
+    - React-callinvoker (= 0.66.4)
397 
+    - React-Core (= 0.66.4)
398 
+    - React-cxxreact (= 0.66.4)
399 
+    - React-jsi (= 0.66.4)
400 
+    - React-logger (= 0.66.4)
401 
+    - React-perflogger (= 0.66.4)
373 402 
   - RNCalendarEvents (2.2.0):
374 403 
     - React
375 404 
   - RNCAsyncStorage (1.15.14):
 
@@ -405,16 +434,17 @@ PODS:
405 434
406 435 
 DEPENDENCIES:
407 436 
   - "amplitude-react-native (from `../node_modules/@amplitude/react-native`)"
437 
+  - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`)
408 438 
   - CocoaLumberjack (~> 3.5.3)
409 439 
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
410 440 
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
411 
-  - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`)
441 
+  - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
412 442 
   - Firebase/Analytics (~> 6.33.0)
413 443 
   - Firebase/Crashlytics (~> 6.33.0)
414 444 
   - Firebase/DynamicLinks (~> 6.33.0)
415 
-  - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
416 445 
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
417 446 
   - ObjectiveDropboxOfficial (~> 6.1.0)
447 
+  - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
418 448 
   - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
419 449 
   - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`)
420 450 
   - React (from `../node_modules/react-native/`)
 
@@ -427,6 +457,7 @@ DEPENDENCIES:
427 457 
   - React-jsi (from `../node_modules/react-native/ReactCommon/jsi`)
428 458 
   - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`)
429 459 
   - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
460 
+  - React-logger (from `../node_modules/react-native/ReactCommon/logger`)
430 461 
   - react-native-background-timer (from `../node_modules/react-native-background-timer`)
431 462 
   - react-native-get-random-values (from `../node_modules/react-native-get-random-values`)
432 463 
   - react-native-keep-awake (from `../node_modules/react-native-keep-awake`)
 
@@ -439,6 +470,7 @@ DEPENDENCIES:
439 470 
   - react-native-video (from `../node_modules/react-native-video`)
440 471 
   - react-native-webrtc (from `../node_modules/react-native-webrtc`)
441 472 
   - react-native-webview (from `../node_modules/react-native-webview`)
473 
+  - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`)
442 474 
   - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
443 475 
   - React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`)
444 476 
   - React-RCTBlob (from `../node_modules/react-native/Libraries/Blob`)
 
@@ -448,6 +480,7 @@ DEPENDENCIES:
448 480 
   - React-RCTSettings (from `../node_modules/react-native/Libraries/Settings`)
449 481 
   - React-RCTText (from `../node_modules/react-native/Libraries/Text`)
450 482 
   - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`)
483 
+  - React-runtimeexecutor (from `../node_modules/react-native/ReactCommon/runtimeexecutor`)
451 484 
   - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
452 485 
   - RNCalendarEvents (from `../node_modules/react-native-calendar-events`)
453 486 
   - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)"
 
@@ -468,7 +501,6 @@ SPEC REPOS:
468 501 
   trunk:
469 502 
     - Amplitude
470 503 
     - AppAuth
471 
-    - boost-for-react-native
472 504 
     - CocoaLumberjack
473 505 
     - Firebase
474 506 
     - FirebaseAnalytics
 
@@ -477,6 +509,7 @@ SPEC REPOS:
477 509 
     - FirebaseCrashlytics
478 510 
     - FirebaseDynamicLinks
479 511 
     - FirebaseInstallations
512 
+    - fmt
480 513 
     - GoogleAppMeasurement
481 514 
     - GoogleDataTransport
482 515 
     - GoogleSignIn
 
@@ -490,16 +523,18 @@ SPEC REPOS:
490 523 
 EXTERNAL SOURCES:
491 524 
   amplitude-react-native:
492 525 
     :path: "../node_modules/@amplitude/react-native"
526 
+  boost:
527 
+    :podspec: "../node_modules/react-native/third-party-podspecs/boost.podspec"
493 528 
   DoubleConversion:
494 529 
     :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
495 530 
   FBLazyVector:
496 531 
     :path: "../node_modules/react-native/Libraries/FBLazyVector"
497 532 
   FBReactNativeSpec:
498 
-    :path: "../node_modules/react-native/Libraries/FBReactNativeSpec"
499 
-  Folly:
500 
-    :podspec: "../node_modules/react-native/third-party-podspecs/Folly.podspec"
533 
+    :path: "../node_modules/react-native/React/FBReactNativeSpec"
501 534 
   glog:
502 535 
     :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec"
536 
+  RCT-Folly:
537 
+    :podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec"
503 538 
   RCTRequired:
504 539 
     :path: "../node_modules/react-native/Libraries/RCTRequired"
505 540 
   RCTTypeSafety:
 
@@ -520,6 +555,8 @@ EXTERNAL SOURCES:
520 555 
     :path: "../node_modules/react-native/ReactCommon/jsiexecutor"
521 556 
   React-jsinspector:
522 557 
     :path: "../node_modules/react-native/ReactCommon/jsinspector"
558 
+  React-logger:
559 
+    :path: "../node_modules/react-native/ReactCommon/logger"
523 560 
   react-native-background-timer:
524 561 
     :path: "../node_modules/react-native-background-timer"
525 562 
   react-native-get-random-values:
 
@@ -544,6 +581,8 @@ EXTERNAL SOURCES:
544 581 
     :path: "../node_modules/react-native-webrtc"
545 582 
   react-native-webview:
546 583 
     :path: "../node_modules/react-native-webview"
584 
+  React-perflogger:
585 
+    :path: "../node_modules/react-native/ReactCommon/reactperflogger"
547 586 
   React-RCTActionSheet:
548 587 
     :path: "../node_modules/react-native/Libraries/ActionSheetIOS"
549 588 
   React-RCTAnimation:
 
@@ -562,6 +601,8 @@ EXTERNAL SOURCES:
562 601 
     :path: "../node_modules/react-native/Libraries/Text"
563 602 
   React-RCTVibration:
564 603 
     :path: "../node_modules/react-native/Libraries/Vibration"
604 
+  React-runtimeexecutor:
605 
+    :path: "../node_modules/react-native/ReactCommon/runtimeexecutor"
565 606 
   ReactCommon:
566 607 
     :path: "../node_modules/react-native/ReactCommon"
567 608 
   RNCalendarEvents:
 
@@ -597,11 +638,11 @@ SPEC CHECKSUMS:
597 638 
   Amplitude: 834c7332dfb9640a751e21c13efb22a07c0c12d4
598 639 
   amplitude-react-native: 0ed8cab759aafaa94961b82122bf56297da607ad
599 640 
   AppAuth: 31bcec809a638d7bd2f86ea8a52bd45f6e81e7c7
600 
-  boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
641 
+  boost: a7c83b31436843459a1961bfd74b96033dc77234
601 642 
   CocoaLumberjack: 2f44e60eb91c176d471fdba43b9e3eae6a721947
602 
-  DoubleConversion: cde416483dac037923206447da6e1454df403714
603 
-  FBLazyVector: 3bb422f41b18121b71783a905c10e58606f7dc3e
604 
-  FBReactNativeSpec: f2c97f2529dd79c083355182cc158c9f98f4bd6e
643 
+  DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
644 
+  FBLazyVector: e5569e42a1c79ca00521846c223173a57aca1fe1
645 
+  FBReactNativeSpec: fe08c1cd7e2e205718d77ad14b34957cce949b58
605 646 
   Firebase: 8db6f2d1b2c5e2984efba4949a145875a8f65fe5
606 647 
   FirebaseAnalytics: 5dd088bd2e67bb9d13dbf792d1164ceaf3052193
607 648 
   FirebaseCore: d889d9e12535b7f36ac8bfbf1713a0836a3012cd
 
@@ -609,8 +650,8 @@ SPEC CHECKSUMS:
609 650 
   FirebaseCrashlytics: 1a747c9cc084a24dc6d9511c991db1cd078154eb
610 651 
   FirebaseDynamicLinks: 6eac37d86910382eafb6315d952cc44c9e176094
611 652 
   FirebaseInstallations: 466c7b4d1f58fe16707693091da253726a731ed2
612 
-  Folly: b73c3869541e86821df3c387eb0af5f65addfab4
613 
-  glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
653 
+  fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
654 
+  glog: 5337263514dd6f09803962437687240c5dc39aa4
614 655 
   GoogleAppMeasurement: 966e88df9d19c15715137bb2ddaf52373f111436
615 656 
   GoogleDataTransport: f56af7caa4ed338dc8e138a5d7c5973e66440833
616 657 
   GoogleSignIn: fd381840dbe7c1137aa6dc30849a5c3e070c034a
 
@@ -620,16 +661,18 @@ SPEC CHECKSUMS:
620 661 
   nanopb: 59317e09cf1f1a0af72f12af412d54edf52603fc
621 662 
   ObjectiveDropboxOfficial: b4765572e334d6fc6214b43a7595510324bbbbaa
622 663 
   PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97
623 
-  RCTRequired: 082f10cd3f905d6c124597fd1c14f6f2655ff65e
624 
-  RCTTypeSafety: 8c9c544ecbf20337d069e4ae7fd9a377aadf504b
625 
-  React: b0a957a2c44da4113b0c4c9853d8387f8e64e615
626 
-  React-callinvoker: c3f44dd3cb195b6aa46621fff95ded79d59043fe
627 
-  React-Core: d3b2a1ac9a2c13c3bcde712d9281fc1c8a5b315b
628 
-  React-CoreModules: 0581ff36cb797da0943d424f69e7098e43e9be60
629 
-  React-cxxreact: c1480d4fda5720086c90df537ee7d285d4c57ac3
630 
-  React-jsi: a0418934cf48f25b485631deb27c64dc40fb4c31
631 
-  React-jsiexecutor: 93bd528844ad21dc07aab1c67cb10abae6df6949
632 
-  React-jsinspector: 58aef7155bc9a9683f5b60b35eccea8722a4f53a
664 
+  RCT-Folly: a21c126816d8025b547704b777a2ba552f3d9fa9
665 
+  RCTRequired: 4bf86c70714490bca4bf2696148638284622644b
666 
+  RCTTypeSafety: c475a7059eb77935fa53d2c17db299893f057d5d
667 
+  React: f64af14e3f2c50f6f2c91a5fd250e4ff1b3c3459
668 
+  React-callinvoker: b74e4ae80287780dcdf0cab262bcb581eeef56e7
669 
+  React-Core: 3eb7432bad96ff1d25aebc1defbae013fee2fd0e
670 
+  React-CoreModules: ad9e1fd5650e16666c57a08328df86fd7e480cb9
671 
+  React-cxxreact: 02633ff398cf7e91a2c1e12590d323c4a4b8668a
672 
+  React-jsi: 805c41a927d6499fb811772acb971467d9204633
673 
+  React-jsiexecutor: 94ce921e1d8ce7023366873ec371f3441383b396
674 
+  React-jsinspector: d0374f7509d407d2264168b6d0fad0b54e300b85
675 
+  React-logger: 933f80c97c633ee8965d609876848148e3fef438
633 676 
   react-native-background-timer: 17ea5e06803401a379ebf1f20505b793ac44d0fe
634 677 
   react-native-get-random-values: 30b3f74ca34e30e2e480de48e4add2706a40ac8f
635 678 
   react-native-keep-awake: afad8a51dfef9fe9655a6344771be32c8596d774
 
@@ -642,16 +685,18 @@ SPEC CHECKSUMS:
642 685 
   react-native-video: a4c2635d0802f983594b7057e1bce8f442f0ad28
643 686 
   react-native-webrtc: 2f20515f3ebb9dbf1f2aad638cc7573396cf948f
644 687 
   react-native-webview: ea4899a1056c782afa96dd082179a66cbebf5504
645 
-  React-RCTActionSheet: 89a0ca9f4a06c1f93c26067af074ccdce0f40336
646 
-  React-RCTAnimation: 1bde3ecc0c104c55df246eda516e0deb03c4e49b
647 
-  React-RCTBlob: a97d378b527740cc667e03ebfa183a75231ab0f0
648 
-  React-RCTImage: c1b1f2d3f43a4a528c8946d6092384b5c880d2f0
649 
-  React-RCTLinking: 35ae4ab9dc0410d1fcbdce4d7623194a27214fb2
650 
-  React-RCTNetwork: 29ec2696f8d8cfff7331fac83d3e893c95ef43ae
651 
-  React-RCTSettings: 60f0691bba2074ef394f95d4c2265ec284e0a46a
652 
-  React-RCTText: 5c51df3f08cb9dedc6e790161195d12bac06101c
653 
-  React-RCTVibration: ae4f914cfe8de7d4de95ae1ea6cc8f6315d73d9d
654 
-  ReactCommon: 73d79c7039f473b76db6ff7c6b159c478acbbb3b
688 
+  React-perflogger: 93075d8931c32cd1fce8a98c15d2d5ccc4d891bd
689 
+  React-RCTActionSheet: 7d3041e6761b4f3044a37079ddcb156575fb6d89
690 
+  React-RCTAnimation: 743e88b55ac62511ae5c2e22803d4f503f2a3a13
691 
+  React-RCTBlob: bee3a2f98fa7fc25c957c8643494244f74bea0a0
692 
+  React-RCTImage: 19fc9e29b06cc38611c553494f8d3040bf78c24e
693 
+  React-RCTLinking: dc799503979c8c711126d66328e7ce8f25c2848f
694 
+  React-RCTNetwork: 417e4e34cf3c19eaa5fd4e9eb20180d662a799ce
695 
+  React-RCTSettings: 4df89417265af26501a7e0e9192a34d3d9848dff
696 
+  React-RCTText: f8a21c3499ab322326290fa9b701ae29aa093aa5
697 
+  React-RCTVibration: e3ffca672dd3772536cb844274094b0e2c31b187
698 
+  React-runtimeexecutor: dec32ee6f2e2a26e13e58152271535fadff5455a
699 
+  ReactCommon: 57b69f6383eafcbd7da625bfa6003810332313c4
655 700 
   RNCalendarEvents: 7e65eb4a94f53c1744d1e275f7fafcfaa619f7a3
656 701 
   RNCAsyncStorage: ea6b5c280997b2b32a587793163b1f10e580c4f7
657 702 
   RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495
 
@@ -665,8 +710,8 @@ SPEC CHECKSUMS:
665 710 
   RNSound: 27e8268bdb0a1f191f219a33267f7e0445e8d62f
666 711 
   RNSVG: ce9d996113475209013317e48b05c21ee988d42e
667 712 
   RNWatch: 99637948ec9b5c9ec5a41920642594ad5ba07e80
668 
-  Yoga: 4bd86afe9883422a7c4028c00e34790f560923d6
713 
+  Yoga: e7dc4e71caba6472ff48ad7d234389b91dadc280
669 714
670 
-PODFILE CHECKSUM: e54f2f2e86709ccebbf8673ba9df71589886c81d
715 
+PODFILE CHECKSUM: 40b99aeea6fd9b3363170ff85721de7c2a5b26a3
671 716
672 717 
 COCOAPODS: 1.11.2

+ 2
- 0
ios/app/app.xcodeproj/project.pbxproj Просмотреть файл 

@@ -977,6 +977,7 @@
977 977 
 				ENABLE_BITCODE = YES;
978 978 
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
979 979 
 				ENABLE_TESTABILITY = YES;
980 
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
980 981 
 				GCC_C_LANGUAGE_STANDARD = gnu99;
981 982 
 				GCC_DYNAMIC_NO_PIC = NO;
982 983 
 				GCC_NO_COMMON_BLOCKS = YES;
 
@@ -1037,6 +1038,7 @@
1037 1038 
 				ENABLE_BITCODE = YES;
1038 1039 
 				ENABLE_NS_ASSERTIONS = NO;
1039 1040 
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
1041 
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
1040 1042 
 				GCC_C_LANGUAGE_STANDARD = gnu99;
1041 1043 
 				GCC_NO_COMMON_BLOCKS = YES;
1042 1044 
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;

+ 2
- 0
ios/sdk/sdk.xcodeproj/project.pbxproj Просмотреть файл 

@@ -518,6 +518,7 @@
518 518 
 				ENABLE_BITCODE = YES;
519 519 
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
520 520 
 				ENABLE_TESTABILITY = YES;
521 
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
521 522 
 				GCC_C_LANGUAGE_STANDARD = gnu99;
522 523 
 				GCC_DYNAMIC_NO_PIC = NO;
523 524 
 				GCC_NO_COMMON_BLOCKS = YES;
 
@@ -580,6 +581,7 @@
580 581 
 				ENABLE_BITCODE = YES;
581 582 
 				ENABLE_NS_ASSERTIONS = NO;
582 583 
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
584 
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
583 585 
 				GCC_C_LANGUAGE_STANDARD = gnu99;
584 586 
 				GCC_NO_COMMON_BLOCKS = YES;
585 587 
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;

+ 1
- 1
metro.config.js Просмотреть файл 

@@ -23,7 +23,7 @@ module.exports = (async () => {
23 23 
             getTransformOptions: async () => ({
24 24 
                 transform: {
25 25 
                     experimentalImportSupport: false,
26 
-                    inlineRequires: false,
26 
+                    inlineRequires: true,
27 27 
                 },
28 28 
             }),
29 29 
         },

+ 3117
- 3870
package-lock.json
Разница между файлами не показана из-за своего большого размера
Просмотреть файл


+ 5
- 5
package.json Просмотреть файл 

@@ -80,13 +80,13 @@
80 80 
     "optional-require": "1.0.3",
81 81 
     "promise.allsettled": "1.0.4",
82 82 
     "punycode": "2.1.1",
83 
-    "react": "16.13.1",
84 
-    "react-dom": "16.13.1",
83 
+    "react": "17.0.2",
84 
+    "react-dom": "17.0.2",
85 85 
     "react-emoji-render": "1.2.4",
86 86 
     "react-focus-lock": "2.5.1",
87 87 
     "react-i18next": "10.11.4",
88 88 
     "react-linkify": "1.0.0-alpha",
89 
-    "react-native": "0.63.4",
89 
+    "react-native": "0.66.4",
90 90 
     "react-native-background-timer": "2.4.1",
91 91 
     "react-native-calendar-events": "2.2.0",
92 92 
     "react-native-callstats": "3.73.7",
 
@@ -151,11 +151,11 @@
151 151 
     "eslint-plugin-react": "7.26.1",
152 152 
     "eslint-plugin-react-native": "3.11.0",
153 153 
     "expose-loader": "3.0.0",
154 
-    "flow-bin": "0.122.0",
154 
+    "flow-bin": "0.158.0",
155 155 
     "imports-loader": "0.7.1",
156 156 
     "jetifier": "1.6.4",
157 157 
     "jsonlint": "1.6.3",
158 
-    "metro-react-native-babel-preset": "0.59.0",
158 
+    "metro-react-native-babel-preset": "0.66.2",
159 159 
     "patch-package": "6.4.7",
160 160 
     "process": "0.11.10",
161 161 
     "sass": "1.26.8",

patches/react-native+0.63.4.patch → patches/react-native+0.66.4.patch Просмотреть файл 

@@ -1,8 +1,8 @@
1 1 
 diff --git a/node_modules/react-native/React/CoreModules/RCTTiming.mm b/node_modules/react-native/React/CoreModules/RCTTiming.mm
2 
-index 7517771..5af8bdc 100644
2 
+index 70f0543..d43a4be 100644
3 3 
 --- a/node_modules/react-native/React/CoreModules/RCTTiming.mm
4 4 
 +++ b/node_modules/react-native/React/CoreModules/RCTTiming.mm
5 
-@@ -148,6 +148,11 @@ - (void)setup
5 
+@@ -146,6 +146,11 @@ - (void)setup
6 6 
                                                   name:name
7 7 
                                                 object:nil];
8 8 
    }
 
@@ -12,12 +12,12 @@ index 7517771..5af8bdc 100644
12 12 
 +                                               name:UIDeviceProximityStateDidChangeNotification
13 13 
 +                                             object:nil];
14 14 
  }
15 
-
15 
+
16 16 
  - (void)dealloc
17 
-@@ -184,6 +189,16 @@ - (void)appDidMoveToForeground
17 
+@@ -182,6 +187,16 @@ - (void)appDidMoveToForeground
18 18 
    [self startTimers];
19 19 
  }
20 
-
20 
+
21 21 
 +- (void)proximityChanged
22 22 
 +{
23 23 
 +  BOOL isClose = [UIDevice currentDevice].proximityState;

+ 4
- 19
react/features/mobile/polyfills/browser.js Просмотреть файл 

@@ -80,13 +80,6 @@ function _visitNode(node, callback) {
80 80 
         global.addEventListener = () => {};
81 81 
     }
82 82
83 
-    // Promise.allSettled is supported from RN 0.63 onwards, use a polyfill for that.
84 
-    // Invokes its shim method to shim Promise.allSettled if it is unavailable or noncompliant.
85 
-    //
86 
-    // Required by:
87 
-    // lib-jitsi-meet/JitsiConference.js
88 
-    require('promise.allsettled').shim();
89 
-
90 83 
     // removeEventListener
91 84 
     //
92 85 
     // Required by:
 
@@ -284,22 +277,14 @@ function _visitNode(node, callback) {
284 277
285 278 
     // Performance API
286 279
287 
-    // RN 0.61 does not provide performance.now(), and react-native-performance
288 
-    // requires it.
289 
-    const now = () => Date.now();
290 
-
291 
-    if (!global.performance) {
292 
-        global.performance = {};
293 
-    }
294 
-
295 
-    if (!global.performance.now) {
296 
-        global.performance.now = now;
297 
-    }
280 
+    // RN only provides the now() method, since the polyfill refers the global
281 
+    // performance object itself we extract it here to avoid infinite recursion.
282 
+    const performanceNow = global.performance.now;
298 283
299 284 
     const perf = require('react-native-performance');
300 285
301 286 
     global.performance = perf.default;
302 
-    global.performance.now = now;
287 
+    global.performance.now = performanceNow;
303 288 
     global.PerformanceObserver = perf.PerformanceObserver;
304 289
305 290 
     // CallStats

+ 3
- 0
react/index.native.js Просмотреть файл 

@@ -1,5 +1,8 @@
1 1 
 // @flow
2 2
3 
+// https://github.com/software-mansion/react-native-gesture-handler/issues/320#issuecomment-443815828
4 
+import 'react-native-gesture-handler';
5 
+
3 6 
 // Apply all necessary polyfills as early as possible to make sure anything imported henceforth
4 7 
 // sees them.
5 8 
 import 'react-native-get-random-values';

Редактирование Предпросмотр
Загрузка…
Отмена
Сохранить