Skip to content

Commit

Permalink
Merge pull request #163 from SpineEventEngine/bump-mc-java-2024-10-08
Browse files Browse the repository at this point in the history
  • Loading branch information
alexander-yevsyukov authored Oct 8, 2024
2 parents 7550519 + d6fcdf9 commit b4276ad
Show file tree
Hide file tree
Showing 16 changed files with 340 additions and 275 deletions.
2 changes: 1 addition & 1 deletion .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* https://www.apache.org/licenses/LICENSE-2.0
*
* Redistribution and use in source and/or binary forms, with or without
* modification, must retain the above copyright notice and the following
Expand Down Expand Up @@ -51,8 +51,8 @@ repositories {
/**
* The version of Jackson used by `buildSrc`.
*
* Please keep this value in sync. with `io.spine.internal.dependency.Jackson.version`.
* It's not a requirement, but would be good in terms of consistency.
* Please keep this value in sync with [io.spine.internal.dependency.Jackson.version].
* It is not a requirement but would be good in terms of consistency.
*/
val jacksonVersion = "2.15.3"

Expand Down Expand Up @@ -114,7 +114,7 @@ val protobufPluginVersion = "0.9.4"
* @see <a href="https://github.com/Kotlin/dokka/releases">
* Dokka Releases</a>
*/
val dokkaVersion = "1.9.10"
val dokkaVersion = "1.9.20"

/**
* The version of Detekt Gradle Plugin.
Expand Down
6 changes: 3 additions & 3 deletions buildSrc/src/main/kotlin/BuildExtensions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ val PluginDependenciesSpec.mcJava: McJava
get() = McJava

/**
* Shortcut to [ProtoData] dependency object for using under `buildScript`.
* Shortcut to [ProtoData] dependency object for using under `buildscript`.
*/
val ScriptHandlerScope.protoData: ProtoData
get() = ProtoData
Expand Down Expand Up @@ -211,14 +211,14 @@ val Project.productionModules: Iterable<Project>
/**
* Sets the remote debug option for this task.
*
* The port number is `5566`.
* The port number is [5566][BuildSettings.REMOTE_DEBUG_PORT].
*
* @param enabled If `true` the task will be suspended.
*/
fun Task.remoteDebug(enabled: Boolean = true) { this as JavaExec
debugOptions {
this@debugOptions.enabled.set(enabled)
port.set(5566)
port.set(BuildSettings.REMOTE_DEBUG_PORT)
server.set(true)
suspend.set(true)
}
Expand Down
3 changes: 2 additions & 1 deletion buildSrc/src/main/kotlin/BuildSettings.kt
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,11 @@
import org.gradle.jvm.toolchain.JavaLanguageVersion

/**
* This object provides high-level constants, like version of JVM, to be used
* This object provides high-level constants, like the version of JVM, to be used
* throughout the project.
*/
object BuildSettings {
private const val JVM_VERSION = 11
val javaVersion: JavaLanguageVersion = JavaLanguageVersion.of(JVM_VERSION)
const val REMOTE_DEBUG_PORT = 5566
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ object Dokka {
* When changing the version, also change the version used in the
* `buildSrc/build.gradle.kts`.
*/
const val version = "1.9.10"
const val version = "1.9.20"

object GradlePlugin {
const val id = "org.jetbrains.dokka"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ object McJava {
const val group = Spine.toolsGroup

/** The version used to in the build classpath. */
const val dogfoodingVersion = "2.0.0-SNAPSHOT.241"
const val dogfoodingVersion = "2.0.0-SNAPSHOT.242"

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

const val pluginId = "io.spine.mc-java"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.61.2"
private const val fallbackDfVersion = "0.61.4"

/**
* The artifact for the ProtoData Gradle plugin.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ object Spine {
* @see <a href="https://github.com/SpineEventEngine/base">spine-base</a>
*/
const val base = "2.0.0-SNAPSHOT.212"
const val baseForBuildScript = "2.0.0-SNAPSHOT.208"
const val baseForBuildScript = "2.0.0-SNAPSHOT.212"

/**
* The version of [Spine.reflect].
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*
* Copyright 2022, TeamDev. All rights reserved.
* Copyright 2024, TeamDev. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* https://www.apache.org/licenses/LICENSE-2.0
*
* Redistribution and use in source and/or binary forms, with or without
* modification, must retain the above copyright notice and the following
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*
* Copyright 2022, TeamDev. All rights reserved.
* Copyright 2024, TeamDev. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* https://www.apache.org/licenses/LICENSE-2.0
*
* Redistribution and use in source and/or binary forms, with or without
* modification, must retain the above copyright notice and the following
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*
* Copyright 2023, TeamDev. All rights reserved.
* Copyright 2024, TeamDev. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* https://www.apache.org/licenses/LICENSE-2.0
*
* Redistribution and use in source and/or binary forms, with or without
* modification, must retain the above copyright notice and the following
Expand Down
Loading

0 comments on commit b4276ad

Please sign in to comment.