Skip to content

Commit 1706138

Browse files
Merge pull request #193 from SpineEventEngine/bump-kotlin-and-ksp
Bump Kotlin and KSP
2 parents cc8cd9a + 41e4dfc commit 1706138

File tree

12 files changed

+621
-524
lines changed

12 files changed

+621
-524
lines changed

.idea/inspectionProfiles/Project_Default.xml

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

buildSrc/src/main/kotlin/io/spine/dependency/build/Ksp.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ package io.spine.dependency.build
3333
*/
3434
@Suppress("ConstPropertyName", "unused")
3535
object Ksp {
36-
const val version = "2.1.10-1.0.31"
36+
const val version = "2.1.20-1.0.31"
3737
const val id = "com.google.devtools.ksp"
3838
const val group = "com.google.devtools.ksp"
3939
const val symbolProcessingApi = "$group:symbol-processing-api:$version"

buildSrc/src/main/kotlin/io/spine/dependency/lib/Kotlin.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ object Kotlin {
3636
* depend on Gradle and the version of embedded Kotlin.
3737
*/
3838
@Suppress("MemberVisibilityCanBePrivate") // used directly from the outside.
39-
const val runtimeVersion = "2.1.10"
39+
const val runtimeVersion = "2.1.20"
4040

4141
/**
4242
* This is the version of
@@ -50,7 +50,7 @@ object Kotlin {
5050
*
5151
* @see <a href="https://github.com/JetBrains/java-annotations">Java Annotations</a>
5252
*/
53-
private const val annotationsVersion = "24.0.1"
53+
private const val annotationsVersion = "26.0.2"
5454

5555
private const val group = "org.jetbrains.kotlin"
5656

@@ -82,7 +82,7 @@ object Kotlin {
8282
}
8383

8484
object GradlePlugin {
85-
const val version = Kotlin.runtimeVersion
85+
const val version = runtimeVersion
8686
const val api = "$group:kotlin-gradle-plugin-api:$version"
8787
const val lib = "$group:kotlin-gradle-plugin:$version"
8888
const val model = "$group:kotlin-gradle-model:$version"

buildSrc/src/main/kotlin/io/spine/dependency/local/McJava.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ object McJava {
4242
/**
4343
* The version used to in the build classpath.
4444
*/
45-
const val dogfoodingVersion = "2.0.0-SNAPSHOT.304"
45+
const val dogfoodingVersion = "2.0.0-SNAPSHOT.305"
4646

4747
/**
4848
* The version to be used for integration tests.
4949
*/
50-
const val version = "2.0.0-SNAPSHOT.304"
50+
const val version = "2.0.0-SNAPSHOT.305"
5151

5252
/**
5353
* The ID of the Gradle plugin.

buildSrc/src/main/kotlin/io/spine/dependency/local/ProtoData.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ object ProtoData {
7373
* The version of ProtoData dependencies.
7474
*/
7575
val version: String
76-
private const val fallbackVersion = "0.93.3"
76+
private const val fallbackVersion = "0.93.4"
7777

7878
/**
7979
* The distinct version of ProtoData used by other build tools.
@@ -82,7 +82,7 @@ object ProtoData {
8282
* transitional dependencies, this is the version used to build the project itself.
8383
*/
8484
val dogfoodingVersion: String
85-
private const val fallbackDfVersion = "0.93.3"
85+
private const val fallbackDfVersion = "0.93.4"
8686

8787
/**
8888
* The artifact for the ProtoData Gradle plugin.

buildSrc/src/main/kotlin/module.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import com.google.common.io.Files
2828
import io.spine.dependency.build.CheckerFramework
2929
import io.spine.dependency.build.ErrorProne
3030
import io.spine.dependency.build.FindBugs
31+
import io.spine.dependency.build.Ksp
3132
import io.spine.dependency.lib.Caffeine
3233
import io.spine.dependency.lib.Grpc
3334
import io.spine.dependency.lib.Guava
@@ -139,12 +140,16 @@ fun Module.forceConfigurations() {
139140
force(
140141
Kotlin.stdLib,
141142
Kotlin.scriptRuntime,
143+
Kotlin.GradlePlugin.api,
142144
KotlinX.Coroutines.bom,
143145
KotlinX.Coroutines.core,
144146
KotlinX.Coroutines.coreJvm,
145147
KotlinX.Coroutines.jdk8,
146148
KotlinPoet.ksp,
147149
KotlinPoet.lib,
150+
Ksp.symbolProcessingApi,
151+
Ksp.symbolProcessingCommonDeps,
152+
Ksp.gradlePlugin,
148153
Protobuf.compiler,
149154
Grpc.api,
150155
Grpc.core,

0 commit comments

Comments
 (0)