Skip to content

Commit 203a326

Browse files
Push module plugin down to modules
Also: * Make `test-module` apply `module-testing` plugin.
1 parent 2a1aa7b commit 203a326

File tree

22 files changed

+33
-24
lines changed

22 files changed

+33
-24
lines changed

annotation/build.gradle.kts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,24 +25,19 @@
2525
*/
2626

2727
import io.spine.dependency.lib.Roaster
28-
import io.spine.dependency.local.CoreJvmCompiler
2928
import io.spine.dependency.local.Logging
3029
import io.spine.dependency.local.TestLib
3130
import io.spine.dependency.local.ToolBase
3231

3332
plugins {
33+
module
3434
id("io.spine.core-jvm")
3535
}
3636

3737
dependencies {
3838
implementation(project(":base"))
3939
implementation(Logging.lib)
4040

41-
// Generate routing schemas using the CoreJvm Compiler, avoiding the missing
42-
// `io/spine/tools/code/manifest/Version` class issue.
43-
// This dependency must be removed when `io.spine.core-jvm` plugin is used.
44-
ksp(CoreJvmCompiler.pluginLib)
45-
4641
testFixturesImplementation(ToolBase.lib)
4742
testFixturesImplementation(TestLib.lib)
4843

base/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import io.spine.dependency.local.ToolBase
3434
import io.spine.dependency.local.Validation
3535

3636
plugins {
37+
module
3738
id("io.spine.artifact-meta")
3839
id("io.spine.core-jvm")
3940
}

build.gradle.kts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ buildscript {
4949
val jackson = io.spine.dependency.lib.Jackson
5050
val kotlin = io.spine.dependency.lib.Kotlin
5151
val logging = io.spine.dependency.local.Logging
52+
val time = io.spine.dependency.local.Time
5253
val toolBase = io.spine.dependency.local.ToolBase
5354
val validation = io.spine.dependency.local.Validation
5455
doForceVersions(configurations)
@@ -72,17 +73,14 @@ buildscript {
7273
io.spine.dependency.local.Reflect.lib,
7374
toolBase.lib,
7475
coreJava.server,
76+
time.lib,
77+
time.javaExtensions,
7578
logging.lib,
7679
logging.libJvm,
7780
"${compiler.module}:${compiler.dogfoodingVersion}",
7881
compiler.api,
79-
80-
// Force ProtoData-compatible version because the build still uses McJava.
81-
// See `classpath` dependencies below.
82-
// When McJava is replaced with CoreJvmCompiler, these lines must be either removed
83-
// or changed with the latest version of Validation.
84-
"${validation.runtimeModule}:${validation.pdCompatibleVersion}",
85-
"${validation.javaBundleModule}:${validation.pdCompatibleVersion}"
82+
"${validation.runtimeModule}:${validation.version}",
83+
"${validation.runtimeModule}:${validation.version}"
8684
)
8785
}
8886
}

buildSrc/src/main/kotlin/test-module.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,14 @@
2626

2727
import io.spine.dependency.local.Base
2828
import io.spine.dependency.local.Validation
29+
import io.spine.gradle.report.license.LicenseReporter
2930

3031
plugins {
3132
java
3233
`java-test-fixtures`
34+
id("module-testing")
3335
}
36+
LicenseReporter.generateReportIn(project)
3437

3538
dependencies {
3639
arrayOf(

comparable-tests/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import io.spine.dependency.local.Logging
2929
import io.spine.dependency.local.TestLib
3030

3131
plugins {
32+
module
3233
prototap
3334
`test-module`
3435
}

comparable/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import io.spine.dependency.local.TestLib
2828

2929
plugins {
30+
module
3031
id("io.spine.core-jvm")
3132
}
3233

entity-tests/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import io.spine.dependency.lib.Protobuf
2727
*/
2828

2929
plugins {
30+
module
3031
prototap
3132
`test-module`
3233
}

entity/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import io.spine.dependency.local.TestLib
3030
import io.spine.dependency.local.ToolBase
3131

3232
plugins {
33+
module
3334
id("io.spine.core-jvm")
3435
}
3536

gradle-plugins/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import io.spine.dependency.local.ToolBase
3333
import io.spine.dependency.local.Validation
3434

3535
plugins {
36+
module
3637
id("io.spine.artifact-meta")
3738
}
3839

grpc/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import io.spine.dependency.lib.GrpcKotlin
2929
import io.spine.dependency.lib.Protobuf
3030

3131
plugins {
32+
module
3233
id("io.spine.artifact-meta")
3334
}
3435

0 commit comments

Comments
 (0)