From b2db338ebb7924f35a2077f86e23ea41c0781a5c Mon Sep 17 00:00:00 2001 From: Amir Hardon Date: Thu, 17 Oct 2019 09:49:32 -0700 Subject: [PATCH 1/3] delete all example/android/app/gradle.properties files --- packages/android_intent/example/android/app/gradle.properties | 2 -- packages/battery/example/android/app/gradle.properties | 2 -- packages/camera/example/android/app/gradle.properties | 2 -- packages/connectivity/example/android/app/gradle.properties | 2 -- packages/device_info/example/android/app/gradle.properties | 2 -- .../google_maps_flutter/example/android/app/gradle.properties | 2 -- packages/google_sign_in/example/android/app/gradle.properties | 2 -- packages/image_picker/example/android/app/gradle.properties | 2 -- packages/in_app_purchase/example/android/app/gradle.properties | 2 -- packages/local_auth/example/android/app/gradle.properties | 2 -- packages/package_info/example/android/app/gradle.properties | 2 -- packages/path_provider/example/android/app/gradle.properties | 2 -- packages/quick_actions/example/android/app/gradle.properties | 2 -- packages/sensors/example/android/app/gradle.properties | 2 -- packages/share/example/android/app/gradle.properties | 2 -- .../shared_preferences/example/android/app/gradle.properties | 2 -- .../url_launcher/example/android/app/gradle.properties | 2 -- packages/video_player/example/android/app/gradle.properties | 2 -- packages/webview_flutter/example/android/app/gradle.properties | 2 -- 19 files changed, 38 deletions(-) delete mode 100644 packages/android_intent/example/android/app/gradle.properties delete mode 100644 packages/battery/example/android/app/gradle.properties delete mode 100644 packages/camera/example/android/app/gradle.properties delete mode 100644 packages/connectivity/example/android/app/gradle.properties delete mode 100644 packages/device_info/example/android/app/gradle.properties delete mode 100644 packages/google_maps_flutter/example/android/app/gradle.properties delete mode 100644 packages/google_sign_in/example/android/app/gradle.properties delete mode 100644 packages/image_picker/example/android/app/gradle.properties delete mode 100644 packages/in_app_purchase/example/android/app/gradle.properties delete mode 100644 packages/local_auth/example/android/app/gradle.properties delete mode 100644 packages/package_info/example/android/app/gradle.properties delete mode 100644 packages/path_provider/example/android/app/gradle.properties delete mode 100644 packages/quick_actions/example/android/app/gradle.properties delete mode 100644 packages/sensors/example/android/app/gradle.properties delete mode 100644 packages/share/example/android/app/gradle.properties delete mode 100644 packages/shared_preferences/example/android/app/gradle.properties delete mode 100644 packages/url_launcher/url_launcher/example/android/app/gradle.properties delete mode 100644 packages/video_player/example/android/app/gradle.properties delete mode 100644 packages/webview_flutter/example/android/app/gradle.properties diff --git a/packages/android_intent/example/android/app/gradle.properties b/packages/android_intent/example/android/app/gradle.properties deleted file mode 100644 index 5465fec0ecad..000000000000 --- a/packages/android_intent/example/android/app/gradle.properties +++ /dev/null @@ -1,2 +0,0 @@ -android.enableJetifier=true -android.useAndroidX=true \ No newline at end of file diff --git a/packages/battery/example/android/app/gradle.properties b/packages/battery/example/android/app/gradle.properties deleted file mode 100644 index 5465fec0ecad..000000000000 --- a/packages/battery/example/android/app/gradle.properties +++ /dev/null @@ -1,2 +0,0 @@ -android.enableJetifier=true -android.useAndroidX=true \ No newline at end of file diff --git a/packages/camera/example/android/app/gradle.properties b/packages/camera/example/android/app/gradle.properties deleted file mode 100644 index 5465fec0ecad..000000000000 --- a/packages/camera/example/android/app/gradle.properties +++ /dev/null @@ -1,2 +0,0 @@ -android.enableJetifier=true -android.useAndroidX=true \ No newline at end of file diff --git a/packages/connectivity/example/android/app/gradle.properties b/packages/connectivity/example/android/app/gradle.properties deleted file mode 100644 index 5465fec0ecad..000000000000 --- a/packages/connectivity/example/android/app/gradle.properties +++ /dev/null @@ -1,2 +0,0 @@ -android.enableJetifier=true -android.useAndroidX=true \ No newline at end of file diff --git a/packages/device_info/example/android/app/gradle.properties b/packages/device_info/example/android/app/gradle.properties deleted file mode 100644 index 5465fec0ecad..000000000000 --- a/packages/device_info/example/android/app/gradle.properties +++ /dev/null @@ -1,2 +0,0 @@ -android.enableJetifier=true -android.useAndroidX=true \ No newline at end of file diff --git a/packages/google_maps_flutter/example/android/app/gradle.properties b/packages/google_maps_flutter/example/android/app/gradle.properties deleted file mode 100644 index 5465fec0ecad..000000000000 --- a/packages/google_maps_flutter/example/android/app/gradle.properties +++ /dev/null @@ -1,2 +0,0 @@ -android.enableJetifier=true -android.useAndroidX=true \ No newline at end of file diff --git a/packages/google_sign_in/example/android/app/gradle.properties b/packages/google_sign_in/example/android/app/gradle.properties deleted file mode 100644 index 5465fec0ecad..000000000000 --- a/packages/google_sign_in/example/android/app/gradle.properties +++ /dev/null @@ -1,2 +0,0 @@ -android.enableJetifier=true -android.useAndroidX=true \ No newline at end of file diff --git a/packages/image_picker/example/android/app/gradle.properties b/packages/image_picker/example/android/app/gradle.properties deleted file mode 100644 index 5465fec0ecad..000000000000 --- a/packages/image_picker/example/android/app/gradle.properties +++ /dev/null @@ -1,2 +0,0 @@ -android.enableJetifier=true -android.useAndroidX=true \ No newline at end of file diff --git a/packages/in_app_purchase/example/android/app/gradle.properties b/packages/in_app_purchase/example/android/app/gradle.properties deleted file mode 100644 index 5465fec0ecad..000000000000 --- a/packages/in_app_purchase/example/android/app/gradle.properties +++ /dev/null @@ -1,2 +0,0 @@ -android.enableJetifier=true -android.useAndroidX=true \ No newline at end of file diff --git a/packages/local_auth/example/android/app/gradle.properties b/packages/local_auth/example/android/app/gradle.properties deleted file mode 100644 index 5465fec0ecad..000000000000 --- a/packages/local_auth/example/android/app/gradle.properties +++ /dev/null @@ -1,2 +0,0 @@ -android.enableJetifier=true -android.useAndroidX=true \ No newline at end of file diff --git a/packages/package_info/example/android/app/gradle.properties b/packages/package_info/example/android/app/gradle.properties deleted file mode 100644 index 5465fec0ecad..000000000000 --- a/packages/package_info/example/android/app/gradle.properties +++ /dev/null @@ -1,2 +0,0 @@ -android.enableJetifier=true -android.useAndroidX=true \ No newline at end of file diff --git a/packages/path_provider/example/android/app/gradle.properties b/packages/path_provider/example/android/app/gradle.properties deleted file mode 100644 index 5465fec0ecad..000000000000 --- a/packages/path_provider/example/android/app/gradle.properties +++ /dev/null @@ -1,2 +0,0 @@ -android.enableJetifier=true -android.useAndroidX=true \ No newline at end of file diff --git a/packages/quick_actions/example/android/app/gradle.properties b/packages/quick_actions/example/android/app/gradle.properties deleted file mode 100644 index 5465fec0ecad..000000000000 --- a/packages/quick_actions/example/android/app/gradle.properties +++ /dev/null @@ -1,2 +0,0 @@ -android.enableJetifier=true -android.useAndroidX=true \ No newline at end of file diff --git a/packages/sensors/example/android/app/gradle.properties b/packages/sensors/example/android/app/gradle.properties deleted file mode 100644 index 5465fec0ecad..000000000000 --- a/packages/sensors/example/android/app/gradle.properties +++ /dev/null @@ -1,2 +0,0 @@ -android.enableJetifier=true -android.useAndroidX=true \ No newline at end of file diff --git a/packages/share/example/android/app/gradle.properties b/packages/share/example/android/app/gradle.properties deleted file mode 100644 index 5465fec0ecad..000000000000 --- a/packages/share/example/android/app/gradle.properties +++ /dev/null @@ -1,2 +0,0 @@ -android.enableJetifier=true -android.useAndroidX=true \ No newline at end of file diff --git a/packages/shared_preferences/example/android/app/gradle.properties b/packages/shared_preferences/example/android/app/gradle.properties deleted file mode 100644 index 5465fec0ecad..000000000000 --- a/packages/shared_preferences/example/android/app/gradle.properties +++ /dev/null @@ -1,2 +0,0 @@ -android.enableJetifier=true -android.useAndroidX=true \ No newline at end of file diff --git a/packages/url_launcher/url_launcher/example/android/app/gradle.properties b/packages/url_launcher/url_launcher/example/android/app/gradle.properties deleted file mode 100644 index 5465fec0ecad..000000000000 --- a/packages/url_launcher/url_launcher/example/android/app/gradle.properties +++ /dev/null @@ -1,2 +0,0 @@ -android.enableJetifier=true -android.useAndroidX=true \ No newline at end of file diff --git a/packages/video_player/example/android/app/gradle.properties b/packages/video_player/example/android/app/gradle.properties deleted file mode 100644 index 5465fec0ecad..000000000000 --- a/packages/video_player/example/android/app/gradle.properties +++ /dev/null @@ -1,2 +0,0 @@ -android.enableJetifier=true -android.useAndroidX=true \ No newline at end of file diff --git a/packages/webview_flutter/example/android/app/gradle.properties b/packages/webview_flutter/example/android/app/gradle.properties deleted file mode 100644 index 5465fec0ecad..000000000000 --- a/packages/webview_flutter/example/android/app/gradle.properties +++ /dev/null @@ -1,2 +0,0 @@ -android.enableJetifier=true -android.useAndroidX=true \ No newline at end of file From d0d97179499dbc4b0c3426d0bd414fd6fb0a4954 Mon Sep 17 00:00:00 2001 From: Amir Hardon Date: Thu, 17 Oct 2019 14:45:09 -0700 Subject: [PATCH 2/3] enable jettifier for the webview sample app --- packages/webview_flutter/example/android/gradle.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/webview_flutter/example/android/gradle.properties b/packages/webview_flutter/example/android/gradle.properties index ad8917e962e5..94adc3a3f97a 100644 --- a/packages/webview_flutter/example/android/gradle.properties +++ b/packages/webview_flutter/example/android/gradle.properties @@ -1,2 +1,3 @@ org.gradle.jvmargs=-Xmx1536M -android.useAndroidX=true \ No newline at end of file +android.useAndroidX=true +android.enableJetifier=true From 85aefb62aad82c15fdf0a3060984ac5b2183a381 Mon Sep 17 00:00:00 2001 From: Amir Hardon Date: Fri, 18 Oct 2019 12:56:45 -0700 Subject: [PATCH 3/3] dont change the androidx state of existing example apps --- packages/google_maps_flutter/example/android/gradle.properties | 2 ++ packages/image_picker/example/android/gradle.properties | 3 +++ packages/local_auth/example/android/gradle.properties | 2 ++ 3 files changed, 7 insertions(+) diff --git a/packages/google_maps_flutter/example/android/gradle.properties b/packages/google_maps_flutter/example/android/gradle.properties index 7be3d8b46841..38c8d4544ff1 100644 --- a/packages/google_maps_flutter/example/android/gradle.properties +++ b/packages/google_maps_flutter/example/android/gradle.properties @@ -1,2 +1,4 @@ org.gradle.jvmargs=-Xmx1536M android.enableR8=true +android.useAndroidX=true +android.enableJetifier=true diff --git a/packages/image_picker/example/android/gradle.properties b/packages/image_picker/example/android/gradle.properties index 8bd86f680510..38c8d4544ff1 100755 --- a/packages/image_picker/example/android/gradle.properties +++ b/packages/image_picker/example/android/gradle.properties @@ -1 +1,4 @@ org.gradle.jvmargs=-Xmx1536M +android.enableR8=true +android.useAndroidX=true +android.enableJetifier=true diff --git a/packages/local_auth/example/android/gradle.properties b/packages/local_auth/example/android/gradle.properties index 8bd86f680510..94adc3a3f97a 100644 --- a/packages/local_auth/example/android/gradle.properties +++ b/packages/local_auth/example/android/gradle.properties @@ -1 +1,3 @@ org.gradle.jvmargs=-Xmx1536M +android.useAndroidX=true +android.enableJetifier=true