upgrade dependencies

circle.yml → .circleci/config.yml

@@ -1,12 +1,11 @@
-version: 2
+version: 2.1
 jobs:
   build:
     docker:
-      - image: circleci/android:api-26-alpha
+      - image: circleci/android:api-26
     working_directory: ~/bigbang
     environment:
       JVM_OPTS: -Xmx3200m
-    resource_class: large
     steps:
       - checkout
       - restore_cache:
@@ -40,8 +39,8 @@ jobs:
       - run:
           name: Run Tests
           command: ./gradlew test
-              lint
-              --max-workers=2
+            lint
+            --max-workers=2
       - run:
           name: Compile App Module
           command: ./gradlew :app:compileLollipopAndAboveProductionReleaseSources --max-workers=1

app/build.gradle

@@ -8,7 +8,7 @@ buildscript {
     dependencies {
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.15.0'
         classpath 'com.google.gms:google-services:3.1.1'
-        classpath 'io.fabric.tools:gradle:1.24.3'
+        classpath 'io.fabric.tools:gradle:1.26.1'
     }
 }
 
@@ -129,11 +129,11 @@ dependencies {
     api project(path: ':ui')
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation "com.android.support:appcompat-v7:${libraryVersion.androidSupport}"
-    implementation "com.android.support:cardview-v7:${libraryVersion.androidSupport}"
-    implementation "com.android.support:design:${libraryVersion.androidSupport}"
-    implementation "com.android.support:recyclerview-v7:${libraryVersion.androidSupport}"
-    implementation "com.android.support:support-v13:${libraryVersion.androidSupport}"
+    implementation "androidx.appcompat:appcompat:${libraryVersion.androidSupport}"
+    implementation "androidx.cardview:cardview:${libraryVersion.androidSupport}"
+    implementation "com.google.android.material:material:${libraryVersion.androidSupport}"
+    implementation "androidx.recyclerview:recyclerview:${libraryVersion.androidSupport}"
+    implementation "androidx.legacy:legacy-support-v13:${libraryVersion.androidSupport}"
     implementation "com.f2prateek.dart:dart:${libraryVersion.dart}"
     implementation "com.f2prateek.dart:henson:${libraryVersion.dart}"
     implementation "com.github.mrmike:Ok2Curl:${libraryVersion.ok2Curl}"
@@ -143,7 +143,6 @@ dependencies {
     implementation "com.google.dagger:dagger:${libraryVersion.dagger}"
     implementation "com.google.dagger:dagger-android-support:${libraryVersion.dagger}"
     implementation "com.hannesdorfmann.fragmentargs:annotation:${libraryVersion.fragmentArgs}"
-    implementation "com.hannesdorfmann.fragmentargs:bundler-parceler:${libraryVersion.fragmentArgs}"
     implementation "com.jakewharton.threetenabp:threetenabp:${libraryVersion.localDateBackport}"
     implementation "com.jakewharton.timber:timber:${libraryVersion.timber}"
     implementation "com.squareup.okhttp3:logging-interceptor:${libraryVersion.okHttp}"
@@ -152,13 +151,12 @@ dependencies {
     implementation "com.squareup.retrofit2:adapter-rxjava2:${libraryVersion.retrofit}"
     implementation "com.squareup.retrofit2:converter-gson:${libraryVersion.retrofit}"
     implementation "com.squareup.retrofit2:retrofit:${libraryVersion.retrofit}"
-    implementation "com.trello.rxlifecycle2:rxlifecycle-components:${libraryVersion.rxLifecycle}"
-    implementation "com.trello.rxlifecycle2:rxlifecycle:${libraryVersion.rxLifecycle}"
+    implementation "com.trello.rxlifecycle3:rxlifecycle-components:${libraryVersion.rxLifecycle}"
+    implementation "com.trello.rxlifecycle3:rxlifecycle:${libraryVersion.rxLifecycle}"
     implementation "com.wdullaer:materialdatetimepicker:${libraryVersion.materialDateTimePicker}"
     implementation "io.reactivex.rxjava2:rxandroid:${libraryVersion.rxAndroid}"
     implementation "io.reactivex.rxjava2:rxjava:${libraryVersion.rxJava}"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${libraryVersion.kotlin}"
-    implementation "org.parceler:parceler-api:${libraryVersion.parceler}"
     implementation "com.github.square.picasso:picasso:${libraryVersion.picasso}"
     implementation 'com.viewpagerindicator:library:2.4.1'
 
@@ -168,7 +166,6 @@ dependencies {
     kapt "com.google.dagger:dagger-android-processor:${libraryVersion.dagger}"
     kapt "com.google.dagger:dagger-compiler:${libraryVersion.dagger}"
     kapt "com.hannesdorfmann.fragmentargs:processor:${libraryVersion.fragmentArgs}"
-    kapt "org.parceler:parceler:${libraryVersion.parceler}"
 
     compileOnly 'javax.annotation:jsr250-api:1.0'
 }

app/src/main/java/com/xmartlabs/template/module/FragmentBuildersModule.kt

@@ -1,7 +1,6 @@
 package com.xmartlabs.template.module
 
 import com.xmartlabs.bigbang.ui.BaseFragment
-import com.xmartlabs.bigbang.ui.BaseFragment_MembersInjector
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 

app/src/main/java/com/xmartlabs/template/ui/common/OnDemandLoadingScrollListener.kt

@@ -1,7 +1,7 @@
 package com.xmartlabs.template.ui.common
 
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 
 /** An OnDemandLoadingScrollListener for recycler view pagination */
 abstract class OnDemandLoadingScrollListener : RecyclerView.OnScrollListener() {

app/src/main/java/com/xmartlabs/template/ui/common/OnDemandRecyclerViewScrollListener.kt

@@ -1,9 +1,9 @@
 package com.xmartlabs.template.ui.common
 
-import android.support.annotation.Dimension
-import android.support.annotation.Px
-import android.support.v4.widget.NestedScrollView
-import android.support.v7.widget.RecyclerView
+import androidx.annotation.Dimension
+import androidx.annotation.Px
+import androidx.core.widget.NestedScrollView
+import androidx.recyclerview.widget.RecyclerView
 import com.xmartlabs.bigbang.core.extensions.dpToPx
 
 /** An OnDemandLoadingScrollListener for recycler view pagination */

app/src/main/res/layout/activity_main.xml

@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout
+<androidx.drawerlayout.widget.DrawerLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:ignore="UnusedResources"
     >
 
-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:fitsSystemWindows="true"
         >
 
-        <android.support.design.widget.AppBarLayout
+        <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             >
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 tools:ignore="UnusedIds"
                 style="@style/Toolbar"
                 >
 
-                <android.support.design.widget.TabLayout
+                <com.google.android.material.tabs.TabLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     style="@style/Toolbar.TabLayout"
                     />
 
-            </android.support.v7.widget.Toolbar>
+            </androidx.appcompat.widget.Toolbar>
 
-        </android.support.design.widget.AppBarLayout>
+        </com.google.android.material.appbar.AppBarLayout>
 
-    </android.support.design.widget.CoordinatorLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
-</android.support.v4.widget.DrawerLayout>
+</androidx.drawerlayout.widget.DrawerLayout>

build.gradle

@@ -4,10 +4,10 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.5.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.41'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61'
     }
 }
 

core/build.gradle

@@ -30,7 +30,7 @@ android {
         targetSdkVersion project.ext.targetSdkVersion
         versionCode versionCodeId
         versionName version
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }
     buildTypes {
@@ -47,17 +47,17 @@ android {
 }
 
 dependencies {
-    androidTestImplementation("com.android.support.test.espresso:espresso-core:${libraryVersion.espresso}") {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0') {
         exclude group: 'com.android.support', module: 'support-annotations'
     }
     androidTestImplementation "com.crittercism.dexmaker:dexmaker:${libraryVersion.dexmaker}"
     androidTestImplementation "com.crittercism.dexmaker:dexmaker-dx:${libraryVersion.dexmaker}"
     androidTestImplementation "com.crittercism.dexmaker:dexmaker-mockito:${libraryVersion.dexmaker}"
     androidTestImplementation "junit:junit:${libraryVersion.junit}"
     androidTestImplementation "org.mockito:mockito-core:${libraryVersion.mockito}"
-    api "com.android.support:appcompat-v7:${libraryVersion.androidSupport}"
-    api "com.android.support:design:${libraryVersion.androidSupport}"
-    api "com.android.support:support-v13:${libraryVersion.androidSupport}"
+    api "androidx.appcompat:appcompat:${libraryVersion.androidSupport}"
+    api "com.google.android.material:material:${libraryVersion.androidSupport}"
+    api "androidx.legacy:legacy-support-v13:${libraryVersion.androidSupport}"
     api "com.f2prateek.dart:dart:${libraryVersion.dart}"
     api "com.f2prateek.dart:henson:${libraryVersion.dart}"
     api "com.github.mrmike:Ok2Curl:${libraryVersion.ok2Curl}"

core/src/androidTest/java/com/xmartlabs/bigbang/core/MetricsExtensionsTest.kt

@@ -1,10 +1,10 @@
 package com.xmartlabs.bigbang.core
 
 import android.content.res.Resources
-import android.support.annotation.DimenRes
-import android.support.annotation.Dimension
-import android.support.test.runner.AndroidJUnit4
 import android.util.DisplayMetrics
+import androidx.annotation.DimenRes
+import androidx.annotation.Dimension
+import androidx.test.runner.AndroidJUnit4
 import com.xmartlabs.bigbang.core.extensions.displayMetrics
 import com.xmartlabs.bigbang.core.extensions.dpToPx
 import com.xmartlabs.bigbang.core.extensions.pxToDp

core/src/main/java/com/xmartlabs/bigbang/core/controller/CoreSessionRepository.kt

@@ -1,7 +1,7 @@
 package com.xmartlabs.bigbang.core.controller
 
 import android.content.SharedPreferences
-import android.support.annotation.CheckResult
+import androidx.annotation.CheckResult
 import com.xmartlabs.bigbang.core.model.SessionType
 
 /**

core/src/main/java/com/xmartlabs/bigbang/core/controller/EntityDao.kt

@@ -1,6 +1,6 @@
 package com.xmartlabs.bigbang.core.controller
 
-import android.support.annotation.CheckResult
+import androidx.annotation.CheckResult
 
 import io.reactivex.Completable
 import io.reactivex.Maybe

core/src/main/java/com/xmartlabs/bigbang/core/controller/EntityRepository.kt

@@ -1,6 +1,6 @@
 package com.xmartlabs.bigbang.core.controller
 
-import android.support.annotation.CheckResult
+import androidx.annotation.CheckResult
 import com.xmartlabs.bigbang.core.extensions.applyIoSchedulers
 import com.xmartlabs.bigbang.core.extensions.observeOnIo
 import com.xmartlabs.bigbang.core.extensions.subscribeOnIo

core/src/main/java/com/xmartlabs/bigbang/core/controller/EntityServiceProvider.kt

@@ -1,6 +1,6 @@
 package com.xmartlabs.bigbang.core.controller
 
-import android.support.annotation.CheckResult
+import androidx.annotation.CheckResult
 import com.xmartlabs.bigbang.core.model.EntityWithId
 import io.reactivex.Maybe
 import io.reactivex.Single

core/src/main/java/com/xmartlabs/bigbang/core/controller/SharedPreferencesSource.kt

@@ -1,7 +1,7 @@
 package com.xmartlabs.bigbang.core.controller
 
 import android.content.SharedPreferences
-import android.support.annotation.CheckResult
+import androidx.annotation.CheckResult
 import com.google.gson.Gson
 import javax.inject.Inject
 

core/src/main/java/com/xmartlabs/bigbang/core/di/AppInjector.kt

@@ -3,9 +3,6 @@ package com.xmartlabs.bigbang.core.di
 import android.app.Activity
 import android.app.Application
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentActivity
-import android.support.v4.app.FragmentManager
 import dagger.android.AndroidInjection
 import dagger.android.HasActivityInjector
 import dagger.android.support.AndroidSupportInjection
@@ -39,14 +36,14 @@ object AppInjector {
     if (activity is HasSupportFragmentInjector) {
       AndroidInjection.inject(activity)
     }
-    if (activity is FragmentActivity) {
+    if (activity is androidx.fragment.app.FragmentActivity) {
       activity.supportFragmentManager
           .registerFragmentLifecycleCallbacks(
-              object : FragmentManager.FragmentLifecycleCallbacks() {
+              object : androidx.fragment.app.FragmentManager.FragmentLifecycleCallbacks() {
                 override fun onFragmentCreated(
-                    fm: FragmentManager,
-                    f: Fragment,
-                    savedInstanceState: Bundle?
+                        fm: androidx.fragment.app.FragmentManager,
+                        f: androidx.fragment.app.Fragment,
+                        savedInstanceState: Bundle?
                 ) {
                   if (f is Injectable) {
                     AndroidSupportInjection.inject(f)

core/src/main/java/com/xmartlabs/bigbang/core/extensions/ColorExtensions.kt

@@ -1,8 +1,8 @@
 package com.xmartlabs.bigbang.core.extensions
 
 import android.content.Context
-import android.support.annotation.ColorRes
-import android.support.v4.content.ContextCompat
+import androidx.annotation.ColorRes
+import androidx.core.content.ContextCompat
 
 /** Extension object that contains all related color extensions that make use of [Context] */
 val Context.color

core/src/main/java/com/xmartlabs/bigbang/core/extensions/ContextExtensions.kt

@@ -29,6 +29,6 @@ fun Context.copyTextToClipboard(text: String) {
   } else {
     val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as android.content.ClipboardManager
     val clip = android.content.ClipData.newPlainText("Copied Text", text)
-    clipboard.primaryClip = clip
+    clipboard.setPrimaryClip(clip)
   }
 }

core/src/main/java/com/xmartlabs/bigbang/core/extensions/MetricExtensions.kt

@@ -2,10 +2,10 @@ package com.xmartlabs.bigbang.core.extensions
 
 import android.content.res.Resources
 import android.content.res.Resources.Theme
-import android.support.annotation.AttrRes
-import android.support.annotation.Dimension
-import android.support.annotation.VisibleForTesting
-import android.support.v7.app.ActionBar
+import androidx.annotation.AttrRes
+import androidx.annotation.Dimension
+import androidx.annotation.VisibleForTesting
+import androidx.appcompat.app.ActionBar
 
 @VisibleForTesting
 var displayMetrics = Resources.getSystem().displayMetrics

core/src/main/java/com/xmartlabs/bigbang/core/helper/ui/IntentHelper.kt

@@ -5,8 +5,8 @@ import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.net.Uri
-import android.support.annotation.RequiresPermission
-import android.support.annotation.StringRes
+import androidx.annotation.RequiresPermission
+import androidx.annotation.StringRes
 
 object IntentHelper {
   /**

core/src/main/java/com/xmartlabs/bigbang/core/helper/ui/UiHelper.kt

@@ -3,17 +3,17 @@ package com.xmartlabs.bigbang.core.helper.ui
 import android.app.Activity
 import android.content.ContentResolver
 import android.content.Context
-import android.support.annotation.DrawableRes
-import android.support.design.widget.TextInputLayout
-import android.support.v4.util.Pair
 import android.text.InputType
 import android.text.TextUtils
 import android.widget.ArrayAdapter
 import android.widget.EditText
 import android.widget.Spinner
+import androidx.annotation.DrawableRes
+import androidx.core.util.Pair
 import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailability
-import java.util.Locale
+import com.google.android.material.textfield.TextInputLayout
+import java.util.*
 
 object UiHelper {
   /**

core/src/main/java/com/xmartlabs/bigbang/core/repository/CoreSessionRepository.kt

@@ -1,7 +1,7 @@
 package com.xmartlabs.bigbang.core.repository
 
 import android.content.SharedPreferences
-import android.support.annotation.CheckResult
+import androidx.annotation.CheckResult
 import com.xmartlabs.bigbang.core.model.SessionType
 
 /**

core/src/main/java/com/xmartlabs/bigbang/core/repository/EntityDao.kt

@@ -1,6 +1,6 @@
 package com.xmartlabs.bigbang.core.repository
 
-import android.support.annotation.CheckResult
+import androidx.annotation.CheckResult
 
 import io.reactivex.Completable
 import io.reactivex.Maybe

core/src/main/java/com/xmartlabs/bigbang/core/repository/EntityRepository.kt

@@ -1,6 +1,6 @@
 package com.xmartlabs.bigbang.core.repository
 
-import android.support.annotation.CheckResult
+import androidx.annotation.CheckResult
 import com.xmartlabs.bigbang.core.extensions.applyIoSchedulers
 import com.xmartlabs.bigbang.core.extensions.observeOnIo
 import com.xmartlabs.bigbang.core.extensions.subscribeOnIo

core/src/main/java/com/xmartlabs/bigbang/core/repository/EntityServiceProvider.kt

@@ -1,6 +1,6 @@
 package com.xmartlabs.bigbang.core.repository
 
-import android.support.annotation.CheckResult
+import androidx.annotation.CheckResult
 import com.xmartlabs.bigbang.core.model.EntityWithId
 import io.reactivex.Maybe
 import io.reactivex.Single