prepare 7.1.0 release

.circleci/config.yml

@@ -50,19 +50,16 @@ jobs:
             cd test
             [ -d "CITest" ] || npx react-native@<<parameters.rn-version>> init CITest --version <<parameters.rn-version>> --skip-install
 
+            # use macos default ruby version
+            cd CITest
+            rm -rf .ruby-version
+
       - save_cache:
           name: Save RN project template to cache
           key: v1-rn-template-cache-<<parameters.rn-version>>
           paths:
             - ../test/CITest
 
-      # See the `patches` directory
-      - run:
-          name: Do any necessary patching
-          command: |
-            if [ -d ".circleci/patches/<<parameters.rn-version>>" ]; then cp -r .circleci/patches/<<parameters.rn-version>>/* ../test/CITest/; fi
-            if [ -x "../test/CITest/patch.sh" ] ; then cd ../test/CITest && ./patch.sh; fi
-
       - run:
           name: Add LaunchDarkly dependency
           command: |
@@ -106,15 +103,10 @@ jobs:
             xcodebuild -workspace CITest.xcworkspace -scheme CITest build -configuration Release -destination "generic/platform=iOS" CODE_SIGNING_ALLOWED=NO GCC_WARN_INHIBIT_ALL_WARNINGS=YES | tee '../../../project/artifacts/xcb-<<parameters.rn-version>>.txt' | xcpretty
 
       - when:
-          # We only care to build Android application and debug iOS Build for a single XCode version
+          # only build android once
           condition:
-            equal: [13.2.1, << parameters.xcode-version >>]
+            equal: [14.2, << parameters.xcode-version >>]
           steps:
-            - run:
-                name: Build application for iOS (Debug)
-                command: |
-                  cd ../test/CITest/ios
-                  xcodebuild -workspace CITest.xcworkspace -scheme CITest build -configuration Debug -destination "generic/platform=iOS" CODE_SIGNING_ALLOWED=NO GCC_WARN_INHIBIT_ALL_WARNINGS=YES | tee '../../../project/artifacts/xcb-<<parameters.rn-version>>.txt' | xcpretty
             - run:
                 name: Build application for Android
                 command: cd ../test/CITest/android && ./gradlew packageRelease
@@ -130,14 +122,10 @@ workflows:
           name: rn<<matrix.rn-version>>-xc<<matrix.xcode-version>>-build-apps-using-template
           matrix:
             parameters:
-              rn-version: ['0.69.4', '0.70.1']
-              xcode-version: ['12.5.1', '13.2.1', '13.4.1', '14.0.1']
+              rn-version: ['0.69.8', '0.70.7', '0.71.3']
+              xcode-version: ['12.5.1', '14.2']
             exclude:
-              - rn-version: '0.69.4'
-                xcode-version: '13.4.1'
-              - rn-version: '0.69.4'
-                xcode-version: '14.0.1'
-              - rn-version: '0.70.1'
-                xcode-version: '13.4.1'
-              - rn-version: '0.70.1'
-                xcode-version: '14.0.1'
+              - rn-version: '0.69.8'
+                xcode-version: '12.5.1'
+              - rn-version: '0.70.7'
+                xcode-version: '12.5.1'

ManualTestApp/android/app/build.gradle

@@ -1,4 +1,5 @@
 apply plugin: "com.android.application"
+apply plugin: "com.facebook.react"
 
 import com.android.build.OutputFile
 
@@ -130,6 +131,7 @@ android {
 
     compileSdkVersion rootProject.ext.compileSdkVersion
 
+    namespace "com.manualtestapp"
     defaultConfig {
         applicationId "com.manualtestapp"
         minSdkVersion rootProject.ext.minSdkVersion

ManualTestApp/android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.manualtestapp">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
@@ -14,6 +13,7 @@
             android:name=".MainActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
             android:exported="true"
+            android:label="@string/app_name"
             android:launchMode="singleTask"
             android:windowSoftInputMode="adjustResize">
             <intent-filter>

ManualTestApp/android/build.gradle

@@ -2,40 +2,20 @@
 
 buildscript {
     ext {
+        buildToolsVersion = "33.0.0"
         minSdkVersion = 21
         compileSdkVersion = 33
         targetSdkVersion = 33
-        ndkVersion = "21.4.7075529"
+
+        // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
+        ndkVersion = "23.1.7779620"
     }
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
         classpath('com.android.tools.build:gradle:7.4.0')
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-allprojects {
-    repositories {
-        maven {
-            // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-            url("$rootDir/../node_modules/react-native/android")
-        }
-        maven {
-            // Android JSC is installed from npm
-            url("$rootDir/../node_modules/jsc-android/dist")
-        }
-        mavenCentral {
-            // We don't want to fetch react-native from Maven Central as there are
-            // older versions over there.
-            content {
-                excludeGroup "com.facebook.react"
-            }
-        }
-        google()
-        maven { url 'https://www.jitpack.io' }
+        classpath("com.facebook.react:react-native-gradle-plugin")
     }
 }

ManualTestApp/android/settings.gradle

@@ -1,3 +1,4 @@
 rootProject.name = 'ManualTestApp'
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'
+includeBuild('../node_modules/react-native-gradle-plugin')

ManualTestApp/ios/.xcode.env

@@ -0,0 +1,11 @@
+# This `.xcode.env` file is versioned and is used to source the environment
+# used when running script phases inside Xcode.
+# To customize your local environment, you can create an `.xcode.env.local`
+# file that is not versioned.
+
+# NODE_BINARY variable contains the PATH to the node executable.
+#
+# Customize the NODE_BINARY variable here.
+# For example, to use nvm with brew, add the following line
+# . "$(brew --prefix nvm)/nvm.sh" --no-use
+export NODE_BINARY=$(command -v node)

ManualTestApp/ios/ManualTestApp.xcodeproj/project.pbxproj

@@ -10,21 +10,21 @@
 		13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
+		743196CED3D77B75105D5AA0 /* libPods-ManualTestApp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D937B6AF77F68034A6BD038 /* libPods-ManualTestApp.a */; };
 		81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
-		F24580C912BF168D16B9CE17 /* libPods-ManualTestApp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7E3FECAE815F45A23A2A17A4 /* libPods-ManualTestApp.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		0C0541498E0F816AAC43AFD6 /* Pods-ManualTestApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ManualTestApp.debug.xcconfig"; path = "Target Support Files/Pods-ManualTestApp/Pods-ManualTestApp.debug.xcconfig"; sourceTree = "<group>"; };
 		13B07F961A680F5B00A75B9A /* ManualTestApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ManualTestApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = ManualTestApp/AppDelegate.h; sourceTree = "<group>"; };
 		13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = ManualTestApp/AppDelegate.m; sourceTree = "<group>"; };
 		13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = ManualTestApp/Images.xcassets; sourceTree = "<group>"; };
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = ManualTestApp/Info.plist; sourceTree = "<group>"; };
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = ManualTestApp/main.m; sourceTree = "<group>"; };
-		7E3FECAE815F45A23A2A17A4 /* libPods-ManualTestApp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ManualTestApp.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		7D937B6AF77F68034A6BD038 /* libPods-ManualTestApp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ManualTestApp.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = ManualTestApp/LaunchScreen.storyboard; sourceTree = "<group>"; };
-		AF2AEB7452F6900B99FF48E4 /* Pods-ManualTestApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ManualTestApp.release.xcconfig"; path = "Target Support Files/Pods-ManualTestApp/Pods-ManualTestApp.release.xcconfig"; sourceTree = "<group>"; };
+		B1DE77EF3F31D91853CA4080 /* Pods-ManualTestApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ManualTestApp.debug.xcconfig"; path = "Target Support Files/Pods-ManualTestApp/Pods-ManualTestApp.debug.xcconfig"; sourceTree = "<group>"; };
+		B73C403206EE31E26D6844D3 /* Pods-ManualTestApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ManualTestApp.release.xcconfig"; path = "Target Support Files/Pods-ManualTestApp/Pods-ManualTestApp.release.xcconfig"; sourceTree = "<group>"; };
 		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
 
@@ -33,7 +33,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				F24580C912BF168D16B9CE17 /* libPods-ManualTestApp.a in Frameworks */,
+				743196CED3D77B75105D5AA0 /* libPods-ManualTestApp.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -57,16 +57,16 @@
 			isa = PBXGroup;
 			children = (
 				ED297162215061F000B7C4FE /* JavaScriptCore.framework */,
-				7E3FECAE815F45A23A2A17A4 /* libPods-ManualTestApp.a */,
+				7D937B6AF77F68034A6BD038 /* libPods-ManualTestApp.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
 		7F649E4EEFE2FB4CD7ED4A8A /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				0C0541498E0F816AAC43AFD6 /* Pods-ManualTestApp.debug.xcconfig */,
-				AF2AEB7452F6900B99FF48E4 /* Pods-ManualTestApp.release.xcconfig */,
+				B1DE77EF3F31D91853CA4080 /* Pods-ManualTestApp.debug.xcconfig */,
+				B73C403206EE31E26D6844D3 /* Pods-ManualTestApp.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -107,14 +107,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "ManualTestApp" */;
 			buildPhases = (
-				1583E6315095EF5E60C53AA5 /* [CP] Check Pods Manifest.lock */,
+				2E3167E3790470C496D2DE4D /* [CP] Check Pods Manifest.lock */,
 				FD10A7F022414F080027D42C /* Start Packager */,
 				13B07F871A680F5B00A75B9A /* Sources */,
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
-				6D5C2C8D85E57C53DB6F2B93 /* [CP] Embed Pods Frameworks */,
-				F1026AFCB683E82B9A2BAC33 /* [CP] Copy Pods Resources */,
+				CA32B08E40102D7A14CDEACA /* [CP] Embed Pods Frameworks */,
+				7188AA91FE4353591A79A6A1 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -183,7 +183,7 @@
 			shellPath = /bin/sh;
 			shellScript = "set -e\n\nexport NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh\n";
 		};
-		1583E6315095EF5E60C53AA5 /* [CP] Check Pods Manifest.lock */ = {
+		2E3167E3790470C496D2DE4D /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -205,38 +205,38 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		6D5C2C8D85E57C53DB6F2B93 /* [CP] Embed Pods Frameworks */ = {
+		7188AA91FE4353591A79A6A1 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-ManualTestApp/Pods-ManualTestApp-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+				"${PODS_ROOT}/Target Support Files/Pods-ManualTestApp/Pods-ManualTestApp-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			name = "[CP] Embed Pods Frameworks";
+			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-ManualTestApp/Pods-ManualTestApp-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+				"${PODS_ROOT}/Target Support Files/Pods-ManualTestApp/Pods-ManualTestApp-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ManualTestApp/Pods-ManualTestApp-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ManualTestApp/Pods-ManualTestApp-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		F1026AFCB683E82B9A2BAC33 /* [CP] Copy Pods Resources */ = {
+		CA32B08E40102D7A14CDEACA /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-ManualTestApp/Pods-ManualTestApp-resources-${CONFIGURATION}-input-files.xcfilelist",
+				"${PODS_ROOT}/Target Support Files/Pods-ManualTestApp/Pods-ManualTestApp-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			name = "[CP] Copy Pods Resources";
+			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-ManualTestApp/Pods-ManualTestApp-resources-${CONFIGURATION}-output-files.xcfilelist",
+				"${PODS_ROOT}/Target Support Files/Pods-ManualTestApp/Pods-ManualTestApp-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ManualTestApp/Pods-ManualTestApp-resources.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ManualTestApp/Pods-ManualTestApp-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		FD10A7F022414F080027D42C /* Start Packager */ = {
@@ -275,7 +275,7 @@
 /* Begin XCBuildConfiguration section */
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 0C0541498E0F816AAC43AFD6 /* Pods-ManualTestApp.debug.xcconfig */;
+			baseConfigurationReference = B1DE77EF3F31D91853CA4080 /* Pods-ManualTestApp.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
@@ -302,7 +302,7 @@
 		};
 		13B07F951A680F5B00A75B9A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = AF2AEB7452F6900B99FF48E4 /* Pods-ManualTestApp.release.xcconfig */;
+			baseConfigurationReference = B73C403206EE31E26D6844D3 /* Pods-ManualTestApp.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;