Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 7b00cce

Browse files
Merge pull request #153 from hoc081098/deps_
deps
2 parents 9cbe13d + 328f6ad commit 7b00cce

File tree

3 files changed

+35
-14
lines changed

3 files changed

+35
-14
lines changed

‎build.gradle.kts‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
12
import java.util.EnumSet
23
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
34
import org.gradle.api.tasks.testing.logging.TestLogEvent
@@ -26,8 +27,28 @@ buildscript {
2627
subprojects {
2728
apply(plugin = "com.diffplug.spotless")
2829
apply(plugin = "com.vanniktech.android.junit.jacoco")
30+
2931
apply(plugin = "com.github.ben-manes.versions")
3032

33+
fun isNonStable(version: String): Boolean {
34+
val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.toUpperCase().contains(it) }
35+
val regex = "^[0-9,.v-]+(-r)?$".toRegex()
36+
val isStable = stableKeyword || regex.matches(version)
37+
return !isStable
38+
}
39+
40+
fun isStable(version: String) = !isNonStable(version)
41+
42+
tasks.withType<DependencyUpdatesTask> {
43+
rejectVersionIf {
44+
if (isStable(currentVersion)) {
45+
isNonStable(candidate.version)
46+
} else {
47+
false
48+
}
49+
}
50+
}
51+
3152
configure<com.diffplug.gradle.spotless.SpotlessExtension> {
3253
val EDITOR_CONFIG_KEYS: Set<String> = hashSetOf(
3354
"ij_kotlin_imports_layout",
@@ -91,7 +112,7 @@ subprojects {
91112
}
92113

93114
configure<com.vanniktech.android.junit.jacoco.JunitJacocoExtension> {
94-
jacocoVersion = "0.8.7"
115+
jacocoVersion = "0.8.8"
95116
includeNoLocationClasses = true
96117
includeInstrumentationCoverageInMergedReport = true
97118
csv.isEnabled = false

‎buildSrc/src/main/kotlin/deps.kt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import org.gradle.plugin.use.PluginDependenciesSpec
77
import org.gradle.plugin.use.PluginDependencySpec
88

99
const val ktlintVersion = "0.45.2"
10-
const val kotlinVersion = "1.7.0"
10+
const val kotlinVersion = "1.7.10"
1111

1212
object appConfig {
1313
const val applicationId = "com.hoc.flowmvi"
@@ -27,16 +27,16 @@ object appConfig {
2727

2828
object deps {
2929
object androidx {
30-
const val appCompat = "androidx.appcompat:appcompat:1.4.1"
31-
const val coreKtx = "androidx.core:core-ktx:1.7.0"
32-
const val constraintLayout = "androidx.constraintlayout:constraintlayout:2.1.3"
30+
const val appCompat = "androidx.appcompat:appcompat:1.4.2"
31+
const val coreKtx = "androidx.core:core-ktx:1.8.0"
32+
const val constraintLayout = "androidx.constraintlayout:constraintlayout:2.1.4"
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"
35+
const val material = "com.google.android.material:material:1.6.1"
3636
}
3737

3838
object lifecycle {
39-
private const val version = "2.4.0"
39+
private const val version = "2.5.0"
4040

4141
const val viewModelKtx = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version" // viewModelScope
4242
const val runtimeKtx = "androidx.lifecycle:lifecycle-runtime-ktx:$version" // lifecycleScope
@@ -46,13 +46,13 @@ object deps {
4646
object squareup {
4747
const val retrofit = "com.squareup.retrofit2:retrofit:2.9.0"
4848
const val converterMoshi = "com.squareup.retrofit2:converter-moshi:2.9.0"
49-
const val loggingInterceptor = "com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.2"
50-
const val moshiKotlin = "com.squareup.moshi:moshi-kotlin:1.12.0"
51-
const val leakCanary = "com.squareup.leakcanary:leakcanary-android:2.7"
49+
const val loggingInterceptor = "com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.10"
50+
const val moshiKotlin = "com.squareup.moshi:moshi-kotlin:1.13.0"
51+
const val leakCanary = "com.squareup.leakcanary:leakcanary-android:2.9.1"
5252
}
5353

5454
object coroutines {
55-
private const val version = "1.6.2"
55+
private const val version = "1.6.4"
5656

5757
const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version"
5858
const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version"
@@ -68,9 +68,9 @@ object deps {
6868
const val test = "io.insert-koin:koin-test:$version"
6969
}
7070

71-
const val coil = "io.coil-kt:coil:2.0.0-rc03"
71+
const val coil = "io.coil-kt:coil:2.1.0"
7272
const val viewBindingDelegate = "com.github.hoc081098:ViewBindingDelegate:1.3.1"
73-
const val flowExt = "io.github.hoc081098:FlowExt:0.4.0-SNAPSHOT"
73+
const val flowExt = "io.github.hoc081098:FlowExt:0.4.0"
7474
const val timber = "com.jakewharton.timber:timber:5.0.1"
7575

7676
object arrow {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /