Fabio/aves
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reverted upgrade to gradle 6 / gradle plugin 4

Browse source
This commit is contained in:
Thibault Deckers 2020-07-07 07:59:49 +09:00
parent f662ae2fad
commit 3bef4d2964
3 changed files with 10 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
android/app/build.gradle
View file

@ -43,7 +43,6 @@ android {
// Gradle plugin 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: // 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 // https://github.com/flutter/flutter/issues/58247
// but there is a workaround (cf `afterEvaluate` section below)
minSdkVersion 24 minSdkVersion 24
targetSdkVersion 29 // same as compileSdkVersion targetSdkVersion 29 // same as compileSdkVersion
versionCode flutterVersionCode.toInteger() versionCode flutterVersionCode.toInteger()
@ -51,12 +50,12 @@ android {
manifestPlaceholders = [googleApiKey:keystoreProperties['googleApiKey']] manifestPlaceholders = [googleApiKey:keystoreProperties['googleApiKey']]
} }
compileOptions { // compileOptions {
// enable support for Java 8 language APIs (stream, optional, etc.) // // enable support for Java 8 language APIs (stream, optional, etc.)
coreLibraryDesugaringEnabled true // coreLibraryDesugaringEnabled true
sourceCompatibility JavaVersion.VERSION_1_8 // sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8 // targetCompatibility JavaVersion.VERSION_1_8
} // }
signingConfigs { signingConfigs {
release { release {
@ -81,22 +80,6 @@ flutter {
source '../..' 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 { repositories {
maven { maven {
url "https://s3.amazonaws.com/repo.commonsware.com" url "https://s3.amazonaws.com/repo.commonsware.com"
@ -105,7 +88,7 @@ repositories {
dependencies { dependencies {
// enable support for Java 8 language APIs (stream, optional, etc.) // 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 "androidx.exifinterface:exifinterface:1.2.0"
implementation 'com.commonsware.cwac:document:0.4.1' implementation 'com.commonsware.cwac:document:0.4.1'

2
android/build.gradle
View file

@ -5,7 +5,7 @@ buildscript {
} }
dependencies { 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.gms:google-services:4.3.3'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.1.1' classpath 'com.google.firebase:firebase-crashlytics-gradle:2.1.1'
} }

4
android/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
#Fri Jul 03 23:16:00 KST 2020 #Tue Apr 21 13:20:37 KST 2020
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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