Update the world

app-partial-users/build.gradle

@@ -42,20 +42,20 @@ dependencies {
 
   implementation 'androidx.appcompat:appcompat:1.1.0'
   implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-  implementation 'com.google.android.material:material:1.1.0-beta02'
+  implementation 'com.google.android.material:material:1.1.0'
   implementation 'androidx.cardview:cardview:1.0.0'
 
-  implementation 'androidx.lifecycle:lifecycle-runtime:2.1.0'
+  implementation 'androidx.lifecycle:lifecycle-runtime:2.2.0'
 
   implementation 'com.facebook.fresco:fresco:2.0.0'
 
   implementation 'com.airbnb.android:epoxy:3.9.0'
 
-  kapt 'com.google.dagger:dagger-compiler:2.25.3'
-  implementation 'com.google.dagger:dagger:2.25.3'
+  kapt 'com.google.dagger:dagger-compiler:2.27'
+  implementation 'com.google.dagger:dagger:2.27'
 
   implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
-  implementation 'com.jakewharton.threetenabp:threetenabp:1.2.1'
-  implementation 'com.squareup.okhttp3:logging-interceptor:4.2.2'
+  implementation 'com.jakewharton.threetenabp:threetenabp:1.2.2'
+  implementation 'com.squareup.okhttp3:logging-interceptor:4.4.1'
 
 }

app-partial-users/src/main/AndroidManifest.xml

@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
-  package="com.jraska.github.client.users">
+  package="com.jraska.github.client.users.app">
 
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
   <uses-permission android:name="android.permission.INTERNET"/>
 
   <application
-    android:name=".UsersApp"
+    android:name="com.jraska.github.client.users.UsersApp"
     android:allowBackup="true"
     android:icon="@android:drawable/alert_dark_frame"
     android:label="@string/app_name"
     android:supportsRtl="true"
     android:theme="@style/AppTheme.NoActionBar"
     tools:ignore="GoogleAppIndexingWarning">
     <activity
-      android:name=".ui.UsersActivity"
+      android:name="com.jraska.github.client.users.ui.UsersActivity"
       android:label="@string/app_name">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>

app/build.gradle

@@ -70,6 +70,10 @@ android {
     unitTests.returnDefaultValues = true
   }
 
+  packagingOptions {
+    exclude 'META-INF/licenses/ASM'
+  }
+
   dynamicFeatures = [":feature:about", ":feature:settings"]
 }
 
@@ -91,45 +95,45 @@ dependencies {
 
   implementation 'androidx.appcompat:appcompat:1.1.0'
   implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-  implementation 'com.google.android.material:material:1.1.0-beta02'
+  implementation 'com.google.android.material:material:1.1.0'
   implementation 'androidx.cardview:cardview:1.0.0'
   implementation 'androidx.browser:browser:1.2.0'
-  implementation 'androidx.core:core:1.2.0-rc01'
+  implementation 'androidx.core:core:1.2.0'
   implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
   implementation 'androidx.media:media:1.1.0'
 
-  implementation 'com.google.firebase:firebase-core:17.2.1'
-  implementation 'com.google.firebase:firebase-config:19.1.0'
-  implementation 'com.google.firebase:firebase-perf:19.0.4'
+  implementation 'com.google.firebase:firebase-core:17.2.3'
+  implementation 'com.google.firebase:firebase-config:19.1.2'
+  implementation 'com.google.firebase:firebase-perf:19.0.5'
   implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
 
-  implementation 'androidx.lifecycle:lifecycle-runtime:2.1.0'
+  implementation 'androidx.lifecycle:lifecycle-runtime:2.2.0'
 
   implementation 'com.facebook.fresco:fresco:2.0.0'
 
   implementation 'com.airbnb.android:epoxy:3.9.0'
 
-  kapt 'com.google.dagger:dagger-compiler:2.25.3'
-  implementation 'com.google.dagger:dagger:2.25.3'
+  kapt 'com.google.dagger:dagger-compiler:2.27'
+  implementation 'com.google.dagger:dagger:2.27'
 
   implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
-  implementation 'com.jakewharton.threetenabp:threetenabp:1.2.1'
+  implementation 'com.jakewharton.threetenabp:threetenabp:1.2.2'
   implementation 'com.google.android.play:core:1.6.1'
-  implementation 'com.squareup.okhttp3:logging-interceptor:4.2.2'
+  implementation 'com.squareup.okhttp3:logging-interceptor:4.4.1'
 
   testImplementation 'com.google.code.gson:gson:2.8.6'
 
-  testImplementation 'junit:junit:4.12'
+  testImplementation 'junit:junit:4.13'
   testImplementation 'javax.inject:javax.inject:1'
-  testImplementation 'org.mockito:mockito-core:3.2.4'
-  testImplementation 'org.threeten:threetenbp:1.4.0' // to fix failures with three ten db
+  testImplementation 'org.mockito:mockito-core:3.3.3'
+  testImplementation 'org.threeten:threetenbp:1.4.1' // to fix failures with three ten db
 
   androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
   androidTestImplementation 'androidx.test:runner:1.2.0'
   androidTestImplementation 'androidx.test:rules:1.2.0'
-  androidTestImplementation 'org.assertj:assertj-core:3.14.0'
-  androidTestImplementation 'org.mockito:mockito-core:3.2.4'
-  androidTestImplementation 'org.mockito:mockito-android:3.2.4'
+  androidTestImplementation 'org.assertj:assertj-core:3.15.0'
+  androidTestImplementation 'org.mockito:mockito-core:3.3.3'
+  androidTestImplementation 'org.mockito:mockito-android:3.3.3'
   androidTestImplementation 'com.airbnb.okreplay:okreplay:1.5.0'
   androidTestImplementation 'com.airbnb.okreplay:espresso:1.5.0'
   androidTestImplementation 'com.squareup.rx.idler:rx2-idler:0.9.1'

build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-  ext.kotlin_version = '1.3.61'
+  ext.kotlin_version = '1.3.70'
   repositories {
     google()
     maven { url 'https://maven.fabric.io/public' }
@@ -8,12 +8,11 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.5.3'
+    classpath 'com.android.tools.build:gradle:3.6.1'
     classpath 'com.google.gms:google-services:4.3.3'
     classpath 'com.google.firebase:firebase-plugins:2.0.0'
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     classpath 'io.fabric.tools:gradle:1.29.0'
-    classpath 'gradle.plugin.org.jlleitschuh.gradle:ktlint-gradle:6.1.0'
   }
 }
 
@@ -29,7 +28,6 @@ task clean(type: Delete) {
 }
 
 subprojects {
-  apply plugin: "org.jlleitschuh.gradle.ktlint"
   project.plugins.whenPluginAdded { plugin ->
     if ('com.android.build.gradle.AppPlugin' == plugin.class.name
       || 'com.android.build.gradle.LibraryPlugin' == plugin.class.name) {

core-android/build.gradle

@@ -12,24 +12,28 @@ android {
     sourceCompatibility JavaVersion.VERSION_1_8
     targetCompatibility JavaVersion.VERSION_1_8
   }
+
+  kotlinOptions {
+    jvmTarget = JavaVersion.VERSION_1_8.toString()
+  }
 }
 
 dependencies {
   api project(':core')
 
   api 'androidx.appcompat:appcompat:1.1.0'
   api 'androidx.annotation:annotation:1.1.0'
-  api 'androidx.lifecycle:lifecycle-extensions:2.1.0'
-  api 'androidx.lifecycle:lifecycle-reactivestreams-ktx:2.1.0'
+  api 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+  api 'androidx.lifecycle:lifecycle-reactivestreams-ktx:2.2.0'
 
-  kapt 'com.google.dagger:dagger-compiler:2.25.3'
-  implementation 'com.google.dagger:dagger:2.25.3'
+  kapt 'com.google.dagger:dagger-compiler:2.27'
+  implementation 'com.google.dagger:dagger:2.27'
 
   implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
 
   api 'com.jakewharton.timber:timber:4.7.1'
 
-  testImplementation 'junit:junit:4.12'
-  testImplementation 'org.assertj:assertj-core:3.14.0'
-  testImplementation 'org.mockito:mockito-core:3.2.4'
+  testImplementation 'junit:junit:4.13'
+  testImplementation 'org.assertj:assertj-core:3.15.0'
+  testImplementation 'org.mockito:mockito-core:3.3.3'
 }

core-android/src/main/java/com/jraska/github/client/core/android/HasViewModelFactory.kt

@@ -3,13 +3,12 @@ package com.jraska.github.client.core.android
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 
 interface HasViewModelFactory {
   fun factory(): ViewModelProvider.Factory
 }
 
 fun <T : ViewModel> FragmentActivity.viewModel(modelClass: Class<T>): T {
   val factory = (application as HasViewModelFactory).factory()
-  return ViewModelProviders.of(this, factory).get(modelClass)
+  return ViewModelProvider(this, factory).get(modelClass)
 }

core/build.gradle

@@ -4,15 +4,15 @@ apply plugin: 'kotlin'
 dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
-  api 'io.reactivex.rxjava2:rxjava:2.2.16'
-  api 'com.squareup.okhttp3:okhttp:4.2.2'
+  api 'io.reactivex.rxjava2:rxjava:2.2.19'
+  api 'com.squareup.okhttp3:okhttp:4.4.1'
   api 'com.squareup.okio:okio:2.4.3'
-  implementation 'com.squareup.retrofit2:retrofit:2.7.0'
+  implementation 'com.squareup.retrofit2:retrofit:2.7.2'
 
   api 'org.threeten:threetenbp:1.4.0:no-tzdb'
   api 'javax.inject:javax.inject:1'
 
-  testImplementation 'junit:junit:4.12'
-  testImplementation 'org.assertj:assertj-core:3.14.0'
-  testImplementation 'org.mockito:mockito-core:3.2.4'
+  testImplementation 'junit:junit:4.13'
+  testImplementation 'org.assertj:assertj-core:3.15.0'
+  testImplementation 'org.mockito:mockito-core:3.3.3'
 }

feature/about/build.gradle

@@ -26,17 +26,17 @@ dependencies {
   implementation project(':lib:dynamic-features')
 
   implementation 'com.google.android.play:core:1.6.1'
+  implementation 'com.google.android.gms:play-services-basement:17.1.1'
 
-
-  kapt 'com.google.dagger:dagger-compiler:2.25.3'
-  implementation 'com.google.dagger:dagger:2.25.3'
+  kapt 'com.google.dagger:dagger-compiler:2.27'
+  implementation 'com.google.dagger:dagger:2.27'
 
   implementation 'com.airbnb.android:epoxy:3.9.0'
   implementation 'com.facebook.fresco:drawee:2.1.0'
 
-  testImplementation 'junit:junit:4.12'
+  testImplementation 'junit:junit:4.13'
   testImplementation 'androidx.arch.core:core-testing:2.1.0'
-  testImplementation 'org.mockito:mockito-core:3.2.4'
+  testImplementation 'org.mockito:mockito-core:3.3.3'
   testImplementation project(':core-testing')
 
   androidTestImplementation 'androidx.appcompat:appcompat:1.1.0'

feature/about/src/main/java/com/jraska/github/client/about/AboutActivity.kt

@@ -5,7 +5,6 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.GridLayoutManager
 import com.airbnb.epoxy.EpoxyModel
 import com.airbnb.epoxy.SimpleEpoxyAdapter
@@ -21,7 +20,7 @@ import kotlinx.android.synthetic.main.content_about.about_recycler
 internal class AboutActivity : BaseActivity() {
 
   private val viewModel: AboutViewModel by lazy {
-    ViewModelProviders.of(this, viewModelFactory()).get(AboutViewModel::class.java)
+    ViewModelProvider(this, viewModelFactory()).get(AboutViewModel::class.java)
   }
 
   override fun attachBaseContext(newBase: Context?) {

feature/about_entrance/build.gradle

@@ -18,10 +18,10 @@ dependencies {
   implementation project(':core')
   implementation project(':core-android')
 
-  implementation 'com.google.dagger:dagger:2.25.3'
-  kapt 'com.google.dagger:dagger-compiler:2.25.3'
+  implementation 'com.google.dagger:dagger:2.27'
+  kapt 'com.google.dagger:dagger-compiler:2.27'
   implementation project(':lib:dynamic-features')
 
-  testImplementation 'junit:junit:4.12'
-  testImplementation 'org.assertj:assertj-core:3.14.0'
+  testImplementation 'junit:junit:4.13'
+  testImplementation 'org.assertj:assertj-core:3.15.0'
 }

feature/push/build.gradle

@@ -19,12 +19,12 @@ dependencies {
   implementation project(':core-android')
   implementation project(':lib:identity')
 
-  api 'com.google.firebase:firebase-messaging:20.1.0'
-  api 'com.google.firebase:firebase-database:19.2.0'
+  api 'com.google.firebase:firebase-messaging:20.1.2'
+  api 'com.google.firebase:firebase-database:19.2.1'
 
-  implementation 'com.google.dagger:dagger:2.25.3'
-  kapt 'com.google.dagger:dagger-compiler:2.25.3'
+  implementation 'com.google.dagger:dagger:2.27'
+  kapt 'com.google.dagger:dagger-compiler:2.27'
 
-  testImplementation 'junit:junit:4.12'
-  testImplementation 'org.assertj:assertj-core:3.14.0'
+  testImplementation 'junit:junit:4.13'
+  testImplementation 'org.assertj:assertj-core:3.15.0'
 }

feature/settings/build.gradle

@@ -24,16 +24,17 @@ dependencies {
   implementation project(':lib:dynamic-features')
 
   implementation 'com.google.android.play:core:1.6.1'
+  implementation 'com.google.android.gms:play-services-basement:17.1.1'
 
   implementation 'com.airbnb.android:epoxy:3.9.0'
   implementation 'com.jraska:console:1.0.0'
   implementation 'com.jraska:console-timber-tree:1.0.0'
 
-  implementation 'com.google.dagger:dagger:2.25.3'
-  kapt 'com.google.dagger:dagger-compiler:2.25.3'
+  implementation 'com.google.dagger:dagger:2.27'
+  kapt 'com.google.dagger:dagger-compiler:2.27'
 
-  testImplementation 'junit:junit:4.12'
-  testImplementation 'org.assertj:assertj-core:3.14.0'
+  testImplementation 'junit:junit:4.13'
+  testImplementation 'org.assertj:assertj-core:3.15.0'
 
   androidTestImplementation 'androidx.appcompat:appcompat:1.1.0'
   androidTestImplementation 'com.google.android.gms:play-services-basement:17.1.1'

feature/settings/src/main/java/com/jraska/github/client/settings/SettingsActivity.kt

@@ -1,11 +1,8 @@
 package com.jraska.github.client.settings
 
-import android.app.Activity
 import android.content.Context
-import android.content.Intent
 import android.os.Bundle
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.airbnb.epoxy.SimpleEpoxyAdapter
 import com.google.android.play.core.splitcompat.SplitCompat
@@ -19,7 +16,7 @@ import kotlinx.android.synthetic.main.content_settings.settings_recycler
 
 internal class SettingsActivity : BaseActivity() {
   private val viewModel: SettingsViewModel by lazy {
-    ViewModelProviders.of(this, viewModelFactory()).get(SettingsViewModel::class.java)
+    ViewModelProvider(this, viewModelFactory()).get(SettingsViewModel::class.java)
   }
 
   override fun attachBaseContext(newBase: Context?) {

feature/settings_entrance/build.gradle

@@ -20,6 +20,6 @@ dependencies {
   implementation project(':core-android')
   implementation project(':lib:dynamic-features')
 
-  implementation 'com.google.dagger:dagger:2.25.3'
-  kapt 'com.google.dagger:dagger-compiler:2.25.3'
+  implementation 'com.google.dagger:dagger:2.27'
+  kapt 'com.google.dagger:dagger-compiler:2.27'
 }

feature/shortcuts/build.gradle

@@ -19,6 +19,6 @@ dependencies {
   implementation project(':core')
   implementation project(':core-android')
 
-  kapt 'com.google.dagger:dagger-compiler:2.25.3'
-  implementation 'com.google.dagger:dagger:2.25.3'
+  kapt 'com.google.dagger:dagger-compiler:2.27'
+  implementation 'com.google.dagger:dagger:2.27'
 }

feature/users/build.gradle

@@ -20,22 +20,22 @@ dependencies {
   implementation project(':core-android')
   implementation project(':navigation')
 
-  kapt 'com.google.dagger:dagger-compiler:2.25.3'
-  implementation 'com.google.dagger:dagger:2.25.3'
+  kapt 'com.google.dagger:dagger-compiler:2.27'
+  implementation 'com.google.dagger:dagger:2.27'
 
-  api 'com.squareup.retrofit2:retrofit:2.7.0'
-  api 'com.squareup.retrofit2:converter-gson:2.7.0'
-  api 'com.squareup.retrofit2:adapter-rxjava2:2.7.0'
+  api 'com.squareup.retrofit2:retrofit:2.7.2'
+  api 'com.squareup.retrofit2:converter-gson:2.7.2'
+  api 'com.squareup.retrofit2:adapter-rxjava2:2.7.2'
   api 'com.google.code.gson:gson:2.8.6'
 
   implementation 'com.airbnb.android:epoxy:3.9.0'
   implementation 'com.facebook.fresco:drawee:2.1.0'
 
   testImplementation 'com.jraska.livedata:testing:1.1.0'
   testImplementation 'com.jraska.livedata:testing-ktx:1.1.0'
-  testImplementation 'junit:junit:4.12'
-  testImplementation 'org.assertj:assertj-core:3.14.0'
-  testImplementation 'org.mockito:mockito-core:3.2.4'
+  testImplementation 'junit:junit:4.13'
+  testImplementation 'org.assertj:assertj-core:3.15.0'
+  testImplementation 'org.mockito:mockito-core:3.3.3'
   testImplementation 'androidx.arch.core:core-testing:2.1.0'
   testImplementation 'androidx.annotation:annotation:1.1.0'
   testImplementation project(':core-testing')