Skip to content

Commit 4507721

Browse files
committed
et update-rn
1 parent 192285b commit 4507721

File tree

14 files changed

+3685
-4231
lines changed

14 files changed

+3685
-4231
lines changed

ReactAndroid/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import de.undercouch.gradle.tasks.download.Download
2626
import org.apache.tools.ant.taskdefs.condition.Os
2727
import org.apache.tools.ant.filters.ReplaceTokens
2828

29-
def AAR_OUTPUT_URL = "file://${projectDir}/../android"
29+
def AAR_OUTPUT_URL = "file:${System.env.HOME}/.m2/repository"
3030
// We download various C++ open-source dependencies into downloads.
3131
// We then copy both the downloaded code and our custom makefiles and headers into third-party-ndk.
3232
// After that we build native code from src/main/jni with module path pointing at third-party-ndk.
@@ -59,7 +59,7 @@ logger.info(":ReactAndroid - buildHermesSource[${buildHermesSource}]")
5959

6060
// We put the publishing version from gradle.properties inside ext. so other
6161
// subprojects can access it as well.
62-
ext.publishing_version = VERSION_NAME
62+
ext.publishing_version = '47.0.0'
6363

6464
task createNativeDepsDirectories {
6565
downloadsDir.mkdirs()
@@ -462,7 +462,7 @@ afterEvaluate {
462462
// You can then customize attributes of the publication as shown below.
463463
artifactId = POM_ARTIFACT_ID
464464
groupId = GROUP
465-
version = VERSION_NAME
465+
version = '47.0.0'
466466

467467
pom {
468468
name = POM_NAME

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)