Skip to content

Commit 8ab65e5

Browse files
committed
et update-rn
1 parent 4a0a8a6 commit 8ab65e5

File tree

12 files changed

+3260
-3822
lines changed

12 files changed

+3260
-3822
lines changed

packages/react-native/ReactAndroid/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import kotlin.Pair
2222

2323
import de.undercouch.gradle.tasks.download.Download
2424

25-
version = VERSION_NAME
25+
version = '49.0.0'
2626
group = "com.facebook.react"
2727

2828
// We download various C++ open-source dependencies into downloads.
@@ -36,7 +36,7 @@ def reactNativeRootDir = projectDir.parent
3636

3737
// We put the publishing version from gradle.properties inside ext. so other
3838
// subprojects can access it as well.
39-
ext.publishing_version = VERSION_NAME
39+
ext.publishing_version = '49.0.0'
4040

4141
// This is the version of CMake we're requesting to the Android SDK to use.
4242
// If missing it will be downloaded automatically. Only CMake versions shipped with the

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/DefaultJSExceptionHandler.java

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,28 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
*/
7-
87
package com.facebook.react.bridge;
98

109
/** Crashy crashy exception handler. */
1110
public class DefaultJSExceptionHandler implements JSExceptionHandler {
1211

13-
@Override
14-
public void handleException(Exception e) {
15-
if (e instanceof RuntimeException) {
16-
// Because we are rethrowing the original exception, the original stacktrace will be
17-
// preserved.
18-
throw (RuntimeException) e;
19-
} else {
20-
throw new RuntimeException(e);
12+
@Override
13+
public void handleException(Exception e) {
14+
try {
15+
{
16+
if (e instanceof RuntimeException) {
17+
// preserved.
18+
throw (RuntimeException) e;
19+
} else {
20+
throw new RuntimeException(e);
21+
}
22+
}
23+
} catch (RuntimeException expoException) {
24+
try {
25+
Class.forName("host.exp.exponent.ReactNativeStaticHelpers").getMethod("handleReactNativeError", String.class, Object.class, Integer.class, Boolean.class).invoke(null, expoException.getMessage(), null, -1, true);
26+
} catch (Exception expoHandleErrorException) {
27+
expoHandleErrorException.printStackTrace();
28+
}
29+
}
2130
}
22-
}
2331
}

0 commit comments

Comments
 (0)