Skip to content

Commit 6d13583

Browse files
Merge pull request #54 from SpineEventEngine/specific-entity-state-types
Migrate to new CoreJvm Compiler
2 parents 0337441 + 664b2fa commit 6d13583

32 files changed

+940
-1103
lines changed

build.gradle.kts

Lines changed: 21 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
@file:Suppress("RemoveRedundantQualifierName") // To prevent IDEA replacing FQN imports.
2828

2929
import io.spine.dependency.build.Dokka
30-
import io.spine.dependency.lib.Protobuf
3130
import io.spine.dependency.local.Compiler
3231
import io.spine.dependency.local.CoreJvm
3332
import io.spine.dependency.local.Validation
@@ -44,34 +43,39 @@ import java.time.Duration
4443

4544
buildscript {
4645
standardSpineSdkRepositories()
47-
48-
val toolBase = io.spine.dependency.local.ToolBase
46+
val base = io.spine.dependency.local.Base
47+
val compiler = io.spine.dependency.local.Compiler
4948
val coreJava = io.spine.dependency.local.CoreJvm
50-
val validation = io.spine.dependency.local.Validation
49+
val jackson = io.spine.dependency.lib.Jackson
50+
val kotlin = io.spine.dependency.lib.Kotlin
5151
val logging = io.spine.dependency.local.Logging
52-
val compiler = io.spine.dependency.local.Compiler
52+
val toolBase = io.spine.dependency.local.ToolBase
53+
val validation = io.spine.dependency.local.Validation
5354
doForceVersions(configurations)
5455
configurations {
5556
all {
5657
exclude(group = "io.spine", module = "spine-logging-backend")
5758
resolutionStrategy {
58-
val configuration = this@all
59-
val strategy = this@resolutionStrategy
60-
io.spine.dependency.lib.Kotlin
61-
.forceArtifacts(project, configuration, strategy)
62-
io.spine.dependency.lib.Kotlin.StdLib
63-
.forceArtifacts(project, configuration, strategy)
59+
val cfg = this@all
60+
val rs = this@resolutionStrategy
61+
kotlin.forceArtifacts(project, cfg, rs)
62+
io.spine.dependency.lib.Kotlin.StdLib.forceArtifacts(project, cfg, rs)
63+
jackson.forceArtifacts(project, cfg, rs)
64+
io.spine.dependency.lib.Jackson.DataType.forceArtifacts(project, cfg, rs)
65+
6466
force(
65-
io.spine.dependency.lib.Kotlin.bom,
66-
io.spine.dependency.lib.Jackson.bom,
67-
io.spine.dependency.local.Base.annotations,
68-
io.spine.dependency.local.Base.libForBuildScript,
67+
kotlin.bom,
68+
jackson.annotations,
69+
jackson.bom,
70+
base.annotations,
71+
base.libForBuildScript,
6972
io.spine.dependency.local.Reflect.lib,
7073
toolBase.lib,
7174
coreJava.server,
7275
logging.lib,
7376
logging.libJvm,
7477
"${compiler.module}:${compiler.dogfoodingVersion}",
78+
compiler.api,
7579

7680
// Force ProtoData-compatible version because the build still uses McJava.
7781
// See `classpath` dependencies below.
@@ -86,7 +90,8 @@ buildscript {
8690
dependencies {
8791
classpath(enforcedPlatform(io.spine.dependency.kotlinx.Coroutines.bom))
8892
classpath(enforcedPlatform(io.spine.dependency.lib.Grpc.bom))
89-
classpath(io.spine.dependency.local.ToolBase.jvmToolPluginDogfooding)
93+
classpath(toolBase.jvmToolPluginDogfooding)
94+
classpath(compiler.pluginLib)
9095
classpath(coreJvmCompiler.pluginLib)
9196
}
9297
}
@@ -130,7 +135,6 @@ allprojects {
130135

131136
subprojects {
132137
apply(plugin = "module")
133-
setupProtocArtifact()
134138
}
135139

136140
JacocoConfig.applyTo(project)
@@ -187,15 +191,6 @@ val check by tasks.existing {
187191

188192
typealias Module = Project
189193

190-
/**
191-
* Specify `protoc` artifact for all the modules for simplicity.
192-
*/
193-
fun Module.setupProtocArtifact() {
194-
protobuf {
195-
protoc { artifact = Protobuf.compiler }
196-
}
197-
}
198-
199194
apply(from = "version.gradle.kts")
200195
val coreJvmCompilerVersion: String by extra
201196

buildSrc/build.gradle.kts

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ plugins {
3838
`kotlin-dsl`
3939

4040
// https://github.com/jk1/Gradle-License-Report/releases
41-
id("com.github.jk1.dependency-license-report").version("2.7")
41+
id("com.github.jk1.dependency-license-report").version("2.9")
4242
}
4343

4444
repositories {
@@ -122,16 +122,6 @@ val dokkaVersion = "2.0.0"
122122
*/
123123
val detektVersion = "1.23.8"
124124

125-
/**
126-
* @see [io.spine.dependency.test.Kotest]
127-
*/
128-
val kotestJvmPluginVersion = "0.4.10"
129-
130-
/**
131-
* @see [io.spine.dependency.test.Kotest.MultiplatformGradlePlugin]
132-
*/
133-
val kotestMultiplatformPluginVersion = "5.9.1"
134-
135125
/**
136126
* @see [io.spine.dependency.test.Kover]
137127
*/
@@ -184,8 +174,6 @@ dependencies {
184174
"com.google.protobuf:protobuf-gradle-plugin:$protobufPluginVersion",
185175
"com.gradleup.shadow:shadow-gradle-plugin:$shadowVersion",
186176
"io.gitlab.arturbosch.detekt:detekt-gradle-plugin:$detektVersion",
187-
"io.kotest:kotest-gradle-plugin:$kotestJvmPluginVersion",
188-
"io.kotest:kotest-framework-multiplatform-plugin-gradle:$kotestMultiplatformPluginVersion",
189177
// https://github.com/srikanth-lingala/zip4j
190178
"net.lingala.zip4j:zip4j:2.10.0",
191179
"net.ltgt.gradle:gradle-errorprone-plugin:$errorPronePluginVersion",

buildSrc/src/main/kotlin/BuildExtensions.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ val PluginDependenciesSpec.`gradle-doctor`: PluginDependencySpec
156156
get() = id(GradleDoctor.pluginId).version(GradleDoctor.version)
157157

158158
val PluginDependenciesSpec.kotest: PluginDependencySpec
159-
get() = Kotest.MultiplatformGradlePlugin.let {
160-
return id(it.id).version(it.version)
159+
get() = Kotest.let {
160+
return id(it.gradlePluginId).version(it.version)
161161
}
162162

163163
val PluginDependenciesSpec.kover: PluginDependencySpec

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import io.spine.dependency.DependencyWithBom
3232
@Suppress("unused")
3333
object Grpc : DependencyWithBom() {
3434

35-
override val version = "1.72.0"
35+
override val version = "1.76.0"
3636
override val group = "io.grpc"
3737
override val bom = "$group:grpc-bom:$version"
3838

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ package io.spine.dependency.lib
3737
*/
3838
@Suppress("unused", "ConstPropertyName")
3939
object Guava {
40-
private const val version = "33.4.8-jre"
40+
private const val version = "33.5.0-jre"
4141
const val group = "com.google.guava"
4242
const val lib = "$group:guava:$version"
4343
const val testLib = "$group:guava-testlib:$version"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ object Kotlin : DependencyWithBom() {
4949
* This is the version of
5050
* [Kotlin embedded into Gradle](https://docs.gradle.org/current/userguide/compatibility.html#kotlin).
5151
*/
52-
const val embeddedVersion = "2.2.20"
52+
const val embeddedVersion = "2.2.21"
5353

5454
/**
5555
* The version of the JetBrains annotations library, which is a transitive

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ package io.spine.dependency.lib
3333
)
3434
object Protobuf {
3535
const val group = "com.google.protobuf"
36-
const val version = "4.31.1"
36+
const val version = "4.33.0"
3737

3838
/**
3939
* The Java library with Protobuf data types.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ package io.spine.dependency.local
3333
*/
3434
@Suppress("ConstPropertyName", "unused")
3535
object Base {
36-
const val version = "2.0.0-SNAPSHOT.364"
37-
const val versionForBuildScript = "2.0.0-SNAPSHOT.364"
36+
const val version = "2.0.0-SNAPSHOT.366"
37+
const val versionForBuildScript = "2.0.0-SNAPSHOT.366"
3838
const val group = Spine.group
3939
const val artifact = "spine-base"
4040
const val lib = "$group:$artifact:$version"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ package io.spine.dependency.local
3333
*/
3434
@Suppress("ConstPropertyName")
3535
object BaseTypes {
36-
const val version = "2.0.0-SNAPSHOT.210"
36+
const val version = "2.0.0-SNAPSHOT.211"
3737
const val group = Spine.group
3838
const val artifact = "spine-base-types"
3939
const val lib = "$group:$artifact:$version"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ object Compiler {
7070
* The version of ProtoData dependencies.
7171
*/
7272
val version: String
73-
private const val fallbackVersion = "2.0.0-SNAPSHOT.028"
73+
private const val fallbackVersion = "2.0.0-SNAPSHOT.030"
7474

7575
/**
7676
* The distinct version of ProtoData used by other build tools.
@@ -79,7 +79,7 @@ object Compiler {
7979
* transitional dependencies, this is the version used to build the project itself.
8080
*/
8181
val dogfoodingVersion: String
82-
private const val fallbackDfVersion = "2.0.0-SNAPSHOT.028"
82+
private const val fallbackDfVersion = "2.0.0-SNAPSHOT.030"
8383

8484
/**
8585
* The artifact for the ProtoData Gradle plugin.

0 commit comments

Comments
 (0)