From aeb4d594eddf2ce235dbceb1d1af345bf1b4fd15 Mon Sep 17 00:00:00 2001 From: Fernando Franco Giraldez Date: Sun, 3 Mar 2019 20:15:42 +0100 Subject: [PATCH] chore: :arrow_up: update kotlintest and remove junit 4 --- app/build.gradle | 12 +++++++++--- .../comicsearch/query/base/ui/QueryActivity.kt | 2 +- dependencies.gradle | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b9d70cb..8f0fec9 100644 --- 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 index 4f7582a..507dbe5 100644 --- 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(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 index a2045c2..5d1bd7c 100644 --- 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],