瀏覽代碼

feat(deps,rn) update React Native to version 0.69.9 (#13241)

* feat(deps,rn) update React Native to version 0.69
factor2
kerem 2 年之前
父節點
當前提交
4c0c36d233
沒有連結到貢獻者的電子郵件帳戶。

+ 3
- 2
.gitignore 查看文件

61
 
61
 
62
 # fastlane
62
 # fastlane
63
 #
63
 #
64
-*/fastlane/report.xml
65
-*/fastlane/Preview.html
64
+**/fastlane/report.xml
65
+**/fastlane/Preview.html
66
+**/fastlane/test_output
66
 
67
 
67
 # Build artifacts
68
 # Build artifacts
68
 *.jsbundle
69
 *.jsbundle

+ 2
- 1
android/build.gradle 查看文件

10
         mavenCentral()
10
         mavenCentral()
11
     }
11
     }
12
     dependencies {
12
     dependencies {
13
-        classpath 'com.android.tools.build:gradle:7.0.4'
13
+        classpath 'com.android.tools.build:gradle:7.1.1'
14
         classpath 'com.google.gms:google-services:4.3.14'
14
         classpath 'com.google.gms:google-services:4.3.14'
15
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
15
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
16
     }
16
     }
17
 }
17
 }
18
 
18
 
19
 ext {
19
 ext {
20
+    kotlinVersion = "1.5.32"
20
     buildToolsVersion = "31.0.0"
21
     buildToolsVersion = "31.0.0"
21
     compileSdkVersion = 32
22
     compileSdkVersion = 32
22
     minSdkVersion    = 24
23
     minSdkVersion    = 24

+ 2
- 2
android/scripts/release-sdk.sh 查看文件

33
         deploy:deploy-file \
33
         deploy:deploy-file \
34
         -Durl=${MVN_REPO} \
34
         -Durl=${MVN_REPO} \
35
         -DrepositoryId=${MVN_REPO_ID} \
35
         -DrepositoryId=${MVN_REPO_ID} \
36
-        -Dfile=react-native-${RN_VERSION}.aar \
36
+        -Dfile=react-native-${RN_VERSION}-release.aar \
37
         -Dpackaging=aar \
37
         -Dpackaging=aar \
38
         -DgeneratePom=false \
38
         -DgeneratePom=false \
39
         -DpomFile=react-native-${RN_VERSION}.pom || true
39
         -DpomFile=react-native-${RN_VERSION}.pom || true
58
         mvn \
58
         mvn \
59
             deploy:deploy-file \
59
             deploy:deploy-file \
60
             -Durl=${MVN_REPO} \
60
             -Durl=${MVN_REPO} \
61
-            -Dfile=react-native-${RN_VERSION}.aar \
61
+            -Dfile=react-native-${RN_VERSION}-release.aar \
62
             -Dpackaging=aar \
62
             -Dpackaging=aar \
63
             -DgeneratePom=false \
63
             -DgeneratePom=false \
64
             -DpomFile=react-native-${RN_VERSION}.pom
64
             -DpomFile=react-native-${RN_VERSION}.pom

+ 7
- 3
ios/Podfile 查看文件

1
 require_relative '../node_modules/react-native/scripts/react_native_pods'
1
 require_relative '../node_modules/react-native/scripts/react_native_pods'
2
 require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
2
 require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
3
 
3
 
4
-platform :ios, '12.0'
4
+platform :ios, '12.4'
5
 workspace 'jitsi-meet'
5
 workspace 'jitsi-meet'
6
 
6
 
7
 install! 'cocoapods', :deterministic_uuids => false
7
 install! 'cocoapods', :deterministic_uuids => false
8
 
8
 
9
+production = ENV["PRODUCTION"] == "1"
10
+
9
 target 'JitsiMeet' do
11
 target 'JitsiMeet' do
10
   project 'app/app.xcodeproj'
12
   project 'app/app.xcodeproj'
11
 
13
 
21
   #
23
   #
22
 
24
 
23
   config = use_native_modules!
25
   config = use_native_modules!
26
+  flags = get_default_flags()
24
   use_react_native!(
27
   use_react_native!(
25
-    :path => config["reactNativePath"],
28
+    :path => config[:reactNativePath],
29
+    :production => production,
26
     :hermes_enabled => false,
30
     :hermes_enabled => false,
27
     :fabric_enabled => false,
31
     :fabric_enabled => false,
28
     # An absolute path to your application root.
32
     # An absolute path to your application root.
81
     end
85
     end
82
     target.build_configurations.each do |config|
86
     target.build_configurations.each do |config|
83
       config.build_settings['SUPPORTS_MACCATALYST'] = 'NO'
87
       config.build_settings['SUPPORTS_MACCATALYST'] = 'NO'
84
-      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0'
88
+      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.4'
85
     end
89
     end
86
   end
90
   end
87
 end
91
 end

+ 5
- 3
ios/app/app.xcodeproj/project.pbxproj 查看文件

439
 				};
439
 				};
440
 			};
440
 			};
441
 			buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "app" */;
441
 			buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "app" */;
442
-			compatibilityVersion = "Xcode 3.2";
442
+			compatibilityVersion = "Xcode 12.0";
443
 			developmentRegion = en;
443
 			developmentRegion = en;
444
 			hasScannedForEncodings = 0;
444
 			hasScannedForEncodings = 0;
445
 			knownRegions = (
445
 			knownRegions = (
1025
 					"$(inherited)",
1025
 					"$(inherited)",
1026
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
1026
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
1027
 				);
1027
 				);
1028
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1028
+				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
1029
 				MTL_ENABLE_DEBUG_INFO = YES;
1029
 				MTL_ENABLE_DEBUG_INFO = YES;
1030
 				ONLY_ACTIVE_ARCH = YES;
1030
 				ONLY_ACTIVE_ARCH = YES;
1031
+				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
1031
 				SDKROOT = iphoneos;
1032
 				SDKROOT = iphoneos;
1032
 				TARGETED_DEVICE_FAMILY = "1,2";
1033
 				TARGETED_DEVICE_FAMILY = "1,2";
1033
 			};
1034
 			};
1078
 					"$(inherited)",
1079
 					"$(inherited)",
1079
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
1080
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
1080
 				);
1081
 				);
1081
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1082
+				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
1082
 				MTL_ENABLE_DEBUG_INFO = NO;
1083
 				MTL_ENABLE_DEBUG_INFO = NO;
1084
+				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
1083
 				SDKROOT = iphoneos;
1085
 				SDKROOT = iphoneos;
1084
 				SWIFT_COMPILATION_MODE = wholemodule;
1086
 				SWIFT_COMPILATION_MODE = wholemodule;
1085
 				TARGETED_DEVICE_FAMILY = "1,2";
1087
 				TARGETED_DEVICE_FAMILY = "1,2";

+ 14
- 20
ios/sdk/sdk.xcodeproj/project.pbxproj 查看文件

472
 				};
472
 				};
473
 			};
473
 			};
474
 			buildConfigurationList = 0BD906DF1EC0C00300C8C18E /* Build configuration list for PBXProject "sdk" */;
474
 			buildConfigurationList = 0BD906DF1EC0C00300C8C18E /* Build configuration list for PBXProject "sdk" */;
475
-			compatibilityVersion = "Xcode 3.2";
475
+			compatibilityVersion = "Xcode 12.0";
476
 			developmentRegion = en;
476
 			developmentRegion = en;
477
 			hasScannedForEncodings = 0;
477
 			hasScannedForEncodings = 0;
478
 			knownRegions = (
478
 			knownRegions = (
526
 			);
526
 			);
527
 			runOnlyForDeploymentPostprocessing = 0;
527
 			runOnlyForDeploymentPostprocessing = 0;
528
 			shellPath = /bin/sh;
528
 			shellPath = /bin/sh;
529
-			shellScript = "export NODE_BINARY=node\nexport NODE_ARGS=\"--max_old_space_size=4096\"\n../../node_modules/react-native/scripts/react-native-xcode.sh\n";
529
+			shellScript = "WITH_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";
530
 		};
530
 		};
531
 		26796D8589142D80C8AFDA51 /* [CP] Check Pods Manifest.lock */ = {
531
 		26796D8589142D80C8AFDA51 /* [CP] Check Pods Manifest.lock */ = {
532
 			isa = PBXShellScriptBuildPhase;
532
 			isa = PBXShellScriptBuildPhase;
551
 			buildActionMask = 2147483647;
551
 			buildActionMask = 2147483647;
552
 			files = (
552
 			files = (
553
 			);
553
 			);
554
-			inputPaths = (
555
-				"${PODS_ROOT}/Target Support Files/Pods-JitsiMeetSDK/Pods-JitsiMeetSDK-resources.sh",
556
-				"${PODS_ROOT}/Amplitude/Sources/Resources/ComodoRsaDomainValidationCA.der",
557
-				"${PODS_CONFIGURATION_BUILD_DIR}/GoogleSignIn/GoogleSignIn.bundle",
558
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
554
+			inputFileListPaths = (
555
+				"${PODS_ROOT}/Target Support Files/Pods-JitsiMeetSDK/Pods-JitsiMeetSDK-resources-${CONFIGURATION}-input-files.xcfilelist",
559
 			);
556
 			);
560
 			name = "[CP] Copy Pods Resources";
557
 			name = "[CP] Copy Pods Resources";
561
-			outputPaths = (
562
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ComodoRsaDomainValidationCA.der",
563
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleSignIn.bundle",
564
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
558
+			outputFileListPaths = (
559
+				"${PODS_ROOT}/Target Support Files/Pods-JitsiMeetSDK/Pods-JitsiMeetSDK-resources-${CONFIGURATION}-output-files.xcfilelist",
565
 			);
560
 			);
566
 			runOnlyForDeploymentPostprocessing = 0;
561
 			runOnlyForDeploymentPostprocessing = 0;
567
 			shellPath = /bin/sh;
562
 			shellPath = /bin/sh;
641
 			buildActionMask = 2147483647;
636
 			buildActionMask = 2147483647;
642
 			files = (
637
 			files = (
643
 			);
638
 			);
644
-			inputPaths = (
645
-				"${PODS_ROOT}/Target Support Files/Pods-JitsiMeetSDKLite/Pods-JitsiMeetSDKLite-resources.sh",
646
-				"${PODS_ROOT}/Amplitude/Sources/Resources/ComodoRsaDomainValidationCA.der",
647
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
639
+			inputFileListPaths = (
640
+				"${PODS_ROOT}/Target Support Files/Pods-JitsiMeetSDKLite/Pods-JitsiMeetSDKLite-resources-${CONFIGURATION}-input-files.xcfilelist",
648
 			);
641
 			);
649
 			name = "[CP] Copy Pods Resources";
642
 			name = "[CP] Copy Pods Resources";
650
-			outputPaths = (
651
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ComodoRsaDomainValidationCA.der",
652
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
643
+			outputFileListPaths = (
644
+				"${PODS_ROOT}/Target Support Files/Pods-JitsiMeetSDKLite/Pods-JitsiMeetSDKLite-resources-${CONFIGURATION}-output-files.xcfilelist",
653
 			);
645
 			);
654
 			runOnlyForDeploymentPostprocessing = 0;
646
 			runOnlyForDeploymentPostprocessing = 0;
655
 			shellPath = /bin/sh;
647
 			shellPath = /bin/sh;
781
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
773
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
782
 				GCC_WARN_UNUSED_FUNCTION = YES;
774
 				GCC_WARN_UNUSED_FUNCTION = YES;
783
 				GCC_WARN_UNUSED_VARIABLE = YES;
775
 				GCC_WARN_UNUSED_VARIABLE = YES;
784
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
776
+				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
785
 				MTL_ENABLE_DEBUG_INFO = YES;
777
 				MTL_ENABLE_DEBUG_INFO = YES;
786
 				ONLY_ACTIVE_ARCH = YES;
778
 				ONLY_ACTIVE_ARCH = YES;
779
+				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
787
 				SDKROOT = iphoneos;
780
 				SDKROOT = iphoneos;
788
 				TARGETED_DEVICE_FAMILY = "1,2";
781
 				TARGETED_DEVICE_FAMILY = "1,2";
789
 				VERSIONING_SYSTEM = "apple-generic";
782
 				VERSIONING_SYSTEM = "apple-generic";
837
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
830
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
838
 				GCC_WARN_UNUSED_FUNCTION = YES;
831
 				GCC_WARN_UNUSED_FUNCTION = YES;
839
 				GCC_WARN_UNUSED_VARIABLE = YES;
832
 				GCC_WARN_UNUSED_VARIABLE = YES;
840
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
833
+				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
841
 				MTL_ENABLE_DEBUG_INFO = NO;
834
 				MTL_ENABLE_DEBUG_INFO = NO;
835
+				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
842
 				SDKROOT = iphoneos;
836
 				SDKROOT = iphoneos;
843
 				SWIFT_COMPILATION_MODE = wholemodule;
837
 				SWIFT_COMPILATION_MODE = wholemodule;
844
 				TARGETED_DEVICE_FAMILY = "1,2";
838
 				TARGETED_DEVICE_FAMILY = "1,2";

+ 1458
- 1697
package-lock.json
文件差異過大導致無法顯示
查看文件


+ 5
- 5
package.json 查看文件

73
     "optional-require": "1.0.3",
73
     "optional-require": "1.0.3",
74
     "promise.allsettled": "1.0.4",
74
     "promise.allsettled": "1.0.4",
75
     "punycode": "2.1.1",
75
     "punycode": "2.1.1",
76
-    "react": "17.0.2",
77
-    "react-dom": "17.0.2",
76
+    "react": "18.2.0",
77
+    "react-dom": "18.2.0",
78
     "react-emoji-render": "1.2.4",
78
     "react-emoji-render": "1.2.4",
79
     "react-focus-lock": "2.9.4",
79
     "react-focus-lock": "2.9.4",
80
     "react-i18next": "10.11.4",
80
     "react-i18next": "10.11.4",
81
     "react-linkify": "1.0.0-alpha",
81
     "react-linkify": "1.0.0-alpha",
82
-    "react-native": "0.68.6",
82
+    "react-native": "0.69.10",
83
     "react-native-background-timer": "2.4.1",
83
     "react-native-background-timer": "2.4.1",
84
     "react-native-calendar-events": "2.2.0",
84
     "react-native-calendar-events": "2.2.0",
85
     "react-native-callstats": "3.73.7",
85
     "react-native-callstats": "3.73.7",
138
     "@types/react": "17.0.14",
138
     "@types/react": "17.0.14",
139
     "@types/react-dom": "17.0.14",
139
     "@types/react-dom": "17.0.14",
140
     "@types/react-linkify": "1.0.1",
140
     "@types/react-linkify": "1.0.1",
141
-    "@types/react-native": "0.68.9",
141
+    "@types/react-native": "0.69.20",
142
     "@types/react-native-keep-awake": "2.0.3",
142
     "@types/react-native-keep-awake": "2.0.3",
143
     "@types/react-native-video": "5.0.14",
143
     "@types/react-native-video": "5.0.14",
144
     "@types/react-redux": "7.1.24",
144
     "@types/react-redux": "7.1.24",
163
     "eslint-plugin-react-native": "4.0.0",
163
     "eslint-plugin-react-native": "4.0.0",
164
     "eslint-plugin-typescript-sort-keys": "2.3.0",
164
     "eslint-plugin-typescript-sort-keys": "2.3.0",
165
     "jetifier": "1.6.4",
165
     "jetifier": "1.6.4",
166
-    "metro-react-native-babel-preset": "0.67.0",
166
+    "metro-react-native-babel-preset": "0.70.3",
167
     "patch-package": "6.4.7",
167
     "patch-package": "6.4.7",
168
     "process": "0.11.10",
168
     "process": "0.11.10",
169
     "sass": "1.26.8",
169
     "sass": "1.26.8",

patches/react-native+0.68.6.patch → patches/react-native+0.69.10.patch 查看文件


+ 0
- 5
react-native.config.js 查看文件

26
                 ios: null
26
                 ios: null
27
             }
27
             }
28
         }
28
         }
29
-    },
30
-    project: {
31
-        ios: {
32
-            project: '.ios/jitsi-meet.xcworkspace'
33
-        }
34
     }
29
     }
35
 };
30
 };

Loading…
取消
儲存