From d178c15d2f71491b6dfbbdb9e76ab8ad8d6130e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Borcz?= Date: Sun, 24 Mar 2019 16:03:51 +0100 Subject: [PATCH] Update dependencies (#302) --- app/build.gradle | 26 +++++++++---------- .../wulkanowy/ui/modules/main/MainActivity.kt | 5 ---- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c0f7e085..453765fd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -86,10 +86,14 @@ dependencies { implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'androidx.multidex:multidex:2.0.1' - implementation 'com.takisoft.preferencex:preferencex:1.0.0' + implementation "androidx.work:work-runtime:2.0.0" + implementation "androidx.work:work-rxjava2:2.0.0" - implementation "android.arch.work:work-rxjava2:1.0.0" - implementation "android.arch.work:work-runtime:1.0.0" + 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.squareup.inject:assisted-inject-annotations-dagger2:0.3.3' kapt 'com.squareup.inject:assisted-inject-processor-dagger2:0.3.3' @@ -98,17 +102,13 @@ dependencies { kapt "com.google.dagger:dagger-compiler:2.21" kapt "com.google.dagger:dagger-android-processor:2.21" - implementation "androidx.room:room-runtime:2.1.0-alpha05" - implementation "androidx.room:room-rxjava2:2.1.0-alpha05" - kapt "androidx.room:room-compiler:2.1.0-alpha05" - 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.1.0' + implementation 'com.ncapdevi:frag-nav:3.2.0' implementation 'com.github.wulkanowy:MaterialChipsInput:b72fd0ee6f' - implementation 'com.github.PhilJay:MPAndroidChart:971640b29d' + 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' @@ -128,15 +128,15 @@ dependencies { debugImplementation "com.amitshekhar.android:debug-db:1.0.6" testImplementation "junit:junit:4.12" - testImplementation "io.mockk:mockk:1.9.1" - testImplementation "org.mockito:mockito-inline:2.25.0" + testImplementation "io.mockk:mockk:1.9.2" + testImplementation "org.mockito:mockito-inline:2.25.1" testImplementation 'org.threeten:threetenbp:1.3.8' - androidTestImplementation "io.mockk:mockk-android:1.9.1" androidTestImplementation 'androidx.test:core:1.1.0' androidTestImplementation 'androidx.test:runner:1.1.1' androidTestImplementation 'androidx.test.ext:junit:1.1.0' - androidTestImplementation 'org.mockito:mockito-android:2.25.0' + androidTestImplementation "io.mockk:mockk-android:1.9.2" + androidTestImplementation 'org.mockito:mockito-android:2.25.1' androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version" } diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt index 85aa94a1..4448e556 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt @@ -71,11 +71,6 @@ class MainActivity : BaseActivity(), MainView { return true } - override fun onStart() { - super.onStart() - presenter.onViewChange() - } - override fun initView() { mainBottomNav.run { addItems(