Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion examples/ExpoMessaging/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
5 changes: 4 additions & 1 deletion examples/SampleApp/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions examples/SampleApp/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 5 additions & 0 deletions examples/SampleApp/android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading
Loading