From 61144396afd0e9abfe0417c28461b6fd40fc4c10 Mon Sep 17 00:00:00 2001
From: Chris Yang <ychris@google.com>
Date: Fri, 18 Oct 2019 14:33:21 -0700
Subject: [PATCH] remove android x in magic script

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

diff --git a/packages/package_info/CHANGELOG.md b/packages/package_info/CHANGELOG.md
index dc9c3cbd84d4..9d6ee505a695 100644
--- a/packages/package_info/CHANGELOG.md
+++ b/packages/package_info/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.0+9
+
+* Android: Use android.arch.lifecycle instead of androidx.lifecycle:lifecycle in `build.gradle` to support apps that has not been migrated to AndroidX.
+
 ## 0.4.0+8
 
 * Support the v2 Android embedder.
diff --git a/packages/package_info/android/build.gradle b/packages/package_info/android/build.gradle
index eb75e2334d4a..0cf067bc7391 100644
--- a/packages/package_info/android/build.gradle
+++ b/packages/package_info/android/build.gradle
@@ -63,9 +63,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/package_info/android/gradle.properties b/packages/package_info/android/gradle.properties
index 7884ce914984..8bd86f680510 100644
--- a/packages/package_info/android/gradle.properties
+++ b/packages/package_info/android/gradle.properties
@@ -1,2 +1 @@
 org.gradle.jvmargs=-Xmx1536M
-android.enableJetifier=true
diff --git a/packages/package_info/pubspec.yaml b/packages/package_info/pubspec.yaml
index d94a1eb4f8ba..a01b7bdd8d7e 100644
--- a/packages/package_info/pubspec.yaml
+++ b/packages/package_info/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for querying information about the application
   package, such as CFBundleVersion on iOS or versionCode on Android.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/package_info
-version: 0.4.0+8
+version: 0.4.0+9
 
 flutter:
   plugin:
@@ -14,7 +14,7 @@ flutter:
 dependencies:
   flutter:
     sdk: flutter
-  
+
 dev_dependencies:
   flutter_test:
     sdk: flutter