Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve dependencies management #1340

Merged
merged 7 commits into from Dec 3, 2020
Merged

Improve dependencies management #1340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ba9cbfe
Update config.
yuri-sergiichuk Dec 3, 2020
51d2cb8
Cleanup code.
yuri-sergiichuk Dec 3, 2020
14fc983
Use new dependency scope and cleanup dependencies.
yuri-sergiichuk Dec 3, 2020
7d6a43f
Merge branch 'master' into improve-dependencies-management
yuri-sergiichuk Dec 3, 2020
0939bea
Bump versions.
yuri-sergiichuk Dec 3, 2020
aacf470
Update reports.
yuri-sergiichuk Dec 3, 2020
85f7ef4
Manually align function.
yuri-sergiichuk Dec 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
47 changes: 25 additions & 22 deletions build.gradle.kts
View file
Open in desktop
Expand Up @@ -43,15 +43,15 @@ buildscript {
configurations.all {
resolutionStrategy {
force(
"io.spine:spine-base:$spineBaseVersion",
"io.spine:spine-time:$spineTimeVersion"
"io.spine:spine-base:$spineBaseVersion",
"io.spine:spine-time:$spineTimeVersion"
)
}
}
}

plugins {
java
`java-library`
idea
@Suppress("RemoveRedundantQualifierName") // Cannot use imports here.
id("com.google.protobuf").version(io.spine.gradle.internal.Deps.versions.protobufPlugin)
Expand All @@ -64,14 +64,14 @@ val spineBaseVersion: String by extra
val spineTimeVersion: String by extra

extra["projectsToPublish"] = listOf(
"core",
"client",
"server",
"testutil-core",
"testutil-client",
"testutil-server",
"model-assembler",
"model-verifier"
"core",
"client",
"server",
"testutil-core",
"testutil-client",
"testutil-server",
"model-assembler",
"model-verifier"
)
extra["credentialsPropertyFile"] = PublishingRepos.cloudRepo.credentials

Expand All @@ -89,7 +89,7 @@ allprojects {
}

subprojects {

apply {
plugin("java-library")
plugin("com.google.protobuf")
Expand Down Expand Up @@ -128,13 +128,14 @@ subprojects {
errorproneJavac(Deps.build.errorProneJavac)

implementation(Deps.build.guava)
implementation(Deps.build.jsr305Annotations)
implementation(Deps.build.checkerAnnotations)
Deps.build.errorProneAnnotations.forEach { implementation(it) }
compileOnlyApi(Deps.build.jsr305Annotations)
compileOnlyApi(Deps.build.checkerAnnotations)
Deps.build.errorProneAnnotations.forEach { compileOnlyApi(it) }

testImplementation(Deps.test.guavaTestlib)
Deps.test.junit5Api.forEach { testImplementation(it) }
testImplementation(Deps.test.junit5Runner)
Deps.test.truth.forEach { testImplementation(it) }
testRuntimeOnly(Deps.test.junit5Runner)
testImplementation("io.spine.tools:spine-mute-logging:$spineBaseVersion")
}

Expand All @@ -143,8 +144,8 @@ subprojects {
all {
resolutionStrategy {
force(
"io.spine:spine-base:$spineBaseVersion",
"io.spine:spine-time:$spineTimeVersion"
"io.spine:spine-base:$spineBaseVersion",
"io.spine:spine-time:$spineTimeVersion"
)
}
}
Expand Down Expand Up @@ -204,14 +205,16 @@ subprojects {

idea {
module {
generatedSourceDirs.addAll(files(
generatedSourceDirs.addAll(
files(
generatedJavaDir,
generatedGrpcDir,
generatedSpineDir,
generatedTestJavaDir,
generatedTestGrpcDir,
generatedTestSpineDir
))
)
)

testSourceDirs.add(file(generatedTestJavaDir))

Expand All @@ -230,8 +233,8 @@ subprojects {
* @return `true` is the project Javadoc should be published, `false` otherwise
*/
fun shouldPublishJavadoc() =
!project.name.startsWith("testutil") &&
!project.name.startsWith("model")
!project.name.startsWith("testutil") &&
!project.name.startsWith("model")

// Apply the Javadoc publishing plugin.
// This plugin *must* be applied here, not in the module `build.gradle` files.
Expand Down
64 changes: 16 additions & 48 deletions license-report.md
View file
Open in desktop
@@ -1,6 +1,6 @@


# Dependencies of `io.spine:spine-client:1.6.17`
# Dependencies of `io.spine:spine-client:1.6.18`

## Runtime
1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
Expand All @@ -21,9 +21,6 @@
1. **Group:** com.google.errorprone **Name:** error_prone_annotations **Version:** 2.4.0
* **POM License: Apache 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)

1. **Group:** com.google.errorprone **Name:** error_prone_type_annotations **Version:** 2.4.0
* **POM License: Apache 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)

1. **Group:** com.google.flogger **Name:** flogger **Version:** 0.5.1
* **POM Project URL:** [https://github.com/google/flogger](https://github.com/google/flogger)
* **POM License: Apache 2.0** - [https://www.apache.org/licenses/LICENSE-2.0.txt](https://www.apache.org/licenses/LICENSE-2.0.txt)
Expand Down Expand Up @@ -402,12 +399,12 @@
The dependencies distributed under several licenses, are used according their commercial-use-friendly license.


This report was generated on **Thu Dec 03 13:20:21 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 **Thu Dec 03 17:11:38 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-core:1.6.17`
# Dependencies of `io.spine:spine-core:1.6.18`

## Runtime
1. **Group:** com.google.code.findbugs **Name:** jsr305 **Version:** 3.0.2
Expand All @@ -420,9 +417,6 @@ This report was generated on **Thu Dec 03 13:20:21 EET 2020** using [Gradle-Lice
1. **Group:** com.google.errorprone **Name:** error_prone_annotations **Version:** 2.4.0
* **POM License: Apache 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)

1. **Group:** com.google.errorprone **Name:** error_prone_type_annotations **Version:** 2.4.0
* **POM License: Apache 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)

1. **Group:** com.google.flogger **Name:** flogger **Version:** 0.5.1
* **POM Project URL:** [https://github.com/google/flogger](https://github.com/google/flogger)
* **POM License: Apache 2.0** - [https://www.apache.org/licenses/LICENSE-2.0.txt](https://www.apache.org/licenses/LICENSE-2.0.txt)
Expand Down Expand Up @@ -769,12 +763,12 @@ This report was generated on **Thu Dec 03 13:20:21 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 13:20: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 **Thu Dec 03 17:11:48 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-assembler:1.6.17`
# Dependencies of `io.spine.tools:spine-model-assembler:1.6.18`

## Runtime
1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
Expand All @@ -795,9 +789,6 @@ This report was generated on **Thu Dec 03 13:20:26 EET 2020** using [Gradle-Lice
1. **Group:** com.google.errorprone **Name:** error_prone_annotations **Version:** 2.4.0
* **POM License: Apache 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)

1. **Group:** com.google.errorprone **Name:** error_prone_type_annotations **Version:** 2.4.0
* **POM License: Apache 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)

1. **Group:** com.google.flogger **Name:** flogger **Version:** 0.5.1
* **POM Project URL:** [https://github.com/google/flogger](https://github.com/google/flogger)
* **POM License: Apache 2.0** - [https://www.apache.org/licenses/LICENSE-2.0.txt](https://www.apache.org/licenses/LICENSE-2.0.txt)
Expand Down Expand Up @@ -1171,12 +1162,12 @@ This report was generated on **Thu Dec 03 13:20: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 13:20: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 **Thu Dec 03 17:11:51 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-verifier:1.6.17`
# Dependencies of `io.spine.tools:spine-model-verifier:1.6.18`

## Runtime
1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
Expand All @@ -1197,9 +1188,6 @@ This report was generated on **Thu Dec 03 13:20:27 EET 2020** using [Gradle-Lice
1. **Group:** com.google.errorprone **Name:** error_prone_annotations **Version:** 2.4.0
* **POM License: Apache 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)

1. **Group:** com.google.errorprone **Name:** error_prone_type_annotations **Version:** 2.4.0
* **POM License: Apache 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)

1. **Group:** com.google.flogger **Name:** flogger **Version:** 0.5.1
* **POM Project URL:** [https://github.com/google/flogger](https://github.com/google/flogger)
* **POM License: Apache 2.0** - [https://www.apache.org/licenses/LICENSE-2.0.txt](https://www.apache.org/licenses/LICENSE-2.0.txt)
Expand Down Expand Up @@ -1639,12 +1627,12 @@ This report was generated on **Thu Dec 03 13:20: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 13:20:30 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 **Thu Dec 03 17:11: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:spine-server:1.6.17`
# Dependencies of `io.spine:spine-server:1.6.18`

## Runtime
1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
Expand All @@ -1665,9 +1653,6 @@ This report was generated on **Thu Dec 03 13:20:30 EET 2020** using [Gradle-Lice
1. **Group:** com.google.errorprone **Name:** error_prone_annotations **Version:** 2.4.0
* **POM License: Apache 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)

1. **Group:** com.google.errorprone **Name:** error_prone_type_annotations **Version:** 2.4.0
* **POM License: Apache 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)

1. **Group:** com.google.flogger **Name:** flogger **Version:** 0.5.1
* **POM Project URL:** [https://github.com/google/flogger](https://github.com/google/flogger)
* **POM License: Apache 2.0** - [https://www.apache.org/licenses/LICENSE-2.0.txt](https://www.apache.org/licenses/LICENSE-2.0.txt)
Expand Down Expand Up @@ -2054,12 +2039,12 @@ This report was generated on **Thu Dec 03 13:20:30 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 13:20:43 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 **Thu Dec 03 17:12:29 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-testutil-client:1.6.17`
# Dependencies of `io.spine:spine-testutil-client:1.6.18`

## Runtime
1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
Expand All @@ -2084,9 +2069,6 @@ This report was generated on **Thu Dec 03 13:20:43 EET 2020** using [Gradle-Lice
1. **Group:** com.google.errorprone **Name:** error_prone_annotations **Version:** 2.4.0
* **POM License: Apache 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)

1. **Group:** com.google.errorprone **Name:** error_prone_type_annotations **Version:** 2.4.0
* **POM License: Apache 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)

1. **Group:** com.google.flogger **Name:** flogger **Version:** 0.5.1
* **POM Project URL:** [https://github.com/google/flogger](https://github.com/google/flogger)
* **POM License: Apache 2.0** - [https://www.apache.org/licenses/LICENSE-2.0.txt](https://www.apache.org/licenses/LICENSE-2.0.txt)
Expand Down Expand Up @@ -2511,12 +2493,12 @@ This report was generated on **Thu Dec 03 13:20:43 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 13:20:44 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 **Thu Dec 03 17:12:34 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-testutil-core:1.6.17`
# Dependencies of `io.spine:spine-testutil-core:1.6.18`

## Runtime
1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
Expand All @@ -2541,9 +2523,6 @@ This report was generated on **Thu Dec 03 13:20:44 EET 2020** using [Gradle-Lice
1. **Group:** com.google.errorprone **Name:** error_prone_annotations **Version:** 2.4.0
* **POM License: Apache 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)

1. **Group:** com.google.errorprone **Name:** error_prone_type_annotations **Version:** 2.4.0
* **POM License: Apache 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)

1. **Group:** com.google.flogger **Name:** flogger **Version:** 0.5.1
* **POM Project URL:** [https://github.com/google/flogger](https://github.com/google/flogger)
* **POM License: Apache 2.0** - [https://www.apache.org/licenses/LICENSE-2.0.txt](https://www.apache.org/licenses/LICENSE-2.0.txt)
Expand Down Expand Up @@ -2648,10 +2627,6 @@ This report was generated on **Thu Dec 03 13:20:44 EET 2020** using [Gradle-Lice
* **POM Project URL:** [https://junit.org/junit5/](https://junit.org/junit5/)
* **POM License: Eclipse Public License v2.0** - [https://www.eclipse.org/legal/epl-v20.html](https://www.eclipse.org/legal/epl-v20.html)

1. **Group:** org.junit.jupiter **Name:** junit-jupiter-engine **Version:** 5.7.0
* **POM Project URL:** [https://junit.org/junit5/](https://junit.org/junit5/)
* **POM License: Eclipse Public License v2.0** - [https://www.eclipse.org/legal/epl-v20.html](https://www.eclipse.org/legal/epl-v20.html)

1. **Group:** org.junit.jupiter **Name:** junit-jupiter-params **Version:** 5.7.0
* **POM Project URL:** [https://junit.org/junit5/](https://junit.org/junit5/)
* **POM License: Eclipse Public License v2.0** - [https://www.eclipse.org/legal/epl-v20.html](https://www.eclipse.org/legal/epl-v20.html)
Expand All @@ -2660,10 +2635,6 @@ This report was generated on **Thu Dec 03 13:20:44 EET 2020** using [Gradle-Lice
* **POM Project URL:** [https://junit.org/junit5/](https://junit.org/junit5/)
* **POM License: Eclipse Public License v2.0** - [https://www.eclipse.org/legal/epl-v20.html](https://www.eclipse.org/legal/epl-v20.html)

1. **Group:** org.junit.platform **Name:** junit-platform-engine **Version:** 1.7.0
* **POM Project URL:** [https://junit.org/junit5/](https://junit.org/junit5/)
* **POM License: Eclipse Public License v2.0** - [https://www.eclipse.org/legal/epl-v20.html](https://www.eclipse.org/legal/epl-v20.html)

1. **Group:** org.opentest4j **Name:** opentest4j **Version:** 1.2.0
* **Manifest License:** The Apache License, Version 2.0 (Not packaged)
* **POM Project URL:** [https://github.com/ota4j-team/opentest4j](https://github.com/ota4j-team/opentest4j)
Expand Down Expand Up @@ -2976,12 +2947,12 @@ This report was generated on **Thu Dec 03 13:20:44 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 13:20:46 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 **Thu Dec 03 17:12:37 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-testutil-server:1.6.17`
# Dependencies of `io.spine:spine-testutil-server:1.6.18`

## Runtime
1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
Expand All @@ -3006,9 +2977,6 @@ This report was generated on **Thu Dec 03 13:20:46 EET 2020** using [Gradle-Lice
1. **Group:** com.google.errorprone **Name:** error_prone_annotations **Version:** 2.4.0
* **POM License: Apache 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)

1. **Group:** com.google.errorprone **Name:** error_prone_type_annotations **Version:** 2.4.0
* **POM License: Apache 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)

1. **Group:** com.google.flogger **Name:** flogger **Version:** 0.5.1
* **POM Project URL:** [https://github.com/google/flogger](https://github.com/google/flogger)
* **POM License: Apache 2.0** - [https://www.apache.org/licenses/LICENSE-2.0.txt](https://www.apache.org/licenses/LICENSE-2.0.txt)
Expand Down Expand Up @@ -3477,4 +3445,4 @@ This report was generated on **Thu Dec 03 13:20:46 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 13:20:48 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 **Thu Dec 03 17:12:50 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).