[firebase_core][firebase_analytics] Fix bug with transitive lifecycle dependencies (firebase#1323)

bparrishMines · web-flow · commit 14c97acb5745 · 2019-10-29T12:36:29.000-07:00
diff --git a/packages/firebase_analytics/CHANGELOG.md b/packages/firebase_analytics/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 5.0.4
+
+* Include lifecycle dependency as a compileOnly one on Android to resolve
+  potential version conflicts with other transitive libraries.
+
 ## 5.0.3
 
 * Support the v2 Android embedding.
diff --git a/packages/firebase_analytics/android/build.gradle b/packages/firebase_analytics/android/build.gradle
@@ -67,9 +67,10 @@ afterEvaluate {
     if (!containsEmbeddingDependencies) {
         android {
             dependencies {
-                def lifecycle_version = "2.1.0"
-                api "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
-                api "androidx.lifecycle:lifecycle-runtime:$lifecycle_version"
+                def lifecycle_version = "1.1.1"
+                compileOnly "android.arch.lifecycle:runtime:$lifecycle_version"
+                compileOnly "android.arch.lifecycle:common:$lifecycle_version"
+                compileOnly "android.arch.lifecycle:common-java8:$lifecycle_version"
             }
         }
     }
diff --git a/packages/firebase_analytics/pubspec.yaml b/packages/firebase_analytics/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Google Analytics for Firebase, an app measuremen
   solution that provides insight on app usage and user engagement on Android and iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/FirebaseExtended/flutterfire/tree/master/packages/firebase_analytics
-version: 5.0.3
+version: 5.0.4
 
 flutter:
   plugin:
diff --git a/packages/firebase_core/CHANGELOG.md b/packages/firebase_core/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.4.1+1
+
+* Include lifecycle dependency as a compileOnly one on Android to resolve
+  potential version conflicts with other transitive libraries.
+
 ## 0.4.1
 
 * Support the v2 Android embedding.
diff --git a/packages/firebase_core/android/build.gradle b/packages/firebase_core/android/build.gradle
@@ -68,9 +68,9 @@ afterEvaluate {
         android {
             dependencies {
                 def lifecycle_version = "1.1.1"
-                api "android.arch.lifecycle:runtime:$lifecycle_version"
-                api "android.arch.lifecycle:common:$lifecycle_version"
-                api "android.arch.lifecycle:common-java8:$lifecycle_version"
+                compileOnly "android.arch.lifecycle:runtime:$lifecycle_version"
+                compileOnly "android.arch.lifecycle:common:$lifecycle_version"
+                compileOnly "android.arch.lifecycle:common-java8:$lifecycle_version"
             }
         }
     }
diff --git a/packages/firebase_core/pubspec.yaml b/packages/firebase_core/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase Core, enabling connecting to multiple
   Firebase apps.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/FirebaseExtended/flutterfire/tree/master/packages/firebase_core
-version: 0.4.1
+version: 0.4.1+1
 
 flutter:
   plugin:

Original file line number	Diff line number	Diff line change
`@@ -67,9 +67,10 @@ afterEvaluate {`
`67`	`67`	`if (!containsEmbeddingDependencies) {`
`68`	`68`	`android {`
`69`	`69`	`dependencies {`
`70`		`- def lifecycle_version = "2.1.0"`
`71`		`- api "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"`
`72`		`- api "androidx.lifecycle:lifecycle-runtime:$lifecycle_version"`
	`70`	`+ def lifecycle_version = "1.1.1"`
	`71`	`+ compileOnly "android.arch.lifecycle:runtime:$lifecycle_version"`
	`72`	`+ compileOnly "android.arch.lifecycle:common:$lifecycle_version"`
	`73`	`+ compileOnly "android.arch.lifecycle:common-java8:$lifecycle_version"`
`73`	`74`	`}`
`74`	`75`	`}`
`75`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,9 +68,9 @@ afterEvaluate {`
`68`	`68`	`android {`
`69`	`69`	`dependencies {`
`70`	`70`	`def lifecycle_version = "1.1.1"`
`71`		`- api "android.arch.lifecycle:runtime:$lifecycle_version"`
`72`		`- api "android.arch.lifecycle:common:$lifecycle_version"`
`73`		`- api "android.arch.lifecycle:common-java8:$lifecycle_version"`
	`71`	`+ compileOnly "android.arch.lifecycle:runtime:$lifecycle_version"`
	`72`	`+ compileOnly "android.arch.lifecycle:common:$lifecycle_version"`
	`73`	`+ compileOnly "android.arch.lifecycle:common-java8:$lifecycle_version"`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`	`}`