From 9a8c94c4abb82f5464c1a37269fa4a4db04c092b Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Tue, 15 Jan 2019 12:38:27 +0100
Subject: [PATCH] Update Android gradle plugin
---
app/build.gradle.kts | 11 +++++++++--
.../ic_shortcut_channel.xml | 0
.../{drawable => drawable-v26}/ic_shortcut_query.xml | 0
build.gradle.kts | 2 +-
gradle.properties | 4 +++-
5 files changed, 13 insertions(+), 4 deletions(-)
rename app/src/main/res/{drawable => drawable-v26}/ic_shortcut_channel.xml (100%)
rename app/src/main/res/{drawable => drawable-v26}/ic_shortcut_query.xml (100%)
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 942dec1d7..3a5ba7e54 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -80,6 +80,7 @@ android {
isZipAlignEnabled = true
isMinifyEnabled = true
isShrinkResources = true
+ isUseProguard = false
proguardFiles(
getDefaultProguardFile("proguard-android.txt"),
@@ -93,6 +94,7 @@ android {
isZipAlignEnabled = true
isMinifyEnabled = true
isShrinkResources = true
+ isUseProguard = false
proguardFiles(
getDefaultProguardFile("proguard-android.txt"),
@@ -101,6 +103,11 @@ android {
}
}
+ compileOptions {
+ setSourceCompatibility(JavaVersion.VERSION_1_8)
+ setTargetCompatibility(JavaVersion.VERSION_1_8)
+ }
+
lintOptions {
isWarningsAsErrors = true
lintConfig = file("../lint.xml")
@@ -142,7 +149,7 @@ dependencies {
implementation("commons-codec", "commons-codec", "1.11")
implementation("com.squareup.retrofit2", "retrofit", "2.5.0")
implementation("com.squareup.retrofit2", "converter-gson", "2.5.0")
- withVersion("9.0.0-rc1") {
+ withVersion("10.0.0") {
implementation("com.jakewharton", "butterknife", version)
kapt("com.jakewharton", "butterknife-compiler", version)
}
@@ -176,7 +183,7 @@ dependencies {
}
// Dependency Injection
- withVersion("2.15") {
+ withVersion("2.20") {
implementation("com.google.dagger", "dagger", version)
kapt("com.google.dagger", "dagger-compiler", version)
kapt("com.google.dagger", "dagger-android-processor", version)
diff --git a/app/src/main/res/drawable/ic_shortcut_channel.xml b/app/src/main/res/drawable-v26/ic_shortcut_channel.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_shortcut_channel.xml
rename to app/src/main/res/drawable-v26/ic_shortcut_channel.xml
diff --git a/app/src/main/res/drawable/ic_shortcut_query.xml b/app/src/main/res/drawable-v26/ic_shortcut_query.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_shortcut_query.xml
rename to app/src/main/res/drawable-v26/ic_shortcut_query.xml
diff --git a/build.gradle.kts b/build.gradle.kts
index 28cd86749..4b20a5a9d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -23,7 +23,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath("com.android.tools.build:gradle:3.2.1")
+ classpath("com.android.tools.build:gradle:3.3.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.11")
}
}
diff --git a/gradle.properties b/gradle.properties
index 09e279809..bf7e5319a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -30,8 +30,10 @@ org.gradle.jvmargs=-Xmx2048m
org.gradle.parallel=true
# Enable new Android D8 Dexer
android.enableD8=true
+# Enable new Android R8 Optimizer
+android.enableR8=true
# Enable gradle build cache
-org.gradle.caching=true
+org.gradle.caching=false
# Enable android build cache
android.enableBuildCache=true
# Enable AndroidX
--
GitLab