Skip to content

Commit 2569f04

Browse files
Merge pull request #158 from SpineEventEngine/improve-deps-management
Improve dependencies management
2 parents f796752 + ea1bff5 commit 2569f04

File tree

16 files changed

+258
-228
lines changed

16 files changed

+258
-228
lines changed

.idea/codeStyles/Project.xml

Lines changed: 25 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/codeStyles/codeStyleConfig.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/inspectionProfiles/Project_Default.xml

Lines changed: 5 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 54 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle.kts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ buildscript {
4545
}
4646

4747
plugins {
48-
java
48+
`java-library`
4949
idea
5050
jacoco
5151
@Suppress("RemoveRedundantQualifierName") // Cannot use imports here.
@@ -122,20 +122,21 @@ subprojects {
122122
dependencies {
123123
errorprone(Deps.build.errorProneCore)
124124
errorproneJavac(Deps.build.errorProneJavac)
125-
// For dependencies config. based on version of Java, see:
126-
// https://github.com/epeee/junit-jupiter-extension-testing/blob/57b7ba75ab64ed8c229d2a5b14a954d6ae359189/gradle/errorprone.gradle
127125

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

128+
compileOnlyApi(Deps.build.checkerAnnotations)
129+
compileOnlyApi(Deps.build.jsr305Annotations)
130+
Deps.build.errorProneAnnotations.forEach { compileOnlyApi(it) }
131+
130132
testImplementation("io.spine:spine-testutil-server:$spineCoreVersion")
131133
testImplementation(group = "io.spine",
132134
name = "spine-server",
133135
version = spineCoreVersion,
134136
classifier = "test")
135137
Deps.test.junit5Api.forEach { testImplementation(it) }
136-
testImplementation(Deps.test.junit5Runner)
137-
testImplementation(Deps.test.hamcrest)
138-
testImplementation(Deps.test.guavaTestlib)
138+
Deps.test.truth.forEach { testImplementation(it) }
139+
testRuntimeOnly(Deps.test.junit5Runner)
139140
}
140141

141142
// Apply the same IDEA module configuration for each of sub-projects.

buildSrc/src/main/kotlin/io/spine/gradle/internal/IncrementGuard.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,10 @@ class IncrementGuard : Plugin<Project> {
5151

5252
shouldRunAfter("test")
5353
if (!shouldCheckVersion()) {
54-
logger.info("The build does not represent a GitHub Actions feature branch job, " +
55-
"the `checkVersionIncrement` task is disabled.")
54+
logger.info(
55+
"The build does not represent a GitHub Actions feature branch job, " +
56+
"the `checkVersionIncrement` task is disabled."
57+
)
5658
this.enabled = false
5759
}
5860
}

0 commit comments

Comments
 (0)