Skip to content

Commit 97fc514

Browse files
committed
Declare missing dependencies, force some of them to resolve conflicts.
1 parent 9f3c63f commit 97fc514

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

build.gradle.kts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ buildscript {
6262
spine.server,
6363
io.spine.internal.dependency.Spine.Logging.lib,
6464
io.spine.internal.dependency.Validation.runtime,
65+
io.spine.internal.dependency.Grpc.api,
6566
)
6667
}
6768
}
@@ -114,6 +115,8 @@ allprojects {
114115
apply(from = "$rootDir/version.gradle.kts")
115116
group = "io.spine.gcloud"
116117
version = extra["versionToPublish"]!!
118+
119+
forceConfigurations()
117120
}
118121

119122
subprojects {
@@ -125,7 +128,6 @@ subprojects {
125128
setupKotlin(javaVersion)
126129

127130
defineDependencies()
128-
forceConfigurations()
129131

130132
val generated = "$projectDir/generated"
131133
applyGeneratedDirectories(generated)
@@ -338,6 +340,7 @@ fun Subproject.forceConfigurations() {
338340
Validation.runtime,
339341
Spine.time,
340342
Spine.Logging.lib,
343+
Spine.Logging.middleware,
341344
Spine.baseTypes,
342345
Spine.change,
343346
Spine.testlib,

buildSrc/src/main/kotlin/DependencyResolution.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ fun NamedDomainObjectContainer<Configuration>.forceVersions() {
8080
}
8181

8282
private fun ResolutionStrategy.forceProductionDependencies() {
83-
@Suppress("DEPRECATION") // Force SLF4J version.
83+
@Suppress("DEPRECATION") // Force SLF4J and Kotlin JDK7 versions.
8484
force(
8585
AnimalSniffer.lib,
8686
AutoCommon.lib,
@@ -96,6 +96,7 @@ private fun ResolutionStrategy.forceProductionDependencies() {
9696
Kotlin.stdLib,
9797
Kotlin.stdLibCommon,
9898
Kotlin.stdLibJdk8,
99+
Kotlin.stdLibJdk7,
99100
Protobuf.GradlePlugin.lib,
100101
Protobuf.libs,
101102
Slf4J.lib
@@ -150,7 +151,7 @@ private fun ResolutionStrategy.forceTransitiveDependencies() {
150151
fun NamedDomainObjectContainer<Configuration>.excludeProtobufLite() {
151152

152153
fun excludeProtoLite(configurationName: String) {
153-
named(configurationName).get().exclude(
154+
findByName(configurationName)?.exclude(
154155
mapOf(
155156
"group" to "com.google.protobuf",
156157
"module" to "protobuf-lite"

buildSrc/src/main/kotlin/io/spine/internal/dependency/Spine.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,12 @@ object Spine {
170170
const val grpcContext = "$group:spine-logging-grpc-context:$version"
171171
const val smokeTest = "$group:spine-logging-smoke-test:$version"
172172

173+
// A transitive dependency which needs to be forced in this library.
174+
const val middleware = "$group:spine-logging-middleware:$version"
175+
173176
// Transitive dependencies.
174177
// Make `public` and use them to force a version in a particular repository, if needed.
175178
internal const val julBackend = "$group:spine-logging-jul-backend:$version"
176-
internal const val middleware = "$group:spine-logging-middleware:$version"
177179
internal const val platformGenerator = "$group:spine-logging-platform-generator:$version"
178180
internal const val jvmDefaultPlatform = "$group:spine-logging-jvm-default-platform:$version"
179181

stackdriver-trace/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ dependencies {
3232
api(GoogleCloud.trace)
3333
testImplementation(GoogleApis.AuthLibrary.oAuth2Http)
3434
testImplementation(Grpc.auth)
35+
testImplementation(Grpc.inProcess)
3536
}
3637

3738
tasks {

0 commit comments

Comments
 (0)