Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ 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 kotlinEmbeddedVersion = "2.3.10"
val kotlinEmbeddedVersion = "2.3.20"

/**
* The version of Guava used in `buildSrc`.
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/io/spine/dependency/lib/Kotlin.kt
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ object Kotlin : DependencyWithBom() {
* depend on Gradle and the version of embedded Kotlin.
*/
@Suppress("MemberVisibilityCanBePrivate") // used directly from the outside.
const val runtimeVersion = "2.3.10"
const val runtimeVersion = "2.3.20"
Comment thread
alexander-yevsyukov marked this conversation as resolved.

override val version = runtimeVersion
override val group = "org.jetbrains.kotlin"
Expand All @@ -49,7 +49,7 @@ object Kotlin : DependencyWithBom() {
* This is the version of
* [Kotlin embedded into Gradle](https://docs.gradle.org/current/userguide/compatibility.html#kotlin).
*/
const val embeddedVersion = "2.2.21"
const val embeddedVersion = "2.3.20"
Comment thread
alexander-yevsyukov marked this conversation as resolved.

/**
* The version of the JetBrains annotations library, which is a transitive
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ package io.spine.dependency.lib
)
object Protobuf {
const val group = "com.google.protobuf"
const val version = "4.34.0"
const val version = "4.34.1"

/**
* The Java library with Protobuf data types.
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/io/spine/dependency/local/Base.kt
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ package io.spine.dependency.local
*/
@Suppress("ConstPropertyName", "unused")
object Base {
const val version = "2.0.0-SNAPSHOT.385"
const val versionForBuildScript = "2.0.0-SNAPSHOT.385"
const val version = "2.0.0-SNAPSHOT.386"
const val versionForBuildScript = "2.0.0-SNAPSHOT.386"
const val group = Spine.group
private const val prefix = "spine"
const val libModule = "$prefix-base"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ object Compiler : Dependency() {
* The version of the Compiler dependencies.
*/
override val version: String
private const val fallbackVersion = "2.0.0-SNAPSHOT.039"
private const val fallbackVersion = "2.0.0-SNAPSHOT.040"

/**
* The distinct version of the Compiler used by other build tools.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ package io.spine.dependency.local
@Suppress("ConstPropertyName", "unused")
object ToolBase {
const val group = Spine.toolsGroup
const val version = "2.0.0-SNAPSHOT.373"
const val dogfoodingVersion = "2.0.0-SNAPSHOT.374"
const val version = "2.0.0-SNAPSHOT.375"
const val dogfoodingVersion = "2.0.0-SNAPSHOT.375"

const val lib = "$group:tool-base:$version"
const val classicCodegen = "$group:classic-codegen:$version"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ object Validation {
/**
* The version of the Validation library artifacts.
*/
const val version = "2.0.0-SNAPSHOT.404"
const val version = "2.0.0-SNAPSHOT.406"

/**
* The last version of Validation compatible with ProtoData.
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/io/spine/dependency/test/JUnit.kt
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import io.spine.dependency.DependencyWithBom
@Suppress("unused", "ConstPropertyName")
object JUnit : DependencyWithBom() {

override val version = "6.0.0"
override val version = "6.0.3"
override val group: String = "org.junit"

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
package io.spine.gradle.kotlin

import org.gradle.jvm.toolchain.JavaLanguageVersion
import org.jetbrains.kotlin.gradle.dsl.JvmDefaultMode
import org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
import org.jetbrains.kotlin.gradle.dsl.JvmDefaultMode

/**
* Sets [Java toolchain](https://kotlinlang.org/docs/gradle.html#gradle-java-toolchains-support)
Expand Down Expand Up @@ -61,7 +61,6 @@ fun KotlinCommonCompilerOptions.setFreeCompilerArgs() {
freeCompilerArgs.addAll(
listOf(
"-Xskip-prerelease-check",
"-Xinline-classes",
"-Xexpect-actual-classes",
"-Xcontext-parameters",
"-opt-in=" +
Expand Down
1,024 changes: 526 additions & 498 deletions dependencies.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
71 changes: 33 additions & 38 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ all modules and does not describe the project structure per-subproject.
-->
<groupId>io.spine.tools</groupId>
<artifactId>spine-compiler</artifactId>
<version>2.0.0-SNAPSHOT.040</version>
<version>2.0.0-SNAPSHOT.041</version>

<inceptionYear>2015</inceptionYear>

Expand Down Expand Up @@ -50,19 +50,19 @@ all modules and does not describe the project structure per-subproject.
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>4.34.0</version>
<version>4.34.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<version>4.34.0</version>
<version>4.34.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-kotlin</artifactId>
<version>4.34.0</version>
<version>4.34.1</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -98,19 +98,19 @@ all modules and does not describe the project structure per-subproject.
<dependency>
<groupId>io.spine</groupId>
<artifactId>spine-base</artifactId>
<version>2.0.0-SNAPSHOT.385</version>
<version>2.0.0-SNAPSHOT.386</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.spine</groupId>
<artifactId>spine-environment</artifactId>
<version>2.0.0-SNAPSHOT.385</version>
<version>2.0.0-SNAPSHOT.386</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.spine</groupId>
<artifactId>spine-format</artifactId>
<version>2.0.0-SNAPSHOT.385</version>
<version>2.0.0-SNAPSHOT.386</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -140,31 +140,31 @@ all modules and does not describe the project structure per-subproject.
<dependency>
<groupId>io.spine</groupId>
<artifactId>spine-validation-jvm-runtime</artifactId>
<version>2.0.0-SNAPSHOT.404</version>
<version>2.0.0-SNAPSHOT.406</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.spine.tools</groupId>
<artifactId>gradle-plugin-api</artifactId>
<version>2.0.0-SNAPSHOT.373</version>
<version>2.0.0-SNAPSHOT.375</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.spine.tools</groupId>
<artifactId>jvm-tools</artifactId>
<version>2.0.0-SNAPSHOT.373</version>
<version>2.0.0-SNAPSHOT.375</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.spine.tools</groupId>
<artifactId>plugin-base</artifactId>
<version>2.0.0-SNAPSHOT.373</version>
<version>2.0.0-SNAPSHOT.375</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.spine.tools</groupId>
<artifactId>protobuf-setup-plugins</artifactId>
<version>2.0.0-SNAPSHOT.373</version>
<version>2.0.0-SNAPSHOT.375</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -176,31 +176,31 @@ all modules and does not describe the project structure per-subproject.
<dependency>
<groupId>io.spine.tools</groupId>
<artifactId>psi-java</artifactId>
<version>2.0.0-SNAPSHOT.373</version>
<version>2.0.0-SNAPSHOT.375</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.spine.tools</groupId>
<artifactId>tool-base</artifactId>
<version>2.0.0-SNAPSHOT.373</version>
<version>2.0.0-SNAPSHOT.375</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-bom</artifactId>
<version>2.3.10</version>
<version>2.3.20</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-reflect</artifactId>
<version>2.3.10</version>
<version>2.3.20</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>2.3.10</version>
<version>2.3.20</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -242,7 +242,7 @@ all modules and does not describe the project structure per-subproject.
<dependency>
<groupId>io.spine.tools</groupId>
<artifactId>plugin-testlib</artifactId>
<version>2.0.0-SNAPSHOT.373</version>
<version>2.0.0-SNAPSHOT.375</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -272,13 +272,13 @@ all modules and does not describe the project structure per-subproject.
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test-junit5</artifactId>
<version>2.3.10</version>
<version>2.3.20</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>6.0.0</version>
<version>6.0.3</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -290,19 +290,19 @@ all modules and does not describe the project structure per-subproject.
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>6.0.0</version>
<version>6.0.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>6.0.0</version>
<version>6.0.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>6.0.0</version>
<version>6.0.3</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -335,7 +335,7 @@ all modules and does not describe the project structure per-subproject.
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protoc</artifactId>
<version>4.34.0</version>
<version>4.34.1</version>
</dependency>
<dependency>
<groupId>dev.zacsweers.autoservice</groupId>
Expand All @@ -350,12 +350,12 @@ all modules and does not describe the project structure per-subproject.
<dependency>
<groupId>io.spine.tools</groupId>
<artifactId>compiler-cli-all</artifactId>
<version>2.0.0-SNAPSHOT.039</version>
<version>2.0.0-SNAPSHOT.040</version>
</dependency>
<dependency>
<groupId>io.spine.tools</groupId>
<artifactId>compiler-protoc-plugin</artifactId>
<version>2.0.0-SNAPSHOT.039</version>
<version>2.0.0-SNAPSHOT.040</version>
</dependency>
<dependency>
<groupId>io.spine.tools</groupId>
Expand All @@ -380,7 +380,7 @@ all modules and does not describe the project structure per-subproject.
<dependency>
<groupId>io.spine.tools</groupId>
<artifactId>validation-java-bundle</artifactId>
<version>2.0.0-SNAPSHOT.404</version>
<version>2.0.0-SNAPSHOT.406</version>
</dependency>
<dependency>
<groupId>org.jacoco</groupId>
Expand Down Expand Up @@ -425,38 +425,33 @@ all modules and does not describe the project structure per-subproject.
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-build-tools-compat</artifactId>
<version>2.3.10</version>
<version>2.3.20</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-build-tools-impl</artifactId>
<version>2.3.10</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-compiler-embeddable</artifactId>
<version>2.3.10</version>
<version>2.3.20</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-gradle-plugin</artifactId>
<version>2.3.10</version>
<version>2.3.20</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-gradle-plugin-api</artifactId>
<version>2.3.10</version>
<version>2.3.20</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-scripting-compiler-embeddable</artifactId>
<version>2.3.10</version>
<version>2.3.20</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>6.0.0</version>
<version>6.0.3</version>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
Expand Down
2 changes: 1 addition & 1 deletion version.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
* This version is also used by integration test projects.
* E.g. see `tests/consumer/build.gradle.kts`.
*/
val compilerVersion: String by extra("2.0.0-SNAPSHOT.040")
val compilerVersion: String by extra("2.0.0-SNAPSHOT.041")

/**
* The version, same as [compilerVersion], which is used for publishing
Expand Down
Loading