From 6041a20e7b04f382d112e9db73084409464eeb44 Mon Sep 17 00:00:00 2001 From: Michael Diarmid Date: Mon, 5 Nov 2018 19:36:46 +0000 Subject: [PATCH] v5.1.0 (#74) * Update Firebase iOS SDK to v5.11.0 * Update build.gradle * Update build.gradle * Update package.json * Update build.gradle * misc v5.1.0 changes --- android/app/build.gradle | 76 ++++++++++++------ android/build.gradle | 8 +- ios/Podfile | 25 +++--- ios/Podfile.lock | 167 ++++++++++++++++++++------------------- package.json | 4 +- 5 files changed, 157 insertions(+), 123 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 8c8980f..7d7d949 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -154,37 +154,67 @@ android { } dependencies { - implementation(project(':react-native-firebase')) { - transitive = false + //noinspection GradleDynamicVersion + implementation "com.facebook.react:react-native:+" + implementation fileTree(dir: "libs", include: ["*.jar"]) + + /* ---------------------------- + * REACT NATIVE FIREBASE + * ---------------------------- */ + + // Library as defined in settings.gradle + implementation project(':react-native-firebase') + // Required dependencies + //noinspection GradleCompatible + implementation "com.google.firebase:firebase-core:16.0.4" + implementation "com.google.android.gms:play-services-base:16.0.1" + + /* ------------------------- + * OPTIONAL FIREBASE SDKS + * ------------------------- */ + + implementation('com.google.firebase:firebase-ads:15.0.1') { + // exclude `customtabs` as the support lib version is out of date + // we manually add it as a dependency below with a custom version + exclude group: 'com.android.support', module: 'customtabs' } + // Authentication + implementation "com.google.firebase:firebase-auth:16.0.5" + // Analytics + implementation "com.google.firebase:firebase-analytics:16.0.4" + // Performance Monitoring + implementation "com.google.firebase:firebase-perf:16.2.0" + // Remote Config + implementation "com.google.firebase:firebase-config:16.1.0" + // Cloud Storage + implementation "com.google.firebase:firebase-storage:16.0.4" + // Invites + implementation "com.google.firebase:firebase-invites:16.0.4" + // Dynamic Links + implementation "com.google.firebase:firebase-dynamic-links:16.1.2" + // Real-time Database + implementation "com.google.firebase:firebase-database:16.0.4" + // Cloud Functions + implementation "com.google.firebase:firebase-functions:16.1.2" + // Cloud Firestore + implementation "com.google.firebase:firebase-firestore:17.1.2" + // Cloud Messaging / FCM + implementation "com.google.firebase:firebase-messaging:17.3.4" + // Crashlytics implementation('com.crashlytics.sdk.android:crashlytics:2.9.5@aar') { transitive = true } - // RNFirebase required dependencies - implementation "com.google.firebase:firebase-core:16.0.4" - implementation "com.google.android.gms:play-services-base:16.0.1" + /* -------------------------------- + * OPTIONAL SUPPORT LIBS + * -------------------------------- */ - // RNFirebase optional dependencies - implementation "com.google.firebase:firebase-ads:15.0.1" - implementation "com.google.firebase:firebase-analytics:16.0.4" - implementation "com.google.firebase:firebase-auth:16.0.4" - implementation "com.google.firebase:firebase-config:16.0.1" - implementation "com.google.firebase:firebase-database:16.0.3" - implementation "com.google.firebase:firebase-firestore:17.1.1" - implementation "com.google.firebase:firebase-functions:16.1.1" - implementation "com.google.firebase:firebase-invites:16.0.4" - implementation "com.google.firebase:firebase-storage:16.0.3" - implementation "com.google.firebase:firebase-messaging:17.3.3" - implementation "com.google.firebase:firebase-perf:16.1.2" + // For Firebase Ads + implementation "com.android.support:customtabs:27.1.1" - //noinspection GradleDynamicVersion - implementation "com.facebook.react:react-native:+" - implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}" - implementation "com.android.support:support-annotations:${rootProject.ext.supportLibVersion}" - - implementation fileTree(dir: "libs", include: ["*.jar"]) + // For React Native Firebase Notifications + implementation 'me.leolin:ShortcutBadger:1.1.21@aar' } // Run this once to be able to run the application with BUCK diff --git a/android/build.gradle b/android/build.gradle index f2aceeb..00ecdd0 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,15 +1,15 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { ext { - buildToolsVersion = "27.0.3" - minSdkVersion = 16 + buildToolsVersion = "28.0.2" + minSdkVersion = 18 compileSdkVersion = 27 targetSdkVersion = 26 supportLibVersion = "27.1.1" } repositories { - jcenter() google() + jcenter() maven { url 'https://maven.fabric.io/public' } @@ -27,12 +27,12 @@ buildscript { allprojects { repositories { mavenLocal() + google() jcenter() maven { // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm url "$rootDir/../node_modules/react-native/android" } - google() } } diff --git a/ios/Podfile b/ios/Podfile index 8d84f4b..8ea170f 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -8,20 +8,21 @@ target 'RNFirebaseStarter' do # Pods for RNFirebaseStarter # Required by RNFirebase - pod 'Firebase/Core', '~> 5.9.0' + pod 'Firebase/Core', '~> 5.11.0' # [OPTIONAL PODS] - comment out pods for firebase products you won't be using. - pod 'Firebase/AdMob', '~> 5.9.0' - pod 'Firebase/Auth', '~> 5.9.0' - pod 'Firebase/Database', '~> 5.9.0' - pod 'Firebase/Functions', '~> 5.9.0' - pod 'Firebase/DynamicLinks', '~> 5.9.0' - pod 'Firebase/Firestore', '~> 5.9.0' - # pod 'Firebase/Invites', '~> 5.9.0' - pod 'Firebase/Messaging', '~> 5.9.0' - pod 'Firebase/RemoteConfig', '~> 5.9.0' - pod 'Firebase/Storage', '~> 5.9.0' - pod 'Firebase/Performance', '~> 5.9.0' + pod 'Firebase/AdMob', '~> 5.11.0' + pod 'Firebase/Auth', '~> 5.11.0' + pod 'Firebase/Core', '~> 5.11.0' + pod 'Firebase/Database', '~> 5.11.0' + pod 'Firebase/Functions', '~> 5.11.0' + pod 'Firebase/DynamicLinks', '~> 5.11.0' + pod 'Firebase/Firestore', '~> 5.11.0' + # pod 'Firebase/Invites', '~> 5.11.0' + pod 'Firebase/Messaging', '~> 5.11.0' + pod 'Firebase/RemoteConfig', '~> 5.11.0' + pod 'Firebase/Storage', '~> 5.11.0' + pod 'Firebase/Performance', '~> 5.11.0' pod 'Fabric', '~> 1.7.13' pod 'Crashlytics', '~> 3.10.9' diff --git a/ios/Podfile.lock b/ios/Podfile.lock index ec8162a..63a0a80 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -8,81 +8,81 @@ PODS: - Crashlytics (3.10.9): - Fabric (~> 1.7.13) - Fabric (1.7.13) - - Firebase/AdMob (5.9.0): + - Firebase/AdMob (5.11.0): - Firebase/Core - - Google-Mobile-Ads-SDK (~> 7.33) - - Firebase/Auth (5.9.0): + - Google-Mobile-Ads-SDK (~> 7.35) + - Firebase/Auth (5.11.0): - Firebase/CoreOnly - FirebaseAuth (= 5.0.4) - - Firebase/Core (5.9.0): + - Firebase/Core (5.11.0): - Firebase/CoreOnly - - FirebaseAnalytics (= 5.2.0) - - Firebase/CoreOnly (5.9.0): - - FirebaseCore (= 5.1.4) - - Firebase/Database (5.9.0): + - FirebaseAnalytics (= 5.3.0) + - Firebase/CoreOnly (5.11.0): + - FirebaseCore (= 5.1.6) + - Firebase/Database (5.11.0): - Firebase/CoreOnly - FirebaseDatabase (= 5.0.3) - - Firebase/DynamicLinks (5.9.0): + - Firebase/DynamicLinks (5.11.0): - Firebase/CoreOnly - - FirebaseDynamicLinks (= 3.1.0) - - Firebase/Firestore (5.9.0): + - FirebaseDynamicLinks (= 3.1.1) + - Firebase/Firestore (5.11.0): - Firebase/CoreOnly - - FirebaseFirestore (= 0.13.4) - - Firebase/Functions (5.9.0): + - FirebaseFirestore (= 0.13.6) + - Firebase/Functions (5.11.0): - Firebase/CoreOnly - FirebaseFunctions (= 2.1.1) - - Firebase/Messaging (5.9.0): + - Firebase/Messaging (5.11.0): - Firebase/CoreOnly - - FirebaseMessaging (= 3.1.2) - - Firebase/Performance (5.9.0): + - FirebaseMessaging (= 3.2.1) + - Firebase/Performance (5.11.0): - Firebase/Core - - FirebasePerformance (= 2.1.2) - - Firebase/RemoteConfig (5.9.0): + - FirebasePerformance (= 2.2.0) + - Firebase/RemoteConfig (5.11.0): - Firebase/Core - - FirebaseRemoteConfig (= 3.0.1) - - Firebase/Storage (5.9.0): + - FirebaseRemoteConfig (= 3.1.0) + - Firebase/Storage (5.11.0): - Firebase/CoreOnly - FirebaseStorage (= 3.0.2) - FirebaseABTesting (2.0.0): - FirebaseCore (~> 5.0) - Protobuf (~> 3.5) - - FirebaseAnalytics (5.2.0): + - FirebaseAnalytics (5.3.0): - FirebaseCore (~> 5.1) - - FirebaseInstanceID (~> 3.2) - - GoogleAppMeasurement (~> 5.2) + - FirebaseInstanceID (~> 3.3) + - GoogleAppMeasurement (~> 5.3) - GoogleUtilities/AppDelegateSwizzler (~> 5.2) - GoogleUtilities/MethodSwizzler (~> 5.2) - GoogleUtilities/Network (~> 5.2) - "GoogleUtilities/NSData+zlib (~> 5.2)" - nanopb (~> 0.3) - - FirebaseAnalyticsInterop (1.0.0) + - FirebaseAnalyticsInterop (1.1.0) - FirebaseAuth (5.0.4): - FirebaseAuthInterop (~> 1.0) - FirebaseCore (~> 5.0) - GoogleUtilities/Environment (~> 5.2) - GTMSessionFetcher/Core (~> 1.1) - FirebaseAuthInterop (1.0.0) - - FirebaseCore (5.1.4): + - FirebaseCore (5.1.6): - GoogleUtilities/Logger (~> 5.2) - FirebaseDatabase (5.0.3): - FirebaseCore (~> 5.0) - leveldb-library (~> 1.18) - - FirebaseDynamicLinks (3.1.0): + - FirebaseDynamicLinks (3.1.1): - FirebaseAnalytics (~> 5.1) - FirebaseAnalyticsInterop (~> 1.0) - FirebaseCore (~> 5.1) - - FirebaseFirestore (0.13.4): + - FirebaseFirestore (0.13.6): - FirebaseAuthInterop (~> 1.0) - - FirebaseCore (~> 5.0) - - FirebaseFirestore/abseil-cpp (= 0.13.4) + - FirebaseCore (~> 5.1) + - FirebaseFirestore/abseil-cpp (= 0.13.6) - "gRPC-C++ (~> 0.0.3)" - gRPC-ProtoRPC (~> 1.0) - leveldb-library (~> 1.20) - nanopb (~> 0.3.8) - Protobuf (~> 3.1) - - FirebaseFirestore/abseil-cpp (0.13.4): + - FirebaseFirestore/abseil-cpp (0.13.6): - FirebaseAuthInterop (~> 1.0) - - FirebaseCore (~> 5.0) + - FirebaseCore (~> 5.1) - "gRPC-C++ (~> 0.0.3)" - gRPC-ProtoRPC (~> 1.0) - leveldb-library (~> 1.20) @@ -91,29 +91,32 @@ PODS: - FirebaseFunctions (2.1.1): - FirebaseCore (~> 5.0) - GTMSessionFetcher/Core (~> 1.1) - - FirebaseInstanceID (3.2.2): + - FirebaseInstanceID (3.3.0): - FirebaseCore (~> 5.1) - GoogleUtilities/Environment (~> 5.3) - GoogleUtilities/UserDefaults (~> 5.3) - - FirebaseMessaging (3.1.2): - - FirebaseCore (~> 5.0) + - FirebaseMessaging (3.2.1): + - FirebaseAnalyticsInterop (~> 1.1) + - FirebaseCore (~> 5.1) - FirebaseInstanceID (~> 3.0) + - GoogleUtilities/Environment (~> 5.2) - GoogleUtilities/Reachability (~> 5.2) - Protobuf (~> 3.1) - - FirebasePerformance (2.1.2): - - FirebaseAnalytics (~> 5.1) - - FirebaseInstanceID (~> 3.2) + - FirebasePerformance (2.2.0): + - FirebaseAnalytics (~> 5.3) + - FirebaseInstanceID (~> 3.3) + - FirebaseRemoteConfig (~> 3.1) - GoogleToolboxForMac/Logger (~> 2.1) - "GoogleToolboxForMac/NSData+zlib (~> 2.1)" - GoogleUtilities/ISASwizzler (~> 5.2) - GoogleUtilities/MethodSwizzler (~> 5.2) - GTMSessionFetcher/Core (~> 1.1) - Protobuf (~> 3.5) - - FirebaseRemoteConfig (3.0.1): + - FirebaseRemoteConfig (3.1.0): - FirebaseABTesting (~> 2.0) - - FirebaseAnalytics (~> 5.1) + - FirebaseAnalytics (~> 5.3) - FirebaseCore (~> 5.1) - - FirebaseInstanceID (~> 3.2) + - FirebaseInstanceID (~> 3.3) - GoogleUtilities/Environment (~> 5.2) - "GoogleUtilities/NSData+zlib (~> 5.2)" - Protobuf (~> 3.5) @@ -121,8 +124,8 @@ PODS: - FirebaseAuthInterop (~> 1.0) - FirebaseCore (~> 5.0) - GTMSessionFetcher/Core (~> 1.1) - - Google-Mobile-Ads-SDK (7.34.0) - - GoogleAppMeasurement (5.2.0): + - Google-Mobile-Ads-SDK (7.35.1) + - GoogleAppMeasurement (5.3.0): - GoogleUtilities/AppDelegateSwizzler (~> 5.2) - GoogleUtilities/MethodSwizzler (~> 5.2) - GoogleUtilities/Network (~> 5.2) @@ -133,24 +136,24 @@ PODS: - GoogleToolboxForMac/Defines (= 2.1.4) - "GoogleToolboxForMac/NSData+zlib (2.1.4)": - GoogleToolboxForMac/Defines (= 2.1.4) - - GoogleUtilities/AppDelegateSwizzler (5.3.0): + - GoogleUtilities/AppDelegateSwizzler (5.3.4): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (5.3.0) - - GoogleUtilities/ISASwizzler (5.3.0) - - GoogleUtilities/Logger (5.3.0): + - GoogleUtilities/Environment (5.3.4) + - GoogleUtilities/ISASwizzler (5.3.4) + - GoogleUtilities/Logger (5.3.4): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (5.3.0): + - GoogleUtilities/MethodSwizzler (5.3.4): - GoogleUtilities/Logger - - GoogleUtilities/Network (5.3.0): + - GoogleUtilities/Network (5.3.4): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (5.3.0)" - - GoogleUtilities/Reachability (5.3.0): + - "GoogleUtilities/NSData+zlib (5.3.4)" + - GoogleUtilities/Reachability (5.3.4): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (5.3.0): + - GoogleUtilities/UserDefaults (5.3.4): - GoogleUtilities/Logger - gRPC (1.14.0): - gRPC-RxLibrary (= 1.14.0) @@ -183,27 +186,27 @@ PODS: - gRPC-RxLibrary (= 1.14.0) - GTMSessionFetcher/Core (1.2.0) - leveldb-library (1.20) - - nanopb (0.3.8): - - nanopb/decode (= 0.3.8) - - nanopb/encode (= 0.3.8) - - nanopb/decode (0.3.8) - - nanopb/encode (0.3.8) + - nanopb (0.3.901): + - nanopb/decode (= 0.3.901) + - nanopb/encode (= 0.3.901) + - nanopb/decode (0.3.901) + - nanopb/encode (0.3.901) - Protobuf (3.6.1) DEPENDENCIES: - Crashlytics (~> 3.10.9) - Fabric (~> 1.7.13) - - Firebase/AdMob (~> 5.9.0) - - Firebase/Auth (~> 5.9.0) - - Firebase/Core (~> 5.9.0) - - Firebase/Database (~> 5.9.0) - - Firebase/DynamicLinks (~> 5.9.0) - - Firebase/Firestore (~> 5.9.0) - - Firebase/Functions (~> 5.9.0) - - Firebase/Messaging (~> 5.9.0) - - Firebase/Performance (~> 5.9.0) - - Firebase/RemoteConfig (~> 5.9.0) - - Firebase/Storage (~> 5.9.0) + - Firebase/AdMob (~> 5.11.0) + - Firebase/Auth (~> 5.11.0) + - Firebase/Core (~> 5.11.0) + - Firebase/Database (~> 5.11.0) + - Firebase/DynamicLinks (~> 5.11.0) + - Firebase/Firestore (~> 5.11.0) + - Firebase/Functions (~> 5.11.0) + - Firebase/Messaging (~> 5.11.0) + - Firebase/Performance (~> 5.11.0) + - Firebase/RemoteConfig (~> 5.11.0) + - Firebase/Storage (~> 5.11.0) SPEC REPOS: https://github.com/cocoapods/specs.git: @@ -244,26 +247,26 @@ SPEC CHECKSUMS: BoringSSL: e10f92a27043805c01071fe815a5cd98ae8212e7 Crashlytics: 55e24fc23989680285a21cb1146578d9d18e432c Fabric: 25d0963b691fc97be566392243ff0ecef5a68338 - Firebase: 383fa29aca93e371cab776b48a5c66544d3c2003 + Firebase: b48f9e653da971ecce5b8c749684bc8bb2d26bd3 FirebaseABTesting: 1f50b8d50f5e3469eea54e7463a7b7fe221d1f5e - FirebaseAnalytics: 831f1f127f4a75698e9875a87bf7e2668730d953 - FirebaseAnalyticsInterop: 31b00d2a916918327308b2dff47251eb96f9e4ad + FirebaseAnalytics: 63202d2665de4e6adcbdce189135255d8b5962ba + FirebaseAnalyticsInterop: e5f21be9af6548372e2f0815834ff909bff395a2 FirebaseAuth: 504b198ceb3472dca5c65bb95544ea44cfc9439e FirebaseAuthInterop: 0ffa57668be100582bb7643d4fcb7615496c41fc - FirebaseCore: 2a84b6b325792a4319ef71ee18819dcba08d2fd7 + FirebaseCore: d16552f06821489ce1affe2e5e3e5593402ddfe3 FirebaseDatabase: e2bcbc106adc4b11a2da3ec2eb63c0c4a44f2f54 - FirebaseDynamicLinks: 33f349103fa71d463688b7671e6a60e00ac6a5af - FirebaseFirestore: eaf0b6244e9463e2429fe216666b641e4dec606b + FirebaseDynamicLinks: 000130a3fc3d81ac7322731b895009f3199ef584 + FirebaseFirestore: 162502df850b584126c609f3449acfb7230d8c1a FirebaseFunctions: 6c03d7c5d62520be4678dc3fb7957654aab82b4f - FirebaseInstanceID: 78ba376fcd5b94c001f9999b2cbd3d1f1e56e78d - FirebaseMessaging: d6feeb06218d2675b4149b0ada925a6b707a74cf - FirebasePerformance: 65f7eb943ef3cc118899f945065ff9fa2d924e52 - FirebaseRemoteConfig: 7b6d675dfb11f0e0e638caee00908b06af150d56 + FirebaseInstanceID: e2fa4cb35ef5558c200f7f0ad8a53e212215f93e + FirebaseMessaging: 0f14a264b0d7f867e8eff5d3556bc5d0d4e57888 + FirebasePerformance: 4adfe91a2c696bc43429822ad0e4aa8753b283b4 + FirebaseRemoteConfig: 7e11c65f0769c09bff6947997c209515058c5318 FirebaseStorage: fd82e5e5c474897e19972b34b22ac0f589dce04e - Google-Mobile-Ads-SDK: a1cbce28c0c78ca1fb0b6c4f213485f55527c99f - GoogleAppMeasurement: 2b3a023a61239c8d002e6e4fcf4abce8eddce0e0 + Google-Mobile-Ads-SDK: 151d5e87b4a0ae6d7d07e2cd8d55d1b41ea2e61e + GoogleAppMeasurement: 5029d78f2b438bd30ffb44e6c558b57c21622727 GoogleToolboxForMac: 91c824d21e85b31c2aae9bb011c5027c9b4e738f - GoogleUtilities: 760ccb53b7c7f40f9c02d8c241f76f841a7a6162 + GoogleUtilities: abb092d2c12e817fa3e0e7b274987dd72fb86ec3 gRPC: 9d4c549f37c7cef22478634bac7a0405b6e3dbfb "gRPC-C++": ee0b01db3122f0b6c2be28b5b11039f62fa15fe6 gRPC-Core: f4836515817c0eb479aeeb9cc27c91c4ba62a9f6 @@ -271,9 +274,9 @@ SPEC CHECKSUMS: gRPC-RxLibrary: 3c305f32155024b116b780f389323c73a28197e6 GTMSessionFetcher: 0c4baf0a73acd0041bf9f71ea018deedab5ea84e leveldb-library: 08cba283675b7ed2d99629a4bc5fd052cd2bb6a5 - nanopb: 5601e6bca2dbf1ed831b519092ec110f66982ca3 + nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48 Protobuf: 1eb9700044745f00181c136ef21b8ff3ad5a0fd5 -PODFILE CHECKSUM: fe99048c7f8ce7cad4ec0061e1b5d3a9d3a3e93b +PODFILE CHECKSUM: 81e61cb80d12a845186cac8b790b122df6fdab1d COCOAPODS: 1.5.3 diff --git a/package.json b/package.json index 1291562..70c8e00 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "RNFirebaseStarter", - "version": "0.1.0", + "version": "5.1.0", "private": true, "devDependencies": { "babel-jest": "23.6.0", @@ -24,6 +24,6 @@ "dependencies": { "react": "16.5.0", "react-native": "0.57.1", - "react-native-firebase": "^5.0.0" + "react-native-firebase": "^5.1.0" } }