From d4ef69afd0ca8f5a5932494d77829c72367ed56f Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Fri, 18 Oct 2019 14:47:29 -0700
Subject: [PATCH] remove android x constraint

---
 packages/camera/CHANGELOG.md              | 4 ++++
 packages/camera/android/build.gradle      | 7 ++++---
 packages/camera/android/gradle.properties | 2 --
 packages/camera/pubspec.yaml              | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/camera/CHANGELOG.md b/packages/camera/CHANGELOG.md
index 14d2289d99b1..805b9a6214e3 100644
--- a/packages/camera/CHANGELOG.md
+++ b/packages/camera/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.5.6+1
+
+* Android: Use android.arch.lifecycle instead of androidx.lifecycle:lifecycle in `build.gradle` to support apps that has not been migrated to AndroidX.
+
 ## 0.5.6
 
 * Add support for the v2 Android embedding. This shouldn't affect existing
diff --git a/packages/camera/android/build.gradle b/packages/camera/android/build.gradle
index ebd355385c1c..57474ca9506f 100644
--- a/packages/camera/android/build.gradle
+++ b/packages/camera/android/build.gradle
@@ -78,9 +78,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"
+                api "android.arch.lifecycle:runtime:$lifecycle_version"
+                api "android.arch.lifecycle:common:$lifecycle_version"
+                api "android.arch.lifecycle:common-java8:$lifecycle_version"
             }
         }
     }
diff --git a/packages/camera/android/gradle.properties b/packages/camera/android/gradle.properties
index 94adc3a3f97a..8bd86f680510 100644
--- a/packages/camera/android/gradle.properties
+++ b/packages/camera/android/gradle.properties
@@ -1,3 +1 @@
 org.gradle.jvmargs=-Xmx1536M
-android.useAndroidX=true
-android.enableJetifier=true
diff --git a/packages/camera/pubspec.yaml b/packages/camera/pubspec.yaml
index 82facbc94e5d..57059a164dd1 100644
--- a/packages/camera/pubspec.yaml
+++ b/packages/camera/pubspec.yaml
@@ -2,7 +2,7 @@ name: camera
 description: A Flutter plugin for getting information about and controlling the
   camera on Android and iOS. Supports previewing the camera feed, capturing images, capturing video,
   and streaming image buffers to dart.
-version: 0.5.6
+version: 0.5.6+1
 
 authors:
   - Flutter Team <flutter-dev@googlegroups.com>