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

fix: update firebase dependency to 12.0.1 to fix issue with icons in … #206

Merged
merged 4 commits into from
Apr 3, 2018
Merged

fix: update firebase dependency to 12.0.1 to fix issue with icons in … #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9defe63
fix: update firebase dependency to 12.0.1 to fix issue with icons in …
lini Mar 29, 2018
26edc31
fix: revert accidental change
lini Mar 29, 2018
e417637
chor: update documentation
lini Mar 29, 2018
4669b3b
Merge branch 'master' into lini/update-firebase-12.0.1
lini Mar 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ 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.ios.d.ts
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
37 changes: 20 additions & 17 deletions native-src/android/app/app.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,22 +111,25 @@
</content>
<orderEntry type="jdk" jdkName="Android API 26 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="com.google.firebase:firebase-iid-11.8.0" level="project" />
<orderEntry type="library" name="com.android.support:support-core-utils-25.2.0" level="project" />
<orderEntry type="library" name="com.google.firebase:firebase-iid-license-11.8.0" level="project" />
<orderEntry type="library" name="com.google.android.gms:play-services-basement-11.8.0" level="project" />
<orderEntry type="library" name="com.google.firebase:firebase-messaging-license-11.8.0" level="project" />
<orderEntry type="library" name="com.google.firebase:firebase-common-11.8.0" level="project" />
<orderEntry type="library" name="com.android.support:support-core-ui-25.2.0" level="project" />
<orderEntry type="library" name="com.google.android.gms:play-services-tasks-11.8.0" level="project" />
<orderEntry type="library" name="com.google.firebase:firebase-common-license-11.8.0" level="project" />
<orderEntry type="library" name="com.google.firebase:firebase-messaging-11.8.0" level="project" />
<orderEntry type="library" name="com.android.support:support-media-compat-25.2.0" level="project" />
<orderEntry type="library" name="com.android.support:support-compat-25.2.0" level="project" />
<orderEntry type="library" name="com.google.android.gms:play-services-basement-license-11.8.0" level="project" />
<orderEntry type="library" name="com.android.support:support-annotations:25.2.0@jar" level="project" />
<orderEntry type="library" name="com.android.support:support-v4-25.2.0" level="project" />
<orderEntry type="library" name="com.android.support:support-fragment-25.2.0" level="project" />
<orderEntry type="library" name="com.google.android.gms:play-services-tasks-license-11.8.0" level="project" />
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-basement-12.0.1" level="project" />
<orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.0.0@jar" level="project" />
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-iid-12.0.1" level="project" />
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-common-12.0.1" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-core-ui-26.1.0" level="project" />
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-messaging-license-12.0.1" level="project" />
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-tasks-12.0.1" level="project" />
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-common-license-12.0.1" level="project" />
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-iid-license-12.0.1" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-core-utils-26.1.0" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-fragment-26.1.0" level="project" />
<orderEntry type="library" name="Gradle: android.arch.core:common:1.0.0@jar" level="project" />
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-basement-license-12.0.1" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-media-compat-26.1.0" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:26.1.0@jar" level="project" />
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-messaging-12.0.1" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-compat-26.1.0" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-v4-26.1.0" level="project" />
<orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.0.0" level="project" />
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-tasks-license-12.0.1" level="project" />
</component>
</module>
2 changes: 1 addition & 1 deletion native-src/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions native-src/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
buildscript {
repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
Expand Down
2 changes: 1 addition & 1 deletion src/platforms/android/include.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down