Skip to content

Commit

Permalink
Kotlin 2.0.10.
Browse files Browse the repository at this point in the history
Signed-off-by: Kenneth J. Shackleton <[email protected]>
  • Loading branch information
kennethshackleton committed Aug 17, 2024
1 parent e28ba7f commit 759c417
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 7 deletions.
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ plugins {
alias(libs.plugins.ktlint)
alias(libs.plugins.ideaExt)
alias(libs.plugins.qodana)
alias(libs.plugins.ksp) apply false
}

repositories {
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/JmhPlugin.kt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class JmhPlugin : Plugin<Project> {
add(name, project)
add(name, "org.openjdk.jmh:jmh-core:${Versions.JMH}")
}
configurations.getByName("kaptJmh") {
configurations.getByName("kspJmh") {
add(name, "org.openjdk.jmh:jmh-generator-annprocess:${Versions.JMH}")
}
}
Expand Down
3 changes: 2 additions & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jmh-core = { group = "org.openjdk.jmh", name = "jmh-core", version.ref = "jmh" }
jmh-generator-annprocess = { group = "org.openjdk.jmh", name = "jmh-generator-annprocess", version.ref = "jmh" }
junit-junit = { group = "junit", name = "junit", version = "4.13.2" }
junit-jupiter-params = { group = "org.junit.jupiter", name = "junit-jupiter-params", version = "5.10.2" }
kotlin-bom = { group = "org.jetbrains.kotlin", name = "kotlin-bom", version = "1.9.24" }
kotlin-bom = { group = "org.jetbrains.kotlin", name = "kotlin-bom", version = "2.0.10" }
kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect" }
kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test" }
kotlin-test-junit = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit" }
Expand All @@ -46,6 +46,7 @@ detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.22.0" }
dokka = { id = "org.jetbrains.dokka", version = "1.9.20" }
ideaExt = { id = "org.jetbrains.gradle.plugin.idea-ext", version = "1.1.7" }
kover = { id = "org.jetbrains.kotlinx.kover", version = "0.7.6" }
ksp = { id = "com.google.devtools.ksp", version = "2.0.10-1.0.24" }
ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "11.5.0" }
nexus = { id = "io.github.gradle-nexus.publish-plugin", version = "1.3.0" }
qodana = { id = "org.jetbrains.qodana", version = "0.1.12" }
Expand Down
4 changes: 2 additions & 2 deletions selekt-android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ plugins {
id("kotlin-android")
alias(libs.plugins.dokka)
alias(libs.plugins.cash.licensee)
kotlin("kapt")
alias(libs.plugins.ksp)
`maven-publish`
signing
alias(libs.plugins.kover)
Expand Down Expand Up @@ -64,7 +64,7 @@ dependencies {
compileOnly(libs.androidx.room.runtime)
implementation(projects.selektJava)
implementation(projects.selektSqlite3Classes)
kaptTest(libs.androidx.room.compiler)
kspTest(libs.androidx.room.compiler)
testImplementation(libs.androidx.lifecycle.livedata.ktx)
testImplementation(libs.androidx.room.runtime)
testImplementation(libs.androidx.room.ktx)
Expand Down
6 changes: 3 additions & 3 deletions selekt-java/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ repositories {

plugins {
kotlin("jvm")
kotlin("kapt")
alias(libs.plugins.ksp)
id("com.android.lint")
alias(libs.plugins.kover)
alias(libs.plugins.dokka)
Expand Down Expand Up @@ -101,9 +101,9 @@ tasks.withType<ProcessResources>().configureEach {
}

tasks.withType<DokkaTask>().configureEach {
dependsOn("kaptKotlin") // FIXME Remove?
dependsOn("kspKotlin") // FIXME Remove?
}

tasks.withType<DokkaTaskPartial>().configureEach {
dependsOn("kaptKotlin") // FIXME Remove?
dependsOn("kspKotlin") // FIXME Remove?
}

0 comments on commit 759c417

Please sign in to comment.