Merge pull request #3788 from GetStream/develop

Next Release

Author: isekovanic

examples/ExpoMessaging/tsconfig.json

@@ -2,7 +2,15 @@
   "extends": ["expo/tsconfig.base", "@stream-io/typescript-config/base.json"],
   "compilerOptions": {
     "paths": {
-      "@/*": ["./*"]
+      "@/*": ["./*"],
+      // This workspace keeps its own React Native (Expo 57 -> RN 0.86) while the SDK workspace is on
+      // RN 0.87, and `nmHoistingLimits: workspaces` means both copies exist. Without this, the SDK's
+      // declarations resolve React Native relative to themselves, so `ColorValue` from the SDK's
+      // theme and `ColorValue` in this app's `ViewStyle` are two different nominal types. Pinning
+      // the whole program to this workspace's copy models what a real consumer sees (exactly one
+      // react-native) and, usefully, type-checks the SDK against RN 0.86.
+      "react-native": ["./node_modules/react-native"],
+      "react-native/*": ["./node_modules/react-native/*"]
     }
   },
   "include": ["**/*.ts", "**/*.tsx"]

examples/SampleApp/android/app/build.gradle

@@ -120,7 +120,10 @@ android {
             // see https://reactnative.dev/docs/signed-apk-android.
             signingConfig signingConfigs.debug
             minifyEnabled enableProguardInReleaseBuilds
-            proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
+            // AGP 9 (React Native 0.87) rejects "proguard-android.txt" because it bundles
+            // -dontoptimize, which blocks most R8 optimisations. The optimizing variant is the
+            // supported replacement.
+            proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
         }
     }
 }

examples/SampleApp/android/build.gradle

@@ -3,12 +3,12 @@ import org.apache.tools.ant.taskdefs.condition.Os
 
 buildscript {
     ext {
-        buildToolsVersion = "36.0.0"
+        buildToolsVersion = "37.0.0"
         minSdkVersion = 24
-        compileSdkVersion = 36
+        compileSdkVersion = 37
         targetSdkVersion = 36
         ndkVersion = "27.1.12297006"
-        kotlinVersion = "2.1.20"
+        kotlinVersion = "2.2.0"
         androidXCore = "1.0.2"
     }
     repositories {

examples/SampleApp/android/gradle.properties

@@ -43,6 +43,11 @@ hermesEnabled=true
 # Note: Only works with ReactActivity and should not be used with custom Activity.
 edgeToEdgeEnabled=true
 
+# Opt out of the built-in Kotlin support and the new DSL that ship with AGP 9, which React Native
+# 0.87 adopts in a transitional configuration. Starting with AGP 10.x these opt-outs are removed.
+android.builtInKotlin=false
+android.newDsl=false
+
 # disables the check for multiple instances for gesture handler
 # this is needed for react-native-gesture-handler to be both a devDep of core and be a dep on the expo sample app
 disableMultipleInstancesCheck=true

examples/SampleApp/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME