Skip to content

Commit e0780ea

Browse files
authored
fix: upgrade ts messaging app according to upgrade helper (#2144)
1 parent 0c5700f commit e0780ea

24 files changed

+474
-490
lines changed

examples/ExpoMessaging/App.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ const ChannelListScreen = ({ navigation }) => {
9898
};
9999

100100
const ChannelScreen = ({ navigation }) => {
101-
const { channel, setThread, thread } = useContext(AppContext);
101+
const { channel, setThread } = useContext(AppContext);
102102
const headerHeight = useHeaderHeight();
103103
const { setTopInset } = useAttachmentPickerContext();
104104

@@ -108,7 +108,7 @@ const ChannelScreen = ({ navigation }) => {
108108

109109
return (
110110
<SafeAreaView>
111-
<Channel channel={channel} keyboardVerticalOffset={headerHeight} thread={thread}>
111+
<Channel channel={channel} keyboardVerticalOffset={headerHeight}>
112112
<View style={{ flex: 1 }}>
113113
<MessageList
114114
onThreadSelect={(thread) => {

examples/ExpoMessaging/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"@react-navigation/elements": "^1.3.12",
1313
"@react-navigation/native": "6.1.1",
1414
"@react-navigation/stack": "6.3.10",
15-
"expo": "~48.0.15",
15+
"expo": "~48.0.18",
1616
"expo-av": "~13.2.1",
1717
"expo-blur": "~12.2.2",
1818
"expo-file-system": "~15.2.2",

examples/ExpoMessaging/yarn.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3550,7 +3550,7 @@ expo-status-bar@~1.4.2:
35503550
resolved "https://registry.yarnpkg.com/expo-status-bar/-/expo-status-bar-1.4.4.tgz#6874ccfda5a270d66f123a9f220735a76692d114"
35513551
integrity sha512-5DV0hIEWgatSC3UgQuAZBoQeaS9CqeWRZ3vzBR9R/+IUD87Adbi4FGhU10nymRqFXOizGsureButGZIXPs7zEA==
35523552

3553-
expo@~48.0.15:
3553+
expo@~48.0.18:
35543554
version "48.0.19"
35553555
resolved "https://registry.yarnpkg.com/expo/-/expo-48.0.19.tgz#0f13be65d3cac99922666e5939388fc22b147e6a"
35563556
integrity sha512-Pmz2HEwcDdjWPq5fM3vF++je0hjZIBX9aTZEkm6sBv09Vfhe4+CuiuKDq3iE+N6G9l2+eFYoRCApDwLqcRMiPA==
@@ -6867,10 +6867,10 @@ [email protected]:
68676867
version "0.0.0"
68686868
uid ""
68696869

6870-
stream-chat-react-native-core@5.14.1:
6871-
version "5.14.1"
6872-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.14.1.tgz#6947961a56bc1fc4233547b005f4e056c8b01104"
6873-
integrity sha512-Jm5uIWAkZ1NpeLOD0/fAvY8YRxEgnlrHwcaG0Etdx1bjDXMWMCfC1UWHWHypocMHZ01CM3IJXnFEhMkigLavUw==
6870+
stream-chat-react-native-core@5.15.0:
6871+
version "5.15.0"
6872+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.15.0.tgz#e4d52ca3b492b7a3f2550049fccd85e025bfed2e"
6873+
integrity sha512-MJf9qV1MZf0r4HTt0afZGxF5/HytbY+Sap/8QTDNE6OucWmxa44kOY7SfHmfdkxOLTUPHMeK7Glc+wCmYZVVLA==
68746874
dependencies:
68756875
"@babel/runtime" "^7.12.5"
68766876
"@gorhom/bottom-sheet" "4.4.5"

examples/TypeScriptMessaging/.buckconfig

Lines changed: 0 additions & 6 deletions
This file was deleted.

examples/TypeScriptMessaging/.gitignore

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ local.properties
3030
*.iml
3131
*.hprof
3232
.cxx/
33+
*.keystore
34+
!debug.keystore
3335

3436
# Visual Studio Code
3537
#
@@ -41,12 +43,6 @@ node_modules/
4143
npm-debug.log
4244
yarn-error.log
4345

44-
# BUCK
45-
buck-out/
46-
\.buckd/
47-
*.keystore
48-
!debug.keystore
49-
5046
# fastlane
5147
#
5248
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the

examples/TypeScriptMessaging/.ruby-version

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source 'https://rubygems.org'
22

33
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
4-
ruby '>= 2.7.5'
4+
ruby '>= 2.6.10'
55

6-
gem 'cocoapods', '>= 1.12.1'
6+
gem 'cocoapods', '>= 1.11.3'

examples/TypeScriptMessaging/android/app/build.gradle

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,6 @@ android {
100100
targetSdkVersion rootProject.ext.targetSdkVersion
101101
versionCode 1
102102
versionName "1.0"
103-
104-
multiDexEnabled true
105-
vectorDrawables.useSupportLibrary true
106103
}
107104

108105
splits {
@@ -156,6 +153,11 @@ dependencies {
156153
implementation("com.facebook.react:react-android")
157154

158155
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0")
156+
debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
157+
debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
158+
exclude group:'com.squareup.okhttp3', module:'okhttp'
159+
}
160+
159161
// For React native video
160162
implementation("androidx.appcompat:appcompat:1.0.0")
161163
// For animated GIF support
@@ -164,10 +166,7 @@ dependencies {
164166
implementation('com.facebook.fresco:animated-webp:2.6.0')
165167
implementation('com.facebook.fresco:webpsupport:2.6.0')
166168

167-
debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
168-
debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
169-
exclude group:'com.squareup.okhttp3', module:'okhttp'
170-
}
169+
171170

172171
debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}")
173172
if (hermesEnabled.toBoolean()) {

examples/TypeScriptMessaging/android/app/build_defs.bzl

Lines changed: 0 additions & 19 deletions
This file was deleted.

examples/TypeScriptMessaging/android/app/src/main/java/com/typescriptmessaging/newarchitecture/MainApplicationReactNativeHost.java

Lines changed: 0 additions & 104 deletions
This file was deleted.

0 commit comments

Comments
 (0)