Skip to content

Commit ad8145d

Browse files
committed
chore: ⬆️ updating dependencies
updating agp up to 3.5.0 updating koin up to 2.0.1 updating kotlin up to 1.3.50 updating junit up to 5.5.1
1 parent d61a8d0 commit ad8145d

File tree

8 files changed

+32
-26
lines changed

8 files changed

+32
-26
lines changed

app/src/main/java/es/ffgiraldez/comicsearch/ComicApplication.kt

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,23 @@ import es.ffgiraldez.comicsearch.comics.di.comicModule
66
import es.ffgiraldez.comicsearch.navigation.di.navigationModule
77
import es.ffgiraldez.comicsearch.query.search.di.searchModule
88
import es.ffgiraldez.comicsearch.query.sugestion.di.suggestionModule
9-
import org.koin.android.ext.android.startKoin
9+
import org.koin.android.ext.koin.androidContext
10+
import org.koin.android.ext.koin.androidLogger
11+
import org.koin.core.context.startKoin
1012

1113
class ComicApplication : Application() {
1214
override fun onCreate() {
1315
super.onCreate()
14-
startKoin(this, listOf(
15-
navigationModule,
16-
comicModule,
17-
searchModule,
18-
suggestionModule
19-
))
16+
startKoin {
17+
androidLogger()
18+
androidContext(this@ComicApplication)
19+
modules(listOf(
20+
navigationModule,
21+
comicModule,
22+
searchModule,
23+
suggestionModule
24+
))
25+
}
2026
Stetho.initializeWithDefaults(this)
2127
}
2228
}

app/src/main/java/es/ffgiraldez/comicsearch/comics/di/comicModule.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import es.ffgiraldez.comicsearch.comics.data.network.ComicVineApi
66
import es.ffgiraldez.comicsearch.comics.data.storage.ComicDatabase
77
import okhttp3.OkHttpClient
88
import okhttp3.logging.HttpLoggingInterceptor
9-
import org.koin.dsl.module.module
9+
import org.koin.dsl.module
1010
import retrofit2.Retrofit
1111
import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
1212
import retrofit2.converter.gson.GsonConverterFactory

app/src/main/java/es/ffgiraldez/comicsearch/navigation/di/androidModule.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package es.ffgiraldez.comicsearch.navigation.di
22

33
import android.app.Activity
44
import es.ffgiraldez.comicsearch.navigation.Navigator
5-
import org.koin.dsl.module.module
5+
import org.koin.dsl.module
66

77
val navigationModule = module {
88
factory { (activity: Activity) -> Navigator(activity) }

app/src/main/java/es/ffgiraldez/comicsearch/query/search/di/SearchModule.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import es.ffgiraldez.comicsearch.query.search.data.SearchLocalDataSource
44
import es.ffgiraldez.comicsearch.query.search.data.SearchRemoteDataSource
55
import es.ffgiraldez.comicsearch.query.search.data.SearchRepository
66
import es.ffgiraldez.comicsearch.query.search.presentation.SearchViewModel
7-
import org.koin.dsl.module.module
7+
import org.koin.dsl.module
88

99
val searchModule = module {
1010
factory { SearchLocalDataSource(get(parameters = { it })) }

app/src/main/java/es/ffgiraldez/comicsearch/query/sugestion/di/SuggestionModule.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import es.ffgiraldez.comicsearch.query.sugestion.data.SuggestionLocalDataSource
44
import es.ffgiraldez.comicsearch.query.sugestion.data.SuggestionRemoteDataSource
55
import es.ffgiraldez.comicsearch.query.sugestion.data.SuggestionRepository
66
import es.ffgiraldez.comicsearch.query.sugestion.presentation.SuggestionViewModel
7-
import org.koin.dsl.module.module
7+
import org.koin.dsl.module
88

99
val suggestionModule = module {
1010
factory { SuggestionLocalDataSource(get(parameters = { it })) }

app/src/test/java/es/ffgiraldez/comicsearch/di/TestContextResolution.kt

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,22 @@ import es.ffgiraldez.comicsearch.query.search.di.searchModule
66
import es.ffgiraldez.comicsearch.query.sugestion.di.suggestionModule
77
import org.junit.jupiter.api.Test
88
import org.junit.jupiter.api.extension.ExtendWith
9+
import org.koin.core.context.startKoin
910
import org.koin.test.KoinTest
10-
import org.koin.test.checkModules
1111

1212
@ExtendWith(InstantTaskExtension::class)
1313
class TestContextResolution : KoinTest {
1414

1515
@Test
1616
fun `dry run`() {
1717
// start Koin
18-
checkModules(listOf(
19-
navigationModule,
20-
comicModule,
21-
searchModule,
22-
suggestionModule
23-
))
18+
startKoin {
19+
modules(listOf(
20+
navigationModule,
21+
comicModule,
22+
searchModule,
23+
suggestionModule
24+
))
25+
}
2426
}
2527
}

dependencies.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ ext {
88

99
versions = [
1010
architecture_components: '2.0.0',
11-
android_plugin : '3.4.1',
12-
koin : '1.0.2',
13-
kotlin : '1.3.40',
11+
android_plugin : '3.5.0',
12+
koin : '2.0.1',
13+
kotlin : '1.3.50',
1414
okhttp : '3.11.0',
1515
retrofit : '2.4.0',
1616
support : '1.0.0',
17-
junit : '5.4.2'
17+
junit : '5.5.1'
1818
]
1919

2020
build_plugins = [
2121
android_gradle: [group: 'com.android.tools.build', name: 'gradle', version: versions.android_plugin],
2222
kotlin_gradle : [group: 'org.jetbrains.kotlin', name: 'kotlin-gradle-plugin', version: versions.kotlin],
23-
android_junit : [group: 'de.mannodermaus.gradle.plugins', name: 'android-junit5', version: '1.4.2.1']
23+
android_junit : [group: 'de.mannodermaus.gradle.plugins', name: 'android-junit5', version: '1.5.1.0']
2424
]
2525

2626
libs = [

gradle.properties

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,10 @@
1616
# This option should only be used with decoupled projects. More details, visit
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1818
# org.gradle.parallel=true
19-
android.databinding.enableV2=true
2019
kotlin.incremental=false
2120
android.enableR8=true
2221

2322
android.useAndroidX=true
2423
android.enableJetifier=true
2524

26-
27-
25+
room.incremental=true

0 commit comments

Comments
 (0)