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
4 changes: 0 additions & 4 deletions api/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,4 @@ forceSpineBase()

afterEvaluate {
spineCompilerRemoteDebug(enabled = false)

val kspKotlin by tasks.getting
val launchSpineCompiler by tasks.getting
kspKotlin.dependsOn(launchSpineCompiler)
}
38 changes: 0 additions & 38 deletions backend/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -65,41 +65,3 @@ apply<IncrementGuard>()
tasks.withType<CheckVersionIncrement> {
repository = PublishingRepos.cloudArtifactRegistry
}

val nl: String = System.lineSeparator()

/**
* Prints output directories produced by `launchProtoData` tasks with
* corresponding number of files in those directories.

val launchProtoData: Task by tasks.getting {
doLast {
println("***** `launchProtoData.output`:")
outputs.files.forEach { dir ->
val fileCount = project.fileTree(dir).count()
println("$dir $fileCount files.")
}
println("*************************")
}
}
*/

/**
* Prints input of `compileKotlin` tasks of this module.

val compileKotlin: Task by tasks.getting {
doFirst {
println()
println(">>>> Kotlin source set dirs:")
sourceSets.main { kotlin.srcDirs.forEach { dir -> println("$dir")} }
println(">>>>> `compileKotlin` task inputs in `doFirst` :")
println(inputs.files.joinToString(separator = nl))
}
}
*/

afterEvaluate {
val kspKotlin by tasks.getting
val launchSpineCompiler by tasks.getting
kspKotlin.dependsOn(launchSpineCompiler)
}
7 changes: 0 additions & 7 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -186,10 +186,3 @@ dependencies {
dokka(it)
}
}

@Suppress("unused")
val dokkaGeneratePublicationHtml by tasks.getting {
// productionModules.forEach {
// dependsOn(it.tasks.named("jar"))
// }
}
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ val grGitVersion = "4.1.1"
* This version may change from the [version of Kotlin][io.spine.dependency.lib.Kotlin.version]
* used by the project.
*/
val kotlinEmbeddedVersion = "2.2.20"
val kotlinEmbeddedVersion = "2.2.21"

/**
* The version of Guava used in `buildSrc`.
Expand Down
7 changes: 0 additions & 7 deletions buildSrc/src/main/kotlin/BuildExtensions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -197,35 +197,28 @@ fun Project.configureTaskDependencies() {
}

afterEvaluate {
val launchProtoData = "launchProtoData"
val launchTestProtoData = "launchTestProtoData"
val generateProto = "generateProto"
val createVersionFile = "createVersionFile"
val compileKotlin = "compileKotlin"
compileKotlin.run {
dependOn(generateProto)
dependOn(launchProtoData)
}
val compileTestKotlin = "compileTestKotlin"
compileTestKotlin.dependOn(launchTestProtoData)
val sourcesJar = "sourcesJar"
val kspKotlin = "kspKotlin"
sourcesJar.run {
dependOn(generateProto)
dependOn(launchProtoData)
dependOn(kspKotlin)
dependOn(createVersionFile)
dependOn("prepareProtocConfigVersions")
}
val dokkaHtml = "dokkaHtml"
dokkaHtml.run {
dependOn(generateProto)
dependOn(launchProtoData)
dependOn(kspKotlin)
}
val dokkaJavadoc = "dokkaJavadoc"
dokkaJavadoc.run {
dependOn(launchProtoData)
dependOn(kspKotlin)
}
"publishPluginJar".dependOn(createVersionFile)
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/io/spine/dependency/build/Ksp.kt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import io.spine.dependency.Dependency
*/
@Suppress("unused")
object Ksp : Dependency() {
override val version = "2.1.21-2.0.1"
override val version = "2.3.0"
override val group = "com.google.devtools.ksp"

const val id = "com.google.devtools.ksp"
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/io/spine/dependency/lib/Kotlin.kt
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ object Kotlin : DependencyWithBom() {
* depend on Gradle and the version of embedded Kotlin.
*/
@Suppress("MemberVisibilityCanBePrivate") // used directly from the outside.
const val runtimeVersion = "2.2.20"
const val runtimeVersion = "2.2.21"

override val version = runtimeVersion
override val group = "org.jetbrains.kotlin"
Expand All @@ -49,7 +49,7 @@ object Kotlin : DependencyWithBom() {
* This is the version of
* [Kotlin embedded into Gradle](https://docs.gradle.org/current/userguide/compatibility.html#kotlin).
*/
const val embeddedVersion = "2.2.20"
const val embeddedVersion = "2.2.21"

/**
* The version of the JetBrains annotations library, which is a transitive
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ object CoreJvmCompiler {
/**
* The version used to in the build classpath.
*/
const val dogfoodingVersion = "2.0.0-SNAPSHOT.015"
const val dogfoodingVersion = "2.0.0-SNAPSHOT.021"

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

/**
* The ID of the Gradle plugin.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ package io.spine.dependency.local
@Suppress("ConstPropertyName", "unused")
object ToolBase {
const val group = Spine.toolsGroup
const val version = "2.0.0-SNAPSHOT.366"
const val dogfoodingVersion = "2.0.0-SNAPSHOT.361"
const val version = "2.0.0-SNAPSHOT.368"
const val dogfoodingVersion = "2.0.0-SNAPSHOT.368"

const val lib = "$group:tool-base:$version"
const val classicCodegen = "$group:classic-codegen:$version"
Expand All @@ -54,7 +54,7 @@ object ToolBase {
const val gradlePluginApiTestFixtures = "$group:gradle-plugin-api-test-fixtures:$version"

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

const val protobufSetupPlugins = "$group:protobuf-setup-plugins:$version"
Expand Down
8 changes: 0 additions & 8 deletions cli/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,3 @@ tasks.shadowJar {
// See https://github.com/johnrengelman/shadow/issues/153.
tasks.shadowDistTar.get().enabled = false
tasks.shadowDistZip.get().enabled = false

// Set explicit dependency for the `kspTestKotlin` task to avoid the Gradle warning
// on missing explicit dependency.
project.afterEvaluate {
val kspTestKotlin by tasks.getting
val launchTestSpineCompiler by tasks.getting
kspTestKotlin.dependsOn(launchTestSpineCompiler)
}
Loading
Loading