diff options
| author | Harsh Shandilya <msfjarvis@gmail.com> | 2020-04-02 13:55:20 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-02 13:55:20 +0530 |
| commit | 7dc6ee799200deee9d5c5faed74dff4d564dad43 (patch) | |
| tree | 93babc7bbe292f93fe5a841de90f76120b0ad948 | |
| parent | bc463f3c64ab04ae766aa2f161cce8d5f0e4b9f3 (diff) | |
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>
| -rw-r--r-- | dependencies.gradle | 4 | ||||
| -rw-r--r-- | gradle.properties | 9 |
2 files changed, 3 insertions, 10 deletions
diff --git a/dependencies.gradle b/dependencies.gradle index e0af6276..6d85b8ea 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -14,9 +14,9 @@ ext.versions = [ ext.deps = [ 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', - spotless: 'com.diffplug.spotless:spotless-plugin-gradle:3.28.0' + spotless: 'com.diffplug.spotless:spotless-plugin-gradle:3.28.1' ], kotlin: [ diff --git a/gradle.properties b/gradle.properties index a418d2f5..d1ca41ca 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,15 +5,8 @@ android.useAndroidX=true # R8 Full mode 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 -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/ android.useMinimalKeepRules=true |