Skip to content

Commit e10b665

Browse files
Merge pull request #105 from SpineEventEngine/improve-dependencies-management
Improve dependencies management
2 parents 7809b9d + ceb3c96 commit e10b665

File tree

14 files changed

+182
-181
lines changed

14 files changed

+182
-181
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: 18 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle.kts

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@
1818
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1919
*/
2020

21-
import com.google.protobuf.gradle.*
21+
import com.google.protobuf.gradle.builtins
22+
import com.google.protobuf.gradle.generateProtoTasks
23+
import com.google.protobuf.gradle.id
24+
import com.google.protobuf.gradle.protobuf
25+
import com.google.protobuf.gradle.protoc
2226
import io.spine.gradle.internal.DependencyResolution
2327
import io.spine.gradle.internal.Deps
2428
import io.spine.gradle.internal.PublishingRepos
@@ -50,8 +54,8 @@ plugins {
5054
}
5155

5256
extra["projectsToPublish"] = listOf(
53-
"time",
54-
"testutil-time"
57+
"time",
58+
"testutil-time"
5559
)
5660
extra["publishToRepository"] = PublishingRepos.cloudRepo
5761

@@ -108,7 +112,9 @@ subprojects {
108112
Deps.build.protobuf.forEach { api(it) }
109113

110114
implementation(Deps.build.guava)
111-
implementation(Deps.build.jsr305Annotations)
115+
compileOnlyApi(Deps.build.checkerAnnotations)
116+
compileOnlyApi(Deps.build.jsr305Annotations)
117+
Deps.build.errorProneAnnotations.forEach { compileOnlyApi(it) }
112118

113119
Deps.test.junit5Api.forEach { testImplementation(it) }
114120
testImplementation(Deps.test.guavaTestlib)
@@ -124,25 +130,25 @@ subprojects {
124130
main {
125131
proto.srcDir("$sourcesRootDir/main/proto")
126132
java.srcDirs(
127-
"$generatedRootDir/main/java",
128-
"$generatedRootDir/main/spine",
129-
"$sourcesRootDir/main/java"
133+
"$generatedRootDir/main/java",
134+
"$generatedRootDir/main/spine",
135+
"$sourcesRootDir/main/java"
130136
)
131137
resources.srcDirs(
132-
"$generatedRootDir/main/resources",
133-
"$sourcesRootDir/main/resources"
138+
"$generatedRootDir/main/resources",
139+
"$sourcesRootDir/main/resources"
134140
)
135141
}
136142
test {
137143
proto.srcDir("$sourcesRootDir/test/proto")
138144
java.srcDirs(
139-
"$generatedRootDir/test/java",
140-
"$generatedRootDir/test/spine",
141-
"$sourcesRootDir/test/java"
145+
"$generatedRootDir/test/java",
146+
"$generatedRootDir/test/spine",
147+
"$sourcesRootDir/test/java"
142148
)
143149
resources.srcDirs(
144-
"$generatedRootDir/test/resources",
145-
"$sourcesRootDir/test/resources"
150+
"$generatedRootDir/test/resources",
151+
"$sourcesRootDir/test/resources"
146152
)
147153
}
148154
}

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)