Skip to content

Migrate to GenerateProtoTask.configureSourceSetDirs() from ToolBase #43

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.

Sign up for GitHub

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

Merged
alexander-yevsyukov merged 8 commits into from
Oct 21, 2025
Merged

Migrate to GenerateProtoTask.configureSourceSetDirs() from ToolBase #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7ce3033
Bump version -> `2.0.0-SNAPSHOT.028`
alexander-yevsyukov Oct 20, 2025
b5d5c92
Adopt `GeneratedDirectoryContext`
alexander-yevsyukov Oct 20, 2025
955ee27
Simplify the code for generated source paths
alexander-yevsyukov Oct 20, 2025
f735904
Update dependency reports
alexander-yevsyukov Oct 20, 2025
530f4fe
Update config ref.
alexander-yevsyukov Oct 20, 2025
93c5e53
Optimise imports
alexander-yevsyukov Oct 20, 2025
ae36a5d
Bump ToolBase -> `2.0.0-SNAPSHOT.366`
alexander-yevsyukov Oct 20, 2025
ca5f552
Update dependency reports
alexander-yevsyukov Oct 20, 2025
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/local/ToolBase.kt
View file
Open in desktop
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.364"
const val version = "2.0.0-SNAPSHOT.366"
const val dogfoodingVersion = "2.0.0-SNAPSHOT.361"

const val lib = "$group:tool-base:$version"
Expand Down
2 changes: 1 addition & 1 deletion config
Open in desktop
Submodule config updated 8 files
+3 −3 .idea/kotlinc.xml
+2 −2 buildSrc/build.gradle.kts
+2 −2 buildSrc/src/main/kotlin/io/spine/dependency/local/Base.kt
+2 −2 buildSrc/src/main/kotlin/io/spine/dependency/local/Compiler.kt
+1 −1 buildSrc/src/main/kotlin/io/spine/dependency/local/TestLib.kt
+2 −1 buildSrc/src/main/kotlin/io/spine/dependency/local/ToolBase.kt
+1 −1 buildSrc/src/main/kotlin/io/spine/dependency/local/Validation.kt
+1 −1 buildSrc/src/main/kotlin/io/spine/gradle/publish/ShadowJarExts.kt
44 changes: 22 additions & 22 deletions dependencies.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@


# Dependencies of `io.spine.tools:compiler-api:2.0.0-SNAPSHOT.027`
# Dependencies of `io.spine.tools:compiler-api:2.0.0-SNAPSHOT.028`

## Runtime
1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.20.0.
Expand Down Expand Up @@ -1143,14 +1143,14 @@

The dependencies distributed under several licenses, are used according their commercial-use-friendly license.

This report was generated on **Sun Oct 19 18:21:02 WEST 2025** using
This report was generated on **Tue Oct 21 00:14:55 WEST 2025** using
[Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under
[Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).




# Dependencies of `io.spine.tools:compiler-api-tests:2.0.0-SNAPSHOT.027`
# Dependencies of `io.spine.tools:compiler-api-tests:2.0.0-SNAPSHOT.028`

## Runtime
1. **Group** : org.jetbrains. **Name** : annotations. **Version** : 13.0.
Expand Down Expand Up @@ -1993,14 +1993,14 @@ This report was generated on **Sun Oct 19 18:21:02 WEST 2025** using

The dependencies distributed under several licenses, are used according their commercial-use-friendly license.

This report was generated on **Sun Oct 19 18:21:02 WEST 2025** using
This report was generated on **Tue Oct 21 00:14:55 WEST 2025** using
[Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under
[Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).




# Dependencies of `io.spine.tools:compiler-backend:2.0.0-SNAPSHOT.027`
# Dependencies of `io.spine.tools:compiler-backend:2.0.0-SNAPSHOT.028`

## Runtime
1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.20.0.
Expand Down Expand Up @@ -3147,14 +3147,14 @@ This report was generated on **Sun Oct 19 18:21:02 WEST 2025** using

The dependencies distributed under several licenses, are used according their commercial-use-friendly license.

This report was generated on **Sun Oct 19 18:21:02 WEST 2025** using
This report was generated on **Tue Oct 21 00:14:55 WEST 2025** using
[Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under
[Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).




# Dependencies of `io.spine.tools:compiler-cli:2.0.0-SNAPSHOT.027`
# Dependencies of `io.spine.tools:compiler-cli:2.0.0-SNAPSHOT.028`

## Runtime
1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.20.0.
Expand Down Expand Up @@ -4350,14 +4350,14 @@ This report was generated on **Sun Oct 19 18:21:02 WEST 2025** using

The dependencies distributed under several licenses, are used according their commercial-use-friendly license.

This report was generated on **Sun Oct 19 18:21:02 WEST 2025** using
This report was generated on **Tue Oct 21 00:14:55 WEST 2025** using
[Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under
[Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).




# Dependencies of `io.spine.tools:compiler-gradle-api:2.0.0-SNAPSHOT.027`
# Dependencies of `io.spine.tools:compiler-gradle-api:2.0.0-SNAPSHOT.028`

## Runtime
1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.20.0.
Expand Down Expand Up @@ -5402,14 +5402,14 @@ This report was generated on **Sun Oct 19 18:21:02 WEST 2025** using

The dependencies distributed under several licenses, are used according their commercial-use-friendly license.

This report was generated on **Sun Oct 19 18:21:02 WEST 2025** using
This report was generated on **Tue Oct 21 00:14:55 WEST 2025** using
[Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under
[Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).




# Dependencies of `io.spine.tools:compiler-gradle-plugin:2.0.0-SNAPSHOT.027`
# Dependencies of `io.spine.tools:compiler-gradle-plugin:2.0.0-SNAPSHOT.028`

## Runtime
1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.20.0.
Expand Down Expand Up @@ -6502,14 +6502,14 @@ This report was generated on **Sun Oct 19 18:21:02 WEST 2025** using

The dependencies distributed under several licenses, are used according their commercial-use-friendly license.

This report was generated on **Sun Oct 19 18:21:02 WEST 2025** using
This report was generated on **Tue Oct 21 00:14:55 WEST 2025** using
[Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under
[Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).




# Dependencies of `io.spine.tools:compiler-jvm:2.0.0-SNAPSHOT.027`
# Dependencies of `io.spine.tools:compiler-jvm:2.0.0-SNAPSHOT.028`

## Runtime
1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.20.0.
Expand Down Expand Up @@ -7673,14 +7673,14 @@ This report was generated on **Sun Oct 19 18:21:02 WEST 2025** using

The dependencies distributed under several licenses, are used according their commercial-use-friendly license.

This report was generated on **Sun Oct 19 18:21:02 WEST 2025** using
This report was generated on **Tue Oct 21 00:14:55 WEST 2025** using
[Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under
[Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).




# Dependencies of `io.spine.tools:compiler-params:2.0.0-SNAPSHOT.027`
# Dependencies of `io.spine.tools:compiler-params:2.0.0-SNAPSHOT.028`

## Runtime
1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.20.0.
Expand Down Expand Up @@ -8815,14 +8815,14 @@ This report was generated on **Sun Oct 19 18:21:02 WEST 2025** using

The dependencies distributed under several licenses, are used according their commercial-use-friendly license.

This report was generated on **Sun Oct 19 18:21:02 WEST 2025** using
This report was generated on **Tue Oct 21 00:14:55 WEST 2025** using
[Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under
[Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).




# Dependencies of `io.spine.tools:compiler-protoc-plugin:2.0.0-SNAPSHOT.027`
# Dependencies of `io.spine.tools:compiler-protoc-plugin:2.0.0-SNAPSHOT.028`

## Runtime
1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2.
Expand Down Expand Up @@ -9679,14 +9679,14 @@ This report was generated on **Sun Oct 19 18:21:02 WEST 2025** using

The dependencies distributed under several licenses, are used according their commercial-use-friendly license.

This report was generated on **Sun Oct 19 18:21:02 WEST 2025** using
This report was generated on **Tue Oct 21 00:14:55 WEST 2025** using
[Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under
[Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).




# Dependencies of `io.spine.tools:compiler-test-env:2.0.0-SNAPSHOT.027`
# Dependencies of `io.spine.tools:compiler-test-env:2.0.0-SNAPSHOT.028`

## Runtime
1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.20.0.
Expand Down Expand Up @@ -10829,14 +10829,14 @@ This report was generated on **Sun Oct 19 18:21:02 WEST 2025** using

The dependencies distributed under several licenses, are used according their commercial-use-friendly license.

This report was generated on **Sun Oct 19 18:21:02 WEST 2025** using
This report was generated on **Tue Oct 21 00:14:55 WEST 2025** using
[Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under
[Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).




# Dependencies of `io.spine.tools:compiler-testlib:2.0.0-SNAPSHOT.027`
# Dependencies of `io.spine.tools:compiler-testlib:2.0.0-SNAPSHOT.028`

## Runtime
1. **Group** : com.fasterxml.jackson. **Name** : jackson-bom. **Version** : 2.20.0.
Expand Down Expand Up @@ -12086,6 +12086,6 @@ This report was generated on **Sun Oct 19 18:21:02 WEST 2025** using

The dependencies distributed under several licenses, are used according their commercial-use-friendly license.

This report was generated on **Sun Oct 19 18:21:02 WEST 2025** using
This report was generated on **Tue Oct 21 00:14:55 WEST 2025** using
[Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under
[Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
15 changes: 2 additions & 13 deletions gradle-plugin/src/main/kotlin/io/spine/tools/compiler/gradle/plugin/ConfigureIdea.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,8 @@ package io.spine.tools.compiler.gradle.plugin
import com.google.protobuf.gradle.GenerateProtoTask
import io.spine.tools.compiler.gradle.api.builtins
import io.spine.tools.compiler.gradle.api.debug
import io.spine.tools.compiler.gradle.api.plugins
import io.spine.tools.compiler.gradle.api.generatedDir
import io.spine.tools.protobuf.gradle.generatedSourceProtoDir
import java.io.File
import io.spine.tools.compiler.gradle.api.plugins
import java.nio.file.Path
import java.nio.file.Paths
import kotlin.io.path.Path
Expand All @@ -47,7 +45,7 @@ import org.gradle.plugins.ide.idea.model.IdeaModule
* not included in the IDEA project.
*
* IDEA should only see the sources generated by the Compiler as
* we define in [GenerateProtoTask.configureSourceSetDirs].
* we define in [io.spine.tools.protobuf.gradle.plugin.configureSourceSetDirs].
*/
internal fun Project.configureIdea() {
afterEvaluate {
Expand Down Expand Up @@ -77,15 +75,6 @@ private fun IdeaModule.setupDirectories(project: Project) {
excludeExtractedDirs(project)
}

/**
* Obtains the root directory into which Protobuf Gradle Plugin assigns the `protoc` output.
*
* This is an alias for [io.spine.tools.gradle.protobuf.generatedSourceProtoDir] which
* also returns [File] instead of [Path].
*/
private val Project.protocOutputDir: File
get() = generatedSourceProtoDir.toFile()

/**
* Traverses [generatedSourceDirs][IdeaModule.generatedSourceDirs] excluding those
* belonging to `protoc` output directory.
Expand Down
5 changes: 2 additions & 3 deletions gradle-plugin/src/main/kotlin/io/spine/tools/compiler/gradle/plugin/Extension.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import io.spine.tools.compiler.gradle.api.Names.EXTENSION_NAME
import io.spine.tools.compiler.gradle.plugin.Extension.Companion.defaultSubdirectories
import io.spine.tools.fs.DirectoryName.generated
import io.spine.tools.gradle.DslSpec
import io.spine.tools.protobuf.gradle.generatedSourceProtoDir
import org.gradle.api.Project
import org.gradle.api.file.Directory
import org.gradle.api.file.DirectoryProperty
Expand Down Expand Up @@ -64,13 +63,13 @@ public class Extension(private val project: Project): CompilerSettings {

/**
* Synthetic property for providing the source directories for the given
* source set under [Project.generatedSourceProtoDir].
* source set under [Project.protocOutputDir].
*
* @see sourceDirs
*/
private val srcBaseDirProperty: DirectoryProperty = with(project) {
objects.directoryProperty().convention(provider {
layout.projectDirectory.dir(generatedSourceProtoDir.toString())
layout.projectDirectory.dir(protocOutputDir.toString())
})
}

Expand Down
11 changes: 11 additions & 0 deletions gradle-plugin/src/main/kotlin/io/spine/tools/compiler/gradle/plugin/Paths.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,19 @@

package io.spine.tools.compiler.gradle.plugin

import io.spine.tools.protobuf.gradle.protobufExtension
import java.io.File
import java.nio.file.Path
import org.gradle.api.Project

/**
* Obtains the root directory into which Protobuf Gradle Plugin assigns the `protoc` output.
*/
internal val Project.protocOutputDir: File
get() {
val path = protobufExtension!!.generatedFilesBaseDir
return File(path)
}

/**
* Obtains a list of directories resolved as nested into this one.
Expand Down
Loading
Loading