update dependencies, port to AndroidX

Author: jakdor

labday/.idea/codeStyles/Project.xml

@@ -5,24 +5,23 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'io.fabric'
 
 project.ext {
-    arch = "1.1.1"
-    archExt = "1.1.1"
-    archDb = "1.1.0"
-    databindingCompilerVersion = "3.1.2"
-    supportLibsVersion = "27.1.1"
-    constraintLayoutVersion = "1.1.0"
-    butterKnifeVersion = "8.8.1"
-    glideVersion = "4.4.0"
-    daggerVersion = "2.13"
+    androidXVersion = "1.1.0"
+    supportVersion = "1.0.0"
+    lifecycleVersion = "2.1.0"
+    databindingCompilerVersion = "3.5.1"
+    constraintLayoutVersion = "1.1.3"
+    sqliteVersion = "2.0.1"
+    glideVersion = "4.9.0"
+    daggerVersion = "2.21"
     retrofitVersion = "2.3.0"
     okHttpVersion = "3.9.1"
     rxJavaVersion = "2.1.7"
-    rxAndroidVersion = "2.0.1"
+    rxAndroidVersion = "2.1.1"
     concealVersion = "2.0.1"
     sqlBriteVersion = "3.1.0"
-    gmsMapsVersion = "15.0.1"
-    timberVersion = "4.7.0"
-    crashlyticsVersion = "2.9.2"
+    gmsMapsVersion = "17.0.0"
+    timberVersion = "4.7.1"
+    crashlyticsVersion = "2.10.1"
 
     junitVersion = "4.12"
     mockitoVersion = "2.13.0"
@@ -32,16 +31,16 @@ project.ext {
     espressoVersion = "3.0.1"
     daggerMockVersion = "0.8.2"
     restMockVersion = "0.2.2"
-    leakCanaryVersion = "1.5.4"
+    leakCanaryVersion = "1.6.3"
 }
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
     defaultConfig {
         applicationId "com.jakdor.labday"
         minSdkVersion 21
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 7
         versionName "2.1.0"
         manifestPlaceholders = [crashlytics:getApiKey("crashlytics.key")]
@@ -67,6 +66,9 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    androidExtensions {
+        experimental = true
+    }
 }
 
 android.sourceSets {
@@ -112,28 +114,25 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
-    kapt "com.android.databinding:compiler:$project.databindingCompilerVersion"
+    kapt "androidx.databinding:databinding-compiler:$project.databindingCompilerVersion"
 
     //support libs
-    implementation "com.android.support:appcompat-v7:$project.supportLibsVersion"
-    implementation "com.android.support:support-v4:$project.supportLibsVersion"
-    implementation "com.android.support:cardview-v7:$project.supportLibsVersion"
-    implementation "com.android.support:design:$project.supportLibsVersion"
-    implementation "com.android.support.constraint:constraint-layout:$project.constraintLayoutVersion"
+    kapt "androidx.annotation:annotation:$project.androidXVersion"
+    implementation "androidx.appcompat:appcompat:$project.androidXVersion"
+    implementation "androidx.legacy:legacy-support-v4:$project.supportVersion"
+    implementation "androidx.cardview:cardview:$project.supportVersion"
+    implementation "com.google.android.material:material:$project.supportVersion"
+    implementation "androidx.constraintlayout:constraintlayout:$project.constraintLayoutVersion"
 
     //android architecture
-    kapt "android.arch.lifecycle:compiler:$project.archExt"
-    implementation "android.arch.lifecycle:extensions:$project.archExt"
-    implementation "android.arch.lifecycle:runtime:$project.arch"
-    implementation "android.arch.persistence:db-framework:$project.archDb"
-
-    //ButterKnife
-    kapt "com.jakewharton:butterknife-compiler:$project.butterKnifeVersion"
-    implementation "com.jakewharton:butterknife:$project.butterKnifeVersion"
+    kapt "androidx.lifecycle:lifecycle-compiler:$project.lifecycleVersion"
+    implementation "androidx.lifecycle:lifecycle-extensions:$project.lifecycleVersion"
+    implementation "androidx.lifecycle:lifecycle-runtime:$project.lifecycleVersion"
+    implementation "androidx.sqlite:sqlite-framework:$project.sqliteVersion"
 
     //Glide
-    kapt "com.github.bumptech.glide:compiler:$project.glideVersion"
     implementation "com.github.bumptech.glide:glide:$project.glideVersion"
+    kapt "com.github.bumptech.glide:compiler:$project.glideVersion"
 
     //Dagger core
     kapt "com.google.dagger:dagger-compiler:$project.daggerVersion"
@@ -181,8 +180,8 @@ dependencies {
     testImplementation "org.robolectric:shadows-support-v4:$project.robolectricShadowsVersion"
     androidTestImplementation "org.mockito:mockito-android:$project.mockitoVersion"
     androidTestImplementation "com.github.andrzejchm.RESTMock:android:$project.restMockVersion"
-    androidTestImplementation "com.android.support.test:runner:$project.androidTestRunnerVersion"
-    androidTestImplementation "com.android.support.test.espresso:espresso-core:$project.espressoVersion"
+    androidTestImplementation "androidx.test.ext:junit:1.1.1"
+    androidTestImplementation "androidx.test.espresso:espresso-core:3.2.0"
 
     debugImplementation "com.squareup.leakcanary:leakcanary-android:$project.leakCanaryVersion"
     releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$project.leakCanaryVersion"

labday/app/build.gradle

@@ -24,12 +24,6 @@
 # Retain generated class which implement Unbinder.
 -keep public class * implements butterknife.Unbinder { public <init>(**, android.view.View); }
 
-# Prevent obfuscation of types which use ButterKnife annotations since the simple name
-# is used to reflectively look up the generated ViewBinding.
--keep class butterknife.*
--keepclasseswithmembernames class * { @butterknife.* <methods>; }
--keepclasseswithmembernames class * { @butterknife.* <fields>; }
-
 #Glide rules
 -keep public class * implements com.bumptech.glide.module.GlideModule
 -keep public class * extends com.bumptech.glide.module.AppGlideModule

labday/app/proguard-rules.pro

@@ -2,7 +2,7 @@
 
 import android.app.Application;
 import android.content.Context;
-import android.support.test.runner.AndroidJUnitRunner;
+import androidx.test.runner.AndroidJUnitRunner;
 
 /**
  * Espresso test runner config

labday/app/src/androidTest/java/com/jakdor/labday/EspressoRunner.java

@@ -3,7 +3,7 @@
 import android.app.Application;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.test.runner.AndroidJUnitRunner;
+import androidx.test.runner.AndroidJUnitRunner;
 
 import io.appflate.restmock.RESTMockServerStarter;
 import io.appflate.restmock.android.AndroidAssetsFileParser;

labday/app/src/androidTest/java/com/jakdor/labday/InstrumentationTestRunner.java

@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
-import android.support.test.InstrumentationRegistry;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import com.google.gson.Gson;
 import com.jakdor.labday.common.model.AccessToken;
@@ -20,7 +20,6 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-import io.appflate.restmock.RESTMockServer;
 import io.reactivex.observers.TestObserver;
 
 import static com.jakdor.labday.androidjunit.TestUtils.readAssetFile;

labday/app/src/androidTest/java/com/jakdor/labday/androidjunit/NetworkManagerIntegrationTest.java

@@ -2,7 +2,7 @@
 import android.app.Instrumentation;
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.support.test.InstrumentationRegistry;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import com.facebook.soloader.SoLoader;
 import com.google.gson.Gson;
@@ -29,7 +29,6 @@
 import java.io.FileOutputStream;
 import java.nio.charset.Charset;
 
-import io.appflate.restmock.RESTMockServer;
 import io.reactivex.observers.TestObserver;
 import io.reactivex.schedulers.Schedulers;
 

labday/app/src/androidTest/java/com/jakdor/labday/androidjunit/ProjectRepositoryIntegrationTest.java

@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.support.test.InstrumentationRegistry;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import com.jakdor.labday.R;
 

labday/app/src/androidTest/java/com/jakdor/labday/automatedUITests/EspressoTests.java

@@ -1,6 +1,6 @@
 package com.jakdor.labday.automatedUITests
 
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import android.view.View
 import android.view.ViewGroup
 
@@ -15,18 +15,18 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.Espresso.pressBack
-import android.support.test.espresso.action.ViewActions.click
-import android.support.test.espresso.action.ViewActions.closeSoftKeyboard
-import android.support.test.espresso.action.ViewActions.replaceText
-import android.support.test.espresso.action.ViewActions.scrollTo
-import android.support.test.espresso.assertion.ViewAssertions.matches
-import android.support.test.espresso.matcher.ViewMatchers.isDisplayed
-import android.support.test.espresso.matcher.ViewMatchers.withContentDescription
-import android.support.test.espresso.matcher.ViewMatchers.withId
-import android.support.test.espresso.matcher.ViewMatchers.withText
-import android.support.test.rule.ActivityTestRule
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.Espresso.pressBack
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.closeSoftKeyboard
+import androidx.test.espresso.action.ViewActions.replaceText
+import androidx.test.espresso.action.ViewActions.scrollTo
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withContentDescription
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.rule.ActivityTestRule
 import org.hamcrest.Matchers.allOf
 
 @RunWith(AndroidJUnit4::class)

labday/app/src/androidTest/java/com/jakdor/labday/automatedUITests/LoginEspressoTest.kt

@@ -1,7 +1,7 @@
 package com.jakdor.labday.common.localdb;
 
-import android.arch.persistence.db.SupportSQLiteDatabase;
-import android.arch.persistence.db.SupportSQLiteOpenHelper;
+import androidx.sqlite.db.SupportSQLiteDatabase;
+import androidx.sqlite.db.SupportSQLiteOpenHelper;
 
 import com.jakdor.labday.common.dao.EventDao;
 import com.jakdor.labday.common.dao.MapOtherDao;

labday/app/src/main/java/com/jakdor/labday/common/localdb/DbCallback.java

@@ -1,8 +1,8 @@
 package com.jakdor.labday.common.localdb;
 
 import android.app.Application;
-import android.arch.persistence.db.SupportSQLiteOpenHelper;
-import android.arch.persistence.db.framework.FrameworkSQLiteOpenHelperFactory;
+import androidx.sqlite.db.SupportSQLiteOpenHelper;
+import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory;
 
 import com.jakdor.labday.common.dao.EventDao;
 import com.jakdor.labday.common.dao.MapOtherDao;