Skip to content

Commit 714fbcf

Browse files
Update dependency org.jetbrains.kotlin.android to v2.3.0 (#187)
* Brought project up to date.
1 parent 115e750 commit 714fbcf

File tree

4 files changed

+23
-19
lines changed

4 files changed

+23
-19
lines changed

example/build.gradle.kts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,18 @@ kapt {
4747
correctErrorTypes = true
4848
}
4949

50+
configurations.all {
51+
resolutionStrategy {
52+
force(libs.kotlin.metadata.jvm)
53+
}
54+
}
55+
5056
dependencies {
5157
implementation(libs.androidx.core.ktx)
5258
implementation(libs.androidx.appcompat)
5359
implementation(libs.androidx.constraintlayout)
5460
implementation(libs.google.android.material)
5561
implementation(libs.androidx.lifecycle.extensions)
56-
5762
implementation(libs.kotlinx.coroutines.core)
5863
implementation(libs.kotlinx.coroutines.android)
5964

gradle/libs.versions.toml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
22
androidApplication = "8.13.2"
3-
kotlinAndroid = "2.2.21"
3+
kotlin = "2.3.0"
44
androidxCore = "1.17.0"
55
androidxAppcompat = "1.7.1"
66
androidxConstraintlayout = "2.2.1"
@@ -31,6 +31,9 @@ kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-
3131
hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "hilt" }
3232
hilt-android-compiler = { group = "com.google.dagger", name = "hilt-android-compiler", version.ref = "hilt" }
3333
junit = { group = "junit", name = "junit", version.ref = "junit" }
34+
kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin" }
35+
kotlin-metadata-jvm = { group = "org.jetbrains.kotlin", name = "kotlin-metadata-jvm", version.ref = "kotlin" }
36+
hamcrest = { group = "org.hamcrest", name = "hamcrest", version.ref = "hamcrest" }
3437
hamcrest-core = { group = "org.hamcrest", name = "hamcrest-core", version.ref = "hamcrest" }
3538
mockito-inline = { group = "org.mockito", name = "mockito-inline", version.ref = "mockito" }
3639
mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", version.ref = "mockitoKotlin" }
@@ -44,6 +47,6 @@ randomgenkt = { group = "com.mitteloupe.randomgenkt", name = "randomgenkt", vers
4447

4548
[plugins]
4649
android-application = { id = "com.android.application", version.ref = "androidApplication" }
47-
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlinAndroid" }
50+
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
4851
hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
4952
gradle-nexus-publish = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "gradleNexusPublish" }

randomgenkt/build.gradle.kts

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ kotlin {
2020

2121
dependencies {
2222
implementation(kotlin("stdlib-jdk8"))
23-
implementation("org.jetbrains.kotlin:kotlin-reflect:2.2.21")
23+
implementation(libs.kotlin.reflect)
2424

25-
testImplementation("junit:junit:4.13.2")
26-
testImplementation("org.hamcrest:hamcrest-core:3.0")
27-
testImplementation("org.hamcrest:hamcrest:3.0")
28-
testImplementation("org.mockito:mockito-inline:5.2.0")
29-
testImplementation("org.mockito.kotlin:mockito-kotlin:6.1.0")
25+
testImplementation(libs.junit)
26+
testImplementation(libs.hamcrest.core)
27+
testImplementation(libs.hamcrest)
28+
testImplementation(libs.mockito.inline)
29+
testImplementation(libs.mockito.kotlin)
3030
}
3131

3232
ext {
@@ -35,9 +35,7 @@ ext {
3535
set("PUBLISH_VERSION", "2.0.1")
3636
}
3737

38-
apply {
39-
from("release-jar.gradle")
40-
}
38+
apply(from = "release-jar.gradle")
4139

4240
tasks.withType(Test::class) {
4341
testLogging {

randomgenkt/src/test/java/com/mitteloupe/randomgenkt/fielddataprovider/RandomEnumFieldDataProviderTest.kt

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,11 @@ class RandomEnumFieldDataProviderTest(
2121
companion object {
2222
@JvmStatic
2323
@Parameters
24-
fun data(): Collection<Array<*>> {
25-
return listOf(
26-
arrayOf(0, MagicColors.WHITE),
27-
arrayOf(2, MagicColors.BLACK),
28-
arrayOf(4, MagicColors.GREEN)
29-
)
30-
}
24+
fun data(): Collection<Array<*>> = listOf(
25+
arrayOf<Any>(0, MagicColors.WHITE),
26+
arrayOf<Any>(2, MagicColors.BLACK),
27+
arrayOf<Any>(4, MagicColors.GREEN)
28+
)
3129
}
3230

3331
private lateinit var classUnderTest: RandomEnumFieldDataProvider<Any, MagicColors>

0 commit comments

Comments
 (0)