diff --git a/diktat-dev-ksp/build.gradle.kts b/diktat-dev-ksp/build.gradle.kts index 6556eecccd..db36e832ae 100644 --- a/diktat-dev-ksp/build.gradle.kts +++ b/diktat-dev-ksp/build.gradle.kts @@ -4,5 +4,5 @@ plugins { } dependencies { - implementation("com.google.devtools.ksp:symbol-processing-api:1.8.10-1.0.9") + implementation(libs.kotlin.ksp.api) } diff --git a/diktat-rules/build.gradle.kts b/diktat-rules/build.gradle.kts index cde215dbc4..e9e954e33a 100644 --- a/diktat-rules/build.gradle.kts +++ b/diktat-rules/build.gradle.kts @@ -1,8 +1,9 @@ +@Suppress("DSL_SCOPE_VIOLATION", "RUN_IN_SCRIPT") // https://github.com/gradle/gradle/issues/22797 plugins { id("org.cqfn.diktat.buildutils.kotlin-jvm-configuration") id("org.cqfn.diktat.buildutils.code-quality-convention") id("org.cqfn.diktat.buildutils.publishing-signing-default-configuration") - id("com.google.devtools.ksp") version "1.8.10-1.0.9" + alias(libs.plugins.kotlin.ksp) idea } diff --git a/examples/gradle-kotlin-dsl-multiproject/build.gradle.kts b/examples/gradle-kotlin-dsl-multiproject/build.gradle.kts index 0d0d65f06b..44a5d479ca 100644 --- a/examples/gradle-kotlin-dsl-multiproject/build.gradle.kts +++ b/examples/gradle-kotlin-dsl-multiproject/build.gradle.kts @@ -1,7 +1,7 @@ import org.cqfn.diktat.plugin.gradle.DiktatExtension plugins { - kotlin("jvm") version "1.8.10" + kotlin("jvm") version "1.8.20" id("org.cqfn.diktat.diktat-gradle-plugin") } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index de8fbf5421..1203ca6a89 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,6 @@ [versions] -kotlin = "1.8.10" +kotlin = "1.8.20" +kotlin-ksp = "1.8.20-1.0.10" serialization = "1.5.0" ktlint = "0.46.1" junit = "5.9.2" @@ -63,6 +64,7 @@ kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref kotlin-plugin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } kotlin-plugin-jpa = { id = "org.jetbrains.kotlin.plugin.jpa", version.ref = "kotlin" } kotlin-plugin-allopen = { id = "org.jetbrains.kotlin.plugin.allopen", version.ref = "kotlin" } +kotlin-ksp = { id = "com.google.devtools.ksp", version.ref = "kotlin-ksp" } talaiot-base = { id = "io.github.cdsap.talaiot.plugin.base", version = "1.5.3" } detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } spotless = { id = "com.diffplug.gradle.spotless", version.ref = "spotless" } @@ -89,6 +91,8 @@ kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", versi kotlin-compiler-embeddable = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlin" } kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" } +# ksp +kotlin-ksp-api = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "kotlin-ksp" } # kotlinx serialization kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "serialization" } diff --git a/renovate.json b/renovate.json index 9fabb79d5a..f4bcbbb7a5 100644 --- a/renovate.json +++ b/renovate.json @@ -17,7 +17,8 @@ ], "excludePackagePatterns": [ "^org\\.jetbrains\\.kotlin[.:]", - "^com\\.pinterest\\.ktlint[.:]" + "^com\\.pinterest\\.ktlint[.:]", + "^com\\.google\\.devtools\\.ksp[.:]" ], "matchUpdateTypes": [ "minor", @@ -29,7 +30,8 @@ { "managers": ["gradle"], "matchPackagePatterns": [ - "^org\\.jetbrains\\.kotlin[.:]" + "^org\\.jetbrains\\.kotlin[.:]", + "^com\\.google\\.devtools\\.ksp[.:]" ], "groupName": "Kotlin core dependencies", "groupSlug": "core-kotlin" @@ -59,7 +61,7 @@ { "managers": ["gradle"], "matchPackageNames": [ - "com.charleskorn.kaml:kaml-jvm" + "com.charleskorn.kaml:kaml" ], "allowedVersions": "<= 0.47.0" },