Skip to content

Commit

Permalink
feat: use latest android & ios Firebase SDKs version (#3956)
Browse files Browse the repository at this point in the history
* chore(*): version upgrades

* chore(*, ios): update GoogleUtilities test/ios

* chore(_,ios): update pod lock

* chore(crashlytics, android): update SDK for tests

* chore: move google-services plugin for gradle

* chore: ios sdk upgrade

* chore: update test Podfile.lock
  • Loading branch information
russellwheatley authored Jul 24, 2020
1 parent ff768fc commit e7b4bb3
Show file tree
Hide file tree
Showing 59 changed files with 258 additions and 263 deletions.
2 changes: 1 addition & 1 deletion packages/admob/RNFBAdMob.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ coreVersionRequired = package['peerDependencies'][appPackage['name']]
if appPackage['sdkVersions']
firebase_sdk_version = appPackage['sdkVersions']['ios']['firebase']
else
firebase_sdk_version = '~> 6.27.0'
firebase_sdk_version = '~> 6.28.1'
end
if coreVersionDetected != coreVersionRequired
Pod::UI.warn "NPM package '#{package['name']}' depends on '#{appPackage['name']}' v#{coreVersionRequired} but found v#{coreVersionDetected}, this might cause build issues or runtime crashes."
Expand Down
2 changes: 1 addition & 1 deletion packages/admob/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:3.5.2")
classpath("com.android.tools.build:gradle:4.0.0")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion packages/analytics/RNFBAnalytics.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ coreVersionRequired = package['peerDependencies'][appPackage['name']]
if appPackage['sdkVersions']
firebase_sdk_version = appPackage['sdkVersions']['ios']['firebase']
else
firebase_sdk_version = '~> 6.27.0'
firebase_sdk_version = '~> 6.28.1'
end
if coreVersionDetected != coreVersionRequired
Pod::UI.warn "NPM package '#{package['name']}' depends on '#{appPackage['name']}' v#{coreVersionRequired} but found v#{coreVersionDetected}, this might cause build issues or runtime crashes."
Expand Down
2 changes: 1 addition & 1 deletion packages/analytics/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:3.5.2")
classpath("com.android.tools.build:gradle:4.0.0")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion packages/app/RNFBApp.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require 'json'
require './firebase_json'
package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
firebase_sdk_version = package['sdkVersions']['ios']['firebase'] || '~> 6.27.0'
firebase_sdk_version = package['sdkVersions']['ios']['firebase'] || '~> 6.28.1'

Pod::Spec.new do |s|
s.name = "RNFBApp"
Expand Down
2 changes: 1 addition & 1 deletion packages/app/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:3.5.2")
classpath("com.android.tools.build:gradle:4.0.0")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
},
"sdkVersions": {
"ios": {
"firebase": "~> 6.27.0"
"firebase": "~> 6.28.1"
},
"android": {
"firebase": "25.5.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/auth/RNFBAuth.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ coreVersionRequired = package['peerDependencies'][appPackage['name']]
if appPackage['sdkVersions']
firebase_sdk_version = appPackage['sdkVersions']['ios']['firebase']
else
firebase_sdk_version = '~> 6.27.0'
firebase_sdk_version = '~> 6.28.1'
end
if coreVersionDetected != coreVersionRequired
Pod::UI.warn "NPM package '#{package['name']}' depends on '#{appPackage['name']}' v#{coreVersionRequired} but found v#{coreVersionDetected}, this might cause build issues or runtime crashes."
Expand Down
2 changes: 1 addition & 1 deletion packages/auth/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:3.5.2")
classpath("com.android.tools.build:gradle:4.0.0")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion packages/crashlytics/RNFBCrashlytics.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ coreVersionRequired = package['peerDependencies'][appPackage['name']]
if appPackage['sdkVersions']
firebase_sdk_version = appPackage['sdkVersions']['ios']['firebase']
else
firebase_sdk_version = '~> 6.27.0'
firebase_sdk_version = '~> 6.28.1'
end
if coreVersionDetected != coreVersionRequired
Pod::UI.warn "NPM package '#{package['name']}' depends on '#{appPackage['name']}' v#{coreVersionRequired} but found v#{coreVersionDetected}, this might cause build issues or runtime crashes."
Expand Down
2 changes: 1 addition & 1 deletion packages/crashlytics/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:3.5.2")
classpath("com.android.tools.build:gradle:4.0.0")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion packages/database/RNFBDatabase.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ coreVersionRequired = package['peerDependencies'][appPackage['name']]
if appPackage['sdkVersions']
firebase_sdk_version = appPackage['sdkVersions']['ios']['firebase']
else
firebase_sdk_version = '~> 6.27.0'
firebase_sdk_version = '~> 6.28.1'
end
if coreVersionDetected != coreVersionRequired
Pod::UI.warn "NPM package '#{package['name']}' depends on '#{appPackage['name']}' v#{coreVersionRequired} but found v#{coreVersionDetected}, this might cause build issues or runtime crashes."
Expand Down
2 changes: 1 addition & 1 deletion packages/database/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:3.5.2")
classpath("com.android.tools.build:gradle:4.0.0")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion packages/dynamic-links/RNFBDynamicLinks.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ coreVersionRequired = package['peerDependencies'][appPackage['name']]
if appPackage['sdkVersions']
firebase_sdk_version = appPackage['sdkVersions']['ios']['firebase']
else
firebase_sdk_version = '~> 6.27.0'
firebase_sdk_version = '~> 6.28.1'
end
if coreVersionDetected != coreVersionRequired
Pod::UI.warn "NPM package '#{package['name']}' depends on '#{appPackage['name']}' v#{coreVersionRequired} but found v#{coreVersionDetected}, this might cause build issues or runtime crashes."
Expand Down
2 changes: 1 addition & 1 deletion packages/dynamic-links/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:3.5.2")
classpath("com.android.tools.build:gradle:4.0.0")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion packages/firestore/RNFBFirestore.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ coreVersionRequired = package['peerDependencies'][appPackage['name']]
if appPackage['sdkVersions']
firebase_sdk_version = appPackage['sdkVersions']['ios']['firebase']
else
firebase_sdk_version = '~> 6.27.0'
firebase_sdk_version = '~> 6.28.1'
end
if coreVersionDetected != coreVersionRequired
Pod::UI.warn "NPM package '#{package['name']}' depends on '#{appPackage['name']}' v#{coreVersionRequired} but found v#{coreVersionDetected}, this might cause build issues or runtime crashes."
Expand Down
2 changes: 1 addition & 1 deletion packages/firestore/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:3.5.2")
classpath("com.android.tools.build:gradle:4.0.0")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion packages/functions/RNFBFunctions.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ coreVersionRequired = package['peerDependencies'][appPackage['name']]
if appPackage['sdkVersions']
firebase_sdk_version = appPackage['sdkVersions']['ios']['firebase']
else
firebase_sdk_version = '~> 6.27.0'
firebase_sdk_version = '~> 6.28.1'
end
if coreVersionDetected != coreVersionRequired
Pod::UI.warn "NPM package '#{package['name']}' depends on '#{appPackage['name']}' v#{coreVersionRequired} but found v#{coreVersionDetected}, this might cause build issues or runtime crashes."
Expand Down
2 changes: 1 addition & 1 deletion packages/functions/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:3.5.2")
classpath("com.android.tools.build:gradle:4.0.0")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion packages/iid/RNFBIid.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ coreVersionRequired = package['peerDependencies'][appPackage['name']]
if appPackage['sdkVersions']
firebase_sdk_version = appPackage['sdkVersions']['ios']['firebase']
else
firebase_sdk_version = '~> 6.27.0'
firebase_sdk_version = '~> 6.28.1'
end
if coreVersionDetected != coreVersionRequired
Pod::UI.warn "NPM package '#{package['name']}' depends on '#{appPackage['name']}' v#{coreVersionRequired} but found v#{coreVersionDetected}, this might cause build issues or runtime crashes."
Expand Down
2 changes: 1 addition & 1 deletion packages/iid/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:3.5.2")
classpath("com.android.tools.build:gradle:4.0.0")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion packages/in-app-messaging/RNFBInAppMessaging.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ coreVersionRequired = package['peerDependencies'][appPackage['name']]
if appPackage['sdkVersions']
firebase_sdk_version = appPackage['sdkVersions']['ios']['firebase']
else
firebase_sdk_version = '~> 6.27.0'
firebase_sdk_version = '~> 6.28.1'
end
if coreVersionDetected != coreVersionRequired
Pod::UI.warn "NPM package '#{package['name']}' depends on '#{appPackage['name']}' v#{coreVersionRequired} but found v#{coreVersionDetected}, this might cause build issues or runtime crashes."
Expand Down
2 changes: 1 addition & 1 deletion packages/in-app-messaging/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:3.5.2")
classpath("com.android.tools.build:gradle:4.0.0")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion packages/messaging/RNFBMessaging.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ coreVersionRequired = package['peerDependencies'][appPackage['name']]
if appPackage['sdkVersions']
firebase_sdk_version = appPackage['sdkVersions']['ios']['firebase']
else
firebase_sdk_version = '~> 6.27.0'
firebase_sdk_version = '~> 6.28.1'
end
if coreVersionDetected != coreVersionRequired
Pod::UI.warn "NPM package '#{package['name']}' depends on '#{appPackage['name']}' v#{coreVersionRequired} but found v#{coreVersionDetected}, this might cause build issues or runtime crashes."
Expand Down
2 changes: 1 addition & 1 deletion packages/messaging/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:3.5.2")
classpath("com.android.tools.build:gradle:4.0.0")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion packages/ml-natural-language/RNFBMLNaturalLanguage.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ coreVersionRequired = package['peerDependencies'][appPackage['name']]
if appPackage['sdkVersions']
firebase_sdk_version = appPackage['sdkVersions']['ios']['firebase']
else
firebase_sdk_version = '~> 6.27.0'
firebase_sdk_version = '~> 6.28.1'
end
if coreVersionDetected != coreVersionRequired
Pod::UI.warn "NPM package '#{package['name']}' depends on '#{appPackage['name']}' v#{coreVersionRequired} but found v#{coreVersionDetected}, this might cause build issues or runtime crashes."
Expand Down
2 changes: 1 addition & 1 deletion packages/ml-natural-language/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:3.5.2")
classpath("com.android.tools.build:gradle:4.0.0")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion packages/ml-vision/RNFBMLVision.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ coreVersionRequired = package['peerDependencies'][appPackage['name']]
if appPackage['sdkVersions']
firebase_sdk_version = appPackage['sdkVersions']['ios']['firebase']
else
firebase_sdk_version = '~> 6.27.0'
firebase_sdk_version = '~> 6.28.1'
end
if coreVersionDetected != coreVersionRequired
Pod::UI.warn "NPM package '#{package['name']}' depends on '#{appPackage['name']}' v#{coreVersionRequired} but found v#{coreVersionDetected}, this might cause build issues or runtime crashes."
Expand Down
2 changes: 1 addition & 1 deletion packages/ml-vision/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:3.5.2")
classpath("com.android.tools.build:gradle:4.0.0")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion packages/perf/RNFBPerf.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ coreVersionRequired = package['peerDependencies'][appPackage['name']]
if appPackage['sdkVersions']
firebase_sdk_version = appPackage['sdkVersions']['ios']['firebase']
else
firebase_sdk_version = '~> 6.27.0'
firebase_sdk_version = '~> 6.28.1'
end
if coreVersionDetected != coreVersionRequired
Pod::UI.warn "NPM package '#{package['name']}' depends on '#{appPackage['name']}' v#{coreVersionRequired} but found v#{coreVersionDetected}, this might cause build issues or runtime crashes."
Expand Down
2 changes: 1 addition & 1 deletion packages/perf/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:3.5.2")
classpath("com.android.tools.build:gradle:4.0.0")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion packages/remote-config/RNFBRemoteConfig.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ coreVersionRequired = package['peerDependencies'][appPackage['name']]
if appPackage['sdkVersions']
firebase_sdk_version = appPackage['sdkVersions']['ios']['firebase']
else
firebase_sdk_version = '~> 6.27.0'
firebase_sdk_version = '~> 6.28.1'
end
if coreVersionDetected != coreVersionRequired
Pod::UI.warn "NPM package '#{package['name']}' depends on '#{appPackage['name']}' v#{coreVersionRequired} but found v#{coreVersionDetected}, this might cause build issues or runtime crashes."
Expand Down
Loading

0 comments on commit e7b4bb3

Please sign in to comment.