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

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

diff --git a/packages/android_intent/CHANGELOG.md b/packages/android_intent/CHANGELOG.md
index e6141d741694..3ceac1e5b06b 100644
--- a/packages/android_intent/CHANGELOG.md
+++ b/packages/android_intent/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.4+3
+
+* Android: Use android.arch.lifecycle instead of androidx.lifecycle:lifecycle in `build.gradle` to support apps that has not been migrated to AndroidX.
+
 ## 0.3.4+2
 
 * Fix resolveActivity not respecting the provided componentName.
diff --git a/packages/android_intent/android/build.gradle b/packages/android_intent/android/build.gradle
index ceece7ff6a00..49fe8827d0c1 100644
--- a/packages/android_intent/android/build.gradle
+++ b/packages/android_intent/android/build.gradle
@@ -74,9 +74,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/android_intent/android/gradle.properties b/packages/android_intent/android/gradle.properties
index 53ae0ae470eb..8bd86f680510 100644
--- a/packages/android_intent/android/gradle.properties
+++ b/packages/android_intent/android/gradle.properties
@@ -1,3 +1 @@
-android.enableJetifier=true
-android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536M
diff --git a/packages/android_intent/pubspec.yaml b/packages/android_intent/pubspec.yaml
index 786ededb17ec..530af51db00a 100644
--- a/packages/android_intent/pubspec.yaml
+++ b/packages/android_intent/pubspec.yaml
@@ -2,7 +2,7 @@ name: android_intent
 description: Flutter plugin for launching Android Intents. Not supported on iOS.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/android_intent
-version: 0.3.4+2
+version: 0.3.4+3
 
 flutter:
   plugin: