Skip to content

Improve dependencies management #158

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

Merged
yuri-sergiichuk merged 8 commits into from
Dec 7, 2020
Merged

Improve dependencies management #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2ae29ef
Bump versions.
yuri-sergiichuk Dec 4, 2020
91fa9fa
Update `config`.
yuri-sergiichuk Dec 4, 2020
50ffd93
Update GCP dependencies
yuri-sergiichuk Dec 4, 2020
704d4bb
Migrate to the new Gradle dependency `compileOnlyApi` configuration.
yuri-sergiichuk Dec 4, 2020
1c9fd84
Migrate from `hamcrest` and drop unused dependencies.
yuri-sergiichuk Dec 4, 2020
b0fdbe3
Update reports.
yuri-sergiichuk Dec 4, 2020
6583d86
Add `misc.xml` from the `config` module.
yuri-sergiichuk Dec 4, 2020
ea1bff5
Improve formatting.
yuri-sergiichuk Dec 7, 2020
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
26 changes: 25 additions & 1 deletion .idea/codeStyles/Project.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/codeStyles/codeStyleConfig.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 5 additions & 28 deletions .idea/inspectionProfiles/Project_Default.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

54 changes: 54 additions & 0 deletions .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 7 additions & 6 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ buildscript {
}

plugins {
java
`java-library`
idea
jacoco
@Suppress("RemoveRedundantQualifierName") // Cannot use imports here.
Expand Down Expand Up @@ -122,20 +122,21 @@ subprojects {
dependencies {
errorprone(Deps.build.errorProneCore)
errorproneJavac(Deps.build.errorProneJavac)
// For dependencies config. based on version of Java, see:
// https://github.com/epeee/junit-jupiter-extension-testing/blob/57b7ba75ab64ed8c229d2a5b14a954d6ae359189/gradle/errorprone.gradle

implementation("io.spine:spine-server:$spineCoreVersion")

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

testImplementation("io.spine:spine-testutil-server:$spineCoreVersion")
testImplementation(group = "io.spine",
name = "spine-server",
version = spineCoreVersion,
classifier = "test")
Deps.test.junit5Api.forEach { testImplementation(it) }
testImplementation(Deps.test.junit5Runner)
testImplementation(Deps.test.hamcrest)
testImplementation(Deps.test.guavaTestlib)
Deps.test.truth.forEach { testImplementation(it) }
testRuntimeOnly(Deps.test.junit5Runner)
}

// Apply the same IDEA module configuration for each of sub-projects.
Expand Down
6 changes: 4 additions & 2 deletions buildSrc/src/main/kotlin/io/spine/gradle/internal/IncrementGuard.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,10 @@ class IncrementGuard : Plugin<Project> {

shouldRunAfter("test")
if (!shouldCheckVersion()) {
logger.info("The build does not represent a GitHub Actions feature branch job, " +
"the `checkVersionIncrement` task is disabled.")
logger.info(
"The build does not represent a GitHub Actions feature branch job, " +
"the `checkVersionIncrement` task is disabled."
)
this.enabled = false
}
}
Expand Down
Loading