Update dependencies and fix Gradle props (#684)

* Remove CI specific gradle props

They are installed by the CI pipeline automatically

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* Upgrade AGP to 3.6.2

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* Suppress android.useMinimalKeepRules warning

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* Update to Spotless 3.28.1

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
Harsh Shandilya 2020-04-02 13:55:20 +05:30 committed by GitHub
parent bc463f3c64
commit 7dc6ee7992
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 10 deletions

View file

@ -14,9 +14,9 @@ ext.versions = [
ext.deps = [ ext.deps = [
gradle_plugin: [ gradle_plugin: [
android: 'com.android.tools.build:gradle:3.6.1', android: 'com.android.tools.build:gradle:3.6.2',
kotlin: 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.71', kotlin: 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.71',
spotless: 'com.diffplug.spotless:spotless-plugin-gradle:3.28.0' spotless: 'com.diffplug.spotless:spotless-plugin-gradle:3.28.1'
], ],
kotlin: [ kotlin: [

View file

@ -5,15 +5,8 @@ android.useAndroidX=true
# R8 Full mode # R8 Full mode
android.enableR8.fullMode=true android.enableR8.fullMode=true
# Reduce memory usage in CI pipeline
org.gradle.daemon=false
org.gradle.parallel=true
org.gradle.caching=true
org.gradle.configureondemand=true
org.gradle.jvmargs=-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
# Disable warnings for experimental options # Disable warnings for experimental options
android.suppressUnsupportedOptionWarnings=android.suppressUnsupportedOptionWarnings,android.enableR8.fullMode,android.namespacedRClass android.suppressUnsupportedOptionWarnings=android.suppressUnsupportedOptionWarnings,android.enableR8.fullMode,android.useMinimalKeepRules,android.namespacedRClass
# https://jakewharton.com/increased-accuracy-of-aapt2-keep-rules/ # https://jakewharton.com/increased-accuracy-of-aapt2-keep-rules/
android.useMinimalKeepRules=true android.useMinimalKeepRules=true