Skip to content

Commit d8c7f1b

Browse files
Merge pull request #44 from SpineEventEngine/bump-local-deps
Bump local dependencies
2 parents 231997e + 797c452 commit d8c7f1b

File tree

18 files changed

+109
-606
lines changed

18 files changed

+109
-606
lines changed

base/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ dependencies {
6464
Validation.configuration,
6565
ToolBase.classicCodegen,
6666
ToolBase.pluginBase,
67+
ToolBase.protobufSetupPlugins,
6768
KotlinPoet.lib,
6869
)
6970
apiDeps.forEach {

base/src/main/kotlin/io/spine/tools/core/jvm/gradle/ProjectExts.kt

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,8 @@ import io.spine.tools.code.SourceSetName
3232
import io.spine.tools.fs.DirectoryName
3333
import io.spine.tools.fs.DirectoryName.grpc
3434
import io.spine.tools.fs.DirectoryName.java
35-
import io.spine.tools.fs.DirectoryName.spine
3635
import io.spine.tools.gradle.project.sourceSet
37-
import io.spine.tools.gradle.protobuf.ProtobufDependencies.sourceSetExtensionName
38-
import io.spine.tools.gradle.protobuf.generated
36+
import io.spine.tools.protobuf.gradle.ProtobufDependencies.sourceSetExtensionName
3937
import io.spine.tools.java.fs.DefaultJavaPaths
4038
import io.spine.tools.gradle.lib.spineExtension
4139
import java.nio.file.Path
@@ -82,16 +80,3 @@ public val generatedJavaDirName: DirectoryName = java
8280
* The short name of the directory containing generated gRPC source code.
8381
*/
8482
public val generatedGrpcDirName: DirectoryName = grpc
85-
86-
/**
87-
* The short name of the directory containing generated rejections source code.
88-
*/
89-
public val generatedRejectionsDirName: DirectoryName = spine
90-
91-
/**
92-
* Obtains the directory with the rejection source code generated for the specified source set.
93-
*/
94-
public fun Project.generatedRejectionsDir(ss: SourceSetName): Path =
95-
generated(ss).resolve(generatedRejectionsDirName)
96-
97-
private fun Path.resolve(dir: DirectoryName) = this.resolve(dir.value())

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ buildscript {
8888
dependencies {
8989
classpath(enforcedPlatform(io.spine.dependency.kotlinx.Coroutines.bom))
9090
classpath(enforcedPlatform(io.spine.dependency.lib.Grpc.bom))
91-
classpath(io.spine.dependency.local.ToolBase.jvmToolPlugins)
91+
classpath(io.spine.dependency.local.ToolBase.jvmToolPluginDogfooding)
9292
classpath(coreJvmCompiler.pluginLib)
9393
}
9494
}

buildSrc/src/main/kotlin/compile-protobuf.gradle.kts

Lines changed: 0 additions & 53 deletions
This file was deleted.

buildSrc/src/main/kotlin/io/spine/dependency/local/Base.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ package io.spine.dependency.local
3333
*/
3434
@Suppress("ConstPropertyName", "unused")
3535
object Base {
36-
const val version = "2.0.0-SNAPSHOT.362"
37-
const val versionForBuildScript = "2.0.0-SNAPSHOT.362"
36+
const val version = "2.0.0-SNAPSHOT.364"
37+
const val versionForBuildScript = "2.0.0-SNAPSHOT.364"
3838
const val group = Spine.group
3939
const val artifact = "spine-base"
4040
const val lib = "$group:$artifact:$version"

buildSrc/src/main/kotlin/io/spine/dependency/local/Compiler.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ object Compiler {
7070
* The version of ProtoData dependencies.
7171
*/
7272
val version: String
73-
private const val fallbackVersion = "2.0.0-SNAPSHOT.026"
73+
private const val fallbackVersion = "2.0.0-SNAPSHOT.028"
7474

7575
/**
7676
* The distinct version of ProtoData used by other build tools.
@@ -79,7 +79,7 @@ object Compiler {
7979
* transitional dependencies, this is the version used to build the project itself.
8080
*/
8181
val dogfoodingVersion: String
82-
private const val fallbackDfVersion = "2.0.0-SNAPSHOT.026"
82+
private const val fallbackDfVersion = "2.0.0-SNAPSHOT.028"
8383

8484
/**
8585
* The artifact for the ProtoData Gradle plugin.

buildSrc/src/main/kotlin/io/spine/dependency/local/ToolBase.kt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ package io.spine.dependency.local
3434
@Suppress("ConstPropertyName", "unused")
3535
object ToolBase {
3636
const val group = Spine.toolsGroup
37-
const val version = "2.0.0-SNAPSHOT.361"
37+
const val version = "2.0.0-SNAPSHOT.366"
38+
const val dogfoodingVersion = "2.0.0-SNAPSHOT.361"
3839

3940
const val lib = "$group:tool-base:$version"
4041
const val classicCodegen = "$group:classic-codegen:$version"
@@ -48,12 +49,15 @@ object ToolBase {
4849
const val psiJavaArtifactName = "psi-java"
4950
const val psiJava = "$group:$psiJavaArtifactName:$version"
5051

51-
const val gradleRootPlugin = "$group:gradle-root-plugin:$version"
52+
const val rootGradlePlugins = "$group:root-gradle-plugins:$version"
5253
const val gradlePluginApi = "$group:gradle-plugin-api:$version"
5354
const val gradlePluginApiTestFixtures = "$group:gradle-plugin-api-test-fixtures:$version"
5455

5556
const val jvmTools = "$group:jvm-tools:$version"
56-
const val jvmToolPlugins = "$group:jvm-tool-all-plugins:$version"
57+
const val jvmToolPluginDogfooding = "$group:jvm-tool-all-plugins:$dogfoodingVersion"
58+
const val jvmToolPlugins = "$group:jvm-tool-plugins-all:$version"
59+
60+
const val protobufSetupPlugins = "$group:protobuf-setup-plugins:$version"
5761

5862
object JavadocFilter {
5963
const val group = ToolBase.group

0 commit comments

Comments
 (0)