Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
25f8407
Update `config`
alexander-yevsyukov Sep 26, 2025
e6db0fd
Update `config`
alexander-yevsyukov Sep 26, 2025
89bb36f
Simplify adding CoreJvm Compiler
alexander-yevsyukov Sep 26, 2025
8d4a253
Fix code layout
alexander-yevsyukov Sep 26, 2025
9b33153
Bump CoreJvm Compiler -> `2.0.0-SNAPSHOT.007`
alexander-yevsyukov Sep 26, 2025
65847f1
Address deprecations
alexander-yevsyukov Sep 27, 2025
45bd273
Bump local dependencies
alexander-yevsyukov Sep 27, 2025
e7983cf
Obtain the CoreJvm Compiler version from `../version.gradle.kts`
alexander-yevsyukov Sep 27, 2025
0d2c840
Bump Gradle -> `8.14.2`
alexander-yevsyukov Sep 28, 2025
10d7c82
Remove redundant forcing
alexander-yevsyukov Sep 28, 2025
967c654
Add CoreJvm library to the version catalog
alexander-yevsyukov Sep 28, 2025
8245e93
Remove imports of dependency objects
alexander-yevsyukov Sep 28, 2025
e8d2970
Trim down `buildSrc`
alexander-yevsyukov Sep 28, 2025
0bb3ef6
Trim down `buildSrc` more
alexander-yevsyukov Sep 28, 2025
86d8df2
Merge remote-tracking branch 'origin/migrate-to-compiler' into migrat…
alexander-yevsyukov Sep 29, 2025
0f6be4f
Use `libs` as the version catalog name
alexander-yevsyukov Sep 29, 2025
5f1a2db
Add more memory and parallel GC
alexander-yevsyukov Sep 29, 2025
1ca6ee8
Bump external dependencies
alexander-yevsyukov Sep 29, 2025
27dca2b
Set versions of Kotlin and Java
alexander-yevsyukov Sep 29, 2025
cc6a460
Address deprecations in validation options
alexander-yevsyukov Sep 29, 2025
d30d780
Remove unused code
alexander-yevsyukov Sep 29, 2025
bf0c758
Remove code unused in `buildSrc`
alexander-yevsyukov Sep 29, 2025
d190d31
Remove `config` submodule
alexander-yevsyukov Sep 29, 2025
8b973c4
Update env. vars for dependencies
alexander-yevsyukov Sep 29, 2025
ba0d4c3
Update measurements
alexander-yevsyukov Sep 29, 2025
878391a
Remove loading `version.gradle.kts`
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
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ jobs:
shell: bash
run: ./substitute-settings.py
env:
MC_JAVA_VERSION: "2.0.0-SNAPSHOT.266"
CORE_VERSION: "2.0.0-SNAPSHOT.201"
PROTO_DATA_VERSION: "0.92.11"
VALIDATION_VERSION: "2.0.0-SNAPSHOT.301"
COMPILER_VERSION: "2.0.0-SNAPSHOT.016"
VALIDATION_VERSION: "2.0.0-SNAPSHOT.351"
CORE_JVM_VERSION: "2.0.0-SNAPSHOT.330"
CORE_JVM_COMPILER_VERSION: "2.0.0-SNAPSHOT.007"

- name: Build project
shell: bash
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
[submodule "config"]
path = config
url = https://github.com/SpineEventEngine/config
70 changes: 25 additions & 45 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,64 +24,44 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

import io.spine.dependency.local.McJava
import io.spine.dependency.local.ProtoData
import io.spine.dependency.local.CoreJava
import io.spine.dependency.local.Validation
import io.spine.gradle.UpdateJournal
import io.spine.gradle.base.build
import io.spine.gradle.standardToSpineSdk
import io.spine.gradle.repo.standardToSpineSdk
import java.util.function.Supplier

buildscript {
standardSpineSdkRepositories()
dependencies {
classpath(variantOf(libs.coreJvmCompiler) { classifier("all") })
}
}

plugins {
java
kotlin("jvm")
id("com.google.protobuf")
idea
id("com.osacky.doctor") version "0.8.1"
}

buildscript {
standardSpineSdkRepositories()

dependencies {
classpath(mcJava.pluginLib(mcJava.version))
kotlin {
explicitApi()
compilerOptions {
jvmTarget.set(BuildSettings.jvmTarget)
}
}

configurations.all {
resolutionStrategy.force(
protoData.pluginLib,
protoData.backend,
protoData.java,
validation.java,
validation.javaBundle,
)
}
tasks.withType<JavaCompile>().configureEach {
val javaVer = BuildSettings.javaVersion.toString()
sourceCompatibility = javaVer
targetCompatibility = javaVer
}

repositories.standardToSpineSdk()
apply(plugin = "io.spine.core-jvm")

apply(plugin = McJava.pluginId)
repositories.standardToSpineSdk()

dependencies {
implementation(CoreJava.server)
}

configurations.all {
resolutionStrategy.force(
ProtoData.backend,
ProtoData.java,
Validation.java,
Validation.runtime,
)
}

idea {
module {
generatedSourceDirs = listOf(
"$projectDir/generated/main/java",
"$projectDir/generated/main/kotlin"
).map(::file).toSet()
}
implementation(libs.coreJvmServer)
}

val customConfigFile = "../build-speed.gradle.kts"
Expand Down Expand Up @@ -110,10 +90,10 @@ val recordExecTime by tasks.registering(UpdateJournal::class) {
startTime = Supplier { startTimeMillis!! }
versions.set(
mapOf(
"core" to CoreJava.version,
"ProtoData" to ProtoData.version,
"Validation" to Validation.version,
"mc-java" to McJava.version
"Compiler" to libs.versions.spineCompiler.get(),
"CoreJvmCompiler" to libs.versions.coreJvmCompiler.get(),
"CoreJvm" to libs.versions.coreJvm.get(),
"Validation" to libs.versions.validation.get(),
)
)
}
Expand Down
16 changes: 8 additions & 8 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ repositories {
* Please keep this value in sync with [io.spine.dependency.lib.Jackson.version].
* It is not a requirement but would be good in terms of consistency.
*/
val jacksonVersion = "2.15.3"
val jacksonVersion = "2.18.3"

/**
* The version of Google Artifact Registry used by `buildSrc`.
Expand All @@ -75,15 +75,15 @@ val grGitVersion = "4.1.1"
* This version may change from the [version of Kotlin][io.spine.dependency.lib.Kotlin.version]
* used by the project.
*/
val kotlinVersion = "2.1.10"
val kotlinVersion = "2.1.21"

/**
* The version of Guava used in `buildSrc`.
*
* Always use the same version as the one specified in [io.spine.dependency.lib.Guava].
* Otherwise, when testing Gradle plugins, clashes may occur.
*/
val guavaVersion = "32.1.3-jre"
val guavaVersion = "33.4.8-jre"

/**
* The version of ErrorProne Gradle plugin.
Expand All @@ -93,7 +93,7 @@ val guavaVersion = "32.1.3-jre"
* @see <a href="https://github.com/tbroyer/gradle-errorprone-plugin/releases">
* Error Prone Gradle Plugin Releases</a>
*/
val errorPronePluginVersion = "4.1.0"
val errorPronePluginVersion = "4.2.0"

/**
* The version of Protobuf Gradle Plugin.
Expand All @@ -103,7 +103,7 @@ val errorPronePluginVersion = "4.1.0"
* @see <a href="https://github.com/google/protobuf-gradle-plugin/releases">
* Protobuf Gradle Plugins Releases</a>
*/
val protobufPluginVersion = "0.9.4"
val protobufPluginVersion = "0.9.5"

/**
* The version of Dokka Gradle Plugins.
Expand All @@ -113,7 +113,7 @@ val protobufPluginVersion = "0.9.4"
* @see <a href="https://github.com/Kotlin/dokka/releases">
* Dokka Releases</a>
*/
val dokkaVersion = "1.9.20"
val dokkaVersion = "2.0.0"

/**
* The version of Detekt Gradle Plugin.
Expand All @@ -139,7 +139,7 @@ val koverVersion = "0.7.2"
*
* @see <a href="https://github.com/johnrengelman/shadow/releases">Shadow Plugin releases</a>
*/
val shadowVersion = "7.1.2"
val shadowVersion = "8.3.6"

configurations.all {
resolutionStrategy {
Expand Down Expand Up @@ -175,7 +175,7 @@ dependencies {
"com.github.jk1:gradle-license-report:$licenseReportVersion",
"com.google.guava:guava:$guavaVersion",
"com.google.protobuf:protobuf-gradle-plugin:$protobufPluginVersion",
"gradle.plugin.com.github.johnrengelman:shadow:${shadowVersion}",
"com.gradleup.shadow:shadow-gradle-plugin:$shadowVersion",
"io.gitlab.arturbosch.detekt:detekt-gradle-plugin:$detektVersion",
"io.kotest:kotest-gradle-plugin:$kotestJvmPluginVersion",
// https://github.com/srikanth-lingala/zip4j
Expand Down
Loading
Loading