Merge branch 'main' of github.com:callstack/react-native-brownfield into feat/expo-updates

Author: hurali97

.changeset/crisp-crabs-mate.md

@@ -0,0 +1,8 @@
+---
+'@callstack/react-native-brownfield': patch
+'@callstack/brownfield-navigation': patch
+'@callstack/brownie': patch
+'@callstack/brownfield-cli': patch
+---
+
+fix securiy vulnerabilities

apps/AndroidApp/app/build.gradle.kts

@@ -1,6 +1,5 @@
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
 }
 
@@ -55,9 +54,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = "17"
-    }
     buildFeatures {
         compose = true
     }
@@ -71,7 +67,6 @@ android {
 
 dependencies {
     implementation(libs.gson)
-
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
     implementation(libs.androidx.activity.compose)

apps/AndroidApp/app/src/main/java/com/callstack/brownfield/android/example/MainActivity.kt

@@ -3,6 +3,7 @@ package com.callstack.brownfield.android.example
 import com.callstack.brownie.registerStoreIfNeeded
 import android.content.Intent
 import android.content.res.Configuration
+import android.os.Build
 import android.os.Bundle
 import android.widget.Toast
 import androidx.activity.compose.setContent
@@ -131,6 +132,15 @@ fun ReactNativeView(
                 ReactNativeFragmentArgNames.ARG_MODULE_NAME,
                 ReactNativeConstants.MAIN_MODULE_NAME
             )
+            putBundle(
+                ReactNativeFragmentArgNames.ARG_LAUNCH_OPTIONS,
+                Bundle().apply {
+                    putString(
+                        "nativeOsVersionLabel",
+                        "Android ${Build.VERSION.RELEASE}"
+                    )
+                }
+            )
         }
     )
 }

apps/AndroidApp/build.gradle.kts

@@ -1,6 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
     alias(libs.plugins.android.application) apply false
-    alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.compose) apply false
 }

apps/AndroidApp/gradle.properties

@@ -15,7 +15,6 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
@@ -24,3 +23,8 @@ kotlin.code.style=official
 android.nonTransitiveRClass=true
 # Enable Gradle's build cache
 org.gradle.caching=true
+android.onlyEnableUnitTestForTheTestedBuildType=false
+android.uniquePackageNames=false
+android.dependency.useConstraints=true
+android.r8.strictFullModeForKeepRules=false
+android.dependency.excludeLibraryComponentsFromConstraints=true

apps/AndroidApp/gradle/libs.versions.toml

@@ -1,18 +1,19 @@
 [versions]
-agp = "8.13.2"
+agp = "9.1.0"
 brownfieldlib = "0.0.1-SNAPSHOT"
 gson = "2.13.1"
-kotlin = "2.2.21"
-coreKtx = "1.17.0"
+kotlin = "2.3.20"
+coreKtx = "1.18.0"
 junit = "4.13.2"
 junitVersion = "1.3.0"
 espressoCore = "3.7.0"
-lifecycleRuntimeKtx = "2.6.1"
-activityCompose = "1.8.0"
-composeBom = "2024.09.00"
+lifecycleRuntimeKtx = "2.10.0"
+activityCompose = "1.13.0"
+composeBom = "2026.03.01"
 appcompat = "1.7.1"
 fragmentCompose = "1.8.9"
 material = "1.13.0"
+gson = "2.13.2"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -36,9 +37,9 @@ androidx-compose-material3 = { group = "androidx.compose.material3", name = "mat
 androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
 androidx-fragment-compose = { group = "androidx.fragment", name = "fragment-compose", version.ref = "fragmentCompose" }
 material = { module = "com.google.android.material:material", version.ref = "material" }
+gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 

apps/AndroidApp/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 #Thu Dec 11 23:54:21 CET 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

apps/AppleApp/Brownfield Apple App/components/ContentView.swift

@@ -23,10 +23,23 @@ struct ContentView: View {
 
                 MessagesView()
 
-                ReactNativeView(moduleName: "main")
+                ReactNativeView(
+                    moduleName: "main",
+                    initialProperties: [
+                        "nativeOsVersionLabel":
+                            "\(UIDevice.current.systemName) \(UIDevice.current.systemVersion)"
+                    ]
+                )
                     .navigationBarHidden(true)
                     .clipShape(RoundedRectangle(cornerRadius: 16))
                     .background(Color(UIColor.systemBackground))
+                
+                Button("Stop React Native") {
+                    ReactNativeBrownfield.shared.stopReactNative()
+                }
+                    .buttonStyle(PlainButtonStyle())
+                    .padding(.top)
+                    .foregroundColor(.red)
             }
             .frame(maxWidth: .infinity, maxHeight: .infinity)
             .padding(16)

apps/ExpoApp54/RNApp.tsx

@@ -6,11 +6,24 @@ import Counter from './components/counter';
 
 import { checkAndFetchUpdate } from './utils/expo-rn-updates';
 
-export default function RNApp() {
+type RNAppProps = {
+  nativeOsVersionLabel?: string;
+};
+
+export default function RNApp({ nativeOsVersionLabel }: RNAppProps) {
   return (
     <SafeAreaView style={styles.container}>
       <Text style={styles.title}>Expo React Native Brownfield</Text>
 
+      {nativeOsVersionLabel ? (
+        <Text
+          style={styles.nativeOsVersionLabel}
+          accessibilityLabel="Native OS version"
+        >
+          {nativeOsVersionLabel}
+        </Text>
+      ) : null}
+
       <View style={styles.content}>
         <Counter />
 
@@ -39,6 +52,12 @@ const styles = StyleSheet.create({
     fontWeight: 'bold',
     textAlign: 'center',
   },
+  nativeOsVersionLabel: {
+    fontSize: 11,
+    opacity: 0.75,
+    textAlign: 'center',
+    marginTop: 4,
+  },
   content: {
     flex: 1,
     justifyContent: 'center',

apps/ExpoApp55/RNApp.tsx

@@ -5,11 +5,24 @@ import { checkAndFetchUpdate } from './src/utils/expo-rn-updates';
 
 import Counter from './src/components/counter';
 
-export default function RNApp() {
+type RNAppProps = {
+  nativeOsVersionLabel?: string;
+};
+
+export default function RNApp({ nativeOsVersionLabel }: RNAppProps) {
   return (
     <SafeAreaView style={styles.container}>
       <Text style={styles.title}>Expo React Native Brownfield</Text>
 
+      {nativeOsVersionLabel ? (
+        <Text
+          style={styles.nativeOsVersionLabel}
+          accessibilityLabel="Native OS version"
+        >
+          {nativeOsVersionLabel}
+        </Text>
+      ) : null}
+
       <View style={styles.content}>
         <Counter />
 
@@ -38,6 +51,12 @@ const styles = StyleSheet.create({
     fontWeight: 'bold',
     textAlign: 'center',
   },
+  nativeOsVersionLabel: {
+    fontSize: 11,
+    opacity: 0.75,
+    textAlign: 'center',
+    marginTop: 4,
+  },
   content: {
     flex: 1,
     justifyContent: 'center',