Skip to content

Fixing merge conflicts for flutter/plugins PR #229 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DennisAlund wants to merge 2 commits into
base: update_gms
Choose a base branch
from
Open

Fixing merge conflicts for flutter/plugins PR #229 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff18cab
Update GMS to 11.+
collinjackson Oct 3, 2017
8f9eeea
Fixing merge conflicts in PR #229
DennisAlund Oct 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/firebase_admob/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## [0.0.2]

* Change GMS dependency to 11.+

## [0.0.1]

* Initial Release: not ready for production use
4 changes: 2 additions & 2 deletions packages/firebase_admob/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ android {
disable 'InvalidPackage'
}
dependencies {
compile 'com.google.firebase:firebase-core:11.0.+'
compile 'com.google.firebase:firebase-ads:11.0.+'
compile 'com.google.firebase:firebase-core:11.+'
compile 'com.google.firebase:firebase-ads:11.+'
}
}
4 changes: 4 additions & 0 deletions packages/firebase_analytics/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.2.0

* Change GMS dependency to 11.+

## 0.1.0+1

* Aligned author name with rest of repo.
Expand Down
4 changes: 2 additions & 2 deletions packages/firebase_analytics/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ android {
disable 'InvalidPackage'
}
dependencies {
compile 'com.google.firebase:firebase-auth:11.0.+'
compile 'com.google.firebase:firebase-analytics:11.0.+'
compile 'com.google.firebase:firebase-auth:11.+'
compile 'com.google.firebase:firebase-analytics:11.+'
}
}
1 change: 0 additions & 1 deletion packages/firebase_analytics/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ flutter {
}

dependencies {
compile 'com.google.firebase:firebase-core:11.0.+'
}

apply plugin: 'com.google.gms.google-services'
4 changes: 4 additions & 0 deletions packages/firebase_auth/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.3.0

* Change GMS dependency to 11.+

## 0.2.4

* Added support for `signInWithCustomToken`
Expand Down
4 changes: 2 additions & 2 deletions packages/firebase_auth/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ android {
}
dependencies {
compile 'com.google.guava:guava:20.0'
compile 'com.google.firebase:firebase-core:11.0.+'
compile 'com.google.firebase:firebase-auth:11.0.+'
compile 'com.google.firebase:firebase-core:11.+'
compile 'com.google.firebase:firebase-auth:11.+'
}
}
4 changes: 4 additions & 0 deletions packages/firebase_database/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.2.0

* Change GMS dependency to 11.+

## 0.1.0+1

* Aligned author name with rest of repo.
Expand Down
6 changes: 3 additions & 3 deletions packages/firebase_database/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ android {
disable 'InvalidPackage'
}
dependencies {
compile 'com.google.firebase:firebase-core:11.0.+'
compile 'com.google.firebase:firebase-auth:11.0.+'
compile 'com.google.firebase:firebase-database:11.0.+'
compile 'com.google.firebase:firebase-core:11.+'
compile 'com.google.firebase:firebase-auth:11.+'
compile 'com.google.firebase:firebase-database:11.+'
}
}
4 changes: 4 additions & 0 deletions packages/firebase_messaging/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.1.0

* Change GMS dependency to 11.+

## 0.0.5+1

* Aligned author name with rest of repo.
Expand Down
4 changes: 2 additions & 2 deletions packages/firebase_messaging/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ android {
disable 'InvalidPackage'
}
dependencies {
compile 'com.google.firebase:firebase-core:11.0.+'
compile 'com.google.firebase:firebase-messaging:11.0.+'
compile 'com.google.firebase:firebase-core:11.+'
compile 'com.google.firebase:firebase-messaging:11.+'
}
}
5 changes: 5 additions & 0 deletions packages/firebase_storage/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@

## 0.1.0

* Change GMS dependency to 11.+

## 0.0.6

* Added StorageReference getData function to download files into memory.
Expand Down
4 changes: 2 additions & 2 deletions packages/firebase_storage/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ android {
disable 'InvalidPackage'
}
dependencies {
compile 'com.google.firebase:firebase-core:11.0.+'
compile 'com.google.firebase:firebase-storage:11.0.+'
compile 'com.google.firebase:firebase-core:11.+'
compile 'com.google.firebase:firebase-storage:11.+'
}
}
4 changes: 4 additions & 0 deletions packages/google_sign_in/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 1.1.0

* Change GMS dependency to 11.+

## 1.0.0

* Make GoogleUserCircleAvatar fade profile image over the top of placeholder
Expand Down
2 changes: 1 addition & 1 deletion packages/google_sign_in/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ android {
}

dependencies {
compile 'com.google.android.gms:play-services-auth:11.0.+'
compile 'com.google.android.gms:play-services-auth:11.+'
compile 'com.google.guava:guava:20.0'
}