Avoid duplicate sources when publishing

license-report.md

@@ -1,6 +1,6 @@
 
 
-# Dependencies of `io.spine.tools:spine-testutil-time:2.0.0-SNAPSHOT.130`
+# Dependencies of `io.spine.tools:spine-testutil-time:2.0.0-SNAPSHOT.131`
 
 ## Runtime
 1.  **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2.
@@ -780,12 +780,12 @@
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Fri Jun 02 16:56:40 WEST 2023** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Fri Jun 02 18:42:11 WEST 2023** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
 
-# Dependencies of `io.spine:spine-time:2.0.0-SNAPSHOT.130`
+# Dependencies of `io.spine:spine-time:2.0.0-SNAPSHOT.131`
 
 ## Runtime
 1.  **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2.
@@ -1638,12 +1638,12 @@ This report was generated on **Fri Jun 02 16:56:40 WEST 2023** using [Gradle-Lic
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Fri Jun 02 16:56:40 WEST 2023** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Fri Jun 02 18:42:27 WEST 2023** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
 
-# Dependencies of `io.spine:spine-time-js:2.0.0-SNAPSHOT.130`
+# Dependencies of `io.spine:spine-time-js:2.0.0-SNAPSHOT.131`
 
 ## Runtime
 1.  **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2.
@@ -1816,4 +1816,4 @@ This report was generated on **Fri Jun 02 16:56:40 WEST 2023** using [Gradle-Lic
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Fri Jun 02 16:56:40 WEST 2023** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Fri Jun 02 18:42:28 WEST 2023** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).

pom.xml

@@ -10,7 +10,7 @@ all modules and does not describe the project structure per-subproject.
  -->
 <groupId>io.spine</groupId>
 <artifactId>spine-time</artifactId>
-<version>2.0.0-SNAPSHOT.130</version>
+<version>2.0.0-SNAPSHOT.131</version>
 
 <inceptionYear>2015</inceptionYear>
 

time/build.gradle.kts

@@ -28,7 +28,7 @@ import io.spine.internal.dependency.AutoService
 import io.spine.internal.dependency.Spine
 import io.spine.internal.dependency.Validation
 import io.spine.internal.gradle.publish.IncrementGuard
-import io.spine.tools.mc.gradle.modelCompiler
+import org.gradle.jvm.tasks.Jar
 
 plugins {
     protobuf
@@ -70,3 +70,28 @@ protoData {
         "io.spine.validation.ValidationPlugin",
     )
 }
+
+/**
+ * Forcibly remove the code by `protoc` under the `build` directory
+ * until ProtoData can handle it by itself.
+ *
+ * The generated code is transferred by ProtoData into `$projectDir/generated` while it
+ * processes it. But ProtoData does not handle the Gradle model fully yet. That's why we have the
+ * build error because of the duplicated source code files are attempted to be packed
+ * into a source code JAR.
+ *
+ * We should not set the `DuplicatesStrategy.INCLUDE` as we did before, because it will
+ * lead to accidental removal of the generated code added by McJava (and ProtoData) into
+ * the vanilla Protobuf Java sources.
+ *
+ * Therefore, the `Jar` tasks are configured to depend on `removeGeneratedVanillaCode`.
+ */
+val removeGeneratedVanillaCode by tasks.registering(Delete::class) {
+    delete("$buildDir/generated/source/proto")
+}
+
+tasks {
+    withType<Jar>().configureEach {
+        dependsOn(removeGeneratedVanillaCode)
+    }
+}

version.gradle.kts

@@ -29,4 +29,4 @@
  *
  * For dependencies on Spine modules please see [io.spine.internal.dependency.Spine].
  */
-val versionToPublish by extra("2.0.0-SNAPSHOT.130")
+val versionToPublish by extra("2.0.0-SNAPSHOT.131")