Skip to content

Commit acf2416

Browse files
committed
upgrade to react-native 0.60
1 parent 3c6cdb3 commit acf2416

7 files changed

Lines changed: 14 additions & 8 deletions

File tree

android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ android {
152152
}
153153

154154
dependencies {
155-
compile project(':react-native-onesignal')
155+
implementation project(':react-native-onesignal')
156156
implementation fileTree(dir: "libs", include: ["*.jar"])
157157
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
158158
implementation 'androidx.appcompat:appcompat:1.0.0'

android/app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
android:icon="@mipmap/ic_launcher"
2020
android:label="@string/app_name"
2121
android:largeHeap="true"
22-
android:theme="@style/AppTheme">
22+
android:theme="@style/AppTheme"
23+
android:networkSecurityConfig="@xml/network_security_config">
2324
<activity
2425
android:name=".MainActivity"
2526
android:configChanges="keyboard|keyboardHidden|orientation|screenSize"

android/app/src/main/java/org/break_out/breakout/MainApplication.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.facebook.react.ReactPackage;
99
import com.facebook.react.shell.MainReactPackage;
1010
import com.facebook.soloader.SoLoader;
11-
import com.geektime.rnonesignalandroid.ReactNativeOneSignalPackage;
1211

1312
import java.util.Arrays;
1413
import java.util.List;
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<network-security-config>
2+
<domain-config cleartextTrafficPermitted="true">
3+
<domain includeSubdomains="true">localhost</domain>
4+
<domain includeSubdomains="true">10.0.2.2</domain>
5+
</domain-config>
6+
</network-security-config>

android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
buildToolsVersion = "28.0.3"
66
minSdkVersion = 16
77
compileSdkVersion = 28
8-
targetSdkVersion = 27
8+
targetSdkVersion = 28
99
supportLibVersion = "28.0.0"
1010
}
1111
repositories {

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"babel-jest": "^24.8.0",
4747
"eslint": "^6.0.1",
4848
"jest": "^24.8.0",
49-
"jetifier": "^1.6.1",
49+
"jetifier": "^1.6.2",
5050
"metro-react-native-babel-preset": "^0.54.1",
5151
"react-test-renderer": "^16.8.6"
5252
},

0 commit comments

Comments
 (0)