Skip to content
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.

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

Propagate recent improvements from ToolBase and ProtoData. Use latest local dependencies #533

Merged
merged 3 commits into from
Dec 15, 2024
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/src/main/kotlin/io/spine/dependency/lib/Auto.kt
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ object AutoServiceKsp {
/**
* The latest version compatible with Kotlin 1.8.22.
*
* @see Ksp.version
* @see io.spine.dependency.build.Ksp.version
*/
private const val version = "1.1.0"
const val processor = "dev.zacsweers.autoservice:auto-service-ksp:$version"
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/io/spine/dependency/lib/Log4j2.kt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ package io.spine.dependency.lib
/**
* An open-source logging framework.
*
* Spine uses its own [logging library][Spine.Logging], but also
* Spine uses its own [logging library][io.spine.dependency.local.Logging], but also
* provides a backend implementation for [Log4j2]. This is why
* this dependency is needed.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ object ArtifactVersion {
*
* @see <a href="https://github.com/SpineEventEngine/model-compiler">spine-model-compiler</a>
*/
@Suppress("unused")
@Deprecated(
message = "Please use `ModelCompiler.version` instead.",
ReplaceWith("ModelCompiler.version")
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")
object Base {
const val version = "2.0.0-SNAPSHOT.224"
const val versionForBuildScript = "2.0.0-SNAPSHOT.224"
const val version = "2.0.0-SNAPSHOT.232"
const val versionForBuildScript = "2.0.0-SNAPSHOT.232"
const val group = Spine.group
const val artifact = "spine-base"
const val lib = "$group:$artifact:$version"
Expand Down
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 CoreJava {
const val group = Spine.group
const val version = "2.0.0-SNAPSHOT.182"
const val version = "2.0.0-SNAPSHOT.191"

const val coreArtifact = "spine-core"
const val clientArtifact = "spine-client"
Expand Down
2 changes: 2 additions & 0 deletions buildSrc/src/main/kotlin/io/spine/dependency/local/Logging.kt
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ object Logging {
const val grpcContext = "$group:spine-logging-grpc-context:$version"
const val smokeTest = "$group:spine-logging-smoke-test:$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.
internal const val julBackend = "$group:spine-logging-jul-backend:$version"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ object ProtoData {
* The version of ProtoData dependencies.
*/
val version: String
private const val fallbackVersion = "0.70.1"
private const val fallbackVersion = "0.80.1"

/**
* The distinct version of ProtoData used by other build tools.
Expand All @@ -82,7 +82,7 @@ object ProtoData {
* transitional dependencies, this is the version used to build the project itself.
*/
val dogfoodingVersion: String
private const val fallbackDfVersion = "0.70.1"
private const val fallbackDfVersion = "0.80.1"

/**
* The artifact for the ProtoData Gradle plugin.
Expand Down
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 = Spine.toolsGroup
const val version = "2.0.0-SNAPSHOT.234"
const val version = "2.0.0-SNAPSHOT.240"

const val lib = "$group:spine-tool-base:$version"
const val pluginBase = "$group:spine-plugin-base:$version"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ package io.spine.dependency.local
*
* See [`SpineEventEngine/validation`](https://github.com/SpineEventEngine/validation/).
*/
@Suppress("ConstPropertyName")
@Suppress("ConstPropertyName", "unused")
object Validation {
/**
* The version of the Validation library artifacts.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,12 @@ fun KotlinJvmProjectExtension.applyJvmToolchain(version: String) =
*/
@Suppress("unused", "MagicNumber" /* Kotlin Compiler version. */)
fun KotlinCompile.setFreeCompilerArgs() {
// Avoid the "unsupported flag warning" for Kotlin compilers pre 1.9.20.
// Avoid the "unsupported flag warning" for Kotlin compilers pre 1.9.20 and after 2.0.0.
// See: https://youtrack.jetbrains.com/issue/KT-61573
val expectActualClasses =
if (KotlinVersion.CURRENT.isAtLeast(1, 9, 20)) "-Xexpect-actual-classes" else ""
val expectActualClasses = KotlinVersion.CURRENT.run {
if (isAtLeast(1, 9, 20) && major < 2) "-Xexpect-actual-classes"
else ""
}
kotlinOptions {
freeCompilerArgs = listOf(
"-Xskip-prerelease-check",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import io.spine.gradle.Repository
*
* There is a special treatment for this repository. Usually, fetching and publishing of artifacts
* is performed via the same URL. But it is not true for CloudRepo. Fetching is performed via
* public repository, and publishing via private one. Their URLs differ in `/public` infix.
* the public repository, and publishing via the private one. Their URLs differ in `/public` infix.
*/
internal object CloudRepo {

Expand Down
Loading