Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 30 additions & 30 deletions license-report.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@


# Dependencies of `io.spine:spine-base:1.5.4`
# Dependencies of `io.spine:spine-base:1.5.5`

## Runtime
1. **Group:** com.google.code.findbugs **Name:** jsr305 **Version:** 3.0.2
Expand Down Expand Up @@ -330,12 +330,12 @@
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.


This report was generated on **Mon Apr 06 12:01:12 EEST 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 **Wed Apr 08 17:20:53 EEST 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.5.4`
# Dependencies of `io.spine.tools:spine-errorprone-checks:1.5.5`

## Runtime
1. **Group:** com.github.ben-manes.caffeine **Name:** caffeine **Version:** 2.7.0
Expand Down Expand Up @@ -777,12 +777,12 @@ This report was generated on **Mon Apr 06 12:01:12 EEST 2020** using [Gradle-Lic
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.


This report was generated on **Mon Apr 06 12:01:13 EEST 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 **Wed Apr 08 17:20:54 EEST 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.5.4`
# Dependencies of `io.spine.tools:spine-javadoc-filter:1.5.5`

## Runtime
1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
Expand Down Expand Up @@ -1170,12 +1170,12 @@ This report was generated on **Mon Apr 06 12:01:13 EEST 2020** using [Gradle-Lic
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.


This report was generated on **Mon Apr 06 12:01:14 EEST 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 **Wed Apr 08 17:20:55 EEST 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.5.4`
# Dependencies of `io.spine.tools:spine-javadoc-prettifier:1.5.5`

## Runtime
1. **Group:** com.google.code.findbugs **Name:** jsr305 **Version:** 3.0.2
Expand Down Expand Up @@ -1537,12 +1537,12 @@ This report was generated on **Mon Apr 06 12:01:14 EEST 2020** using [Gradle-Lic
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.


This report was generated on **Mon Apr 06 12:01:14 EEST 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 **Wed Apr 08 17:20:55 EEST 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.5.4`
# Dependencies of `io.spine.tools:spine-model-compiler:1.5.5`

## Runtime
1. **Group:** com.google.code.findbugs **Name:** jsr305 **Version:** 3.0.2
Expand Down Expand Up @@ -1920,12 +1920,12 @@ This report was generated on **Mon Apr 06 12:01:14 EEST 2020** using [Gradle-Lic
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.


This report was generated on **Mon Apr 06 12:01:15 EEST 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 **Wed Apr 08 17:20:56 EEST 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.5.4`
# Dependencies of `io.spine.tools:spine-mute-logging:1.5.5`

## Runtime
1. **Group:** com.google.auto.value **Name:** auto-value-annotations **Version:** 1.6.3
Expand Down Expand Up @@ -2305,12 +2305,12 @@ This report was generated on **Mon Apr 06 12:01:15 EEST 2020** using [Gradle-Lic
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.


This report was generated on **Mon Apr 06 12:01:15 EEST 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 **Wed Apr 08 17:20:57 EEST 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.5.4`
# Dependencies of `io.spine.tools:spine-plugin-base:1.5.5`

## Runtime
1. **Group:** com.google.code.findbugs **Name:** jsr305 **Version:** 3.0.2
Expand Down Expand Up @@ -2672,12 +2672,12 @@ This report was generated on **Mon Apr 06 12:01:15 EEST 2020** using [Gradle-Lic
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.


This report was generated on **Mon Apr 06 12:01:16 EEST 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 **Wed Apr 08 17:20:58 EEST 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.5.4`
# Dependencies of `io.spine.tools:spine-plugin-testlib:1.5.5`

## Runtime
1. **Group:** com.google.auto.value **Name:** auto-value-annotations **Version:** 1.6.3
Expand Down Expand Up @@ -3097,12 +3097,12 @@ This report was generated on **Mon Apr 06 12:01:16 EEST 2020** using [Gradle-Lic
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.


This report was generated on **Mon Apr 06 12:01:16 EEST 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 **Wed Apr 08 17:20:58 EEST 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.5.4`
# Dependencies of `io.spine.tools:spine-proto-dart-plugin:1.5.5`

## Runtime
1. **Group:** com.google.code.findbugs **Name:** jsr305 **Version:** 3.0.2
Expand Down Expand Up @@ -3464,12 +3464,12 @@ This report was generated on **Mon Apr 06 12:01:16 EEST 2020** using [Gradle-Lic
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.


This report was generated on **Mon Apr 06 12:01:17 EEST 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 **Wed Apr 08 17:20:59 EEST 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.5.4`
# Dependencies of `io.spine.tools:spine-proto-js-plugin:1.5.5`

## Runtime
1. **Group:** com.google.code.findbugs **Name:** jsr305 **Version:** 3.0.2
Expand Down Expand Up @@ -3831,12 +3831,12 @@ This report was generated on **Mon Apr 06 12:01:17 EEST 2020** using [Gradle-Lic
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.


This report was generated on **Mon Apr 06 12:01:17 EEST 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 **Wed Apr 08 17:21:00 EEST 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.5.4`
# Dependencies of `io.spine.tools:spine-protoc-api:1.5.5`

## Runtime
1. **Group:** com.google.code.findbugs **Name:** jsr305 **Version:** 3.0.2
Expand Down Expand Up @@ -4158,12 +4158,12 @@ This report was generated on **Mon Apr 06 12:01:17 EEST 2020** using [Gradle-Lic
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.


This report was generated on **Mon Apr 06 12:01:18 EEST 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 **Wed Apr 08 17:21:00 EEST 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.5.4`
# Dependencies of `io.spine.tools:spine-protoc-plugin:1.5.5`

## Runtime
1. **Group:** com.google.code.findbugs **Name:** jsr305 **Version:** 3.0.2
Expand Down Expand Up @@ -4493,12 +4493,12 @@ This report was generated on **Mon Apr 06 12:01:18 EEST 2020** using [Gradle-Lic
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.


This report was generated on **Mon Apr 06 12:01:18 EEST 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 **Wed Apr 08 17:21:01 EEST 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.5.4`
# Dependencies of `io.spine:spine-testlib:1.5.5`

## Runtime
1. **Group:** com.google.auto.value **Name:** auto-value-annotations **Version:** 1.6.3
Expand Down Expand Up @@ -4878,12 +4878,12 @@ This report was generated on **Mon Apr 06 12:01:18 EEST 2020** using [Gradle-Lic
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.


This report was generated on **Mon Apr 06 12:01:18 EEST 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 **Wed Apr 08 17:21:01 EEST 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.5.4`
# Dependencies of `io.spine.tools:spine-tool-base:1.5.5`

## Runtime
1. **Group:** com.google.code.findbugs **Name:** jsr305 **Version:** 3.0.2
Expand Down Expand Up @@ -5213,12 +5213,12 @@ This report was generated on **Mon Apr 06 12:01:18 EEST 2020** using [Gradle-Lic
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.


This report was generated on **Mon Apr 06 12:01:19 EEST 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 **Wed Apr 08 17:21:02 EEST 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.5.4`
# Dependencies of `io.spine.tools:spine-validation-generator:1.5.5`

## Runtime
1. **Group:** com.google.code.findbugs **Name:** jsr305 **Version:** 3.0.2
Expand Down Expand Up @@ -5548,4 +5548,4 @@ This report was generated on **Mon Apr 06 12:01:19 EEST 2020** using [Gradle-Lic
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.


This report was generated on **Mon Apr 06 12:01:19 EEST 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 **Wed Apr 08 17:21:02 EEST 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).
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ all modules and does not describe the project structure per-subproject.

<groupId>io.spine</groupId>
<artifactId>spine-base</artifactId>
<version>1.5.4</version>
<version>1.5.5</version>

<inceptionYear>2015</inceptionYear>

Expand Down Expand Up @@ -154,7 +154,7 @@ all modules and does not describe the project structure per-subproject.
<dependency>
<groupId>io.spine.tools</groupId>
<artifactId>spine-protoc-plugin</artifactId>
<version>1.5.4</version>
<version>1.5.5</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

package io.spine.js.generate.resolve;
package io.spine.tools.code.structure;

import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Joiner;
import io.spine.code.fs.js.DirectoryReference;
import io.spine.code.fs.js.FileReference;
import io.spine.code.fs.DirectoryReference;
import io.spine.code.fs.FileReference;

import java.util.List;
import java.util.Objects;
Expand Down Expand Up @@ -62,7 +62,6 @@ private DirectoryPattern(DirectoryReference directory, boolean includeNested) {
* the value of the pattern
* @return a new instance
*/
@SuppressWarnings("ResultOfMethodCallIgnored" /* The result can be ignored. */)
public static DirectoryPattern of(String value) {
checkNotEmptyOrBlank(value);
boolean includeNested = value.endsWith(INCLUDE_NESTED_PATTERN_ENDING);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

package io.spine.js.generate.resolve;
package io.spine.tools.code.structure;

import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import io.spine.code.fs.js.DirectoryReference;
import io.spine.code.fs.js.FileReference;
import io.spine.code.fs.DirectoryReference;
import io.spine.code.fs.FileReference;

import java.util.Collection;
import java.util.Objects;
Expand All @@ -34,9 +35,9 @@
import static io.spine.util.Preconditions2.checkNotEmptyOrBlank;

/**
* An external JavaScript module used in a project.
* An external library module used in a project.
*
* <p>External means that it is provided by an artifact repository like NPM.
* <p>An external module is typically provided by a package manager, such as NPM or Pub.
*/
public final class ExternalModule {

Expand Down Expand Up @@ -65,7 +66,7 @@ public ExternalModule(String name, Collection<DirectoryPattern> directories) {
* @throws IllegalStateException
* if the file is not provided by the module
*/
FileReference fileInModule(FileReference fileReference) {
public FileReference fileInModule(FileReference fileReference) {
Optional<DirectoryPattern> matchingDirectory = matchingDirectory(fileReference);
checkState(matchingDirectory.isPresent());
DirectoryReference directory = matchingDirectory.get()
Expand All @@ -83,11 +84,18 @@ FileReference fileInModule(FileReference fileReference) {
* the file to check
* @return {@code true} if the module provides the file
*/
boolean provides(FileReference fileReference) {
public boolean provides(FileReference fileReference) {
boolean result = matchingDirectory(fileReference).isPresent();
return result;
}

/**
* Obtains the name of the module.
*/
public String name() {
return name;
}

private Optional<DirectoryPattern> matchingDirectory(FileReference fileReference) {
DirectoryReference directory = fileReference.directory();
for (DirectoryPattern pattern : directories) {
Expand Down Expand Up @@ -133,6 +141,13 @@ public static ExternalModule spineUsers() {
return new ExternalModule("spine-users", directories);
}

/**
* All the modules in {@link #spineWeb()} and {@link #spineUsers()}.
*/
public static ImmutableList<ExternalModule> predefinedModules() {
return ImmutableList.of(spineWeb(), spineUsers());
}

@Override
public boolean equals(Object o) {
if (this == o) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
*/

/**
* The classes which resolve imports in generated code.
* Classes which work with source code directory structure.
*/
@CheckReturnValue
@ParametersAreNonnullByDefault
package io.spine.js.generate.resolve;
package io.spine.tools.code.structure;

import javax.annotation.CheckReturnValue;
import javax.annotation.ParametersAreNonnullByDefault;
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ private void dependTask(Task task, Project project) {
}
if (followingTask != null) {
TaskContainer existingTasks = project.getTasks();
existingTasks.getByPath(followingTask.name())
existingTasks.getByName(followingTask.name())
.dependsOn(task);
}
if (previousTaskOfAllProjects != null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,10 @@ public enum ProtoDartTaskName implements TaskName {
*
* <p>Works only with the {@code test} scope files.
*/
copyTestGeneratedDart
copyTestGeneratedDart,

/**
* Rewrites the Dart source files generated from Protobuf with the resolved absolute imports.
*/
resolveImports
}
Loading