From 787d5e42082fcc64a8bc9ef3b09b7e2f4c51f80d Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Wed, 20 Feb 2019 17:21:08 -0300 Subject: [PATCH] Migrate Android from GCM to FCM (#2577) --- android/app/build.gradle | 15 +++++++++++++-- package-lock.json | 12 ++++++------ package.json | 2 +- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 3510519f0..9927fb8d2 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -182,8 +182,17 @@ configurations.all { if (details.requested.name == 'android-jsc') { details.useTarget group: details.requested.group, name: 'android-jsc-intl', version: 'r236355' } - if (details.requested.name == 'play-services-gcm') { - details.useTarget group: details.requested.group, name: details.requested.name, version: '16.0.0' + if (details.requested.name == 'play-services-base') { + details.useTarget group: details.requested.group, name: details.requested.name, version: '15.0.1' + } + if (details.requested.name == 'play-services-tasks') { + details.useTarget group: details.requested.group, name: details.requested.name, version: '15.0.1' + } + if (details.requested.name == 'play-services-stats') { + details.useTarget group: details.requested.group, name: details.requested.name, version: '15.0.1' + } + if (details.requested.name == 'play-services-basement') { + details.useTarget group: details.requested.group, name: details.requested.name, version: '15.0.1' } } } @@ -232,3 +241,5 @@ task copyDownloadableDepsToLibs(type: Copy) { from configurations.compile into 'libs' } + +apply plugin: 'com.google.gms.google-services' diff --git a/package-lock.json b/package-lock.json index 6731eefe8..8db19b547 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11272,8 +11272,8 @@ } }, "react-native-notifications": { - "version": "github:enahum/react-native-notifications#aeb014b4d01db3d0afb091683c45e7ad7e572ea3", - "from": "github:enahum/react-native-notifications#aeb014b4d01db3d0afb091683c45e7ad7e572ea3", + "version": "github:enahum/react-native-notifications#ae66562fb9ad167cf8078def3588895049881859", + "from": "github:enahum/react-native-notifications#ae66562fb9ad167cf8078def3588895049881859", "requires": { "core-js": "^1.0.0", "uuid": "^2.0.3" @@ -11281,12 +11281,12 @@ "dependencies": { "core-js": { "version": "1.2.7", - "resolved": "http://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=" }, "uuid": { "version": "2.0.3", - "resolved": "http://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=" } } @@ -12136,7 +12136,7 @@ "dependencies": { "jsesc": { "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=" } } @@ -13332,7 +13332,7 @@ }, "ws": { "version": "5.1.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-5.1.1.tgz", + "resolved": "http://registry.npmjs.org/ws/-/ws-5.1.1.tgz", "integrity": "sha512-bOusvpCb09TOBLbpMKszd45WKC2KPtxiyiHanv+H2DE3Az+1db5a/L7sVJZVDPUC1Br8f0SKRr1KjLpD1U/IAw==", "dev": true, "requires": { diff --git a/package.json b/package.json index d4ea8a6cc..7d18df515 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "react-native-linear-gradient": "2.4.4", "react-native-local-auth": "github:enahum/react-native-local-auth#cc9ce2f468fbf7b431dfad3191a31aaa9227a6ab", "react-native-navigation": "1.1.492", - "react-native-notifications": "github:enahum/react-native-notifications#aeb014b4d01db3d0afb091683c45e7ad7e572ea3", + "react-native-notifications": "github:enahum/react-native-notifications#ae66562fb9ad167cf8078def3588895049881859", "react-native-passcode-status": "1.1.1", "react-native-permissions": "1.1.1", "react-native-recyclerview-list": "enahum/react-native-recyclerview-list.git#a2d26bc7b2623cae25e947ba3905f702434717bf",