Skip to content
This repository has been archived by the owner on Dec 29, 2020. It is now read-only.

Commit

Permalink
- [dependencies][android] remove all Firebase SDKs in favour of Fireb…
Browse files Browse the repository at this point in the history
…ase BoM

- [android] upgrade to Android X
- [android] upgrade gradle wrapper to v5.4.1
- [android][ios][tests] remove manual packages & enable auto-linking
- [tests][internal] upgrade tests project to RN 60
- [ios] temporarily remove framework support in pods - broken in RN 60 - see facebook/react-native#25349
- [linting] switch to use rn community linting rules
  • Loading branch information
Salakar committed Jul 30, 2019
1 parent 2ffb18a commit 6699a06
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 14 deletions.
2 changes: 1 addition & 1 deletion RNFBAnalytics.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ Pod::Spec.new do |s|
s.dependency 'React'
s.dependency 'Firebase/Core', '~> 6.5.0'
s.dependency 'RNFBApp'
s.static_framework = true
s.static_framework = false
end
12 changes: 4 additions & 8 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.4.0'
classpath 'com.android.tools.build:gradle:3.4.2'
}
}

Expand All @@ -24,12 +24,8 @@ project.ext {
buildTools: "28.0.3"
],

googlePlayServices: [
base: "16.1.0",
],

firebase : [
analytics: "16.4.0"
bom: "21.1.0",
],
],
])
Expand Down Expand Up @@ -61,8 +57,8 @@ repositories {

dependencies {
api project(':@react-native-firebase_app')
implementation "com.google.firebase:firebase-analytics:${ReactNative.ext.getVersion("firebase", "analytics")}"
implementation "com.google.android.gms:play-services-base:${ReactNative.ext.getVersion("googlePlayServices", "base")}"
implementation platform("com.google.firebase:firebase-bom:${ReactNative.ext.getVersion("firebase", "bom")}")
implementation "com.google.firebase:firebase-analytics"
}

ReactNative.shared.applyPackageVersion()
Expand Down
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
5 changes: 2 additions & 3 deletions e2e/analytics.e2e.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-disable consistent-return */
/*
* Copyright (c) 2016-present Invertase Limited & Contributors
*
Expand Down Expand Up @@ -91,15 +90,15 @@ describe('analytics()', () => {
(() => {
firebase.analytics().logEvent(13377331);
}).should.throw(
`firebase.analytics().logEvent(*): First argument 'name' is required and must be a string value.`,
"firebase.analytics().logEvent(*): First argument 'name' is required and must be a string value.",
);
});

it('errors if params is not an object', () => {
(() => {
firebase.analytics().logEvent('invertase_event', 'this should be an object');
}).should.throw(
`firebase.analytics().logEvent(_, *): Second optional argument 'params' must be an object if provided.`,
"firebase.analytics().logEvent(_, *): Second optional argument 'params' must be an object if provided.",
);
});

Expand Down
2 changes: 1 addition & 1 deletion ios/RNFBAnalytics.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ Pod::Spec.new do |s|
s.dependency 'React'
s.dependency 'Firebase/Core', '~> 6.5.0'
s.dependency 'RNFBApp'
s.static_framework = true
s.static_framework = false
end

0 comments on commit 6699a06

Please sign in to comment.