Skip to content

Commit 9cf791e

Browse files
authored
Bump React Native to 0.83 (#748)
Co-authored-by: war-in <war-in@users.noreply.github.com>
1 parent b17eaee commit 9cf791e

16 files changed

Lines changed: 17693 additions & 18430 deletions

File tree

WebExample/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,23 @@
1212
"dependencies": {
1313
"@expo/webpack-config": "~19.0.1",
1414
"babel-plugin-module-resolver": "^5.0.0",
15-
"expo": "53.0.0-preview.5",
15+
"expo": "^54.0.32",
1616
"expo-status-bar": "2.2.0",
17-
"react": "19.1.0",
18-
"react-dom": "19.1.0",
19-
"react-native": "0.80.1",
17+
"react": "19.2.0",
18+
"react-dom": "19.2.0",
19+
"react-native": "0.83.1",
2020
"react-native-web": "~0.20.0"
2121
},
2222
"devDependencies": {
2323
"@babel/core": "^7.24.0",
2424
"@playwright/test": "^1.43.1",
2525
"@types/node": "^20.12.7",
26-
"@types/react": "^19.1.0",
26+
"@types/react": "^19.2.0",
2727
"typescript": "~5.3.3"
2828
},
2929
"overrides": {
3030
"@expo/webpack-config": {
31-
"expo": "53.0.0-preview.5"
31+
"expo": "^54.0.32"
3232
}
3333
},
3434
"private": true

android/src/main/cpp/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ file(GLOB CPP_SRC CONFIGURE_DEPENDS "${CPP_DIR}/*.cpp")
1919

2020
add_library(${CMAKE_PROJECT_NAME} SHARED ${ANDROID_SRC} ${CPP_SRC})
2121

22-
target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CPP_DIR} "${REACT_NATIVE_ROOT_DIR}/ReactCommon/jsiexecutor")
22+
target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CPP_DIR} "${REACT_NATIVE_ROOT_DIR}/ReactCommon/jsiexecutor" "${REACT_NATIVE_ROOT_DIR}/ReactCommon")
2323

2424
find_package(fbjni REQUIRED CONFIG)
2525
find_package(ReactAndroid REQUIRED CONFIG)

android/src/main/new_arch/react/renderer/components/RNLiveMarkdownSpec/MarkdownTextInputDecoratorShadowNode.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class JSI_EXPORT MarkdownTextInputDecoratorShadowNode final
3535
void layout(LayoutContext layoutContext) override;
3636

3737
private:
38-
ContextContainer::Shared customContextContainer_;
38+
std::shared_ptr<const ContextContainer> customContextContainer_;
3939
folly::dynamic previousMarkdownStyle_;
4040
int previousParserId_;
4141

example/android/app/src/main/java/com/expensify/livemarkdownexample/MainApplication.kt

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,20 @@ import com.facebook.react.PackageList
55
import com.facebook.react.ReactApplication
66
import com.facebook.react.ReactHost
77
import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
8-
import com.facebook.react.ReactNativeHost
9-
import com.facebook.react.ReactPackage
108
import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
11-
import com.facebook.react.defaults.DefaultReactNativeHost
129

1310
class MainApplication : Application(), ReactApplication {
1411

15-
override val reactNativeHost: ReactNativeHost =
16-
object : DefaultReactNativeHost(this) {
17-
override fun getPackages(): List<ReactPackage> =
18-
PackageList(this).packages.apply {
19-
// Packages that cannot be autolinked yet can be added manually here, for example:
20-
// add(MyReactNativePackage())
21-
}
22-
23-
override fun getJSMainModuleName(): String = "index"
24-
25-
override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG
26-
27-
override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
28-
override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
29-
}
30-
31-
override val reactHost: ReactHost
32-
get() = getDefaultReactHost(applicationContext, reactNativeHost)
12+
override val reactHost: ReactHost by lazy {
13+
getDefaultReactHost(
14+
context = applicationContext,
15+
packageList =
16+
PackageList(this).packages.apply {
17+
// Packages that cannot be autolinked yet can be added manually here, for example:
18+
// add(MyReactNativePackage())
19+
},
20+
)
21+
}
3322

3423
override fun onCreate() {
3524
super.onCreate()
1.65 KB
Binary file not shown.

example/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

example/ios/LiveMarkdownExample.xcodeproj/project.pbxproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@
181181
);
182182
runOnlyForDeploymentPostprocessing = 0;
183183
shellPath = /bin/sh;
184-
shellScript = "set -e\n\nWITH_ENVIRONMENT=\"$REACT_NATIVE_PATH/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"$REACT_NATIVE_PATH/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n";
184+
shellScript = "set -e\n\nWITH_ENVIRONMENT=\"$REACT_NATIVE_PATH/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"$REACT_NATIVE_PATH/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"\\\"$WITH_ENVIRONMENT\\\" \\\"$REACT_NATIVE_XCODE\\\"\"\n";
185185
};
186186
00EEFC60759A1932668264C0 /* [CP] Embed Pods Frameworks */ = {
187187
isa = PBXShellScriptBuildPhase;
@@ -368,6 +368,7 @@
368368
);
369369
MTL_ENABLE_DEBUG_INFO = YES;
370370
ONLY_ACTIVE_ARCH = YES;
371+
OTHER_CFLAGS = "$(inherited)";
371372
OTHER_CPLUSPLUSFLAGS = (
372373
"$(OTHER_CFLAGS)",
373374
"-DFOLLY_NO_CONFIG",
@@ -440,6 +441,7 @@
440441
"\"$(inherited)\"",
441442
);
442443
MTL_ENABLE_DEBUG_INFO = NO;
444+
OTHER_CFLAGS = "$(inherited)";
443445
OTHER_CPLUSPLUSFLAGS = (
444446
"$(OTHER_CFLAGS)",
445447
"-DFOLLY_NO_CONFIG",

example/ios/LiveMarkdownExample/Info.plist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5+
<key>CADisableMinimumFrameDurationOnPhone</key>
6+
<true/>
57
<key>CFBundleDevelopmentRegion</key>
68
<string>en</string>
79
<key>CFBundleDisplayName</key>

0 commit comments

Comments
 (0)