From d87b7d4b5ec9fb28c464dc42951eade643e6ba47 Mon Sep 17 00:00:00 2001 From: Chris Bianca Date: Sat, 31 Mar 2018 09:17:49 +0100 Subject: [PATCH] Update to RNFB v4.0.0-rc.3 --- App.js | 6 ++-- android/app/build.gradle | 34 +++++++++---------- .../rnfirebasestarter/MainApplication.java | 14 +++++--- android/build.gradle | 9 +++-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- ios/Podfile | 5 ++- ios/Podfile.lock | 23 ++++--------- package-lock.json | 6 ++-- package.json | 2 +- 9 files changed, 46 insertions(+), 55 deletions(-) diff --git a/App.js b/App.js index 6a91faf..1cd52fd 100644 --- a/App.js +++ b/App.js @@ -42,9 +42,11 @@ export default class App extends React.Component { {firebase.analytics.nativeModuleExists && Analytics} {firebase.auth.nativeModuleExists && Authentication} {firebase.fabric.crashlytics.nativeModuleExists && Crashlytics} - {firebase.crash.nativeModuleExists && Crash Reporting} {firebase.firestore.nativeModuleExists && Cloud Firestore} - {firebase.messaging.nativeModuleExists && Messaging} + {firebase.messaging.nativeModuleExists && Cloud Messaging} + {firebase.links.nativeModuleExists && Dynamic Links} + {firebase.iid.nativeModuleExists && Instance ID} + {firebase.notifications.nativeModuleExists && Notifications} {firebase.perf.nativeModuleExists && Performance Monitoring} {firebase.database.nativeModuleExists && Realtime Database} {firebase.config.nativeModuleExists && Remote Config} diff --git a/android/app/build.gradle b/android/app/build.gradle index 7414740..f5dd2e8 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -99,8 +99,7 @@ android { dexOptions { javaMaxHeapSize "4g" } - compileSdkVersion 24 - buildToolsVersion "23.0.1" + compileSdkVersion 27 defaultConfig { applicationId "com.invertase.rnfirebasestarter" @@ -148,32 +147,31 @@ android { } dependencies { - compile(project(':react-native-firebase')) { + implementation(project(':react-native-firebase')) { transitive = false } // RNFirebase required dependencies - compile "com.google.firebase:firebase-core:11.8.0" - compile "com.google.android.gms:play-services-base:11.8.0" + implementation "com.google.firebase:firebase-core:12.0.1" + implementation "com.google.android.gms:play-services-base:12.0.1" // RNFirebase optional dependencies - compile "com.google.firebase:firebase-ads:11.8.0" - compile "com.google.firebase:firebase-auth:11.8.0" - compile "com.google.firebase:firebase-config:11.8.0" - compile "com.google.firebase:firebase-crash:11.8.0" - compile "com.google.firebase:firebase-database:11.8.0" - compile "com.google.firebase:firebase-firestore:11.8.0" - compile "com.google.firebase:firebase-messaging:11.8.0" - compile "com.google.firebase:firebase-perf:11.8.0" - compile "com.google.firebase:firebase-storage:11.8.0" + implementation "com.google.firebase:firebase-ads:12.0.1" + implementation "com.google.firebase:firebase-auth:12.0.1" + implementation "com.google.firebase:firebase-config:12.0.1" + implementation "com.google.firebase:firebase-database:12.0.1" + implementation "com.google.firebase:firebase-firestore:12.0.1" + implementation "com.google.firebase:firebase-messaging:12.0.1" + implementation "com.google.firebase:firebase-perf:12.0.1" + implementation "com.google.firebase:firebase-storage:12.0.1" - compile('com.crashlytics.sdk.android:crashlytics:2.7.1@aar') { + implementation('com.crashlytics.sdk.android:crashlytics:2.9.1@aar') { transitive = true } - compile fileTree(dir: "libs", include: ["*.jar"]) - compile "com.android.support:appcompat-v7:23.0.1" - compile "com.facebook.react:react-native:+" // From node_modules + implementation fileTree(dir: "libs", include: ["*.jar"]) + implementation "com.android.support:appcompat-v7:27.0.2" + implementation "com.facebook.react:react-native:+" // From node_modules } // Run this once to be able to run the application with BUCK diff --git a/android/app/src/main/java/com/invertase/rnfirebasestarter/MainApplication.java b/android/app/src/main/java/com/invertase/rnfirebasestarter/MainApplication.java index bb3eff4..8f08800 100644 --- a/android/app/src/main/java/com/invertase/rnfirebasestarter/MainApplication.java +++ b/android/app/src/main/java/com/invertase/rnfirebasestarter/MainApplication.java @@ -14,10 +14,12 @@ import io.invertase.firebase.admob.RNFirebaseAdMobPackage; //Firebase AdMob import io.invertase.firebase.analytics.RNFirebaseAnalyticsPackage; // Firebase Analytics import io.invertase.firebase.auth.RNFirebaseAuthPackage; // Firebase Auth import io.invertase.firebase.config.RNFirebaseRemoteConfigPackage; // Firebase Remote Config -import io.invertase.firebase.crash.RNFirebaseCrashPackage; // Firebase Crash Reporting import io.invertase.firebase.database.RNFirebaseDatabasePackage; // Firebase Realtime Database import io.invertase.firebase.firestore.RNFirebaseFirestorePackage; // Firebase Firestore +import io.invertase.firebase.instanceid.RNFirebaseInstanceIdPackage; // Firebase Instance ID +import io.invertase.firebase.links.RNFirebaseLinksPackage; // Firebase Dynamic Links import io.invertase.firebase.messaging.RNFirebaseMessagingPackage; // Firebase Cloud Messaging +import io.invertase.firebase.notifications.RNFirebaseNotificationsPackage; // Firebase Notifications import io.invertase.firebase.perf.RNFirebasePerformancePackage; // Firebase Performance import io.invertase.firebase.storage.RNFirebaseStoragePackage; // Firebase Storage import io.invertase.firebase.fabric.crashlytics.RNFirebaseCrashlyticsPackage; // Crashlytics @@ -42,14 +44,16 @@ public class MainApplication extends Application implements ReactApplication { new RNFirebaseAdMobPackage(), new RNFirebaseAnalyticsPackage(), new RNFirebaseAuthPackage(), - new RNFirebaseRemoteConfigPackage(), - new RNFirebaseCrashPackage(), + new RNFirebaseCrashlyticsPackage(), new RNFirebaseDatabasePackage(), new RNFirebaseFirestorePackage(), + new RNFirebaseInstanceIdPackage(), + new RNFirebaseLinksPackage(), new RNFirebaseMessagingPackage(), + new RNFirebaseNotificationsPackage(), new RNFirebasePerformancePackage(), - new RNFirebaseStoragePackage(), - new RNFirebaseCrashlyticsPackage() + new RNFirebaseRemoteConfigPackage(), + new RNFirebaseStoragePackage() ); } diff --git a/android/build.gradle b/android/build.gradle index 4dacdba..55ac015 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -3,14 +3,15 @@ buildscript { repositories { jcenter() + google() maven { url 'https://maven.fabric.io/public' } } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:3.1.0' classpath 'com.google.gms:google-services:3.1.2' - classpath 'io.fabric.tools:gradle:1.24.4' + classpath 'io.fabric.tools:gradle:1.25.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } @@ -20,12 +21,10 @@ allprojects { repositories { mavenLocal() jcenter() + google() maven { // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm url "$rootDir/../node_modules/react-native/android" } - maven { - url 'https://maven.google.com' - } } } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index dbdc05d..b6517bb 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip diff --git a/ios/Podfile b/ios/Podfile index dd895e4..eafce43 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -13,7 +13,6 @@ target 'RNFirebaseStarter' do # [OPTIONAL PODS] - comment out pods for firebase products you won't be using. pod 'Firebase/AdMob' pod 'Firebase/Auth' - pod 'Firebase/Crash' pod 'Firebase/Database' pod 'Firebase/DynamicLinks' pod 'Firebase/Performance' @@ -22,6 +21,6 @@ target 'RNFirebaseStarter' do pod 'Firebase/RemoteConfig' pod 'Firebase/Storage' - pod 'Fabric', '~> 1.7.2' - pod 'Crashlytics', '~> 3.9.3' + pod 'Fabric', '~> 1.7.6' + pod 'Crashlytics', '~> 3.10.1' end diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 2ee5446..6861098 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -5,8 +5,8 @@ PODS: - BoringSSL/Implementation (10.0): - BoringSSL/Interface (= 10.0) - BoringSSL/Interface (10.0) - - Crashlytics (3.9.3): - - Fabric (~> 1.7.2) + - Crashlytics (3.10.1): + - Fabric (~> 1.7.5) - Fabric (1.7.6) - Firebase/AdMob (4.11.0): - Firebase/Core @@ -17,9 +17,6 @@ PODS: - Firebase/Core (4.11.0): - FirebaseAnalytics (= 4.1.0) - FirebaseCore (= 4.0.18) - - Firebase/Crash (4.11.0): - - Firebase/Core - - FirebaseCrash (= 2.0.2) - Firebase/Database (4.11.0): - Firebase/Core - FirebaseDatabase (= 4.1.5) @@ -55,12 +52,6 @@ PODS: - GTMSessionFetcher/Core (~> 1.1) - FirebaseCore (4.0.18): - GoogleToolboxForMac/NSData+zlib (~> 2.1) - - FirebaseCrash (2.0.2): - - FirebaseAnalytics (~> 4.0) - - FirebaseInstanceID (~> 2.0) - - GoogleToolboxForMac/Logger (~> 2.1) - - GoogleToolboxForMac/NSData+zlib (~> 2.1) - - Protobuf (~> 3.1) - FirebaseDatabase (4.1.5): - FirebaseAnalytics (~> 4.1) - FirebaseCore (~> 4.0) @@ -143,12 +134,11 @@ PODS: - Protobuf (3.5.0) DEPENDENCIES: - - Crashlytics (~> 3.9.3) - - Fabric (~> 1.7.2) + - Crashlytics (~> 3.10.1) + - Fabric (~> 1.7.6) - Firebase/AdMob - Firebase/Auth - Firebase/Core - - Firebase/Crash - Firebase/Database - Firebase/DynamicLinks - Firebase/Firestore @@ -159,14 +149,13 @@ DEPENDENCIES: SPEC CHECKSUMS: BoringSSL: 32764dbaf5f5888cf51fbaa172a010126b41bcd4 - Crashlytics: dbb07d01876c171c5ccbdf7826410380189e452c + Crashlytics: aee1a064cbbf99b32efa3f056a5f458d846bc8ff Fabric: f8d42c893bb187326a7968b62abe55c36a987a46 Firebase: cc13dfab1038c8b45d7903e01fc690451d6d0b24 FirebaseABTesting: d07d0ee833b842d5153549e4c7e2e2cb1c23a3f9 FirebaseAnalytics: 3dfae28d4a5e06f86c4fae830efc2ad3fadb19bc FirebaseAuth: 147bf340a0706b44ca1753d6b41ebafd9687cfe6 FirebaseCore: b981f47e5254cbcfdeb483355300d743f6fcab2c - FirebaseCrash: cded0fc566c03651aea606a101bc156085f333ca FirebaseDatabase: 5f0bc6134c5c237cf55f9e1249d406770a75eafd FirebaseDynamicLinks: 38b68641d24e78d0277a9205d988ce22875d5a25 FirebaseFirestore: 796df79c29cf8ecf806564f4d347665bdafa6ef0 @@ -187,6 +176,6 @@ SPEC CHECKSUMS: nanopb: 5601e6bca2dbf1ed831b519092ec110f66982ca3 Protobuf: 8a9838fba8dae3389230e1b7f8c104aa32389c03 -PODFILE CHECKSUM: d2ec5676da425a2da805526b1b72d5de1ee92a61 +PODFILE CHECKSUM: 1371cc042ab01135103be9c2c2c5204ee2a8b0e4 COCOAPODS: 1.4.0 diff --git a/package-lock.json b/package-lock.json index c42a1a0..7e2a2c7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6865,9 +6865,9 @@ } }, "react-native-firebase": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/react-native-firebase/-/react-native-firebase-3.3.1.tgz", - "integrity": "sha512-8OFIO+x0/7vs03oVKIJaDyLP3pDmhYuGPPviAS2/98G9BCyrsvZXSEN/LPjKtYq5yb3pBfEkZCU5FOuwGlTWmw==", + "version": "4.0.0-rc.3", + "resolved": "https://registry.npmjs.org/react-native-firebase/-/react-native-firebase-4.0.0-rc.3.tgz", + "integrity": "sha512-Ix+exbDW7wZnpRtrt/ktH276avi7WdGh4azu9D8yCyOaOTRVC0kvE2fdnXbofrgjdrlBARGx8utzdhjyTFVjNA==", "requires": { "opencollective": "1.0.3", "postinstall-build": "5.0.1", diff --git a/package.json b/package.json index 204859b..17212ef 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,6 @@ "fbjs": "^0.8.16", "react": "^16.3.0-alpha.1", "react-native": "^0.54.4", - "react-native-firebase": "^3.3.1" + "react-native-firebase": "^4.0.0-rc.3" } }