Skip to content
Snippets Groups Projects
Verified Commit 9a8c94c4 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Update Android gradle plugin

parent 36d4b968
Branches
Tags
No related merge requests found
Pipeline #353 canceled
...@@ -80,6 +80,7 @@ android { ...@@ -80,6 +80,7 @@ android {
isZipAlignEnabled = true isZipAlignEnabled = true
isMinifyEnabled = true isMinifyEnabled = true
isShrinkResources = true isShrinkResources = true
isUseProguard = false
proguardFiles( proguardFiles(
getDefaultProguardFile("proguard-android.txt"), getDefaultProguardFile("proguard-android.txt"),
...@@ -93,6 +94,7 @@ android { ...@@ -93,6 +94,7 @@ android {
isZipAlignEnabled = true isZipAlignEnabled = true
isMinifyEnabled = true isMinifyEnabled = true
isShrinkResources = true isShrinkResources = true
isUseProguard = false
proguardFiles( proguardFiles(
getDefaultProguardFile("proguard-android.txt"), getDefaultProguardFile("proguard-android.txt"),
...@@ -101,6 +103,11 @@ android { ...@@ -101,6 +103,11 @@ android {
} }
} }
compileOptions {
setSourceCompatibility(JavaVersion.VERSION_1_8)
setTargetCompatibility(JavaVersion.VERSION_1_8)
}
lintOptions { lintOptions {
isWarningsAsErrors = true isWarningsAsErrors = true
lintConfig = file("../lint.xml") lintConfig = file("../lint.xml")
...@@ -142,7 +149,7 @@ dependencies { ...@@ -142,7 +149,7 @@ dependencies {
implementation("commons-codec", "commons-codec", "1.11") implementation("commons-codec", "commons-codec", "1.11")
implementation("com.squareup.retrofit2", "retrofit", "2.5.0") implementation("com.squareup.retrofit2", "retrofit", "2.5.0")
implementation("com.squareup.retrofit2", "converter-gson", "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) implementation("com.jakewharton", "butterknife", version)
kapt("com.jakewharton", "butterknife-compiler", version) kapt("com.jakewharton", "butterknife-compiler", version)
} }
...@@ -176,7 +183,7 @@ dependencies { ...@@ -176,7 +183,7 @@ dependencies {
} }
// Dependency Injection // Dependency Injection
withVersion("2.15") { withVersion("2.20") {
implementation("com.google.dagger", "dagger", version) implementation("com.google.dagger", "dagger", version)
kapt("com.google.dagger", "dagger-compiler", version) kapt("com.google.dagger", "dagger-compiler", version)
kapt("com.google.dagger", "dagger-android-processor", version) kapt("com.google.dagger", "dagger-android-processor", version)
......
...@@ -23,7 +23,7 @@ buildscript { ...@@ -23,7 +23,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { 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") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.11")
} }
} }
......
...@@ -30,8 +30,10 @@ org.gradle.jvmargs=-Xmx2048m ...@@ -30,8 +30,10 @@ org.gradle.jvmargs=-Xmx2048m
org.gradle.parallel=true org.gradle.parallel=true
# Enable new Android D8 Dexer # Enable new Android D8 Dexer
android.enableD8=true android.enableD8=true
# Enable new Android R8 Optimizer
android.enableR8=true
# Enable gradle build cache # Enable gradle build cache
org.gradle.caching=true org.gradle.caching=false
# Enable android build cache # Enable android build cache
android.enableBuildCache=true android.enableBuildCache=true
# Enable AndroidX # Enable AndroidX
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment