Merge pull request #197 from SpineEventEngine/newer-protodata-etc

Newer ProtoData and other dependencies

Author: alexander-yevsyukov

.gitignore

@@ -117,4 +117,4 @@ pubspec.lock
 # Ignore the `tmp` directory used for building dependant repositories.
 /tmp
 
-old-dot-gradle-test-kit/
+.gradle-test-kit/

build.gradle.kts

@@ -74,6 +74,7 @@ buildscript {
     dependencies {
         classpath(mcJava.pluginLib)
         classpath(enforcedPlatform(io.spine.dependency.kotlinx.Coroutines.bom))
+        classpath(enforcedPlatform(io.spine.dependency.lib.Grpc.bom))
     }
 }
 

buildSrc/src/main/kotlin/io/spine/dependency/Dependency.kt

@@ -114,5 +114,3 @@ private fun ResolutionStrategy.forceWithLogging(
     force(artifact)
     project.log { "Forced the version of `$artifact` in " + configuration.diagSuffix(project) }
 }
-
-

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

@@ -33,8 +33,8 @@ package io.spine.dependency.local
  */
 @Suppress("ConstPropertyName")
 object Base {
-    const val version = "2.0.0-SNAPSHOT.316"
-    const val versionForBuildScript = "2.0.0-SNAPSHOT.316"
+    const val version = "2.0.0-SNAPSHOT.317"
+    const val versionForBuildScript = "2.0.0-SNAPSHOT.317"
     const val group = Spine.group
     const val artifact = "spine-base"
     const val lib = "$group:$artifact:$version"

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

@@ -34,7 +34,7 @@ package io.spine.dependency.local
 @Suppress("ConstPropertyName", "unused")
 object CoreJava {
     const val group = Spine.group
-    const val version = "2.0.0-SNAPSHOT.301"
+    const val version = "2.0.0-SNAPSHOT.313"
 
     const val coreArtifact = "spine-core"
     const val clientArtifact = "spine-client"

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

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

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

@@ -72,7 +72,7 @@ object ProtoData {
      * The version of ProtoData dependencies.
      */
     val version: String
-    private const val fallbackVersion = "0.94.0"
+    private const val fallbackVersion = "0.95.0"
 
     /**
      * The distinct version of ProtoData used by other build tools.
@@ -81,7 +81,7 @@ object ProtoData {
      * transitional dependencies, this is the version used to build the project itself.
      */
     val dogfoodingVersion: String
-    private const val fallbackDfVersion = "0.94.0"
+    private const val fallbackDfVersion = "0.95.0"
 
     /**
      * The artifact for the ProtoData Gradle plugin.

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

@@ -38,7 +38,7 @@ package io.spine.dependency.local
 )
 object ProtoTap {
     const val group = "io.spine.tools"
-    const val version = "0.9.1"
+    const val version = "0.10.0"
     const val gradlePluginId = "io.spine.prototap"
     const val api = "$group:prototap-api:$version"
     const val gradlePlugin = "$group:prototap-gradle-plugin:$version"

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

@@ -36,7 +36,7 @@ object Validation {
     /**
      * The version of the Validation library artifacts.
      */
-    const val version = "2.0.0-SNAPSHOT.316"
+    const val version = "2.0.0-SNAPSHOT.332"
 
     const val group = "io.spine.validation"
     private const val prefix = "spine-validation"

buildSrc/src/main/kotlin/io/spine/gradle/protobuf/ProtoTaskExtensions.kt

@@ -30,12 +30,14 @@
 package io.spine.gradle.protobuf
 
 import com.google.protobuf.gradle.GenerateProtoTask
+import com.google.protobuf.gradle.ProtobufExtension
 import io.spine.gradle.sourceSets
 import java.io.File
 import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.Paths
 import java.nio.file.StandardOpenOption.TRUNCATE_EXISTING
+import kotlin.io.path.Path
 import org.gradle.api.Project
 import org.gradle.api.file.SourceDirectorySet
 import org.gradle.api.tasks.SourceSet
@@ -329,18 +331,42 @@ fun IdeaModule.printSourceDirectories() {
     excludeDirs.forEach { println(it) }
 }
 
+/**
+ * Obtains the extension of Protobuf Gradle Plugin in the given project.
+ */
+val Project.protobufExtension: ProtobufExtension?
+    get() = extensions.findByType(ProtobufExtension::class.java)
+
 /**
  * Obtains the directory where the Protobuf Gradle Plugin should place the generated code.
  *
- * The directory is fixed to be `$buildDir/generated/source/proto` and cannot be
- * changed by the settings of the plugin. Even though [ProtobufExtension] has a property
+ * The directory is fixed to be `$buildDir/generated/source/proto` in versions pre v0.9.5
+ * and cannot be changed by the settings of the plugin.
+ * In the v0.9.5 the path was changed to
+ * [`$buildDir/generated/sources/proto`](https://github.com/google/protobuf-gradle-plugin/releases/tag/v0.9.5).
+ *
+ * Even though [ProtobufExtension] has a property
  * [generatedFilesBaseDir][ProtobufExtension.getGeneratedFilesBaseDir], which is supposed
- * to be used for this purpose, it is declared with `@PackageScope` and thus cannot be
- * accessed from outside the plugin. The Protobuf Gradle Plugin (at v0.9.2) does not
- * modify the value of the property either.
+ * to be used for this purpose, it is declared with `@PackageScope` (again in earlier versions)
+ * and thus cannot be accessed from outside the plugin.
+ * The Protobuf Gradle Plugin (at v0.9.2) does not modify the value of the property either.
+ * Therefore, we try getting the path using the newer version API and resort to the "legacy"
+ * convention if the call fails.
  */
 val Project.generatedSourceProtoDir: Path
-    get() = layout.buildDirectory.dir("generated/source/proto").get().asFile.toPath()
+    get() {
+        val legacyPath = layout.buildDirectory.dir("generated/source/proto").get().asFile.toPath()
+        protobufExtension?.let {
+            return try {
+                it.generatedFilesBaseDir.let { Path(it) }
+            } catch (_: Throwable) {
+                // Probably we're running on an older version of the Protobuf Gradle Plugin
+                // which has `package-access` for the `getGeneratedFilesDir()` method.
+                legacyPath
+            }
+        }
+        return legacyPath
+    }
 
 /**
  * Ensures that the sources generated by Protobuf Gradle Plugin