From 3fa7e60f38ebe4deeed64c22f04f4db8b898866c Mon Sep 17 00:00:00 2001
From: Matthias Urhahn <matthias.urhahn@sap.com>
Date: Mon, 12 Oct 2020 10:16:04 +0200
Subject: [PATCH] Disable Jetifier (DEV) #1369
Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com>
---
Corona-Warn-App/build.gradle | 14 ++++++++------
gradle.properties | 1 -
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/Corona-Warn-App/build.gradle b/Corona-Warn-App/build.gradle
index 599e626ad..578782e8f 100644
--- a/Corona-Warn-App/build.gradle
+++ b/Corona-Warn-App/build.gradle
@@ -254,15 +254,17 @@ dependencies {
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.preference:preference:1.1.1'
implementation 'androidx.work:work-runtime-ktx:2.3.4'
- implementation 'android.arch.lifecycle:extensions:2.2.0'
+
implementation 'androidx.lifecycle:lifecycle-common-java8:2.2.0'
+ implementation 'androidx.lifecycle:lifecycle-process:2.2.0'
+ implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
+ implementation 'androidx.lifecycle:lifecycle-viewmodel-savedstate:2.2.0'
+ implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+
implementation 'androidx.annotation:annotation:1.1.0'
implementation "androidx.recyclerview:recyclerview:1.1.0"
implementation "androidx.recyclerview:recyclerview-selection:1.1.0-rc02"
- implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
-
-
// DAGGER
implementation 'com.google.dagger:dagger:2.28.1'
implementation 'com.google.dagger:dagger-android:2.28.1'
@@ -283,8 +285,8 @@ dependencies {
implementation files('libs\\play-services-nearby-exposurenotification-1.6.1-eap.aar')
// Testing
- testImplementation "android.arch.core:core-testing:1.1.1"
- testImplementation('org.robolectric:robolectric:4.3.1') {
+ testImplementation "androidx.arch.core:core-testing:2.1.0"
+ testImplementation('org.robolectric:robolectric:4.4') {
exclude group: 'com.google.protobuf'
}
testImplementation "io.mockk:mockk:1.10.0"
diff --git a/gradle.properties b/gradle.properties
index 09327fded..f388041b0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,7 +12,6 @@
# org.gradle.parallel=true
#Wed May 20 08:50:55 CEST 2020
kotlin.code.style=official
-android.enableJetifier=true
org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
android.useAndroidX=true
org.gradle.parallel=true
--
GitLab