Update dependencies (#323)

.idea/codeStyles/Project.xml

@@ -21,31 +21,6 @@
       <option name="CONTINUATION_INDENT_IN_ELVIS" value="false" />
       <option name="WRAP_ELVIS_EXPRESSIONS" value="0" />
     </JetCodeStyleSettings>
-    <Objective-C-extensions>
-      <file>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-      </file>
-      <class>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-      </class>
-      <extensions>
-        <pair source="cpp" header="h" fileNamingConvention="NONE" />
-        <pair source="c" header="h" fileNamingConvention="NONE" />
-      </extensions>
-    </Objective-C-extensions>
     <XML>
       <option name="XML_KEEP_LINE_BREAKS" value="false" />
       <option name="XML_ALIGN_ATTRIBUTES" value="false" />

app/build.gradle

@@ -22,7 +22,7 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         manifestPlaceholders = [
-                fabric_api_key: System.getenv("FABRIC_API_KEY") ?: "null",
+                fabric_api_key     : System.getenv("FABRIC_API_KEY") ?: "null",
                 crashlytics_enabled: project.hasProperty("enableCrashlytics")
         ]
         javaCompileOptions {
@@ -85,48 +85,49 @@ play {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation 'com.github.wulkanowy:api:3335bd6'
 
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "androidx.legacy:legacy-support-v4:1.0.0"
     implementation "androidx.appcompat:appcompat:1.0.2"
-    implementation "androidx.cardview:cardview:1.0.0"
-    implementation "com.google.android.material:material:1.0.0"
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.multidex:multidex:2.0.1'
 
-    implementation "android.arch.work:work-runtime:1.0.0"
+    implementation "androidx.cardview:cardview:1.0.0"
-    implementation "android.arch.work:work-rxjava2:1.0.0"
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation "com.google.android.material:material:1.0.0"
+    implementation 'com.github.wulkanowy:MaterialChipsInput:b72fd0ee6f'
+    implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
+
+    implementation "androidx.work:work-runtime:2.0.1"
+    implementation "androidx.work:work-rxjava2:2.0.1"
 
     implementation "androidx.room:room-runtime:2.1.0-alpha06"
     implementation "androidx.room:room-rxjava2:2.1.0-alpha06"
     kapt "androidx.room:room-compiler:2.1.0-alpha06"
 
-    implementation 'com.takisoft.preferencex:preferencex:1.0.0'
+    implementation "com.google.dagger:dagger-android-support:2.22.1"
-
+    kapt "com.google.dagger:dagger-compiler:2.22.1"
-    implementation 'com.squareup.inject:assisted-inject-annotations-dagger2:0.3.3'
+    kapt "com.google.dagger:dagger-android-processor:2.22.1"
-    kapt 'com.squareup.inject:assisted-inject-processor-dagger2:0.3.3'
+    implementation 'com.squareup.inject:assisted-inject-annotations-dagger2:0.4.0'
-
+    kapt 'com.squareup.inject:assisted-inject-processor-dagger2:0.4.0'
-    implementation "com.google.dagger:dagger-android-support:2.21"
-    kapt "com.google.dagger:dagger-compiler:2.21"
-    kapt "com.google.dagger:dagger-android-processor:2.21"
 
     implementation "eu.davidea:flexible-adapter:5.1.0"
     implementation "eu.davidea:flexible-adapter-ui:1.0.0"
     implementation "com.aurelhubert:ahbottomnavigation:2.3.4"
     implementation 'com.ncapdevi:frag-nav:3.2.0'
 
-    implementation 'com.github.wulkanowy:MaterialChipsInput:b72fd0ee6f'
-    implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
-
     implementation 'com.github.pwittchen:reactivenetwork-rx2:3.0.2'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
-    implementation "io.reactivex.rxjava2:rxjava:2.2.7"
+    implementation "io.reactivex.rxjava2:rxjava:2.2.8"
 
+    implementation 'com.google.code.gson:gson:2.8.5'
     implementation "com.jakewharton.threetenabp:threetenabp:1.2.0"
     implementation "com.jakewharton.timber:timber:4.7.1"
     implementation "at.favre.lib:slf4j-timber:1.0.1"
+    implementation "com.squareup.okhttp3:logging-interceptor:3.14.1"
+
     implementation "com.mikepenz:aboutlibraries:6.2.3"
+    implementation 'com.takisoft.preferencex:preferencex:1.0.0'
 
     implementation 'com.google.firebase:firebase-core:16.0.8'
     implementation 'com.crashlytics.sdk.android:crashlytics:2.9.9'
@@ -138,14 +139,14 @@ dependencies {
 
     testImplementation "junit:junit:4.12"
     testImplementation "io.mockk:mockk:1.9.2"
-    testImplementation "org.mockito:mockito-inline:2.25.1"
+    testImplementation "org.mockito:mockito-inline:2.27.0"
     testImplementation 'org.threeten:threetenbp:1.3.8'
 
     androidTestImplementation 'androidx.test:core:1.1.0'
     androidTestImplementation 'androidx.test:runner:1.1.1'
     androidTestImplementation 'androidx.test.ext:junit:1.1.0'
     androidTestImplementation "io.mockk:mockk-android:1.9.2"
-    androidTestImplementation 'org.mockito:mockito-android:2.25.1'
+    androidTestImplementation 'org.mockito:mockito-android:2.27.0'
     androidTestImplementation "androidx.room:room-testing:2.1.0-alpha06"
     androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 }

app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt

@@ -23,7 +23,6 @@ import io.reactivex.exceptions.UndeliverableException
 import io.reactivex.plugins.RxJavaPlugins
 import timber.log.Timber
 import java.io.IOException
-import java.lang.Exception
 import javax.inject.Inject
 
 class WulkanowyApp : DaggerApplication() {
@@ -57,7 +56,7 @@ class WulkanowyApp : DaggerApplication() {
     private fun initializeFabric() {
         Fabric.with(Fabric.Builder(this).kits(
             Crashlytics.Builder().core(CrashlyticsCore.Builder().disabled(!BuildConfig.CRASHLYTICS_ENABLED).build()).build()
-        ).debuggable(BuildConfig.DEBUG).build())
+        ).debuggable(DEBUG).build())
         Timber.plant(CrashlyticsTree())
     }
 
@@ -68,6 +67,6 @@ class WulkanowyApp : DaggerApplication() {
     }
 
     override fun applicationInjector(): AndroidInjector<out DaggerApplication> {
-        return DaggerAppComponent.builder().create(this)
+        return DaggerAppComponent.factory().create(this)
     }
 }

app/src/main/java/io/github/wulkanowy/di/AppComponent.kt

@@ -17,6 +17,6 @@ import javax.inject.Singleton
     BuilderModule::class])
 interface AppComponent : AndroidInjector<WulkanowyApp> {
 
-    @Component.Builder
+    @Component.Factory
-    abstract class Builder : AndroidInjector.Builder<WulkanowyApp>()
+    interface Factory : AndroidInjector.Factory<WulkanowyApp>
 }

build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.21'
+    ext.kotlin_version = '1.3.30'
     repositories {
         mavenCentral()
         google()
@@ -9,10 +9,10 @@ buildscript {
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.4.0'
         classpath 'com.google.gms:google-services:4.2.0'
-        classpath "io.fabric.tools:gradle:1.27.1"
+        classpath "io.fabric.tools:gradle:1.28.1"
-        classpath "com.github.triplet.gradle:play-publisher:2.1.0"
+        classpath "com.github.triplet.gradle:play-publisher:2.2.0"
         classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7"
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Jan 20 13:58:58 CET 2019
+#Thu Apr 18 00:26:43 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip