Skip to content
This repository was archived by the owner on Sep 14, 2020. It is now read-only.

Commit 7847aba

Browse files
committed
Merge branch 'master' into next
2 parents acf8a69 + 8c1ed58 commit 7847aba

4 files changed

Lines changed: 8 additions & 6 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ scenario.json
1717
android/local.properties
1818
android/android.iml
1919
test/tmp
20+
.gradle

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ and [upgrade your gradle wrapper](https://docs.gradle.org/current/userguide/grad
1414
* Remove unnecessary gradlew from android directory, reducing artefact bundle size
1515
[#363](https://github.com/bugsnag/bugsnag-react-native/pull/363)
1616

17+
### Bug fixes
18+
19+
* Remove nullability annotations to workaround androidx jetifier issue
20+
[#361](https://github.com/bugsnag/bugsnag-react-native/pull/361)
21+
1722
## 2.19.1 (2019-05-21)
1823

1924
### Bug fixes

android/src/main/java/com/bugsnag/DiagnosticsCallback.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
import com.bugsnag.android.Report;
66
import com.bugsnag.android.Severity;
77

8-
import android.support.annotation.NonNull;
9-
108
import com.facebook.react.bridge.ReadableMap;
119
import com.facebook.react.bridge.ReadableMapKeySetIterator;
1210

@@ -92,7 +90,7 @@ Map<String, Object> readObjectMap(ReadableMap map) {
9290
}
9391

9492
@Override
95-
public void beforeNotify(@NonNull Report report) {
93+
public void beforeNotify(Report report) {
9694
report.getNotifier().setName(NOTIFIER_NAME);
9795
report.getNotifier().setURL(NOTIFIER_URL);
9896
report.getNotifier().setVersion(String.format("%s (Android %s)",

android/src/main/java/com/bugsnag/JavaScriptException.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import com.bugsnag.android.JsonStream;
44

5-
import android.support.annotation.NonNull;
6-
75
import java.io.IOException;
86

97
/**
@@ -24,7 +22,7 @@ class JavaScriptException extends Exception implements JsonStream.Streamable {
2422
}
2523

2624
@Override
27-
public void toStream(@NonNull JsonStream writer) throws IOException {
25+
public void toStream(JsonStream writer) throws IOException {
2826
writer.beginObject();
2927
writer.name("errorClass").value(name);
3028
writer.name("message").value(getLocalizedMessage());

0 commit comments

Comments
 (0)