Skip to content

Commit 91b2234

Browse files
authored
chore: upgrade to react native 81 and expo 54 (#6875)
1 parent 75d866b commit 91b2234

74 files changed

Lines changed: 10262 additions & 12407 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.maestro/tests/accessibilityAndAppearance/ToastsAndDialogs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ tags:
1818
# Show alerts as Toasts
1919
- tapOn: 'Menu'
2020
- tapOn: 'Accessibility & appearance'
21-
- tapOn: 'Show alerts as. Toasts'
21+
- tapOn: '.*Show alerts as.*'
2222
- assertVisible: 'Toasts. Dismissed automatically. Checked'
2323
- assertVisible: 'Dialogs. Require manual dismissal. Unchecked'
2424
- tapOn:
@@ -37,7 +37,7 @@ tags:
3737

3838
# Show alerts as Dialogs
3939
- tapOn: 'Accessibility & appearance'
40-
- tapOn: 'Show alerts as. Toasts'
40+
- tapOn: '.*Show alerts as.*'
4141
- assertVisible: 'Toasts. Dismissed automatically. Checked'
4242
- tapOn: 'Dialogs. Require manual dismissal. Unchecked'
4343
- tapOn: 'Menu'

.maestro/tests/assorted/join-from-directory.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@ tags:
9797
id: 'directory-view-filter'
9898
- extendedWaitUntil:
9999
visible:
100-
text: 'Users unselected'
100+
id: 'directory-switch-users'
101101
timeout: 60000
102102
- tapOn:
103-
text: 'Users unselected'
103+
id: 'directory-switch-users'
104104
- tapOn:
105105
id: 'directory-view-search'
106106
- inputText: ${output.otherUser.username}
@@ -145,10 +145,10 @@ tags:
145145
id: 'directory-view-filter'
146146
- extendedWaitUntil:
147147
visible:
148-
text: 'Teams unselected'
148+
id: 'directory-switch-teams'
149149
timeout: 60000
150150
- tapOn:
151-
text: 'Teams unselected'
151+
id: 'directory-switch-teams'
152152
- tapOn:
153153
id: 'directory-view-search'
154154
- inputText: ${output.team}

.maestro/tests/assorted/profile.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ tags:
9696
env:
9797
id: 'profile-view-username'
9898
- inputText: ${output.user.username + 'username'}
99-
- tapOn: '.*Username.*' #hidekeyboard on iOS
99+
- runFlow:
100+
file: '../../helpers/hide-keyboard.yaml'
100101
- scrollUntilVisible:
101102
element:
102103
id: 'profile-view-submit'
@@ -111,9 +112,8 @@ tags:
111112
- tapOn:
112113
id: 'profile-view-nickname'
113114
- inputText: ${output.user.username + 'newnickname'}
114-
- tapOn:
115-
text: '.*Nickname.*'
116-
index: 0
115+
- runFlow:
116+
file: '../../helpers/hide-keyboard.yaml'
117117
- assertVisible:
118118
id: 'profile-view-bio'
119119
- tapOn:

.maestro/tests/room/room-actions.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ tags:
121121
from:
122122
id: action-sheet-handle
123123
direction: UP
124-
- extendedWaitUntil:
125-
visible:
124+
- scrollUntilVisible:
125+
element:
126126
text: 'Star'
127127
timeout: 60000
128128
- tapOn:

android/app/src/debug/AndroidManifest.xml

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

android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
android:requestLegacyExternalStorage="true"
2929
android:supportsRtl="true"
3030
android:theme="@style/AppTheme"
31+
android:usesCleartextTraffic="${usesCleartextTraffic}"
3132
android:hardwareAccelerated="true"
3233
tools:replace="android:allowBackup">
3334
<activity

android/app/src/main/java/chat/rocket/reactnative/MainApplication.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ import android.content.res.Configuration
55
import com.facebook.react.PackageList
66
import com.facebook.react.ReactApplication
77
import com.facebook.react.ReactHost
8+
import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
9+
import com.facebook.react.ReactInstanceEventListener
810
import com.facebook.react.ReactNativeHost
911
import com.facebook.react.ReactPackage
10-
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
12+
import com.facebook.react.bridge.ReactContext
13+
import com.facebook.react.bridge.ReactApplicationContext
1114
import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
1215
import com.facebook.react.defaults.DefaultReactNativeHost
13-
import com.facebook.react.soloader.OpenSourceMergedSoMapping
14-
import com.facebook.soloader.SoLoader
1516
import com.nozbe.watermelondb.jsi.WatermelonDBJSIPackage;
1617
import com.bugsnag.android.Bugsnag
1718
import expo.modules.ApplicationLifecycleDispatcher
@@ -61,15 +62,14 @@ open class MainApplication : Application(), ReactApplication {
6162

6263
override fun onCreate() {
6364
super.onCreate()
64-
SoLoader.init(this, OpenSourceMergedSoMapping)
6565
Bugsnag.start(this)
6666

6767
// Initialize MMKV encryption - reads existing key or generates new one
6868
// Must run before React Native starts to avoid race conditions
6969
MMKVKeyManager.initialize(this)
7070

7171
// Load the native entry point for the New Architecture
72-
load()
72+
loadReactNative(this)
7373

7474
ApplicationLifecycleDispatcher.onApplicationCreate(this)
7575
}

android/app/src/main/java/chat/rocket/reactnative/networking/SSLPinningTurboModule.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import java.util.concurrent.TimeUnit;
3434

3535
import com.reactnativecommunity.webview.RNCWebViewManager;
36-
import expo.modules.filesystem.FileSystemModule;
36+
import expo.modules.filesystem.legacy.FileSystemLegacyModule;
3737
import chat.rocket.reactnative.networking.ExpoImageClient;
3838

3939
public class SSLPinningTurboModule extends NativeSSLPinningSpec implements KeyChainAliasCallback {
@@ -107,7 +107,7 @@ public void setCertificate(String name, Promise promise) {
107107
RNCWebViewManager.setCertificateAlias(name);
108108

109109
// Expo File System network layer
110-
FileSystemModule.setOkHttpClient(client);
110+
FileSystemLegacyModule.setOkHttpClient(client);
111111
// Expo Image network layer
112112
ExpoImageClient.setOkHttpClient(client);
113113
ExpoImageClient.applyToGlide(this.reactContext);

android/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
buildscript {
22
ext {
3-
buildToolsVersion = "35.0.0"
3+
buildToolsVersion = "36.0.0"
44
minSdkVersion = 24
5-
compileSdkVersion = 35
6-
targetSdkVersion = 35
5+
compileSdkVersion = 36
6+
targetSdkVersion = 36
77
ndkVersion = "27.1.12297006"
8-
kotlinVersion = "2.0.21"
8+
kotlinVersion = "2.1.20"
99
kotlin_version = kotlinVersion
1010
glideVersion = "4.11.0"
1111
supportLibVersion = "28.0.0"

android/gradle.properties

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,9 @@ BugsnagAPIKey=""
4343

4444
# Use this property to enable or disable the Hermes JS engine.
4545
# If set to false, you will be using JSC instead.
46-
hermesEnabled=true
46+
hermesEnabled=true
47+
48+
# Use this property to enable edge-to-edge display support.
49+
# This allows your app to draw behind system bars for an immersive UI.
50+
# Note: Only works with ReactActivity and should not be used with custom Activity.
51+
edgeToEdgeEnabled=false

0 commit comments

Comments
 (0)