Merge branch 'develop'

android/app/build.gradle

@@ -43,7 +43,6 @@ android {
         // 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
-        // but there is a workaround (cf `afterEvaluate` section below)
         minSdkVersion 24
         targetSdkVersion 29 // same as compileSdkVersion
         versionCode flutterVersionCode.toInteger()
@@ -51,12 +50,12 @@ android {
         manifestPlaceholders = [googleApiKey:keystoreProperties['googleApiKey']]
     }
 
-    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
+//    }
 
     signingConfigs {
         release {
@@ -81,22 +80,6 @@ flutter {
     source '../..'
 }
 
-// workaround to https://github.com/flutter/flutter/issues/58247
-afterEvaluate {
-    android.productFlavors.all { flavor ->
-        def debugLintTask = tasks.findByName("lint${flavor.name.capitalize()}Debug")
-        def releaseLintTask = tasks.findByName("lint${flavor.name.capitalize()}Release")
-
-        if (debugLintTask != null) {
-            debugLintTask.dependsOn ':flutter:assemble'
-        }
-
-        if (releaseLintTask != null) {
-            releaseLintTask.dependsOn ':flutter:assemble'
-        }
-    }
-}
-
 repositories {
     maven {
         url "https://s3.amazonaws.com/repo.commonsware.com"
@@ -105,7 +88,7 @@ repositories {
 
 dependencies {
     // enable support for Java 8 language APIs (stream, optional, etc.)
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.9'
+//    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.9'
 
     implementation "androidx.exifinterface:exifinterface:1.2.0"
     implementation 'com.commonsware.cwac:document:0.4.1'

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'
         classpath 'com.google.gms:google-services:4.3.3'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.1.1'
     }

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Jul 03 23:16:00 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

pubspec.yaml

@@ -11,7 +11,7 @@ description: A new Flutter application.
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.0.7+8
+version: 1.0.8+9
 
 # video_player (as of v0.10.8+2, backed by ExoPlayer):
 # - does not support content URIs (by default, but trivial by fork)