Skip to content

chore: react native upgrade #6771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Rohit3523 wants to merge 23 commits into from
Closed

chore: react native upgrade #6771

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
3025d3c
RN 80
Rohit3523 Nov 6, 2025
a517e1c
react-native 81 and expo 54
Rohit3523 Nov 6, 2025
221d983
changes
Rohit3523 Nov 6, 2025
7b57f3a
metro config fix
Rohit3523 Nov 6, 2025
1c76e46
Temporary disabled FileSystemModule setOkHttpClient
Rohit3523 Nov 6, 2025
8d8212d
Merge branch 'develop' into react-native-upgrade
Rohit3523 Nov 6, 2025
2e0af8d
fixed expo-file-system patch
Rohit3523 Nov 6, 2025
4e138e0
chore: format code and fix lint issues [skip ci]
Rohit3523 Nov 6, 2025
ff6604b
upgrade babel-preset-expo
Rohit3523 Nov 6, 2025
30656f7
Update to 0.81.5
Rohit3523 Nov 6, 2025
1bbe6ed
deleted react native patch
Rohit3523 Nov 6, 2025
645e6ef
pod changes
Rohit3523 Nov 6, 2025
a53706f
Enabled FileSystemModule.setOkHttpClient
Rohit3523 Nov 6, 2025
c2df773
Upgrade @react-native/codegen
Rohit3523 Nov 6, 2025
2030b54
React Native patch
Rohit3523 Nov 6, 2025
2552fa7
remove expo image patch
Rohit3523 Nov 6, 2025
39e0c83
Using expo-file-system/legacy ;-;
Rohit3523 Nov 6, 2025
615616b
Revert typescript version
Rohit3523 Nov 7, 2025
1376313
lock file
Rohit3523 Nov 7, 2025
ef31750
some ts warning fix
Rohit3523 Nov 7, 2025
e556e69
chore: format code and fix lint issues [skip ci]
Rohit3523 Nov 7, 2025
df69545
Merge branch 'develop' into react-native-upgrade
Rohit3523 Jan 3, 2026
059cf24
install
Rohit3523 Jan 3, 2026
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
9 changes: 0 additions & 9 deletions android/app/src/debug/AndroidManifest.xml
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions android/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
android:requestLegacyExternalStorage="true"
android:supportsRtl="true"
android:theme="@style/AppTheme"
android:usesCleartextTraffic="${usesCleartextTraffic}"
android:hardwareAccelerated="true"
tools:replace="android:allowBackup">
<activity
Expand Down
10 changes: 2 additions & 8 deletions android/app/src/main/java/chat/rocket/reactnative/MainApplication.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,12 @@ import com.facebook.react.ReactApplication
import com.facebook.react.ReactHost
import com.facebook.react.ReactInstanceEventListener
import com.facebook.react.ReactNativeHost
import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
import com.facebook.react.ReactPackage
import com.facebook.react.bridge.ReactContext
import com.facebook.react.bridge.ReactApplicationContext
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
import com.facebook.react.defaults.DefaultReactNativeHost
import com.facebook.react.soloader.OpenSourceMergedSoMapping
import com.facebook.soloader.SoLoader
import com.nozbe.watermelondb.jsi.WatermelonDBJSIPackage;
import com.wix.reactnativenotifications.core.AppLaunchHelper
import com.wix.reactnativenotifications.core.AppLifecycleFacade
Expand Down Expand Up @@ -51,13 +49,9 @@ open class MainApplication : Application(), ReactApplication, INotificationsAppl

override fun onCreate() {
super.onCreate()
SoLoader.init(this, OpenSourceMergedSoMapping)
Bugsnag.start(this)

if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
// If you opted-in for the New Architecture, we load the native entry point for this app.
load()
}
loadReactNative(this)

reactNativeHost.reactInstanceManager.addReactInstanceEventListener(object : ReactInstanceEventListener {
override fun onReactContextInitialized(context: ReactContext) {
Expand Down
8 changes: 4 additions & 4 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
buildscript {
ext {
buildToolsVersion = "35.0.0"
buildToolsVersion = "36.0.0"
minSdkVersion = 24
compileSdkVersion = 35
targetSdkVersion = 35
compileSdkVersion = 36
targetSdkVersion = 36
ndkVersion = "27.1.12297006"
kotlinVersion = "2.0.21"
kotlinVersion = "2.1.20"
kotlin_version = kotlinVersion
glideVersion = "4.11.0"
supportLibVersion = "28.0.0"
Expand Down
7 changes: 6 additions & 1 deletion android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,9 @@ BugsnagAPIKey=""

# Use this property to enable or disable the Hermes JS engine.
# If set to false, you will be using JSC instead.
hermesEnabled=true
hermesEnabled=true

# Use this property to enable edge-to-edge display support.
# This allows your app to draw behind system bars for an immersive UI.
# Note: Only works with ReactActivity and should not be used with custom Activity.
edgeToEdgeEnabled=false
Copy link
Contributor Author

@Rohit3523 Rohit3523 Nov 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

planning to enable edge to edge with unistyle migration

Binary file modified android/gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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-8.13-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
4 changes: 2 additions & 2 deletions android/gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions android/gradlew.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion app.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"name": "RocketChatRN"
"name": "RocketChatRN",
"plugins": ["expo-web-browser", "react-native-bootsplash"]
}
6 changes: 4 additions & 2 deletions ios/NotificationService/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
<dict>
<key>AppGroup</key>
<string>group.ios.chat.rocket</string>
<key>IS_OFFICIAL</key>
<false/>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleDisplayName</key>
Expand All @@ -24,6 +22,8 @@
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>IS_OFFICIAL</key>
<false/>
<key>KeychainGroup</key>
<string>$(AppIdentifierPrefix)chat.rocket.reactnative</string>
<key>NSExtension</key>
Expand All @@ -33,5 +33,7 @@
<key>NSExtensionPrincipalClass</key>
<string>$(PRODUCT_MODULE_NAME).NotificationService</string>
</dict>
<key>RCTNewArchEnabled</key>
<true/>
</dict>
</plist>
Loading
Loading