Merge pull request #256 from SpineEventEngine/continue-migration-to-new-package

Avoid applying the `module` script plugin via `submodules`

Author: alexander-yevsyukov

build.gradle.kts

@@ -50,6 +50,7 @@ buildscript {
                 // Make sure we have the right Protobuf Runtime.
                 io.spine.dependency.lib.Protobuf.javaLib,
                 io.spine.dependency.local.Logging.grpcContext,
+                "io.spine.validation:spine-validation-java-runtime:2.0.0-SNAPSHOT.360",
             )
         }
     }
@@ -129,17 +130,12 @@ allprojects {
                 Time.javaExtensions,
                 ToolBase.lib,
                 ToolBase.pluginBase,
+                "io.spine.validation:spine-validation-java-runtime:2.0.0-SNAPSHOT.360",
             )
         }
     }
 }
 
-subprojects {
-    apply {
-        plugin("module")
-    }
-}
-
 JacocoConfig.applyTo(project)
 LicenseReporter.mergeAllReports(project)
 PomGenerator.applyTo(project)

buildSrc/src/main/kotlin/BuildExtensions.kt

@@ -227,6 +227,8 @@ fun Project.configureTaskDependencies() {
         "compileTestFixturesKotlin".dependOn("kspTestFixturesKotlin")
         "javadocJar".dependOn(dokkaGeneratePublicationJavadoc)
         "htmlDocsJar".dependOn(dokkaGenerate)
+
+        "kspTestKotlin".dependOn("launchTestSpineCompiler")
     }
 }
 

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

@@ -65,7 +65,6 @@ plugins {
     id("dokka-setup")
     `maven-publish`
     jacoco
-    idea
     id("project-report")
     id("pmd-settings")
 }
@@ -77,7 +76,6 @@ JavadocConfig.applyTo(project)
 project.run {
     addDependencies()
     forceConfigurations()
-    applyGeneratedDirectories("$projectDir/generated")
 
     val javaVersion = BuildSettings.javaVersion
     configureJava(javaVersion)
@@ -229,50 +227,6 @@ fun Module.configureKotlin(javaVersion: JavaLanguageVersion) {
     }
 }
 
-/**
- * Adds directories with the generated source code to source sets of the project and
- * to IntelliJ IDEA module settings.
- *
- * @param generatedDir
- *          the name of the root directory with the generated code.
- */
-fun Module.applyGeneratedDirectories(generatedDir: String) {
-    val generatedMain = "$generatedDir/main"
-    val generatedJava = "$generatedMain/java"
-    val generatedKotlin = "$generatedMain/kotlin"
-    val generatedGrpc = "$generatedMain/grpc"
-    val generatedSpine = "$generatedMain/spine"
-
-    val generatedTest = "$generatedDir/test"
-    val generatedTestJava = "$generatedTest/java"
-    val generatedTestKotlin = "$generatedTest/kotlin"
-    val generatedTestGrpc = "$generatedTest/grpc"
-    val generatedTestSpine = "$generatedTest/spine"
-
-    idea {
-        module {
-            generatedSourceDirs.addAll(files(
-                generatedJava,
-                generatedTestJava,
-                generatedKotlin,
-                generatedTestKotlin,
-                generatedGrpc,
-                generatedTestGrpc,
-                generatedSpine,
-                generatedTestSpine,
-            ))
-            testSources.from(
-                generatedTestJava,
-                generatedTestKotlin,
-                generatedTestGrpc,
-                generatedTestSpine,
-            )
-            isDownloadJavadoc = true
-            isDownloadSources = true
-        }
-    }
-}
-
 fun Module.configureProtoc() {
     protobuf {
         protoc { artifact = Protobuf.compiler }

context-tests/build.gradle.kts

@@ -25,16 +25,19 @@
  */
 
 import io.spine.dependency.artifact
+import io.spine.dependency.lib.Protobuf
 import io.spine.dependency.local.Compiler
 import io.spine.dependency.local.Logging
 import io.spine.dependency.test.JUnit.Jupiter
+import io.spine.gradle.report.license.LicenseReporter
 
 plugins {
     java
     protobuf
     `java-test-fixtures`
     prototap
 }
+LicenseReporter.generateReportIn(project)
 
 dependencies {
     implementation(project(":context"))
@@ -47,3 +50,7 @@ dependencies {
     testFixturesImplementation(Compiler.testlib)
     testFixturesImplementation(Jupiter.artifact { params })
 }
+
+protobuf {
+    protoc { artifact = Protobuf.compiler }
+}

context/build.gradle.kts

@@ -46,6 +46,10 @@ buildscript {
     }
 }
 
+plugins {
+    module
+}
+
 apply(plugin = "io.spine.core-jvm")
 
 dependencies {

dependencies.md

@@ -40,10 +40,12 @@ import io.spine.dependency.local.Compiler
 import io.spine.dependency.local.CoreJvm
 import io.spine.dependency.local.Reflect
 import io.spine.dependency.local.Time
+import io.spine.gradle.report.license.LicenseReporter
 
 plugins {
     `fat-jar`
 }
+LicenseReporter.generateReportIn(project)
 
 dependencies {
 

java-bundle/build.gradle.kts

@@ -27,6 +27,7 @@ import io.spine.dependency.local.Compiler
  */
 
 plugins {
+    module
     `build-proto-model`
 }
 

java/build.gradle.kts

@@ -51,13 +51,13 @@ buildscript {
 }
 
 plugins {
+    module
+    `build-proto-model`
     id("io.spine.generated-sources")
     id("io.spine.descriptor-set-file")
     // We use it the KSP plugin via its ID because it's added to the build classpath
     // in the root project.
     id("com.google.devtools.ksp")
-    `build-proto-model`
-    module
     id("maven-publish")
 }
 

jvm-runtime/build.gradle.kts

@@ -35,6 +35,7 @@ import io.spine.dependency.test.KotlinCompileTesting
 
 plugins {
     id("com.google.devtools.ksp")
+    module
 }
 
 dependencies {