Преглед изворни кода

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
No account linked to committer's email address

+ 3
- 2
.gitignore Прегледај датотеку

@@ -61,8 +61,9 @@ buck-out/
61 61
 
62 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 68
 # Build artifacts
68 69
 *.jsbundle

+ 2
- 1
android/build.gradle Прегледај датотеку

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

+ 2
- 2
android/scripts/release-sdk.sh Прегледај датотеку

@@ -33,7 +33,7 @@ if [[ $MVN_HTTP == 1 ]]; then
33 33
         deploy:deploy-file \
34 34
         -Durl=${MVN_REPO} \
35 35
         -DrepositoryId=${MVN_REPO_ID} \
36
-        -Dfile=react-native-${RN_VERSION}.aar \
36
+        -Dfile=react-native-${RN_VERSION}-release.aar \
37 37
         -Dpackaging=aar \
38 38
         -DgeneratePom=false \
39 39
         -DpomFile=react-native-${RN_VERSION}.pom || true
@@ -58,7 +58,7 @@ else
58 58
         mvn \
59 59
             deploy:deploy-file \
60 60
             -Durl=${MVN_REPO} \
61
-            -Dfile=react-native-${RN_VERSION}.aar \
61
+            -Dfile=react-native-${RN_VERSION}-release.aar \
62 62
             -Dpackaging=aar \
63 63
             -DgeneratePom=false \
64 64
             -DpomFile=react-native-${RN_VERSION}.pom

+ 7
- 3
ios/Podfile Прегледај датотеку

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

+ 5
- 3
ios/app/app.xcodeproj/project.pbxproj Прегледај датотеку

@@ -439,7 +439,7 @@
439 439
 				};
440 440
 			};
441 441
 			buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "app" */;
442
-			compatibilityVersion = "Xcode 3.2";
442
+			compatibilityVersion = "Xcode 12.0";
443 443
 			developmentRegion = en;
444 444
 			hasScannedForEncodings = 0;
445 445
 			knownRegions = (
@@ -1025,9 +1025,10 @@
1025 1025
 					"$(inherited)",
1026 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 1029
 				MTL_ENABLE_DEBUG_INFO = YES;
1030 1030
 				ONLY_ACTIVE_ARCH = YES;
1031
+				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
1031 1032
 				SDKROOT = iphoneos;
1032 1033
 				TARGETED_DEVICE_FAMILY = "1,2";
1033 1034
 			};
@@ -1078,8 +1079,9 @@
1078 1079
 					"$(inherited)",
1079 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 1083
 				MTL_ENABLE_DEBUG_INFO = NO;
1084
+				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
1083 1085
 				SDKROOT = iphoneos;
1084 1086
 				SWIFT_COMPILATION_MODE = wholemodule;
1085 1087
 				TARGETED_DEVICE_FAMILY = "1,2";

+ 14
- 20
ios/sdk/sdk.xcodeproj/project.pbxproj Прегледај датотеку

@@ -472,7 +472,7 @@
472 472
 				};
473 473
 			};
474 474
 			buildConfigurationList = 0BD906DF1EC0C00300C8C18E /* Build configuration list for PBXProject "sdk" */;
475
-			compatibilityVersion = "Xcode 3.2";
475
+			compatibilityVersion = "Xcode 12.0";
476 476
 			developmentRegion = en;
477 477
 			hasScannedForEncodings = 0;
478 478
 			knownRegions = (
@@ -526,7 +526,7 @@
526 526
 			);
527 527
 			runOnlyForDeploymentPostprocessing = 0;
528 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 531
 		26796D8589142D80C8AFDA51 /* [CP] Check Pods Manifest.lock */ = {
532 532
 			isa = PBXShellScriptBuildPhase;
@@ -551,17 +551,12 @@
551 551
 			buildActionMask = 2147483647;
552 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 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 561
 			runOnlyForDeploymentPostprocessing = 0;
567 562
 			shellPath = /bin/sh;
@@ -641,15 +636,12 @@
641 636
 			buildActionMask = 2147483647;
642 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 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 646
 			runOnlyForDeploymentPostprocessing = 0;
655 647
 			shellPath = /bin/sh;
@@ -781,9 +773,10 @@
781 773
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
782 774
 				GCC_WARN_UNUSED_FUNCTION = YES;
783 775
 				GCC_WARN_UNUSED_VARIABLE = YES;
784
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
776
+				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
785 777
 				MTL_ENABLE_DEBUG_INFO = YES;
786 778
 				ONLY_ACTIVE_ARCH = YES;
779
+				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
787 780
 				SDKROOT = iphoneos;
788 781
 				TARGETED_DEVICE_FAMILY = "1,2";
789 782
 				VERSIONING_SYSTEM = "apple-generic";
@@ -837,8 +830,9 @@
837 830
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
838 831
 				GCC_WARN_UNUSED_FUNCTION = YES;
839 832
 				GCC_WARN_UNUSED_VARIABLE = YES;
840
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
833
+				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
841 834
 				MTL_ENABLE_DEBUG_INFO = NO;
835
+				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
842 836
 				SDKROOT = iphoneos;
843 837
 				SWIFT_COMPILATION_MODE = wholemodule;
844 838
 				TARGETED_DEVICE_FAMILY = "1,2";

+ 1458
- 1697
package-lock.json
Разлика између датотеке није приказан због своје велике величине
Прегледај датотеку


+ 5
- 5
package.json Прегледај датотеку

@@ -73,13 +73,13 @@
73 73
     "optional-require": "1.0.3",
74 74
     "promise.allsettled": "1.0.4",
75 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 78
     "react-emoji-render": "1.2.4",
79 79
     "react-focus-lock": "2.9.4",
80 80
     "react-i18next": "10.11.4",
81 81
     "react-linkify": "1.0.0-alpha",
82
-    "react-native": "0.68.6",
82
+    "react-native": "0.69.10",
83 83
     "react-native-background-timer": "2.4.1",
84 84
     "react-native-calendar-events": "2.2.0",
85 85
     "react-native-callstats": "3.73.7",
@@ -138,7 +138,7 @@
138 138
     "@types/react": "17.0.14",
139 139
     "@types/react-dom": "17.0.14",
140 140
     "@types/react-linkify": "1.0.1",
141
-    "@types/react-native": "0.68.9",
141
+    "@types/react-native": "0.69.20",
142 142
     "@types/react-native-keep-awake": "2.0.3",
143 143
     "@types/react-native-video": "5.0.14",
144 144
     "@types/react-redux": "7.1.24",
@@ -163,7 +163,7 @@
163 163
     "eslint-plugin-react-native": "4.0.0",
164 164
     "eslint-plugin-typescript-sort-keys": "2.3.0",
165 165
     "jetifier": "1.6.4",
166
-    "metro-react-native-babel-preset": "0.67.0",
166
+    "metro-react-native-babel-preset": "0.70.3",
167 167
     "patch-package": "6.4.7",
168 168
     "process": "0.11.10",
169 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,10 +26,5 @@ module.exports = {
26 26
                 ios: null
27 27
             }
28 28
         }
29
-    },
30
-    project: {
31
-        ios: {
32
-            project: '.ios/jitsi-meet.xcworkspace'
33
-        }
34 29
     }
35 30
 };

Loading…
Откажи
Сачувај