Skip to content
This repository was archived by the owner on Feb 7, 2019. It is now read-only.

Commit a096afc

Browse files
DimitarTodorovDimitarTodorov
authored
Merge pull request #206 from NativeScript/lini/update-firebase-12.0.1
fix: update firebase dependency to 12.0.1 to fix issue with icons in …
2 parents 6e18254 + 4669b3b commit a096afc

File tree

6 files changed

+25
-21
lines changed

6 files changed

+25
-21
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ demo/report/stats.json
3434
demo-angular/report/report.html
3535
demo-angular/report/stats.json
3636
src/push-plugin.android.d.ts
37-
src/push-plugin.ios.d.ts
37+
src/push-plugin.ios.d.ts

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ In the Command prompt / Terminal navigate to your application root folder and ru
6262

6363
- 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.
6464

65-
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`:
65+
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`:
6666

6767
```Groovy
6868
// in the root level of /app/App_Resources/Android/app.gradle:

‎native-src/android/app/app.iml‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -111,22 +111,25 @@
111111
</content>
112112
<orderEntry type="jdk" jdkName="Android API 26 Platform" jdkType="Android SDK" />
113113
<orderEntry type="sourceFolder" forTests="false" />
114-
<orderEntry type="library" name="com.google.firebase:firebase-iid-11.8.0" level="project" />
115-
<orderEntry type="library" name="com.android.support:support-core-utils-25.2.0" level="project" />
116-
<orderEntry type="library" name="com.google.firebase:firebase-iid-license-11.8.0" level="project" />
117-
<orderEntry type="library" name="com.google.android.gms:play-services-basement-11.8.0" level="project" />
118-
<orderEntry type="library" name="com.google.firebase:firebase-messaging-license-11.8.0" level="project" />
119-
<orderEntry type="library" name="com.google.firebase:firebase-common-11.8.0" level="project" />
120-
<orderEntry type="library" name="com.android.support:support-core-ui-25.2.0" level="project" />
121-
<orderEntry type="library" name="com.google.android.gms:play-services-tasks-11.8.0" level="project" />
122-
<orderEntry type="library" name="com.google.firebase:firebase-common-license-11.8.0" level="project" />
123-
<orderEntry type="library" name="com.google.firebase:firebase-messaging-11.8.0" level="project" />
124-
<orderEntry type="library" name="com.android.support:support-media-compat-25.2.0" level="project" />
125-
<orderEntry type="library" name="com.android.support:support-compat-25.2.0" level="project" />
126-
<orderEntry type="library" name="com.google.android.gms:play-services-basement-license-11.8.0" level="project" />
127-
<orderEntry type="library" name="com.android.support:support-annotations:25.2.0@jar" level="project" />
128-
<orderEntry type="library" name="com.android.support:support-v4-25.2.0" level="project" />
129-
<orderEntry type="library" name="com.android.support:support-fragment-25.2.0" level="project" />
130-
<orderEntry type="library" name="com.google.android.gms:play-services-tasks-license-11.8.0" level="project" />
114+
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-basement-12.0.1" level="project" />
115+
<orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.0.0@jar" level="project" />
116+
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-iid-12.0.1" level="project" />
117+
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-common-12.0.1" level="project" />
118+
<orderEntry type="library" name="Gradle: com.android.support:support-core-ui-26.1.0" level="project" />
119+
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-messaging-license-12.0.1" level="project" />
120+
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-tasks-12.0.1" level="project" />
121+
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-common-license-12.0.1" level="project" />
122+
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-iid-license-12.0.1" level="project" />
123+
<orderEntry type="library" name="Gradle: com.android.support:support-core-utils-26.1.0" level="project" />
124+
<orderEntry type="library" name="Gradle: com.android.support:support-fragment-26.1.0" level="project" />
125+
<orderEntry type="library" name="Gradle: android.arch.core:common:1.0.0@jar" level="project" />
126+
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-basement-license-12.0.1" level="project" />
127+
<orderEntry type="library" name="Gradle: com.android.support:support-media-compat-26.1.0" level="project" />
128+
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:26.1.0@jar" level="project" />
129+
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-messaging-12.0.1" level="project" />
130+
<orderEntry type="library" name="Gradle: com.android.support:support-compat-26.1.0" level="project" />
131+
<orderEntry type="library" name="Gradle: com.android.support:support-v4-26.1.0" level="project" />
132+
<orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.0.0" level="project" />
133+
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-tasks-license-12.0.1" level="project" />
131134
</component>
132135
</module>

‎native-src/android/app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ android {
2121
dependencies {
2222
compile fileTree(dir: 'libs', include: ['*.jar'])
2323
// compile 'com.android.support:appcompat-v7:25.1.0'
24-
compile 'com.google.firebase:firebase-messaging:11.8.0'
24+
compile 'com.google.firebase:firebase-messaging:12.0.1'
2525
}
2626

2727
gradle.buildFinished {

‎native-src/android/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
buildscript {
44
repositories {
55
jcenter()
6+
google()
67
}
78
dependencies {
89
classpath 'com.android.tools.build:gradle:3.0.1'

‎src/platforms/android/include.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ android {
1111
}
1212

1313
dependencies {
14-
def firebaseMessagingVersion = project.hasProperty('firebaseMessagingVersion') ? project.firebaseMessagingVersion : '11.8.0'
14+
def firebaseMessagingVersion = project.hasProperty('firebaseMessagingVersion') ? project.firebaseMessagingVersion : '12.0.1'
1515
def supportVer = project.hasProperty("supportVersion") ? supportVersion : "25.1.0";
1616

1717
compile "com.android.support:appcompat-v7:$supportVer"

0 commit comments

Comments
 (0)