Skip to content

Commit f578ece

Browse files
committed
Fixed Sandbox apps
1 parent 19cee12 commit f578ece

File tree

12 files changed

+2706
-1538
lines changed

12 files changed

+2706
-1538
lines changed

sandboxes/IntercomExpo/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
},
1111
"dependencies": {
1212
"@intercom/intercom-react-native": "^7.0.1",
13-
"expo": "^52.0.23",
14-
"expo-build-properties": "~0.11.1",
15-
"expo-status-bar": "~1.11.1",
16-
"expo-system-ui": "~2.9.4",
13+
"expo": "^51.0.0",
14+
"expo-build-properties": "~0.12.5",
15+
"expo-status-bar": "~1.12.1",
16+
"expo-system-ui": "~3.0.7",
1717
"react": "18.2.0",
18-
"react-native": "0.73.6",
18+
"react-native": "0.74.5",
1919
"react-native-mmkv-storage": "^0.9.1"
2020
},
2121
"devDependencies": {

sandboxes/IntercomExpo/yarn.lock

Lines changed: 1680 additions & 768 deletions
Large diffs are not rendered by default.

sandboxes/NotificationsSandbox/Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,4 +104,4 @@ RUBY VERSION
104104
ruby 2.6.10p210
105105

106106
BUNDLED WITH
107-
1.17.2
107+
2.1.4

sandboxes/NotificationsSandbox/android/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ android {
107107
dependencies {
108108
// The version of react-native is set by the React Native Gradle Plugin
109109
implementation("com.facebook.react:react-android")
110-
implementation("com.facebook.react:flipper-integration")
111110

112111
if (hermesEnabled.toBoolean()) {
113112
implementation("com.facebook.react:hermes-android")

sandboxes/NotificationsSandbox/android/app/src/main/java/com/example/sample/MainApplication.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import com.facebook.react.ReactPackage
99
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
1010
import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
1111
import com.facebook.react.defaults.DefaultReactNativeHost
12-
import com.facebook.react.flipper.ReactNativeFlipper
1312
import com.facebook.soloader.SoLoader
1413
import com.intercom.reactnative.IntercomModule
1514

@@ -43,7 +42,5 @@ class MainApplication : Application(), ReactApplication {
4342
}
4443

4544
IntercomModule.initialize(this, "apiKey", "appId"); // Add your Intercom configurations here
46-
47-
ReactNativeFlipper.initializeFlipper(this, reactNativeHost.reactInstanceManager)
4845
}
4946
}

sandboxes/NotificationsSandbox/android/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
buildscript {
22
ext {
3-
buildToolsVersion = "34.0.0"
4-
minSdkVersion = 21
5-
compileSdkVersion = 34
6-
targetSdkVersion = 34
7-
ndkVersion = "25.1.8937393"
8-
kotlinVersion = "1.8.0"
3+
buildToolsVersion = "35.0.0"
4+
minSdkVersion = 23
5+
compileSdkVersion = 35
6+
targetSdkVersion = 35
7+
ndkVersion = "26.1.10909125"
8+
kotlinVersion = "1.9.22"
99
}
1010
repositories {
1111
google()

sandboxes/NotificationsSandbox/ios/Podfile

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,6 @@ setup_permissions([
1919
'Notifications',
2020
])
2121

22-
# If you are using a `react-native-flipper` your iOS build will fail when `NO_FLIPPER=1` is set.
23-
# because `react-native-flipper` depends on (FlipperKit,...) that will be excluded
24-
#
25-
# To fix this you can also exclude `react-native-flipper` using a `react-native.config.js`
26-
# ```js
27-
# module.exports = {
28-
# dependencies: {
29-
# ...(process.env.NO_FLIPPER ? { 'react-native-flipper': { platforms: { ios: null } } } : {}),
30-
# ```
31-
flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled
32-
3322
linkage = ENV['USE_FRAMEWORKS']
3423
if linkage != nil
3524
Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green
@@ -41,11 +30,6 @@ target 'notificationsandbox' do
4130

4231
use_react_native!(
4332
:path => config[:reactNativePath],
44-
# Enables Flipper.
45-
#
46-
# Note that if you have use_frameworks! enabled, Flipper will not work and
47-
# you should disable the next line.
48-
:flipper_configuration => flipper_config,
4933
# An absolute path to your application root.
5034
:app_path => "#{Pod::Config.instance.installation_root}/.."
5135
)

0 commit comments

Comments
 (0)