Do not apply ModelCompiler to "proto-extension" module. Remove some…

… unnecessary build scripts. Remove usage of `System.out`.
spine-examples · Jul 31, 2024 · 8650911 · 8650911
1 parent 45c4ad4
commit 8650911
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 178 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -85,7 +85,13 @@ subprojects {
         plugin("detekt-code-analysis")
         plugin("com.google.protobuf")
         plugin("idea")
-        plugin("io.spine.mc-java")
+    }
+
+    // Apply ModelCompiler to every subproject except "proto-extension".
+    if (!name.contains("proto-extension")) {
+        apply {
+            plugin("io.spine.mc-java")
+        }
     }
 
     dependencies {

diff --git a/buildSrc/src/main/kotlin/build-proto-model.gradle.kts b/buildSrc/src/main/kotlin/build-proto-model.gradle.kts
diff --git a/buildSrc/src/main/kotlin/compile-protobuf.gradle.kts b/buildSrc/src/main/kotlin/compile-protobuf.gradle.kts
diff --git a/buildSrc/src/main/kotlin/config-tester.gradle.kts b/buildSrc/src/main/kotlin/config-tester.gradle.kts
diff --git a/...tests/src/test/kotlin/io/spine/examples/protodata/hello/test/ApplySizeOptionPluginTest.kt b/...tests/src/test/kotlin/io/spine/examples/protodata/hello/test/ApplySizeOptionPluginTest.kt
@@ -157,15 +157,8 @@ class `ApplySizeOptionPlugin should` {
         } catch (_: UnexpectedBuildFailure) {
         }
 
-        val sdterrContent = stderr.toString()
-        val errorFound = sdterrContent.contains(expectedExceptionMessage)
-
-        System.err.println(sdterrContent)
-
-        //check(errorFound) { sdterrContent }
-
         assertTrue(
-            errorFound,
+            stderr.toString().contains(expectedExceptionMessage),
             "The expected exception was not thrown."
         )
     }

diff --git a/proto-extension/build.gradle.kts b/proto-extension/build.gradle.kts
@@ -26,7 +26,6 @@
 import io.spine.internal.dependency.AutoService
 import io.spine.internal.dependency.AutoServiceKsp
 import io.spine.internal.dependency.HelloProtoData
-import io.spine.internal.dependency.Validation
 
 plugins {
     `maven-publish`
@@ -35,19 +34,8 @@ plugins {
 
 dependencies {
     // To use @AutoService in options provider.
-    compileOnly(AutoService.annotations)
+    api(AutoService.annotations)
     ksp(AutoServiceKsp.processor)
-
-    // To allow access to `ValidatingBuilder` from the generated Kotlin code.
-    implementation(Validation.runtime)
-}
-
-modelCompiler {
-    java {
-        codegen {
-            validation().enabled.set(false)
-        }
-    }
 }
 
 publishing {
@@ -58,12 +46,3 @@ publishing {
         }
     }
 }
-
-// To avoid warning on implicit tasks dependency.
-// See https://discuss.gradle.org/t/implicit-dependency-among-tasks-but-the-tasks-do-not-exist/46127
-// for details.
-tasks.configureEach {
-    if (name == "kspKotlin") {
-        mustRunAfter(tasks.named("launchProtoData"))
-    }
-}