From 9defe63714f37c70ac787d90621bbb864fbecafc Mon Sep 17 00:00:00 2001 From: Stoyan Stratev Date: Thu, 29 Mar 2018 10:32:39 +0300 Subject: [PATCH 1/3] fix: update firebase dependency to 12.0.1 to fix issue with icons in Oreo --- demo/app/main-view-model.ts | 2 +- native-src/android/app/app.iml | 37 +++++++++++++++------------- native-src/android/app/build.gradle | 2 +- native-src/android/build.gradle | 1 + src/platforms/android/include.gradle | 2 +- 5 files changed, 24 insertions(+), 20 deletions(-) diff --git a/demo/app/main-view-model.ts b/demo/app/main-view-model.ts index fe60d32..0ec0de9 100755 --- a/demo/app/main-view-model.ts +++ b/demo/app/main-view-model.ts @@ -5,7 +5,7 @@ export class PushTestModel extends Observable { private pushSettings = { // Android settings - senderID: "", // Android: Required setting with the sender/project number + senderID: "424050927453", // Android: Required setting with the sender/project number notificationCallbackAndroid: (stringifiedData: String, fcmNotification: any) => { const notificationBody = fcmNotification && fcmNotification.getBody(); this.updateMessage("Message received!\n" + notificationBody + "\n" + stringifiedData); diff --git a/native-src/android/app/app.iml b/native-src/android/app/app.iml index 7185d6e..8d34955 100644 --- a/native-src/android/app/app.iml +++ b/native-src/android/app/app.iml @@ -111,22 +111,25 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/native-src/android/app/build.gradle b/native-src/android/app/build.gradle index ca8724b..5922baf 100644 --- a/native-src/android/app/build.gradle +++ b/native-src/android/app/build.gradle @@ -21,7 +21,7 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) // compile 'com.android.support:appcompat-v7:25.1.0' - compile 'com.google.firebase:firebase-messaging:11.8.0' + compile 'com.google.firebase:firebase-messaging:12.0.1' } gradle.buildFinished { diff --git a/native-src/android/build.gradle b/native-src/android/build.gradle index a5a2aa1..60d770f 100644 --- a/native-src/android/build.gradle +++ b/native-src/android/build.gradle @@ -3,6 +3,7 @@ buildscript { repositories { jcenter() + google() } dependencies { classpath 'com.android.tools.build:gradle:3.0.1' diff --git a/src/platforms/android/include.gradle b/src/platforms/android/include.gradle index 1004dcf..843b588 100644 --- a/src/platforms/android/include.gradle +++ b/src/platforms/android/include.gradle @@ -11,7 +11,7 @@ android { } dependencies { - def firebaseMessagingVersion = project.hasProperty('firebaseMessagingVersion') ? project.firebaseMessagingVersion : '11.8.0' + def firebaseMessagingVersion = project.hasProperty('firebaseMessagingVersion') ? project.firebaseMessagingVersion : '12.0.1' def supportVer = project.hasProperty("supportVersion") ? supportVersion : "25.1.0"; compile "com.android.support:appcompat-v7:$supportVer" From 26edc31b0d07b1b55f88a0878ee00633c8d200a0 Mon Sep 17 00:00:00 2001 From: Stoyan Stratev Date: Thu, 29 Mar 2018 11:49:51 +0300 Subject: [PATCH 2/3] fix: revert accidental change --- demo/app/main-view-model.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/app/main-view-model.ts b/demo/app/main-view-model.ts index 0ec0de9..fe60d32 100755 --- a/demo/app/main-view-model.ts +++ b/demo/app/main-view-model.ts @@ -5,7 +5,7 @@ export class PushTestModel extends Observable { private pushSettings = { // Android settings - senderID: "424050927453", // Android: Required setting with the sender/project number + senderID: "", // Android: Required setting with the sender/project number notificationCallbackAndroid: (stringifiedData: String, fcmNotification: any) => { const notificationBody = fcmNotification && fcmNotification.getBody(); this.updateMessage("Message received!\n" + notificationBody + "\n" + stringifiedData); From e41763726f73f41ec853715034d2c71d9ff9f25c Mon Sep 17 00:00:00 2001 From: Stoyan Stratev Date: Thu, 29 Mar 2018 12:03:13 +0300 Subject: [PATCH 3/3] chor: update documentation --- .gitignore | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 482ce81..b0649de 100644 --- a/.gitignore +++ b/.gitignore @@ -33,5 +33,5 @@ demo/report/report.html demo/report/stats.json demo-angular/report/report.html demo-angular/report/stats.json -src/push-plugin.android.d.ts -src/push-plugin.ios.d.ts +src/push-plugin.android.d.ts +src/push-plugin.ios.d.ts diff --git a/README.md b/README.md index e549354..787b77b 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ In the Command prompt / Terminal navigate to your application root folder and ru - Add the `google-settings.json` file with the FCM configuration to the `app/App_Resources/Android folder` in your app. If this file is not added, building the app for android will fail. -The plugin will default to version 11.8.0 of the `firebase-messaging` SDK. If you need to change the version, you can add a project ext property `firebaseMessagingVersion`: +The plugin will default to version 12.0.1 of the `firebase-messaging` SDK. If you need to change the version, you can add a project ext property `firebaseMessagingVersion`: ```Groovy // in the root level of /app/App_Resources/Android/app.gradle: