Skip to content

Commit e80a23c

Browse files
authored
Merge pull request #134 from hoc081098/update_deps
update deps
2 parents 62d007c + fe71a95 commit e80a23c

File tree

11 files changed

+29
-26
lines changed

11 files changed

+29
-26
lines changed

.idea/compiler.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,5 @@ dependencies {
7979
addUnitTest()
8080
testImplementation(testUtils)
8181
testImplementation(deps.koin.testJunit4)
82+
testImplementation(deps.koin.test)
8283
}

app/src/main/java/com/hoc/flowmvi/App.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ class App : Application() {
5151
startKoin {
5252
androidContext(this@App)
5353

54-
// TODO(koin): https://github.com/InsertKoinIO/koin/issues/1188
55-
androidLogger(if (BuildConfig.DEBUG) Level.ERROR else Level.NONE)
54+
androidLogger(if (BuildConfig.DEBUG) Level.DEBUG else Level.NONE)
5655

5756
modules(allModules)
5857
}

app/src/test/java/com/hoc/flowmvi/CheckModulesTest.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ class CheckModulesTest : AutoCloseKoinTest() {
3636
koinApplication {
3737
modules(allModules)
3838

39-
// TODO(koin): https://github.com/InsertKoinIO/koin/issues/1188
40-
printLogger(Level.ERROR)
39+
printLogger(Level.DEBUG)
4140

4241
checkModules {
4342
withInstance<SavedStateHandle>()

buildSrc/src/main/kotlin/deps.kt

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,33 @@ import org.gradle.kotlin.dsl.project
66
import org.gradle.plugin.use.PluginDependenciesSpec
77
import org.gradle.plugin.use.PluginDependencySpec
88

9-
const val ktlintVersion = "0.43.2"
10-
const val kotlinVersion = "1.6.10"
9+
const val ktlintVersion = "0.44.0"
10+
const val kotlinVersion = "1.6.21"
1111

1212
object appConfig {
1313
const val applicationId = "com.hoc.flowmvi"
1414

15-
const val compileSdkVersion = 31
16-
const val buildToolsVersion = "31.0.0"
15+
const val compileSdkVersion = 32
16+
const val buildToolsVersion = "32.0.0"
1717

1818
const val minSdkVersion = 21
19-
const val targetSdkVersion = 31
19+
const val targetSdkVersion = 32
2020

2121
private const val MAJOR = 2
2222
private const val MINOR = 1
23-
private const val PATCH = 0
23+
private const val PATCH = 1
2424
const val versionCode = MAJOR * 10000 + MINOR * 100 + PATCH
25-
const val versionName = "$MAJOR.$MINOR.$PATCH"
25+
const val versionName = "$MAJOR.$MINOR.$PATCH-SNAPSHOT"
2626
}
2727

2828
object deps {
2929
object androidx {
3030
const val appCompat = "androidx.appcompat:appcompat:1.4.1"
3131
const val coreKtx = "androidx.core:core-ktx:1.7.0"
32-
const val constraintLayout = "androidx.constraintlayout:constraintlayout:2.1.1"
32+
const val constraintLayout = "androidx.constraintlayout:constraintlayout:2.1.3"
3333
const val recyclerView = "androidx.recyclerview:recyclerview:1.2.1"
3434
const val swipeRefreshLayout = "androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01"
35-
const val material = "com.google.android.material:material:1.6.0-alpha02"
35+
const val material = "com.google.android.material:material:1.6.0"
3636
}
3737

3838
object lifecycle {
@@ -52,28 +52,29 @@ object deps {
5252
}
5353

5454
object coroutines {
55-
private const val version = "1.6.0"
55+
private const val version = "1.6.1"
5656

5757
const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version"
5858
const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version"
5959
const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version"
6060
}
6161

6262
object koin {
63-
private const val version = "3.1.5"
63+
private const val version = "3.2.0-beta-1"
6464

6565
const val core = "io.insert-koin:koin-core:$version"
6666
const val android = "io.insert-koin:koin-android:$version"
6767
const val testJunit4 = "io.insert-koin:koin-test-junit4:$version"
68+
const val test = "io.insert-koin:koin-test:$version"
6869
}
6970

70-
const val coil = "io.coil-kt:coil:1.2.1"
71+
const val coil = "io.coil-kt:coil:2.0.0-rc03"
7172
const val viewBindingDelegate = "com.github.hoc081098:ViewBindingDelegate:1.3.1"
7273
const val flowExt = "io.github.hoc081098:FlowExt:0.3.0"
7374
const val timber = "com.jakewharton.timber:timber:5.0.1"
7475

7576
object arrow {
76-
private const val version = "1.0.1"
77+
private const val version = "1.1.2"
7778
const val core = "io.arrow-kt:arrow-core:$version"
7879
}
7980

@@ -89,7 +90,7 @@ object deps {
8990
}
9091
}
9192

92-
const val mockk = "io.mockk:mockk:1.12.1"
93+
const val mockk = "io.mockk:mockk:1.12.3"
9394
const val kotlinJUnit = "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion"
9495
}
9596
}
@@ -125,6 +126,4 @@ fun DependencyHandler.addUnitTest(testImplementation: Boolean = true) {
125126
}
126127

127128
val Project.isCiBuild: Boolean
128-
get() = providers.environmentVariable("CI")
129-
.forUseAtConfigurationTime()
130-
.orNull == "true"
129+
get() = providers.environmentVariable("CI").orNull == "true"

data/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,5 @@ dependencies {
5858
addUnitTest()
5959
testImplementation(testUtils)
6060
testImplementation(deps.koin.testJunit4)
61+
testImplementation(deps.koin.test)
6162
}

data/src/main/java/com/hoc/flowmvi/data/UserRepositoryImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.hoc.flowmvi.data
22

33
import arrow.core.ValidatedNel
4-
import arrow.core.computations.either
4+
import arrow.core.continuations.either
55
import arrow.core.left
66
import arrow.core.leftWiden
77
import arrow.core.right

data/src/test/java/com/hoc/flowmvi/data/UserRepositoryImplRealAPITest.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import kotlinx.coroutines.CoroutineDispatcher
88
import kotlinx.coroutines.Dispatchers.IO
99
import kotlinx.coroutines.Dispatchers.Main
1010
import kotlinx.coroutines.ExperimentalCoroutinesApi
11+
import kotlinx.coroutines.FlowPreview
1112
import kotlinx.coroutines.flow.first
1213
import kotlinx.coroutines.runBlocking
1314
import org.junit.Rule
@@ -25,14 +26,15 @@ import kotlin.test.Test
2526
import kotlin.test.assertTrue
2627
import kotlin.time.ExperimentalTime
2728

29+
@FlowPreview
2830
@ExperimentalCoroutinesApi
2931
@ExperimentalTime
3032
@ExperimentalStdlibApi
3133
class UserRepositoryImplRealAPITest : KoinTest {
3234
@get:Rule
3335
val koinRuleTest = KoinTestRule.create {
34-
// TODO(koin): https://github.com/InsertKoinIO/koin/issues/1188
35-
printLogger(Level.ERROR)
36+
printLogger(Level.DEBUG)
37+
3638
modules(
3739
dataModule,
3840
module {

feature-main/src/main/java/com/hoc/flowmvi/ui/main/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class MainActivity :
5555
}
5656
}
5757

58-
override fun onCreateOptionsMenu(menu: Menu?) =
58+
override fun onCreateOptionsMenu(menu: Menu) =
5959
menuInflater.inflate(R.menu.menu_main, menu).let { true }
6060

6161
override fun setupViews() {

0 commit comments

Comments
 (0)