Merge pull request #346 from wix/RN0.59.5

Uprgade example project react-native@0.59.5

android/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion '28.0.3'
+    buildToolsVersion '28.0.0'
 
     defaultConfig {
         minSdkVersion 19
@@ -18,13 +18,12 @@ android {
     }
 }
 
+
 dependencies {
-    // Google's GCM.
-//    compile 'com.google.android.gms:play-services-gcm:15.0.1'
-    compile "com.google.firebase:firebase-messaging:17.3.0"
-    compile 'com.facebook.react:react-native:+'
+    implementation "com.google.firebase:firebase-messaging:17.3.0"
+    implementation 'com.facebook.react:react-native:+'
 
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.mockito:mockito-core:2.+'
-    testCompile 'org.robolectric:robolectric:3.1.4'
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.mockito:mockito-core:2.+'
+    testImplementation 'org.robolectric:robolectric:3.1.4'
 }

e2e/Utils.js

-const exec = require('shell-utils').exec;
 
 module.exports = {
   elementByLabel: (label) => {

example/android/build.gradle

@@ -2,10 +2,10 @@
 
 buildscript {
     ext {
-        buildToolsVersion = "28.0.3"
+        buildToolsVersion = "28.0.0"
         minSdkVersion = 16
         compileSdkVersion = 28
-        targetSdkVersion = 28
+        targetSdkVersion = 26
         supportLibVersion = "28.0.0"
     }
     repositories {
@@ -16,6 +16,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath 'com.google.gms:google-services:4.0.0'
     }
 }
 
@@ -28,8 +29,9 @@ allprojects {
 
         maven {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-            url "$rootDir/../node_modules/react-native/android"
+            url "$rootDir/../../node_modules/react-native/android"
         }
+        maven { url "$rootDir/../../node_modules/jsc-android/dist" }
     }
 }
 

example/android/myapplication/.gitignore

 /build
+google-services.json
\ No newline at end of file

example/android/myapplication/build.gradle

-apply plugin: 'com.android.application'
+apply plugin: "com.android.application"
+
+project.ext.react = [
+        root     : "../../../",
+        entryFile: "index.js",
+        bundleAssetName: "index.android.bundle",
+        bundleInAlpha: true,
+        bundleInBeta: true
+]
+
+apply from: "../../../node_modules/react-native/react.gradle"
 
 android {
     compileSdkVersion 28
-    buildToolsVersion "28.0.3"
+    buildToolsVersion "28.0.0"
 
     defaultConfig {
         applicationId "com.wix.reactnativenotifications.app"
@@ -31,16 +41,21 @@ configurations.all {
     resolutionStrategy.eachDependency { DependencyResolveDetails details ->
         def requested = details.requested
         if (requested.group == 'com.android.support') {
-            if (!requested.name.startsWith("multidex")) {
-                details.useVersion "26.1.0"
+            details.useVersion "28.0.0"
         }
     }
+}
+
+configurations.all {
+    resolutionStrategy {
+        force 'org.webkit:android-jsc:r236355'
     }
 }
 
 dependencies {
 //    compile fileTree(dir: 'libs', include: ['*.jar'])
 
+    implementation 'com.google.firebase:firebase-core:16.0.0'
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support:design:28.0.0'
     implementation 'com.facebook.react:react-native:+'
@@ -48,3 +63,5 @@ dependencies {
 
     testImplementation'junit:junit:4.12'
 }
+
+apply plugin: 'com.google.gms.google-services'
\ No newline at end of file

example/android/myapplication/src/main/AndroidManifest.xml

@@ -9,6 +9,7 @@
         android:name=".MainApplication"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
+        android:usesCleartextTraffic="true"
         android:label="@string/app_name"
         android:theme="@style/AppTheme">
         <meta-data

example/android/settings.gradle

 include ':myapplication'
 
 include ':react-native-notifications'
-project(':react-native-notifications').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-notifications/android')
+project(':react-native-notifications').projectDir = new File(rootProject.projectDir, '../../android')
\ No newline at end of file

example/index.ios.js

@@ -122,7 +122,7 @@ class NotificationsExampleApp extends Component {
       title: 'Local Notification Title',
       sound: 'chime.aiff',
       category: 'SOME_CATEGORY',
-      userInfo: { }
+      userInfo: { link: 'localNotificationLink' },
     });
   }
 

index.ios.js

+require('./example/index');
\ No newline at end of file

package.json

@@ -51,9 +51,10 @@
     "sinon": "^1.17.3",
     "sinon-chai": "^2.8.0",
     "shell-utils": "1.x.x",
-    "react-native": "0.60.0",
+    "react-native": "0.59.5",
     "react": "16.8.6",
     "detox": "13.x.x",
+    "jsc-android": "236355.x.x",
     "jest": "24.8.0",
     "metro-react-native-babel-preset": "0.55.x",
     "@babel/register": "7.4.4"