From d5ee5b77f56d45e18bde5fe3145398e143e1ac27 Mon Sep 17 00:00:00 2001 From: Yuri Sergiichuk Date: Mon, 14 Dec 2020 10:43:43 +0200 Subject: [PATCH 1/4] Fix the version. Set to `1.7.0`. --- version.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.gradle.kts b/version.gradle.kts index 7dd16cacb5..8c7e932b34 100644 --- a/version.gradle.kts +++ b/version.gradle.kts @@ -40,7 +40,7 @@ /** * The version of this library. */ -val base = "1.17.0" +val base = "1.7.0" project.extra.apply { this["spineVersion"] = base From e58d2834ccea1d0574fc6f009f897230297f5503 Mon Sep 17 00:00:00 2001 From: Yuri Sergiichuk Date: Mon, 14 Dec 2020 10:58:02 +0200 Subject: [PATCH 2/4] Update reports. --- license-report.md | 64 +++++++++++++++++++++++------------------------ pom.xml | 2 +- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/license-report.md b/license-report.md index 1869906656..1c066ae0bb 100644 --- a/license-report.md +++ b/license-report.md @@ -1,6 +1,6 @@ -# Dependencies of `io.spine:spine-base:1.6.16` +# Dependencies of `io.spine:spine-base:1.7.0` ## Runtime 1. **Group:** com.google.code.findbugs **Name:** jsr305 **Version:** 3.0.2 @@ -346,12 +346,12 @@ The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Thu Dec 03 12:15:22 EET 2020** 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 **Mon Dec 14 10:56:52 EET 2020** 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.tools:spine-errorprone-checks:1.6.16` +# Dependencies of `io.spine.tools:spine-errorprone-checks:1.7.0` ## Runtime 1. **Group:** com.github.ben-manes.caffeine **Name:** caffeine **Version:** 2.8.0 @@ -829,12 +829,12 @@ This report was generated on **Thu Dec 03 12:15:22 EET 2020** using [Gradle-Lice The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Thu Dec 03 12:15:22 EET 2020** 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 **Mon Dec 14 10:56:53 EET 2020** 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.tools:spine-javadoc-filter:1.6.16` +# Dependencies of `io.spine.tools:spine-javadoc-filter:1.7.0` ## Runtime 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4 @@ -1234,12 +1234,12 @@ This report was generated on **Thu Dec 03 12:15:22 EET 2020** using [Gradle-Lice The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Thu Dec 03 12:15:23 EET 2020** 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 **Mon Dec 14 10:56:54 EET 2020** 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.tools:spine-javadoc-prettifier:1.6.16` +# Dependencies of `io.spine.tools:spine-javadoc-prettifier:1.7.0` ## Runtime 1. **Group:** com.google.code.findbugs **Name:** jsr305 **Version:** 3.0.2 @@ -1631,12 +1631,12 @@ This report was generated on **Thu Dec 03 12:15:23 EET 2020** using [Gradle-Lice The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Thu Dec 03 12:15:23 EET 2020** 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 **Mon Dec 14 10:56:54 EET 2020** 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.tools:spine-model-compiler:1.6.16` +# Dependencies of `io.spine.tools:spine-model-compiler:1.7.0` ## Runtime 1. **Group:** com.google.code.findbugs **Name:** jsr305 **Version:** 3.0.2 @@ -2044,12 +2044,12 @@ This report was generated on **Thu Dec 03 12:15:23 EET 2020** using [Gradle-Lice The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Thu Dec 03 12:15:24 EET 2020** 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 **Mon Dec 14 10:56:55 EET 2020** 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.tools:spine-mute-logging:1.6.16` +# Dependencies of `io.spine.tools:spine-mute-logging:1.7.0` ## Runtime 1. **Group:** com.google.auto.value **Name:** auto-value-annotations **Version:** 1.7.4 @@ -2446,12 +2446,12 @@ This report was generated on **Thu Dec 03 12:15:24 EET 2020** using [Gradle-Lice The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Thu Dec 03 12:15:24 EET 2020** 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 **Mon Dec 14 10:56:56 EET 2020** 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.tools:spine-plugin-base:1.6.16` +# Dependencies of `io.spine.tools:spine-plugin-base:1.7.0` ## Runtime 1. **Group:** com.google.code.findbugs **Name:** jsr305 **Version:** 3.0.2 @@ -2843,12 +2843,12 @@ This report was generated on **Thu Dec 03 12:15:24 EET 2020** using [Gradle-Lice The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Thu Dec 03 12:15:24 EET 2020** 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 **Mon Dec 14 10:56:57 EET 2020** 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.tools:spine-plugin-testlib:1.6.16` +# Dependencies of `io.spine.tools:spine-plugin-testlib:1.7.0` ## Runtime 1. **Group:** com.google.auto.value **Name:** auto-value-annotations **Version:** 1.7.4 @@ -3295,12 +3295,12 @@ This report was generated on **Thu Dec 03 12:15:24 EET 2020** using [Gradle-Lice The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Thu Dec 03 12:15:25 EET 2020** 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 **Mon Dec 14 10:56:58 EET 2020** 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.tools:spine-proto-dart-plugin:1.6.16` +# Dependencies of `io.spine.tools:spine-proto-dart-plugin:1.7.0` ## Runtime 1. **Group:** com.google.code.findbugs **Name:** jsr305 **Version:** 3.0.2 @@ -3692,12 +3692,12 @@ This report was generated on **Thu Dec 03 12:15:25 EET 2020** using [Gradle-Lice The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Thu Dec 03 12:15:25 EET 2020** 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 **Mon Dec 14 10:56:58 EET 2020** 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.tools:spine-proto-js-plugin:1.6.16` +# Dependencies of `io.spine.tools:spine-proto-js-plugin:1.7.0` ## Runtime 1. **Group:** com.google.code.findbugs **Name:** jsr305 **Version:** 3.0.2 @@ -4089,12 +4089,12 @@ This report was generated on **Thu Dec 03 12:15:25 EET 2020** using [Gradle-Lice The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Thu Dec 03 12:15:25 EET 2020** 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 **Mon Dec 14 10:56:59 EET 2020** 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.tools:spine-protoc-api:1.6.16` +# Dependencies of `io.spine.tools:spine-protoc-api:1.7.0` ## Runtime 1. **Group:** com.google.code.findbugs **Name:** jsr305 **Version:** 3.0.2 @@ -4436,12 +4436,12 @@ This report was generated on **Thu Dec 03 12:15:25 EET 2020** using [Gradle-Lice The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Thu Dec 03 12:15:26 EET 2020** 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 **Mon Dec 14 10:57:00 EET 2020** 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.tools:spine-protoc-plugin:1.6.16` +# Dependencies of `io.spine.tools:spine-protoc-plugin:1.7.0` ## Runtime 1. **Group:** com.google.code.findbugs **Name:** jsr305 **Version:** 3.0.2 @@ -4801,12 +4801,12 @@ This report was generated on **Thu Dec 03 12:15:26 EET 2020** using [Gradle-Lice The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Thu Dec 03 12:15:26 EET 2020** 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 **Mon Dec 14 10:57:00 EET 2020** 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-testlib:1.6.16` +# Dependencies of `io.spine:spine-testlib:1.7.0` ## Runtime 1. **Group:** com.google.auto.value **Name:** auto-value-annotations **Version:** 1.7.4 @@ -5203,12 +5203,12 @@ This report was generated on **Thu Dec 03 12:15:26 EET 2020** using [Gradle-Lice The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Thu Dec 03 12:15:26 EET 2020** 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 **Mon Dec 14 10:57:01 EET 2020** 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.tools:spine-tool-base:1.6.16` +# Dependencies of `io.spine.tools:spine-tool-base:1.7.0` ## Runtime 1. **Group:** com.google.code.findbugs **Name:** jsr305 **Version:** 3.0.2 @@ -5568,12 +5568,12 @@ This report was generated on **Thu Dec 03 12:15:26 EET 2020** using [Gradle-Lice The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Thu Dec 03 12:15:27 EET 2020** 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 **Mon Dec 14 10:57:02 EET 2020** 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.tools:spine-tools-api:1.6.16` +# Dependencies of `io.spine.tools:spine-tools-api:1.7.0` ## Runtime 1. **Group:** com.google.code.findbugs **Name:** jsr305 **Version:** 3.0.2 @@ -5915,12 +5915,12 @@ This report was generated on **Thu Dec 03 12:15:27 EET 2020** using [Gradle-Lice The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Thu Dec 03 12:15:27 EET 2020** 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 **Mon Dec 14 10:57:02 EET 2020** 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.tools:spine-validation-generator:1.6.16` +# Dependencies of `io.spine.tools:spine-validation-generator:1.7.0` ## Runtime 1. **Group:** com.google.code.findbugs **Name:** jsr305 **Version:** 3.0.2 @@ -6280,4 +6280,4 @@ This report was generated on **Thu Dec 03 12:15:27 EET 2020** using [Gradle-Lice The dependencies distributed under several licenses, are used according their commercial-use-friendly license. -This report was generated on **Thu Dec 03 12:15:27 EET 2020** 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). \ No newline at end of file +This report was generated on **Mon Dec 14 10:57:03 EET 2020** 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). \ No newline at end of file diff --git a/pom.xml b/pom.xml index ac964a6ef0..bc2a128cb5 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ all modules and does not describe the project structure per-subproject. io.spine spine-base -1.6.16 +1.7.0 2015 From 459ca16b9edd3f3395391ac2d8d538360591bcfb Mon Sep 17 00:00:00 2001 From: Yuri Sergiichuk Date: Mon, 14 Dec 2020 11:12:50 +0200 Subject: [PATCH 3/4] Cleanup links and readmes. --- base-validating-builders/README.md | 4 ++-- tools/model-compiler/README.md | 5 ++--- tools/protoc-plugin/README.md | 10 +--------- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/base-validating-builders/README.md b/base-validating-builders/README.md index d32fdb14fd..554a41fcb9 100644 --- a/base-validating-builders/README.md +++ b/base-validating-builders/README.md @@ -18,6 +18,6 @@ the JAR archive rebuild the same way. ## References -See [`base-validating-builders/build.gradle`](./build.gradle) for the builders assembly. +See [`base-validating-builders/build.gradle`](./build.gradle.kts) for the builders assembly. -See [`base/build.gradle`](../base/build.gradle) for the builders usage. +See [`base/build.gradle`](../base/build.gradle.kts) for the builders usage. diff --git a/tools/model-compiler/README.md b/tools/model-compiler/README.md index 89eaa55f5d..f2fc1ba148 100644 --- a/tools/model-compiler/README.md +++ b/tools/model-compiler/README.md @@ -11,9 +11,8 @@ These features include: * [Annotating](src/main/java/io/spine/tools/compiler/annotation) Java files generated from the Protobuf definitions. -* [Generating](src/main/java/io/spine/tools/compiler/rejection) Rejections from the `proto` +* [Generating](src/main/java/io/spine/tools/compiler/gen/rejection) Rejections from the `proto` messages. -* Various [validation tools](src/main/java/io/spine/tools/compiler/validation). ## Usage @@ -28,7 +27,7 @@ apply plugin: "com.google.protobuf" All operations performed by the Spine Model Compiler plugin are automatically injected in the `.proto` compilation process performed by the Protobuf plugin. -The required version of the Protobuf Gradle plugin is `0.8.3` or higher. +The required version of the Protobuf Gradle plugin is `0.8.13` or higher. ## Settings diff --git a/tools/protoc-plugin/README.md b/tools/protoc-plugin/README.md index 128b5a9cc3..a2fe8874e6 100644 --- a/tools/protoc-plugin/README.md +++ b/tools/protoc-plugin/README.md @@ -109,19 +109,11 @@ artifact, which is equal to the version of the Spine Gradle plugin used. #### Assembling -The plugin consists of two artifacts: - - a shell runner; - - the executable JAR with the actual `protoc` plugin. +The plugin is a self-executable JAR with the `protoc` plugin. Both the plugins are published alongside with the Spine Gradle plugin. To update the `protoc` plugin, the user should update the Gradle plugin. -The shell runner artifact is OS-sensitive, thus when building on different systems -different artifacts (for [Windows](./plugin_runner.bat) or [Unix-like](./plugin_runner.sh)) are -used. This switch is performed automatically. - -The JAR artifact is the same no matter which shell runner is used. - The JAR contains a simple Java program, which reads from stdin and writes into stdout according to the [Protobuf compiler contract](https://developers.google.com/protocol-buffers/docs/reference/other#plugins). From f215de8b26e61b3f04303b13a0cf319f4dd4e0f6 Mon Sep 17 00:00:00 2001 From: Yuri Sergiichuk Date: Mon, 14 Dec 2020 11:13:23 +0200 Subject: [PATCH 4/4] Add missing EOL. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6a75412da2..ed07b7bbc6 100644 --- a/README.md +++ b/README.md @@ -55,4 +55,4 @@ It is always recommended running `./pull` instead of `./config/pull`. [codecov]: https://codecov.io/gh/SpineEventEngine/base [codecov-badge]: https://codecov.io/gh/SpineEventEngine/base/branch/master/graph/badge.svg [license-badge]: https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat -[license]: http://www.apache.org/licenses/LICENSE-2.0 \ No newline at end of file +[license]: http://www.apache.org/licenses/LICENSE-2.0