chore: ⬆️ update kotlintest and remove junit 4

jrgonzalezg · Mar 3, 2019 · aeb4d59 · aeb4d59
1 parent 5dc2352
commit aeb4d59
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -76,11 +76,17 @@ dependencies {
     implementation libs.rx_android
     implementation libs.steho
 
-    testImplementation libs.arch_comp_room_test
-    testImplementation libs.arch_comp_test
+    testImplementation (libs.arch_comp_room_test) {
+        exclude module: 'junit'
+    }
+    testImplementation (libs.arch_comp_test) {
+        exclude module: 'junit'
+    }
     testImplementation libs.junit_api
     testImplementation libs.kotlintest
-    testImplementation libs.koin_test
+    testImplementation (libs.koin_test) {
+        exclude module: 'junit'
+    }
     testImplementation libs.mockito_kotlin
 
     testRuntimeOnly libs.junit_engine

diff --git a/app/src/main/java/es/ffgiraldez/comicsearch/query/base/ui/QueryActivity.kt b/app/src/main/java/es/ffgiraldez/comicsearch/query/base/ui/QueryActivity.kt
@@ -21,7 +21,7 @@ class QueryActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         DataBindingUtil.setContentView<QueryActivityBinding>(this, R.layout.query_activity).also {
-            it.setLifecycleOwner(this@QueryActivity)
+            it.setLifecycleOwner(this)
             it.delegate = QueryScreenDelegate(suggestionViewModel, searchViewModel, QueryVolumeAdapter(), navigator)
         }
     }

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -45,7 +45,7 @@ ext {
             koin_architecture      : [group: 'org.koin', name: 'koin-android-viewmodel', version: versions.koin],
             koin_test              : [group: 'org.koin', name: 'koin-test', version: versions.koin],
             kotlin_stdlib          : [group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk7', version: versions.kotlin],
-            kotlintest             : [group: 'io.kotlintest', name: 'kotlintest-runner-junit5', version: '3.2.1'],
+            kotlintest             : [group: 'io.kotlintest', name: 'kotlintest-runner-junit5', version: '3.3.0'],
             mockito_kotlin         : [group: 'com.nhaarman.mockitokotlin2', name: 'mockito-kotlin', version: '2.1.0'],
             picasso                : [group: 'com.squareup.picasso', name: 'picasso', version: '2.5.2'],
             retrofit               : [group: 'com.squareup.retrofit2', name: 'retrofit', version: versions.retrofit],