Skip to content
This repository was archived by the owner on Apr 4, 2023. It is now read-only.

Commit 3674371

Browse files
EddyVerbruggenEddyVerbruggen
committed
Bump Firebase SDK versions #1083 
1 parent 366f929 commit 3674371

File tree

7 files changed

+64
-48
lines changed

7 files changed

+64
-48
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
- [Firebase iOS SDK Changelog](https://firebase.google.com/support/release-notes/ios)
44
- [Firebase Android SDK Changelog](https://firebase.google.com/support/release-notes/android)
55

6+
## 7.6.0 (2018, December 21)
7+
[Fixes & Enhancements](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/milestone/90?closed=1)
8+
9+
610
## 7.5.1 (2018, December 15)
711
[Fixes & Enhancements](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/milestone/89?closed=1)
812

‎demo-ng/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"nativescript-angular": "^6.1.0",
2626
"nativescript-camera": "~4.1.1",
2727
"nativescript-imagepicker": "~6.0.5",
28-
"nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-7.5.1.tgz",
28+
"nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-7.6.0.tgz",
2929
"nativescript-theme-core": "~1.0.4",
3030
"reflect-metadata": "~0.1.10",
3131
"rxjs": "~6.0.0 || >=6.1.0",

‎demo-push/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
}
1010
},
1111
"dependencies": {
12-
"nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-7.5.1.tgz",
12+
"nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-7.6.0.tgz",
1313
"nativescript-theme-core": "^1.0.4",
1414
"nativescript-unit-test-runner": "^0.3.4",
1515
"tns-core-modules": "~4.2.0"

‎demo/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"dependencies": {
1212
"firebase-functions": "^2.0.5",
13-
"nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-7.5.1.tgz",
13+
"nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-7.6.0.tgz",
1414
"nativescript-theme-core": "^1.0.4",
1515
"nativescript-unit-test-runner": "^0.3.4",
1616
"tns-core-modules": "~5.0.5"

‎publish/scripts/installer.js‎

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -332,17 +332,16 @@ function writePodFile(result) {
332332
// The MLVision pod requires a minimum of iOS 9, otherwise the build will fail
333333
(isPresent(result.ml_kit) ? `` : `#`) + `platform :ios, '9.0'
334334
335-
pod 'Firebase/Core', '~> 5.12.0'
336-
pod 'GoogleAppMeasurement', '5.3' # temp fix for https://github.com/firebase/firebase-ios-sdk/issues/2151 (remove when bumping 'Firebase/Core')
335+
pod 'Firebase/Core', '~> 5.15.0'
337336
338337
# Authentication
339338
` + (!isPresent(result.authentication) || isSelected(result.authentication) ? `` : `#`) + `pod 'Firebase/Auth'
340339
341340
# Realtime DB
342341
` + (!isPresent(result.realtimedb) || isSelected(result.realtimedb) ? `` : `#`) + `pod 'Firebase/Database'
343342
344-
# Cloud Firestore
345-
` + (isSelected(result.firestore) ? `` : `#`) + `pod 'Firebase/Firestore'
343+
# Cloud Firestore (sticking to 0.14 for now because of build error - see https://github.com/firebase/firebase-ios-sdk/issues/2177)
344+
` + (isSelected(result.firestore) ? `` : `#`) + `pod 'FirebaseFirestore', '~> 0.14.0'
346345
347346
# Remote Config
348347
` + (isSelected(result.remote_config) ? `` : `#`) + `pod 'Firebase/RemoteConfig'
@@ -668,6 +667,11 @@ android {
668667
dimension "fireb"
669668
}
670669
}
670+
671+
// (possibly-temporary) workaround for https://stackoverflow.com/questions/52518378/more-than-one-file-was-found-with-os-independent-path-meta-inf-proguard-android
672+
packagingOptions {
673+
exclude 'META-INF/proguard/androidx-annotations.pro'
674+
}
671675
}
672676
673677
repositories {
@@ -693,46 +697,48 @@ dependencies {
693697
compile "com.android.support:support-compat:$supportVersion"
694698
695699
// make sure you have these versions by updating your local Android SDK's (Android Support repo and Google repo)
696-
compile "com.google.firebase:firebase-core:16.0.4"
700+
compile "com.google.firebase:firebase-core:16.0.6"
701+
702+
// compile "com.google.firebase:firebase-analytics:16.0.6"
697703
698704
// for reading google-services.json and configuration
699705
compile "com.google.android.gms:play-services-base:$googlePlayServicesVersion"
700706
701707
// Authentication
702-
` + (!externalPushClientOnly && (!isPresent(result.authentication) || isSelected(result.authentication)) ? `` : `//`) + ` compile "com.google.firebase:firebase-auth:16.0.5"
708+
` + (!externalPushClientOnly && (!isPresent(result.authentication) || isSelected(result.authentication)) ? `` : `//`) + ` compile "com.google.firebase:firebase-auth:16.1.0"
703709
704710
// Realtime DB
705-
` + (!externalPushClientOnly && (!isPresent(result.realtimedb) || isSelected(result.realtimedb)) ? `` : `//`) + ` compile "com.google.firebase:firebase-database:16.0.4"
711+
` + (!externalPushClientOnly && (!isPresent(result.realtimedb) || isSelected(result.realtimedb)) ? `` : `//`) + ` compile "com.google.firebase:firebase-database:16.0.5"
706712
707713
// Cloud Firestore
708-
` + (isSelected(result.firestore) ? `` : `//`) + ` compile "com.google.firebase:firebase-firestore:17.1.2"
714+
` + (isSelected(result.firestore) ? `` : `//`) + ` compile "com.google.firebase:firebase-firestore:17.1.5"
709715
710716
// Remote Config
711-
` + (isSelected(result.remote_config) ? `` : `//`) + ` compile "com.google.firebase:firebase-config:16.1.0"
717+
` + (isSelected(result.remote_config) ? `` : `//`) + ` compile "com.google.firebase:firebase-config:16.1.2"
712718
713719
// Performance Monitoring
714-
` + (isSelected(result.performance_monitoring) ? `` : `//`) + ` compile "com.google.firebase:firebase-perf:16.2.0"
720+
` + (isSelected(result.performance_monitoring) ? `` : `//`) + ` compile "com.google.firebase:firebase-perf:16.2.3"
715721
716722
// Crash Reporting
717723
` + (isSelected(result.crash_reporting) && !isSelected(result.crashlytics) ? `` : `//`) + ` compile "com.google.firebase:firebase-crash:16.2.1"
718724
719725
// Crashlytics
720-
` + (isSelected(result.crashlytics) ? `` : `//`) + ` compile "com.crashlytics.sdk.android:crashlytics:2.9.6"
726+
` + (isSelected(result.crashlytics) ? `` : `//`) + ` compile "com.crashlytics.sdk.android:crashlytics:2.9.7"
721727
722-
// Firebase Cloud Messaging (FCM)
728+
// Cloud Messaging (FCM)
723729
` + (isSelected(result.messaging) || externalPushClientOnly ? `` : `//`) + ` compile "com.google.firebase:firebase-messaging:17.3.4"
724730
725731
// Cloud Storage
726-
` + (isSelected(result.storage) ? `` : `//`) + ` compile "com.google.firebase:firebase-storage:16.0.3"
732+
` + (isSelected(result.storage) ? `` : `//`) + ` compile "com.google.firebase:firebase-storage:16.0.5"
727733
728734
// Cloud Functions
729-
` + (isSelected(result.functions) ? `` : `//`) + ` compile "com.google.firebase:firebase-functions:16.1.2"
735+
` + (isSelected(result.functions) ? `` : `//`) + ` compile "com.google.firebase:firebase-functions:16.1.3"
730736
731737
// AdMob / Ads
732-
` + (isSelected(result.admob) ? `` : `//`) + ` compile "com.google.firebase:firebase-ads:17.0.0"
738+
` + (isSelected(result.admob) ? `` : `//`) + ` compile "com.google.firebase:firebase-ads:17.1.2"
733739
734740
// ML Kit
735-
` + (isSelected(result.ml_kit) ? `` : `//`) + ` compile "com.google.firebase:firebase-ml-vision:18.0.1"
741+
` + (isSelected(result.ml_kit) ? `` : `//`) + ` compile "com.google.firebase:firebase-ml-vision:18.0.2"
736742
` + (isSelected(result.ml_kit_image_labeling) ? `` : `//`) + ` compile "com.google.firebase:firebase-ml-vision-image-label-model:17.0.2"
737743
738744
// Facebook Authentication
@@ -741,11 +747,11 @@ dependencies {
741747
// Google Sign-In Authentication
742748
` + (isSelected(result.google_auth) ? `` : `//`) + ` compile "com.google.android.gms:play-services-auth:16.0.0"
743749
744-
// Firebase Invites
745-
` + (isSelected(result.invites) ? `` : `//`) + ` compile "com.google.firebase:firebase-invites:16.0.4"
750+
// Invites
751+
` + (isSelected(result.invites) ? `` : `//`) + ` compile "com.google.firebase:firebase-invites:16.0.6"
746752
747-
// Firebase Dynamic Links
748-
` + (isSelected(result.dynamic_links) ? `` : `//`) + ` compile "com.google.firebase:firebase-dynamic-links:16.1.2" // BEWARE: 16.1.2 is fine, but 16.1.3 results in a build error
753+
// Dynamic Links
754+
` + (isSelected(result.dynamic_links) ? `` : `//`) + ` compile "com.google.firebase:firebase-dynamic-links:16.1.5" // BEWARE: 16.1.2 is fine, but 16.1.3 results in a build error
749755
}
750756
751757
apply plugin: "com.google.gms.google-services"

‎src/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nativescript-plugin-firebase",
3-
"version": "7.5.1",
3+
"version": "7.6.0",
44
"description": "Fire. Base. Firebase!",
55
"main": "firebase",
66
"typings": "index.d.ts",
@@ -115,15 +115,15 @@
115115
"readmeFilename": "README.md",
116116
"dependencies": {
117117
"fs-extra": "~2.1.0",
118-
"nativescript-hook": "~0.2.0",
118+
"nativescript-hook": "~0.2.4",
119119
"prompt-lite": "~0.1.0",
120120
"xcode": "~0.9.0"
121121
},
122122
"devDependencies": {
123123
"rimraf": "^2.6.2",
124-
"tns-core-modules": "~5.1.0",
125-
"tns-platform-declarations": "~5.1.0",
124+
"tns-core-modules": "~5.1.1",
125+
"tns-platform-declarations": "~5.1.1",
126126
"tslint": "^5.1.0",
127-
"typescript": "~2.8.0"
127+
"typescript": "~3.2.2"
128128
}
129129
}

‎src/scripts/postinstall.js‎

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3130,17 +3130,16 @@ function writePodFile(result) {
31303130
// The MLVision pod requires a minimum of iOS 9, otherwise the build will fail
31313131
(isPresent(result.ml_kit) ? `` : `#`) + `platform :ios, '9.0'
31323132
3133-
pod 'Firebase/Core', '~> 5.12.0'
3134-
pod 'GoogleAppMeasurement', '5.3' # temp fix for https://github.com/firebase/firebase-ios-sdk/issues/2151 (remove when bumping 'Firebase/Core')
3133+
pod 'Firebase/Core', '~> 5.15.0'
31353134
31363135
# Authentication
31373136
` + (!isPresent(result.authentication) || isSelected(result.authentication) ? `` : `#`) + `pod 'Firebase/Auth'
31383137
31393138
# Realtime DB
31403139
` + (!isPresent(result.realtimedb) || isSelected(result.realtimedb) ? `` : `#`) + `pod 'Firebase/Database'
31413140
3142-
# Cloud Firestore
3143-
` + (isSelected(result.firestore) ? `` : `#`) + `pod 'Firebase/Firestore'
3141+
# Cloud Firestore (sticking to 0.14 for now because of build error - see https://github.com/firebase/firebase-ios-sdk/issues/2177)
3142+
` + (isSelected(result.firestore) ? `` : `#`) + `pod 'FirebaseFirestore', '~> 0.14.0'
31443143
31453144
# Remote Config
31463145
` + (isSelected(result.remote_config) ? `` : `#`) + `pod 'Firebase/RemoteConfig'
@@ -3466,6 +3465,11 @@ android {
34663465
dimension "fireb"
34673466
}
34683467
}
3468+
3469+
// (possibly-temporary) workaround for https://stackoverflow.com/questions/52518378/more-than-one-file-was-found-with-os-independent-path-meta-inf-proguard-android
3470+
packagingOptions {
3471+
exclude 'META-INF/proguard/androidx-annotations.pro'
3472+
}
34693473
}
34703474
34713475
repositories {
@@ -3491,46 +3495,48 @@ dependencies {
34913495
compile "com.android.support:support-compat:$supportVersion"
34923496
34933497
// make sure you have these versions by updating your local Android SDK's (Android Support repo and Google repo)
3494-
compile "com.google.firebase:firebase-core:16.0.4"
3498+
compile "com.google.firebase:firebase-core:16.0.6"
3499+
3500+
// compile "com.google.firebase:firebase-analytics:16.0.6"
34953501
34963502
// for reading google-services.json and configuration
34973503
compile "com.google.android.gms:play-services-base:$googlePlayServicesVersion"
34983504
34993505
// Authentication
3500-
` + (!externalPushClientOnly && (!isPresent(result.authentication) || isSelected(result.authentication)) ? `` : `//`) + ` compile "com.google.firebase:firebase-auth:16.0.5"
3506+
` + (!externalPushClientOnly && (!isPresent(result.authentication) || isSelected(result.authentication)) ? `` : `//`) + ` compile "com.google.firebase:firebase-auth:16.1.0"
35013507
35023508
// Realtime DB
3503-
` + (!externalPushClientOnly && (!isPresent(result.realtimedb) || isSelected(result.realtimedb)) ? `` : `//`) + ` compile "com.google.firebase:firebase-database:16.0.4"
3509+
` + (!externalPushClientOnly && (!isPresent(result.realtimedb) || isSelected(result.realtimedb)) ? `` : `//`) + ` compile "com.google.firebase:firebase-database:16.0.5"
35043510
35053511
// Cloud Firestore
3506-
` + (isSelected(result.firestore) ? `` : `//`) + ` compile "com.google.firebase:firebase-firestore:17.1.2"
3512+
` + (isSelected(result.firestore) ? `` : `//`) + ` compile "com.google.firebase:firebase-firestore:17.1.5"
35073513
35083514
// Remote Config
3509-
` + (isSelected(result.remote_config) ? `` : `//`) + ` compile "com.google.firebase:firebase-config:16.1.0"
3515+
` + (isSelected(result.remote_config) ? `` : `//`) + ` compile "com.google.firebase:firebase-config:16.1.2"
35103516
35113517
// Performance Monitoring
3512-
` + (isSelected(result.performance_monitoring) ? `` : `//`) + ` compile "com.google.firebase:firebase-perf:16.2.0"
3518+
` + (isSelected(result.performance_monitoring) ? `` : `//`) + ` compile "com.google.firebase:firebase-perf:16.2.3"
35133519
35143520
// Crash Reporting
35153521
` + (isSelected(result.crash_reporting) && !isSelected(result.crashlytics) ? `` : `//`) + ` compile "com.google.firebase:firebase-crash:16.2.1"
35163522
35173523
// Crashlytics
3518-
` + (isSelected(result.crashlytics) ? `` : `//`) + ` compile "com.crashlytics.sdk.android:crashlytics:2.9.6"
3524+
` + (isSelected(result.crashlytics) ? `` : `//`) + ` compile "com.crashlytics.sdk.android:crashlytics:2.9.7"
35193525
3520-
// Firebase Cloud Messaging (FCM)
3526+
// Cloud Messaging (FCM)
35213527
` + (isSelected(result.messaging) || externalPushClientOnly ? `` : `//`) + ` compile "com.google.firebase:firebase-messaging:17.3.4"
35223528
35233529
// Cloud Storage
3524-
` + (isSelected(result.storage) ? `` : `//`) + ` compile "com.google.firebase:firebase-storage:16.0.3"
3530+
` + (isSelected(result.storage) ? `` : `//`) + ` compile "com.google.firebase:firebase-storage:16.0.5"
35253531
35263532
// Cloud Functions
3527-
` + (isSelected(result.functions) ? `` : `//`) + ` compile "com.google.firebase:firebase-functions:16.1.2"
3533+
` + (isSelected(result.functions) ? `` : `//`) + ` compile "com.google.firebase:firebase-functions:16.1.3"
35283534
35293535
// AdMob / Ads
3530-
` + (isSelected(result.admob) ? `` : `//`) + ` compile "com.google.firebase:firebase-ads:17.0.0"
3536+
` + (isSelected(result.admob) ? `` : `//`) + ` compile "com.google.firebase:firebase-ads:17.1.2"
35313537
35323538
// ML Kit
3533-
` + (isSelected(result.ml_kit) ? `` : `//`) + ` compile "com.google.firebase:firebase-ml-vision:18.0.1"
3539+
` + (isSelected(result.ml_kit) ? `` : `//`) + ` compile "com.google.firebase:firebase-ml-vision:18.0.2"
35343540
` + (isSelected(result.ml_kit_image_labeling) ? `` : `//`) + ` compile "com.google.firebase:firebase-ml-vision-image-label-model:17.0.2"
35353541
35363542
// Facebook Authentication
@@ -3539,11 +3545,11 @@ dependencies {
35393545
// Google Sign-In Authentication
35403546
` + (isSelected(result.google_auth) ? `` : `//`) + ` compile "com.google.android.gms:play-services-auth:16.0.0"
35413547
3542-
// Firebase Invites
3543-
` + (isSelected(result.invites) ? `` : `//`) + ` compile "com.google.firebase:firebase-invites:16.0.4"
3548+
// Invites
3549+
` + (isSelected(result.invites) ? `` : `//`) + ` compile "com.google.firebase:firebase-invites:16.0.6"
35443550
3545-
// Firebase Dynamic Links
3546-
` + (isSelected(result.dynamic_links) ? `` : `//`) + ` compile "com.google.firebase:firebase-dynamic-links:16.1.2" // BEWARE: 16.1.2 is fine, but 16.1.3 results in a build error
3551+
// Dynamic Links
3552+
` + (isSelected(result.dynamic_links) ? `` : `//`) + ` compile "com.google.firebase:firebase-dynamic-links:16.1.5" // BEWARE: 16.1.2 is fine, but 16.1.3 results in a build error
35473553
}
35483554
35493555
apply plugin: "com.google.gms.google-services"

0 commit comments

Comments
 (0)