Merge pull request #53 from SpineEventEngine/bump-core-jvm-and-validation

Update local dependencies

Author: alexander-yevsyukov

api/build.gradle.kts

@@ -27,7 +27,7 @@
 import io.spine.dependency.lib.Aedile
 import io.spine.dependency.lib.Jackson
 import io.spine.dependency.local.Base
-import io.spine.dependency.local.CoreJava
+import io.spine.dependency.local.CoreJvm
 import io.spine.dependency.local.Logging
 import io.spine.dependency.local.Reflect
 import io.spine.dependency.local.ToolBase
@@ -43,7 +43,7 @@ dependencies {
     listOf(
         Base.lib,
         Base.format,
-        CoreJava.server,
+        CoreJvm.server,
         ToolBase.lib,
         ToolBase.psiJava
     ).forEach {

api/src/main/kotlin/io/spine/tools/compiler/plugin/View.kt

@@ -35,7 +35,7 @@ import io.spine.server.projection.ProjectionRepository
 import io.spine.server.projection.model.ProjectionClass
 import io.spine.server.route.EventRoute
 import io.spine.server.route.EventRouting
-import io.spine.validate.ValidatingBuilder
+import io.spine.validation.ValidatingBuilder
 import kotlin.reflect.KClass
 
 /**

api/src/test/kotlin/io/spine/tools/compiler/ast/FilePatternsSpec.kt

@@ -35,7 +35,7 @@ import io.spine.tools.compiler.ast.FilePatternFactory.infix
 import io.spine.tools.compiler.ast.FilePatternFactory.prefix
 import io.spine.tools.compiler.ast.FilePatternFactory.regex
 import io.spine.tools.compiler.ast.FilePatternFactory.suffix
-import io.spine.validate.ValidationError
+import io.spine.validation.ValidationError
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test

api/src/test/kotlin/io/spine/tools/compiler/ast/FileSpec.kt

@@ -26,7 +26,7 @@
 
 package io.spine.tools.compiler.ast
 
-import io.spine.validate.ValidationException
+import io.spine.validation.ValidationException
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertDoesNotThrow

backend/build.gradle.kts

@@ -28,7 +28,7 @@ import io.spine.dependency.lib.AutoService
 import io.spine.dependency.lib.Jackson
 import io.spine.dependency.lib.Jackson.DataFormat
 import io.spine.dependency.local.Base
-import io.spine.dependency.local.CoreJava
+import io.spine.dependency.local.CoreJvm
 import io.spine.dependency.local.ToolBase
 import io.spine.dependency.test.JUnit
 import io.spine.gradle.publish.CheckVersionIncrement
@@ -44,7 +44,7 @@ plugins {
 
 dependencies {
     api(AutoService.annotations)
-    api(CoreJava.server)
+    api(CoreJvm.server)
     api(ToolBase.lib)
     api(project(":api"))
 

backend/src/main/kotlin/io/spine/tools/compiler/backend/Pipeline.kt

@@ -56,7 +56,7 @@ import io.spine.tools.compiler.render.SourceFileSet
 import io.spine.tools.compiler.settings.SettingsDirectory
 import io.spine.tools.compiler.type.TypeSystem
 import io.spine.type.parse
-import io.spine.validate.NonValidated
+import io.spine.validation.NonValidated
 import kotlin.io.path.Path
 import kotlin.io.path.exists
 import kotlin.io.path.inputStream
@@ -84,7 +84,7 @@ import kotlin.io.path.inputStream
  *   the `PipelineParameters` message type. This is to allow tests to pass only some of
  *   the parameters if plugins under the test do not need them all.
  *   The production mode of the execution requires a `@Validated` instance of `PipelineParameters`.
- * @param plugins The code generation plugins to be applied to the pipeline in addition to
+ * @param additionalPlugins The code generation plugins to be applied to the pipeline in addition to
  *  those specified via [params][PipelineParameters.getPluginClassNameList].
  * @property descriptorFilter The predicate to accept descriptors during parsing of the [request].
  *  The default value accepts all the descriptors.
@@ -95,7 +95,7 @@ import kotlin.io.path.inputStream
 public class Pipeline(
     public val id: String = generateId(),
     public val params: @NonValidated PipelineParameters,
-    @VisibleForTesting plugins: List<Plugin> = emptyList(),
+    @VisibleForTesting additionalPlugins: List<Plugin> = emptyList(),
     private val descriptorFilter: DescriptorFilter = { true }
 ) : WithLogging {
 
@@ -126,7 +126,7 @@ public class Pipeline(
     }
 
     /**
-     * The directory to which setting files for the [plugins] should be stored.
+     * The directory to which setting files for the [additionalPlugins] should be stored.
      */
     public val settings: SettingsDirectory by lazy {
         val dir = params.settings.toPath()
@@ -141,7 +141,7 @@ public class Pipeline(
      * the constructor parameter.
      */
     public val plugins: List<Plugin> by lazy {
-        val combined = loadPlugins(params.pluginClassNameList) + plugins
+        val combined = loadPlugins(params.pluginClassNameList) + additionalPlugins
         combined
     }
 
@@ -279,7 +279,7 @@ public class Pipeline(
     }
 
     /**
-     * Assembles the `Code Generation` context by applying given [plugins].
+     * Assembles the `Code Generation` context by applying given [additionalPlugins].
      */
     private fun assembleCodegenContext(): CodegenContext =
         CodeGenerationContext(id, typeSystem) {

backend/src/test/kotlin/io/spine/tools/compiler/backend/PipelineSpec.kt

@@ -154,7 +154,7 @@ internal class PipelineSpec {
     fun `render enhanced code`() {
         Pipeline(
             params = params,
-            plugins = listOf(TestPlugin(), RenderingTestbed(renderer)),
+            additionalPlugins = listOf(TestPlugin(), RenderingTestbed(renderer)),
         )()
         assertTextIn(targetFile).isEqualTo("_Journey worth taking")
     }
@@ -163,7 +163,7 @@ internal class PipelineSpec {
     fun `generate new files`() {
         Pipeline(
             params = params,
-            plugins = listOf(TestPlugin(), RenderingTestbed(InternalAccessRenderer())),
+            additionalPlugins = listOf(TestPlugin(), RenderingTestbed(InternalAccessRenderer())),
         )()
         val newClass = targetRoot.resolve("$SRC_DIR_NO_IO/JourneyInternal.java")
         assertExists(newClass)
@@ -176,7 +176,7 @@ internal class PipelineSpec {
         write(path, "foo bar")
         Pipeline(
             params = params,
-            plugins = listOf(TestPlugin(), RenderingTestbed(DeletingRenderer()))
+            additionalPlugins = listOf(TestPlugin(), RenderingTestbed(DeletingRenderer()))
         )()
         assertDoesNotExist(targetRoot / path)
     }
@@ -229,7 +229,7 @@ internal class PipelineSpec {
         """.trimIndent())
         Pipeline(
             params = params,
-            plugins = listOf(RenderingTestbed(
+            additionalPlugins = listOf(RenderingTestbed(
                 renderers = listOf(
                     AnnotationInsertionPointPrinter(),
                     NullableAnnotationRenderer()
@@ -318,7 +318,7 @@ internal class PipelineSpec {
         }
         Pipeline(
             params = local,
-            plugins = listOf(TestPlugin(), RenderingTestbed(InternalAccessRenderer())),
+            additionalPlugins = listOf(TestPlugin(), RenderingTestbed(InternalAccessRenderer())),
         )()
 
         val path = "$SRC_DIR_NO_IO/JourneyInternal.java"
@@ -335,7 +335,7 @@ internal class PipelineSpec {
     fun `copy all sources into the new destination`() {
         Pipeline(
             params = params,
-            plugins = listOf(TestPlugin(), RenderingTestbed(NoOpRenderer())),
+            additionalPlugins = listOf(TestPlugin(), RenderingTestbed(NoOpRenderer())),
         )()
         assertExists(targetFile)
     }
@@ -363,7 +363,7 @@ internal class PipelineSpec {
 
             Pipeline(
                 params = local,
-                plugins = listOf(
+                additionalPlugins = listOf(
                     TestPlugin(),
                     RenderingTestbed(NoOpRenderer())
                 )
@@ -403,7 +403,7 @@ internal class PipelineSpec {
 
             Pipeline(
                 params = params,
-                plugins = listOf(
+                additionalPlugins = listOf(
                     TestPlugin(),
                     RenderingTestbed(PlainStringRenderer())
                 ),
@@ -436,7 +436,7 @@ internal class PipelineSpec {
             }
             Pipeline(
                 params = local,
-                plugins = listOf(
+                additionalPlugins = listOf(
                     TestPlugin(),
                     RenderingTestbed(listOf(
                             JavaGenericInsertionPointPrinter(),
@@ -461,7 +461,7 @@ internal class PipelineSpec {
             val viewClass = DeletedTypeView::class.java
             val pipeline = Pipeline(
                 params = params,
-                plugins = listOf(
+                additionalPlugins = listOf(
                     DocilePlugin(
                         views = setOf(viewClass),
                         viewRepositories = setOf(DeletedTypeRepository())
@@ -478,7 +478,7 @@ internal class PipelineSpec {
     fun `expose 'codegenContext' property for testing purposes`() {
         val pipeline = Pipeline(
             params = params,
-            plugins = listOf(TestPlugin(), RenderingTestbed(renderer)),
+            additionalPlugins = listOf(TestPlugin(), RenderingTestbed(renderer)),
         )
         var codegenContext: CodegenContext? = null
         try {

backend/src/test/kotlin/io/spine/tools/compiler/render/InsertionPointSpec.kt

@@ -107,7 +107,7 @@ class InsertionPointsSpec {
             params = pipelineParams {
                 withRoots(input, output)
             },
-            plugins = listOf(RenderingTestbed(
+            additionalPlugins = listOf(RenderingTestbed(
                 renderers = listOf(
                     VariousKtInsertionPointsPrinter(),
                     CatOutOfTheBoxEmancipator(),

build.gradle.kts

@@ -28,9 +28,10 @@
 
 import io.spine.dependency.lib.Grpc
 import io.spine.dependency.local.Base
-import io.spine.dependency.local.CoreJava
+import io.spine.dependency.local.CoreJvm
 import io.spine.dependency.local.Reflect
 import io.spine.dependency.local.TestLib
+import io.spine.dependency.local.Validation
 import io.spine.gradle.RunBuild
 import io.spine.gradle.publish.PublishingRepos
 import io.spine.gradle.publish.SpinePublishing
@@ -108,7 +109,9 @@ allprojects {
                 Reflect.lib,
                 Base.lib,
                 TestLib.lib,
-                CoreJava.server
+                CoreJvm.server,
+                Validation.runtime,
+                Validation.javaBundle
             )
         }
     }

buildSrc/src/main/kotlin/io/spine/dependency/lib/Protobuf.kt

@@ -33,7 +33,7 @@ package io.spine.dependency.lib
 )
 object Protobuf {
     const val group = "com.google.protobuf"
-    const val version = "4.33.1"
+    const val version = "4.33.2"
 
     /**
      * The Java library with Protobuf data types.