chore: bump to RN 0.74

Author: okwasniewski

.circleci/config.yml

@@ -19,10 +19,10 @@ jobs:
           name: Lint JS Code (ESLint)
           command: yarn run lint
       - run:
-          name: Flow
-          command: yarn run flow
+          name: Typescript Type Checking (tsc) 
+          command: yarn run typecheck
 
 workflows:
   test:
     jobs:
-      - analyse
+      - analyse

.eslintrc.js

@@ -21,6 +21,7 @@ DerivedData
 *.ipa
 *.xcuserstate
 project.xcworkspace
+**/.xcode.env.local
 
 # Android/IntelliJ
 #
@@ -57,3 +58,17 @@ buck-out/
 
 # CocoaPods
 **/Pods
+
+
+# Yarn
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+.yarnrc.yml 
+
+# generated by bob
+lib/
+

.flowconfig

@@ -0,0 +1 @@
+nodeLinker: node-modules

.gitignore

@@ -84,9 +84,11 @@ class ReactNativeActivity : ReactActivity(), DefaultHardwareBackBtnHandler, Perm
                 ReactNativeBrownfield.shared.reactNativeHost.reactInstanceManager.showDevOptionsDialog()
                 return true
             }
-            val didDoubleTapR = Assertions.assertNotNull(doubleTapReloadRecognizer)
-                .didDoubleTapR(keyCode, this.currentFocus)
-            if (didDoubleTapR) {
+            val didDoubleTapR = this.currentFocus?.let {
+                Assertions.assertNotNull(doubleTapReloadRecognizer)
+                    .didDoubleTapR(keyCode, it)
+            }
+            if (didDoubleTapR == true) {
                 ReactNativeBrownfield.shared.reactNativeHost.reactInstanceManager.devSupportManager.handleReloadJS()
                 return true
             }
@@ -132,6 +134,7 @@ class ReactNativeActivity : ReactActivity(), DefaultHardwareBackBtnHandler, Perm
         permissions: Array<String>,
         grantResults: IntArray
     ) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
         permissionsCallback = Callback {
             if (permissionListener != null) {
                 permissionListener?.onRequestPermissionsResult(

.yarnrc.yml

@@ -1,8 +1,10 @@
 package com.callstack.reactnativebrownfield
 
 import android.app.Application
+import com.facebook.react.ReactInstanceEventListener
 import com.facebook.react.ReactNativeHost
 import com.facebook.react.ReactPackage
+import com.facebook.react.bridge.ReactContext
 import com.facebook.soloader.SoLoader
 import java.util.concurrent.atomic.AtomicBoolean
 
@@ -60,10 +62,13 @@ class ReactNativeBrownfield private constructor(val reactNativeHost: ReactNative
 
   @JvmName("startReactNativeKotlin")
   fun startReactNative(callback: ((initialized: Boolean) -> Unit)?) {
-    if (callback != null) {
-      reactNativeHost.reactInstanceManager?.addReactInstanceEventListener { callback(true) }
-    }
-
+    reactNativeHost.reactInstanceManager.addReactInstanceEventListener(object : ReactInstanceEventListener {
+      override fun onReactContextInitialized(reactContext: ReactContext) {
+        callback?.let { it(true) }
+        reactNativeHost.reactInstanceManager.removeReactInstanceEventListener(this)
+      }
+    })
     reactNativeHost.reactInstanceManager?.createReactContextInBackground()
   }
-}
+}
+

android/src/main/java/com/callstack/reactnativebrownfield/ReactNativeActivity.kt

@@ -103,12 +103,12 @@ class ReactNativeFragment : Fragment(), PermissionAwareActivity {
     }
 
     override fun checkPermission(permission: String, pid: Int, uid: Int): Int {
-        return activity!!.checkPermission(permission, pid, uid)
+        return requireActivity().checkPermission(permission, pid, uid)
     }
 
     @TargetApi(Build.VERSION_CODES.M)
     override fun checkSelfPermission(permission: String): Int {
-        return activity!!.checkSelfPermission(permission)
+        return requireActivity().checkSelfPermission(permission)
     }
 
     @TargetApi(Build.VERSION_CODES.M)
@@ -128,9 +128,11 @@ class ReactNativeFragment : Fragment(), PermissionAwareActivity {
                 ReactNativeBrownfield.shared.reactNativeHost.reactInstanceManager.showDevOptionsDialog()
                 handled = true
             }
-            val didDoubleTapR = Assertions.assertNotNull(doubleTapReloadRecognizer)
-                .didDoubleTapR(keyCode, activity?.currentFocus)
-            if (didDoubleTapR) {
+            val didDoubleTapR = activity?.currentFocus?.let {
+                Assertions.assertNotNull(doubleTapReloadRecognizer)
+                    .didDoubleTapR(keyCode, it)
+            }
+            if (didDoubleTapR == true) {
                 ReactNativeBrownfield.shared.reactNativeHost.reactInstanceManager.devSupportManager.handleReloadJS()
                 handled = true
             }

android/src/main/java/com/callstack/reactnativebrownfield/ReactNativeBrownfield.kt

@@ -1,5 +1,5 @@
 module.exports = {
-  presets: ['module:metro-react-native-babel-preset'],
+  presets: ['module:@react-native/babel-preset'],
   plugins: [
     [
       'module-resolver',

android/src/main/java/com/callstack/reactnativebrownfield/ReactNativeFragment.kt

@@ -1,31 +1,39 @@
 import React, {useEffect} from 'react';
 import {AppRegistry, StyleSheet, Text, View, Button} from 'react-native';
-import {NavigationContainer} from '@react-navigation/native';
-import {createNativeStackNavigator} from '@react-navigation/native-stack';
+import {
+  createNativeStackNavigator,
+  type NativeStackScreenProps,
+} from '@react-navigation/native-stack';
 import ReactNativeBrownfield from '@callstack/react-native-brownfield';
+import {NavigationContainer} from '@react-navigation/native';
 
+const getRandomValue = () => Math.round(Math.random() * 255);
 const getRandomTheme = () => {
-  const getRandomValue = () => Math.round(Math.random() * 255);
-
   const primary = [getRandomValue(), getRandomValue(), getRandomValue()];
-  const secondary = [255 - primary[0], 255 - primary[1], 255 - primary[2]];
+  const secondary = [
+    255 - (primary?.[0] || 0),
+    255 - (primary?.[1] || 0),
+    255 - (primary?.[2] || 0),
+  ];
 
   return {
     primary: `rgb(${primary[0]}, ${primary[1]}, ${primary[2]})`,
     secondary: `rgb(${secondary[0]}, ${secondary[1]}, ${secondary[2]})`,
   };
 };
 
-function HomeScreen({navigation}) {
-  const colors = navigation.params?.theme || getRandomTheme();
+type Props = NativeStackScreenProps<RootStackParamList, 'Home'>;
+
+function HomeScreen({navigation, route}: Props) {
+  const colors = route.params?.theme || getRandomTheme();
 
   useEffect(() => {
-    const unsubscribe = navigation.addListener('focus', (e) => {
+    const unsubscribe = navigation.addListener('focus', () => {
       const isFirstRoute = !navigation.canGoBack();
       ReactNativeBrownfield.setNativeBackGestureAndButtonEnabled(isFirstRoute);
     });
     return unsubscribe;
-  }, []);
+  }, [navigation]);
 
   return (
     <View style={[styles.container, {backgroundColor: colors.primary}]}>
@@ -57,8 +65,11 @@ function HomeScreen({navigation}) {
     </View>
   );
 }
+type RootStackParamList = {
+  Home: {theme: {primary: string, secondary: string}},
+};
 
-const Stack = createNativeStackNavigator();
+const Stack = createNativeStackNavigator<RootStackParamList>();
 
 function App() {
   return (

babel.config.js

@@ -10,7 +10,10 @@ react {
 def jscFlavor = 'org.webkit:android-jsc:+'
 
 android {
+    namespace "com.callstack.nativeexample"
     ndkVersion rootProject.ext.ndkVersion
+
+    buildToolsVersion rootProject.ext.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     compileOptions {

example/index.js renamed to example/index.tsx

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.callstack.nativeexample">
-
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
@@ -25,4 +23,4 @@
         <activity android:name="com.callstack.reactnativebrownfield.ReactNativeActivity"/>
     </application>
 
-</manifest>
+</manifest>

example/java/app/build.gradle

@@ -2,28 +2,31 @@
 
 buildscript {
     ext {
-        buildToolsVersion = "33.0.0"
-        minSdkVersion = 21
-        compileSdkVersion = 33
-        targetSdkVersion = 33
-        supportLibVersion = "28.0.0"
-        kotlinVersion = '1.9.10'
+        buildToolsVersion = "34.0.0"
+        minSdkVersion = 23
+        compileSdkVersion = 34
+        targetSdkVersion = 34
+        ndkVersion = "26.1.10909125"
+        kotlinVersion = "1.9.22"
 
         // 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()
-        jcenter()
         mavenCentral()
+        google()
+        gradlePluginPortal()
     }
     dependencies {
         classpath "com.android.tools.build:gradle"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath "com.facebook.react:react-native-gradle-plugin"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin"
     }
 }
 
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
+
+apply plugin: "com.facebook.react.rootproject"

example/java/app/src/main/AndroidManifest.xml

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists