Skip to content

Fix running the BuildSpeed module #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexander-yevsyukov merged 23 commits into from
Sep 29, 2025
Merged

Fix running the BuildSpeed module #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
87b4528
Bump version -> `2.0.0-SNAPSHOT.008`
alexander-yevsyukov Sep 26, 2025
bd489cc
Rename `CoreJava` to `CoreJvm`
alexander-yevsyukov Sep 26, 2025
1eaed2d
Update dependency reports
alexander-yevsyukov Sep 26, 2025
99b9317
Bump CoreJvm Compiler -> `2.0.0-SNAPSHOT.007`
alexander-yevsyukov Sep 26, 2025
b1e519a
Update dependency reports
alexander-yevsyukov Sep 26, 2025
1665298
Update build time
alexander-yevsyukov Sep 28, 2025
4e6db5c
Remove redundant configuration
alexander-yevsyukov Sep 28, 2025
301f1bd
Clarify extension name
alexander-yevsyukov Sep 28, 2025
10a5054
Open `CoreJvmCompiler.artifact` for integration tests in the `plugin-…
alexander-yevsyukov Sep 28, 2025
a8b89ce
Revert the call to `name()`
alexander-yevsyukov Sep 28, 2025
f2c89ed
Filter Spine Compiler code parts
alexander-yevsyukov Sep 28, 2025
52572b8
Add integration test for adding CoreJvm Compiler via `classpath`
alexander-yevsyukov Sep 28, 2025
63a1447
Update build time
alexander-yevsyukov Sep 28, 2025
50e9138
Comment out the exclusion of the Compiler parts into CoreJvm Plugin
alexander-yevsyukov Sep 28, 2025
b456fb8
Comment out the exclusion of the Compiler parts into CoreJvm Plugin
alexander-yevsyukov Sep 28, 2025
474a505
Update build time
alexander-yevsyukov Sep 28, 2025
9dace8f
Force `ToolBase.jvmTools`
alexander-yevsyukov Sep 29, 2025
9c05c25
Remove outdated comment
alexander-yevsyukov Sep 29, 2025
ac8866e
Update dependency reports
alexander-yevsyukov Sep 29, 2025
41a5f7d
Bump ToolBase -> `2.0.0-SNAPSHOT.356`
alexander-yevsyukov Sep 29, 2025
d51895e
Document commented out code
alexander-yevsyukov Sep 29, 2025
7f72863
Update documentation to mention Spine Compiler
alexander-yevsyukov Sep 29, 2025
b7e7d89
Update `BuildSpeed` ref.
alexander-yevsyukov Sep 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions .idea/runConfigurations/LaunchProtoData_Remote_Debug.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion BuildSpeed
Open in desktop
Submodule BuildSpeed updated 207 files
15 changes: 6 additions & 9 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import io.spine.dependency.build.Dokka
import io.spine.dependency.lib.Protobuf
import io.spine.dependency.local.Compiler
import io.spine.dependency.local.CoreJava
import io.spine.dependency.local.CoreJvm
import io.spine.dependency.local.Validation
import io.spine.gradle.RunBuild
import io.spine.gradle.RunGradle
Expand All @@ -46,7 +46,7 @@ buildscript {
standardSpineSdkRepositories()

val toolBase = io.spine.dependency.local.ToolBase
val coreJava = io.spine.dependency.local.CoreJava
val coreJava = io.spine.dependency.local.CoreJvm
val validation = io.spine.dependency.local.Validation
val logging = io.spine.dependency.local.Logging
val compiler = io.spine.dependency.local.Compiler
Expand Down Expand Up @@ -197,10 +197,10 @@ val coreJvmCompilerVersion: String by extra

val prepareBuildPerformanceSettings by tasks.registering(Exec::class) {
environment(
"CORE_JVM_COMPILER_VERSION" to coreJvmCompilerVersion,
"CORE_VERSION" to CoreJava.version,
"COMPILER_VERSION" to Compiler.version,
"VALIDATION_VERSION" to Validation.version
"VALIDATION_VERSION" to Validation.version,
"CORE_JVM_VERSION" to CoreJvm.version,
"CORE_JVM_COMPILER_VERSION" to coreJvmCompilerVersion,
)
workingDir = File(rootDir, "BuildSpeed")
commandLine("./substitute-settings.py")
Expand All @@ -213,8 +213,5 @@ tasks.register<RunGradle>("checkPerformance") {
dependsOn(prepareBuildPerformanceSettings, localPublish)
shouldRunAfter(check)

// Do not run `BuildSpeed` until Validation is migrated to the Compiler.
//TODO:2025-06-16:alexander.yevsyukov: Uncomment the below line, and remove `task()`
// task("clean", "build")
task("tasks")
task("clean", "build")
}
5 changes: 3 additions & 2 deletions ...lin/io/spine/dependency/local/CoreJava.kt → ...tlin/io/spine/dependency/local/CoreJvm.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,16 @@

package io.spine.dependency.local

import io.spine.dependency.local.ToolBase
// For backward compatibility.
Comment thread
alexander-yevsyukov marked this conversation as resolved.
typealias CoreJava = CoreJvm

/**
* Dependencies on `core-java` modules.
*
* See [`SpineEventEngine/core-java`](https://github.com/SpineEventEngine/core-java/).
*/
@Suppress("ConstPropertyName", "unused")
object CoreJava {
object CoreJvm {
const val group = Spine.group
const val version = "2.0.0-SNAPSHOT.330"

Expand Down
6 changes: 2 additions & 4 deletions buildSrc/src/main/kotlin/io/spine/dependency/local/CoreJvmCompiler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@

package io.spine.dependency.local

import io.spine.dependency.local.ToolBase

/**
* Dependencies on the CoreJvm Compiler artifacts.
*
Expand All @@ -48,12 +46,12 @@ object CoreJvmCompiler {
/**
* The version used to in the build classpath.
*/
const val dogfoodingVersion = "2.0.0-SNAPSHOT.006"
const val dogfoodingVersion = "2.0.0-SNAPSHOT.007"

/**
* The version to be used for integration tests.
*/
const val version = "2.0.0-SNAPSHOT.006"
const val version = "2.0.0-SNAPSHOT.007"

/**
* The ID of the Gradle plugin.
Expand Down
4 changes: 1 addition & 3 deletions buildSrc/src/main/kotlin/io/spine/dependency/local/Logging.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@

package io.spine.dependency.local

import io.spine.dependency.local.ToolBase

/**
* Dependencies on the artifacts of the Spine Logging library.
*
Expand All @@ -48,7 +46,7 @@ object Logging {
const val grpcContext = "$group:spine-logging-grpc-context:$version"
const val smokeTest = "$group:spine-logging-smoke-test:$version"

const val testLib = "${ToolBase.group}:spine-logging-testlib:$version"
const val testLib = "${Spine.toolsGroup}:spine-logging-testlib:$version"

// Transitive dependencies.
// Make `public` and use them to force a version in a particular repository, if needed.
Expand Down
4 changes: 1 addition & 3 deletions buildSrc/src/main/kotlin/io/spine/dependency/local/ModelCompiler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@

package io.spine.dependency.local

import io.spine.dependency.local.ToolBase

/**
* Spine Model Compiler Gradle API.
*
Expand All @@ -36,7 +34,7 @@ import io.spine.dependency.local.ToolBase
@Suppress("ConstPropertyName")
object ModelCompiler {
const val version = "2.0.0-SNAPSHOT.133"
const val group = ToolBase.group
const val group = Spine.toolsGroup
const val artifact = "spine-model-compiler"
const val lib = "$group:$artifact:$version"
}
1 change: 1 addition & 0 deletions buildSrc/src/main/kotlin/io/spine/dependency/local/Spine.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,5 @@ package io.spine.dependency.local
@Suppress("unused", "ConstPropertyName")
object Spine {
const val group = "io.spine"
const val toolsGroup = "io.spine.tools"
}
2 changes: 0 additions & 2 deletions buildSrc/src/main/kotlin/io/spine/dependency/local/TestLib.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@

package io.spine.dependency.local

import io.spine.dependency.local.ToolBase

/**
* Spine TestLib library.
*
Expand Down
2 changes: 0 additions & 2 deletions buildSrc/src/main/kotlin/io/spine/dependency/local/Time.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@

package io.spine.dependency.local

import io.spine.dependency.local.ToolBase

/**
* Spine Time library.
*
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/io/spine/dependency/local/ToolBase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ package io.spine.dependency.local
@Suppress("ConstPropertyName", "unused")
object ToolBase {
const val group = "io.spine.tools"
const val version = "2.0.0-SNAPSHOT.355"
const val version = "2.0.0-SNAPSHOT.356"

const val lib = "$group:tool-base:$version"
const val pluginBase = "$group:plugin-base:$version"
Expand Down
8 changes: 4 additions & 4 deletions buildSrc/src/main/kotlin/module.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import io.spine.dependency.lib.KotlinPoet
import io.spine.dependency.lib.Protobuf
import io.spine.dependency.local.Base
import io.spine.dependency.local.Compiler
import io.spine.dependency.local.CoreJava
import io.spine.dependency.local.CoreJvm
import io.spine.dependency.local.Logging
import io.spine.dependency.local.Reflect
import io.spine.dependency.local.TestLib
Expand Down Expand Up @@ -148,9 +148,9 @@ fun Module.forceConfigurations() {
Reflect.lib,
Base.lib,
Time.lib,
CoreJava.core,
CoreJava.client,
CoreJava.server,
CoreJvm.core,
CoreJvm.client,
CoreJvm.server,
TestLib.lib,
ToolBase.lib,
ToolBase.pluginBase,
Expand Down
Loading
Loading