Merge pull request #86 from SpineEventEngine/release-1.8.2

armiol · web-flow · commit 10b61545de6c · 2022-06-29T14:29:06.000+03:00
Release 1.8.2
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -0,0 +1,45 @@
+name: Build under Ubuntu
+
+on:
+  pull_request:
+    branches:
+      - master
+      - 1.x-dev
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: 'true'
+
+      - uses: actions/setup-java@v3
+        with:
+          java-version: 8
+          distribution: zulu
+
+      - name: Update APT
+        shell: bash
+        run: chmod +x ./config/scripts/update-apt.sh
+          && ./config/scripts/update-apt.sh
+
+      - name: Install Dart
+        shell: bash
+        run: sudo apt-get install dart
+
+      - name: Activate `protoc-plugin`
+        shell: bash
+        run: dart pub global activate protoc_plugin
+
+      - name: Activate `dart_code_gen`
+        shell: bash
+        run: dart pub global activate dart_code_gen
+
+      - name: Run Gradle build
+        shell: bash
+        run: ./gradlew build
+
+
+
diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
@@ -4,28 +4,28 @@ on:
   pull_request:
     branches:
       - master
+      - 1.x-dev
 
 jobs:
   build:
 
     runs-on: windows-latest
 
     steps:
-      - uses: actions/checkout@v1
-
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
         with:
-          java-version: 1.8
+          submodules: 'true'
 
-      - name: Pull config
-        run: git submodule update --init --recursive
+      - uses: actions/setup-java@v3
+        with:
+          java-version: 8
+          distribution: zulu
 
       - name: Run tests with Gradle
         shell: cmd
         run: >
           choco install dart-sdk --limitoutput
           && refreshenv
-          && pub global activate protoc_plugin
-          && pub global activate dart_code_gen
+          && dart pub global activate protoc_plugin
+          && dart pub global activate dart_code_gen
           && gradlew.bat build
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 #
-# Copyright 2021, TeamDev. All rights reserved.
+# Copyright 2022, TeamDev. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ In order to apply the plugin to a Gradle project, in `build.gralde` add the foll
 
 ```gradle
 plugins {
-    id("io.spine.tools.gradle.bootstrap").version("1.8.0")
+    id("io.spine.tools.gradle.bootstrap").version("1.8.2")
 }
 ```
 
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildSrc/src/main/kotlin/bootstrap-plugin.gradle.kts b/buildSrc/src/main/kotlin/bootstrap-plugin.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/internal/CheckVersionIncrement.kt b/buildSrc/src/main/kotlin/io/spine/gradle/internal/CheckVersionIncrement.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/internal/IncrementGuard.kt b/buildSrc/src/main/kotlin/io/spine/gradle/internal/IncrementGuard.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/internal/RunBuild.kt b/buildSrc/src/main/kotlin/io/spine/gradle/internal/RunBuild.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildSrc/src/main/kotlin/io/spine/gradle/internal/deps.kt b/buildSrc/src/main/kotlin/io/spine/gradle/internal/deps.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildSrc/src/main/kotlin/prepare-config-resources.gradle.kts b/buildSrc/src/main/kotlin/prepare-config-resources.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2021, TeamDev. All rights reserved.
+# Copyright 2022, TeamDev. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/license-report.md b/license-report.md
@@ -1,6 +1,6 @@
 
     
-# Dependencies of `io.spine.tools:spine-plugin:1.8.0`
+# Dependencies of `io.spine.tools:spine-plugin:1.8.2`
 
 ## Runtime
 1. **Group:** com.google.code.findbugs **Name:** jsr305 **Version:** 3.0.2
@@ -335,4 +335,4 @@
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Dec 20 16:24:49 EET 2021** 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 Jun 27 17:38:50 EEST 2022** 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).
diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin/src/main/java/io/spine/tools/gradle/bootstrap/BootstrapPlugin.java b/plugin/src/main/java/io/spine/tools/gradle/bootstrap/BootstrapPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin/src/main/java/io/spine/tools/gradle/bootstrap/CodeGenExtension.java b/plugin/src/main/java/io/spine/tools/gradle/bootstrap/CodeGenExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin/src/main/java/io/spine/tools/gradle/bootstrap/DartExtension.java b/plugin/src/main/java/io/spine/tools/gradle/bootstrap/DartExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin/src/main/java/io/spine/tools/gradle/bootstrap/DartTaskName.java b/plugin/src/main/java/io/spine/tools/gradle/bootstrap/DartTaskName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin/src/main/java/io/spine/tools/gradle/bootstrap/Extension.java b/plugin/src/main/java/io/spine/tools/gradle/bootstrap/Extension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin/src/main/java/io/spine/tools/gradle/bootstrap/JavaCodegenExtension.java b/plugin/src/main/java/io/spine/tools/gradle/bootstrap/JavaCodegenExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin/src/main/java/io/spine/tools/gradle/bootstrap/JavaExtension.java b/plugin/src/main/java/io/spine/tools/gradle/bootstrap/JavaExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin/src/main/java/io/spine/tools/gradle/bootstrap/JavaScriptExtension.java b/plugin/src/main/java/io/spine/tools/gradle/bootstrap/JavaScriptExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin/src/main/java/io/spine/tools/gradle/bootstrap/ModelExtension.java b/plugin/src/main/java/io/spine/tools/gradle/bootstrap/ModelExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin/src/main/java/io/spine/tools/gradle/bootstrap/SpineBasedProject.java b/plugin/src/main/java/io/spine/tools/gradle/bootstrap/SpineBasedProject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin/src/main/java/io/spine/tools/gradle/bootstrap/SpinePluginScripts.java b/plugin/src/main/java/io/spine/tools/gradle/bootstrap/SpinePluginScripts.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin/src/main/java/io/spine/tools/gradle/bootstrap/SpinePluginTarget.java b/plugin/src/main/java/io/spine/tools/gradle/bootstrap/SpinePluginTarget.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin/src/main/java/io/spine/tools/gradle/bootstrap/package-info.java b/plugin/src/main/java/io/spine/tools/gradle/bootstrap/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin/src/main/java/io/spine/tools/gradle/config/ArtifactSnapshot.java b/plugin/src/main/java/io/spine/tools/gradle/config/ArtifactSnapshot.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin/src/main/java/io/spine/tools/gradle/config/SpineDependency.java b/plugin/src/main/java/io/spine/tools/gradle/config/SpineDependency.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin/src/main/java/io/spine/tools/gradle/config/package-info.java b/plugin/src/main/java/io/spine/tools/gradle/config/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin/src/main/java/io/spine/tools/gradle/protoc/ProtobufGenerator.java b/plugin/src/main/java/io/spine/tools/gradle/protoc/ProtobufGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin/src/main/java/io/spine/tools/gradle/protoc/ProtocPlugin.java b/plugin/src/main/java/io/spine/tools/gradle/protoc/ProtocPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin/src/main/java/io/spine/tools/gradle/protoc/package-info.java b/plugin/src/main/java/io/spine/tools/gradle/protoc/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin/src/test/build.gradle.template b/plugin/src/test/build.gradle.template
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin/src/test/java/io/spine/tools/gradle/bootstrap/BootstrapPluginTest.java b/plugin/src/test/java/io/spine/tools/gradle/bootstrap/BootstrapPluginTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin/src/test/java/io/spine/tools/gradle/bootstrap/ExtensionTest.java b/plugin/src/test/java/io/spine/tools/gradle/bootstrap/ExtensionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin/src/test/java/io/spine/tools/gradle/bootstrap/func/SpineBootstrapPluginTest.java b/plugin/src/test/java/io/spine/tools/gradle/bootstrap/func/SpineBootstrapPluginTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin/src/test/java/io/spine/tools/gradle/bootstrap/func/package-info.java b/plugin/src/test/java/io/spine/tools/gradle/bootstrap/func/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin/src/test/java/io/spine/tools/gradle/bootstrap/given/FakeArtifacts.java b/plugin/src/test/java/io/spine/tools/gradle/bootstrap/given/FakeArtifacts.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin/src/test/java/io/spine/tools/gradle/bootstrap/given/package-info.java b/plugin/src/test/java/io/spine/tools/gradle/bootstrap/given/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin/src/test/java/io/spine/tools/gradle/protoc/ProtocPluginTest.java b/plugin/src/test/java/io/spine/tools/gradle/protoc/ProtocPluginTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin/src/test/java/io/spine/tools/gradle/protoc/given/TestPluginOptionsContainer.java b/plugin/src/test/java/io/spine/tools/gradle/protoc/given/TestPluginOptionsContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin/src/test/java/io/spine/tools/gradle/protoc/given/package-info.java b/plugin/src/test/java/io/spine/tools/gradle/protoc/given/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin/src/test/resources/func-test/src/main/proto/client.proto b/plugin/src/test/resources/func-test/src/main/proto/client.proto
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021, TeamDev. All rights reserved.
+ * Copyright 2022, TeamDev. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugin/src/test/resources/func-test/src/main/proto/restaurant.proto b/plugin/src/test/resources/func-test/src/main/proto/restaurant.proto
diff --git a/plugin/src/test/resources/func-test/src/main/proto/restaurant_rejections.proto b/plugin/src/test/resources/func-test/src/main/proto/restaurant_rejections.proto
diff --git a/plugin/src/test/resources/func-test/src/main/proto/roller_coaster.proto b/plugin/src/test/resources/func-test/src/main/proto/roller_coaster.proto
diff --git a/plugin/src/test/resources/func-test/src/main/proto/server.proto b/plugin/src/test/resources/func-test/src/main/proto/server.proto
diff --git a/pom.xml b/pom.xml
diff --git a/settings.gradle.kts b/settings.gradle.kts
diff --git a/version.gradle.kts b/version.gradle.kts

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#`
`2`		`-# Copyright 2021, TeamDev. All rights reserved.`
	`2`	`+# Copyright 2022, TeamDev. All rights reserved.`
`3`	`3`	`#`
`4`	`4`	`# Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`# you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2021, TeamDev. All rights reserved.`
	`2`	`+ * Copyright 2022, TeamDev. All rights reserved.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`