diff --git a/.travis.yml b/.travis.yml index 80628cc2e..4771be527 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ jdk: oraclejdk8 env: global: - ANDROID_API_LEVEL=29 - - ANDROID_BUILD_TOOLS_VERSION=29.0.2 + - ANDROID_BUILD_TOOLS_VERSION=29.0.3 cache: directories: diff --git a/app/build.gradle b/app/build.gradle index 639fd04c3..622c4b12c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,7 +10,7 @@ apply from: 'hooks.gradle' android { compileSdkVersion 29 - buildToolsVersion '29.0.2' + buildToolsVersion '29.0.3' defaultConfig { applicationId "io.github.wulkanowy" diff --git a/gradle.properties b/gradle.properties index 113bb1069..5741ecfc4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,6 @@ # The setting is particularly useful for tweaking memory settings. android.enableJetifier=true android.useAndroidX=true -android.enableR8=true org.gradle.jvmargs=-Xmx1536m kapt.incremental.apt=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0ebb3108e..6254d2d4a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists