Merge pull request #55 from SpineEventEngine/avoid-subprojects-block

Avoid `subprojects` block

Author: alexander-yevsyukov

BuildSpeed

@@ -25,24 +25,19 @@
  */
 
 import io.spine.dependency.lib.Roaster
-import io.spine.dependency.local.CoreJvmCompiler
 import io.spine.dependency.local.Logging
 import io.spine.dependency.local.TestLib
 import io.spine.dependency.local.ToolBase
 
 plugins {
+    module
     id("io.spine.core-jvm")
 }
 
 dependencies {
     implementation(project(":base"))
     implementation(Logging.lib)
 
-    // Generate routing schemas using the CoreJvm Compiler, avoiding the missing
-    // `io/spine/tools/code/manifest/Version` class issue.
-    // This dependency must be removed when `io.spine.core-jvm` plugin is used.
-    ksp(CoreJvmCompiler.pluginLib)
-
     testFixturesImplementation(ToolBase.lib)
     testFixturesImplementation(TestLib.lib)
 

annotation/build.gradle.kts

@@ -34,6 +34,7 @@ import io.spine.dependency.local.ToolBase
 import io.spine.dependency.local.Validation
 
 plugins {
+    module
     id("io.spine.artifact-meta")
     id("io.spine.core-jvm")
 }

base/build.gradle.kts

@@ -49,6 +49,7 @@ buildscript {
     val jackson = io.spine.dependency.lib.Jackson
     val kotlin = io.spine.dependency.lib.Kotlin
     val logging = io.spine.dependency.local.Logging
+    val time = io.spine.dependency.local.Time
     val toolBase = io.spine.dependency.local.ToolBase
     val validation = io.spine.dependency.local.Validation
     doForceVersions(configurations)
@@ -72,17 +73,14 @@ buildscript {
                     io.spine.dependency.local.Reflect.lib,
                     toolBase.lib,
                     coreJava.server,
+                    time.lib,
+                    time.javaExtensions,
                     logging.lib,
                     logging.libJvm,
                     "${compiler.module}:${compiler.dogfoodingVersion}",
                     compiler.api,
-
-                    // Force ProtoData-compatible version because the build still uses McJava.
-                    // See `classpath` dependencies below.
-                    // When McJava is replaced with CoreJvmCompiler, these lines must be either removed
-                    // or changed with the latest version of Validation.
-                    "${validation.runtimeModule}:${validation.pdCompatibleVersion}",
-                    "${validation.javaBundleModule}:${validation.pdCompatibleVersion}"
+                    "${validation.runtimeModule}:${validation.version}",
+                    "${validation.runtimeModule}:${validation.version}"
                 )
             }
         }
@@ -133,10 +131,6 @@ allprojects {
     repositories.standardToSpineSdk()
 }
 
-subprojects {
-    apply(plugin = "module")
-}
-
 JacocoConfig.applyTo(project)
 PomGenerator.applyTo(project)
 LicenseReporter.mergeAllReports(project)
@@ -189,8 +183,6 @@ val check by tasks.existing {
     dependsOn(integrationTests)
 }
 
-typealias Module = Project
-
 apply(from = "version.gradle.kts")
 val coreJvmCompilerVersion: String by extra
 

build.gradle.kts

@@ -46,12 +46,12 @@ object CoreJvmCompiler {
     /**
      * The version used to in the build classpath.
      */
-    const val dogfoodingVersion = "2.0.0-SNAPSHOT.025"
+    const val dogfoodingVersion = "2.0.0-SNAPSHOT.026"
 
     /**
      * The version to be used for integration tests.
      */
-    const val version = "2.0.0-SNAPSHOT.025"
+    const val version = "2.0.0-SNAPSHOT.026"
 
     /**
      * The ID of the Gradle plugin.

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

@@ -26,11 +26,14 @@
 
 import io.spine.dependency.local.Base
 import io.spine.dependency.local.Validation
+import io.spine.gradle.report.license.LicenseReporter
 
 plugins {
     java
     `java-test-fixtures`
+    id("module-testing")
 }
+LicenseReporter.generateReportIn(project)
 
 dependencies {
     arrayOf(

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

@@ -29,6 +29,7 @@ import io.spine.dependency.local.Logging
 import io.spine.dependency.local.TestLib
 
 plugins {
+    module
     prototap
     `test-module`
 }

comparable-tests/build.gradle.kts

@@ -27,6 +27,7 @@
 import io.spine.dependency.local.TestLib
 
 plugins {
+    module
     id("io.spine.core-jvm")
 }