upgraded to gradle 6 / gradle plugin 4

This commit is contained in:
Thibault Deckers 2020-07-03 23:35:38 +09:00
parent 5df3d78e7e
commit efd7759a9e
3 changed files with 20 additions and 3 deletions

View file

@ -43,6 +43,7 @@ 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()
@ -80,6 +81,22 @@ 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"

View file

@ -5,7 +5,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.6.3' classpath 'com.android.tools.build:gradle:4.0.0'
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'
} }

View file

@ -1,6 +1,6 @@
#Tue Apr 21 13:20:37 KST 2020 #Fri Jul 03 23:16:00 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-5.6.4-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip