chore(deps): upgrade react-native to resolve dependabot alert (#14327)

* chore: upgrade react-native version

* chore: upgrade ios example app

* chore: upgrade android example app

* chore: add vscode setting for final new line

* chore: downgrade react native to lowest patched

* chore: upgrade beyond additional vuln

* chore: revert project new line setting

* chore: rerun yarn install

* chore: fix formatting

* chore: fix formatting

* chore: remove @types/react-native

Author: jjarvisp

.gitignore

@@ -50,6 +50,7 @@ xcuserdata/
 !*.xcworkspace/contents.xcworkspacedata
 /*.gcno
 **/xcshareddata/WorkspaceSettings.xcsettings
+**/.xcode.env.local
 
 ### Coverage ###
 coverage/

package.json

@@ -145,4 +145,4 @@
 		"tar": "6.2.1",
 		"cross-spawn": "7.0.5"
 	}
-}
+}

packages/react-native/example/Gemfile

@@ -2,4 +2,8 @@ source 'https://rubygems.org'
 
 ruby ">= 2.6.10"
 
-gem 'cocoapods', '~> 1.12'
+# Exclude problematic versions of cocoapods and activesupport that causes build failures.
+gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
+gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
+gem 'xcodeproj', '< 1.26.0'
+gem 'concurrent-ruby', '<= 1.3.4'

packages/react-native/example/android/app/build.gradle

@@ -1,22 +1,23 @@
 apply plugin: "com.android.application"
+apply plugin: "org.jetbrains.kotlin.android"
 apply plugin: "com.facebook.react"
 
 react {
+    /* Autolinking */
+    autolinkLibrariesWithApp()
 }
 
+
 def enableProguardInReleaseBuilds = false
 
 def jscFlavor = 'org.webkit:android-jsc:+'
 
 android {
     ndkVersion rootProject.ext.ndkVersion
-
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdk rootProject.ext.compileSdkVersion
 
     namespace "com.amplifyrtncoreexample"
-    buildFeatures {
-        buildConfig = true
-    }
     defaultConfig {
         applicationId "com.amplifyrtncoreexample"
         minSdkVersion rootProject.ext.minSdkVersion
@@ -47,17 +48,9 @@ android {
 dependencies {
     implementation("com.facebook.react:react-android")
 
-    debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
-    debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
-        exclude group:'com.squareup.okhttp3', module:'okhttp'
-    }
-
-    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}")
     if (hermesEnabled.toBoolean()) {
         implementation("com.facebook.react:hermes-android")
     } else {
         implementation jscFlavor
     }
-}
-
-apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
+}

packages/react-native/example/android/app/src/debug/AndroidManifest.xml

@@ -7,7 +7,5 @@
     <application
         android:usesCleartextTraffic="true"
         tools:targetApi="28"
-        tools:ignore="GoogleAppIndexingWarning">
-        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false" />
-    </application>
+        tools:ignore="GoogleAppIndexingWarning" />
 </manifest>

packages/react-native/example/android/app/src/debug/java/com/amplifyrtncoreexample/ReactNativeFlipper.java

@@ -1,25 +1,24 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <uses-permission android:name="android.permission.INTERNET" />
-
-    <application
-      android:name=".MainApplication"
-      android:label="@string/app_name"
-      android:icon="@mipmap/ic_launcher"
-      android:roundIcon="@mipmap/ic_launcher_round"
-      android:allowBackup="false"
-      android:theme="@style/AppTheme">
-      <activity
-        android:name=".MainActivity"
-        android:label="@string/app_name"
-        android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
-        android:launchMode="singleTask"
-        android:windowSoftInputMode="adjustResize"
-        android:exported="true">
-        <intent-filter>
-            <action android:name="android.intent.action.MAIN" />
-            <category android:name="android.intent.category.LAUNCHER" />
-        </intent-filter>
-      </activity>
-    </application>
-</manifest>
+	<uses-permission android:name="android.permission.INTERNET" />
+	<application
+		android:name=".MainApplication"
+		android:label="@string/app_name"
+		android:icon="@mipmap/ic_launcher"
+		android:roundIcon="@mipmap/ic_launcher_round"
+		android:allowBackup="false"
+		android:theme="@style/AppTheme"
+		android:supportsRtl="true">
+		<activity
+			android:name=".MainActivity"
+			android:label="@string/app_name"
+			android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
+			android:launchMode="singleTask"
+			android:windowSoftInputMode="adjustResize"
+			android:exported="true">
+			<intent-filter>
+				<action android:name="android.intent.action.MAIN" />
+				<category android:name="android.intent.category.LAUNCHER" />
+			</intent-filter>
+		</activity>
+	</application>
+</manifest>

packages/react-native/example/android/app/src/main/AndroidManifest.xml

@@ -0,0 +1,14 @@
+package com.amplifyrtncoreexample
+
+import com.facebook.react.ReactActivity
+import com.facebook.react.ReactActivityDelegate
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled
+import com.facebook.react.defaults.DefaultReactActivityDelegate
+
+class MainActivity : ReactActivity() {
+
+	override fun getMainComponentName(): String = "AmplifyRTNCoreExample"
+
+	override fun createReactActivityDelegate(): ReactActivityDelegate = 
+		DefaultReactActivityDelegate(this, mainComponentName, fabricEnabled)
+}