From cf88c63e99af606900d7629c358f20b19e08b331 Mon Sep 17 00:00:00 2001
From: Thibault Deckers <thibault.deckers@gmail.com>
Date: Fri, 5 Jun 2020 11:01:36 +0900
Subject: [PATCH] revert Android Studio gradle plugin 4.0 usage

---
 android/app/build.gradle                       | 18 ++++++++++--------
 android/build.gradle                           |  2 +-
 .../gradle/wrapper/gradle-wrapper.properties   |  4 ++--
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index ac8a02d8f..4e157772d 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -34,19 +34,21 @@ android {
     defaultConfig {
         applicationId "deckers.thibault.aves"
         // some Java 8 APIs (java.util.stream, etc.) require minSdkVersion 24
-        // but Android Studio 4.0 desugaring features allow targeting older SDKs
+        // Gradle plugin 4.0 desugaring features allow targeting older SDKs
+        // but Flutter (as of v1.17.3) fails to run in release mode when using Gradle plugin 4.0:
+        // https://github.com/flutter/flutter/issues/58247
         minSdkVersion 24
         targetSdkVersion 29 // same as compileSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
 
-    compileOptions {
-        // enable support for Java 8 language APIs (stream, optional, etc.)
-        coreLibraryDesugaringEnabled true
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
+//    compileOptions {
+//        // enable support for Java 8 language APIs (stream, optional, etc.)
+//        coreLibraryDesugaringEnabled true
+//        sourceCompatibility JavaVersion.VERSION_1_8
+//        targetCompatibility JavaVersion.VERSION_1_8
+//    }
 
     buildTypes {
         debug {
@@ -72,7 +74,7 @@ repositories {
 
 dependencies {
     // enable support for Java 8 language APIs (stream, optional, etc.)
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.5'
+//    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.5'
 
     implementation "androidx.exifinterface:exifinterface:1.2.0"
     implementation 'com.commonsware.cwac:document:0.4.1'
diff --git a/android/build.gradle b/android/build.gradle
index 989c6404c..c1bcd1abe 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:3.6.3'
     }
 }
 
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index f167fabc6..33268b8ca 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon May 25 13:52:11 KST 2020
+#Tue Apr 21 13:20:37 KST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
\ No newline at end of file