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
1 change: 1 addition & 0 deletions base/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ dependencies {
Validation.configuration,
ToolBase.classicCodegen,
ToolBase.pluginBase,
ToolBase.protobufSetupPlugins,
KotlinPoet.lib,
)
apiDeps.forEach {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,8 @@ import io.spine.tools.code.SourceSetName
import io.spine.tools.fs.DirectoryName
import io.spine.tools.fs.DirectoryName.grpc
import io.spine.tools.fs.DirectoryName.java
import io.spine.tools.fs.DirectoryName.spine
import io.spine.tools.gradle.project.sourceSet
import io.spine.tools.gradle.protobuf.ProtobufDependencies.sourceSetExtensionName
import io.spine.tools.gradle.protobuf.generated
import io.spine.tools.protobuf.gradle.ProtobufDependencies.sourceSetExtensionName
import io.spine.tools.java.fs.DefaultJavaPaths
import io.spine.tools.gradle.lib.spineExtension
import java.nio.file.Path
Expand Down Expand Up @@ -82,16 +80,3 @@ public val generatedJavaDirName: DirectoryName = java
* The short name of the directory containing generated gRPC source code.
*/
public val generatedGrpcDirName: DirectoryName = grpc

/**
* The short name of the directory containing generated rejections source code.
*/
public val generatedRejectionsDirName: DirectoryName = spine

/**
* Obtains the directory with the rejection source code generated for the specified source set.
*/
public fun Project.generatedRejectionsDir(ss: SourceSetName): Path =
generated(ss).resolve(generatedRejectionsDirName)

private fun Path.resolve(dir: DirectoryName) = this.resolve(dir.value())
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ buildscript {
dependencies {
classpath(enforcedPlatform(io.spine.dependency.kotlinx.Coroutines.bom))
classpath(enforcedPlatform(io.spine.dependency.lib.Grpc.bom))
classpath(io.spine.dependency.local.ToolBase.jvmToolPlugins)
classpath(io.spine.dependency.local.ToolBase.jvmToolPluginDogfooding)
classpath(coreJvmCompiler.pluginLib)
}
}
Expand Down
53 changes: 0 additions & 53 deletions buildSrc/src/main/kotlin/compile-protobuf.gradle.kts

This file was deleted.

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.362"
const val versionForBuildScript = "2.0.0-SNAPSHOT.362"
const val version = "2.0.0-SNAPSHOT.364"
const val versionForBuildScript = "2.0.0-SNAPSHOT.364"
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 @@ -70,7 +70,7 @@ object Compiler {
* The version of ProtoData dependencies.
*/
val version: String
private const val fallbackVersion = "2.0.0-SNAPSHOT.026"
private const val fallbackVersion = "2.0.0-SNAPSHOT.028"

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

/**
* The artifact for the ProtoData Gradle plugin.
Expand Down
10 changes: 7 additions & 3 deletions buildSrc/src/main/kotlin/io/spine/dependency/local/ToolBase.kt
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ package io.spine.dependency.local
@Suppress("ConstPropertyName", "unused")
object ToolBase {
const val group = Spine.toolsGroup
const val version = "2.0.0-SNAPSHOT.361"
const val version = "2.0.0-SNAPSHOT.366"
const val dogfoodingVersion = "2.0.0-SNAPSHOT.361"

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

const val gradleRootPlugin = "$group:gradle-root-plugin:$version"
const val rootGradlePlugins = "$group:root-gradle-plugins:$version"
const val gradlePluginApi = "$group:gradle-plugin-api:$version"
const val gradlePluginApiTestFixtures = "$group:gradle-plugin-api-test-fixtures:$version"

const val jvmTools = "$group:jvm-tools:$version"
const val jvmToolPlugins = "$group:jvm-tool-all-plugins:$version"
const val jvmToolPluginDogfooding = "$group:jvm-tool-all-plugins:$dogfoodingVersion"
const val jvmToolPlugins = "$group:jvm-tool-plugins-all:$version"

const val protobufSetupPlugins = "$group:protobuf-setup-plugins:$version"

object JavadocFilter {
const val group = ToolBase.group
Expand Down
Loading
Loading