From 154bbbed867c3b7b3a20ab745addba332c3a79e5 Mon Sep 17 00:00:00 2001 From: Yevhenii Nadtochii Date: Thu, 12 Oct 2023 13:09:50 +0300 Subject: [PATCH 1/5] Bump `Spine.Logging` --> `2.0.0-SNAPSHOT.232` --- buildSrc/src/main/kotlin/io/spine/internal/dependency/Spine.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/io/spine/internal/dependency/Spine.kt b/buildSrc/src/main/kotlin/io/spine/internal/dependency/Spine.kt index e935bf41..8b08578d 100644 --- a/buildSrc/src/main/kotlin/io/spine/internal/dependency/Spine.kt +++ b/buildSrc/src/main/kotlin/io/spine/internal/dependency/Spine.kt @@ -59,7 +59,7 @@ object Spine { * * @see spine-logging */ - const val logging = "2.0.0-SNAPSHOT.226" + const val logging = "2.0.0-SNAPSHOT.232" /** * The version of [Spine.testlib]. @@ -180,7 +180,6 @@ object Spine { replaceWith = ReplaceWith("grpcContext") ) const val floggerGrpcContext = "$group:spine-flogger-grpc-context:$version" - const val smokeTest = "$group:spine-logging-smoke-test:$version" } /** From 81230a27865b741c096900c3351ac085cf6242fe Mon Sep 17 00:00:00 2001 From: Yevhenii Nadtochii Date: Thu, 12 Oct 2023 13:10:10 +0300 Subject: [PATCH 2/5] Update logging artifacts --- .../kotlin/io/spine/internal/dependency/Spine.kt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/io/spine/internal/dependency/Spine.kt b/buildSrc/src/main/kotlin/io/spine/internal/dependency/Spine.kt index 8b08578d..7abfc687 100644 --- a/buildSrc/src/main/kotlin/io/spine/internal/dependency/Spine.kt +++ b/buildSrc/src/main/kotlin/io/spine/internal/dependency/Spine.kt @@ -164,10 +164,18 @@ object Spine { object Logging { const val version = ArtifactVersion.logging const val lib = "$group:spine-logging:$version" - const val backend = "$group:spine-logging-backend:$version" + const val log4j2Backend = "$group:spine-logging-log4j2-backend:$version" - const val context = "$group:spine-logging-context:$version" + const val stdContext = "$group:spine-logging-std-context:$version" const val grpcContext = "$group:spine-logging-grpc-context:$version" + const val smokeTest = "$group:spine-logging-smoke-test:$version" + + // Transitive dependencies. + // Make `public` and use them to force a version in a particular repository, if needed. + internal const val julBackend = "$group:spine-logging-jul-backend:$version" + internal const val middleware = "$group:spine-logging-middleware:$version" + internal const val platformGenerator = "$group:spine-logging-platform-generator:$version" + internal const val jvmDefaultPlatform = "$group:spine-logging-jvm-default-platform:$version" @Deprecated( message = "Please use `Logging.lib` instead.", From 5f559251fb6c01b81fedcc79d3139d1a223581a2 Mon Sep 17 00:00:00 2001 From: Yevhenii Nadtochii Date: Thu, 12 Oct 2023 13:11:07 +0300 Subject: [PATCH 3/5] Remove no longer needed dependency on `jul-backend` --- buildSrc/src/main/kotlin/jvm-module.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/jvm-module.gradle.kts b/buildSrc/src/main/kotlin/jvm-module.gradle.kts index 81c7a875..4f7b9d09 100644 --- a/buildSrc/src/main/kotlin/jvm-module.gradle.kts +++ b/buildSrc/src/main/kotlin/jvm-module.gradle.kts @@ -149,7 +149,6 @@ fun Module.addDependencies() = dependencies { ErrorProne.annotations.forEach { compileOnlyApi(it) } implementation(Spine.Logging.lib) - runtimeOnly(Spine.Logging.backend) testImplementation(Guava.testLib) testImplementation(JUnit.runner) From 15f4f7a7ebda7608371484cf3f9770ccc3efdc9b Mon Sep 17 00:00:00 2001 From: Yevhenii Nadtochii Date: Thu, 12 Oct 2023 13:11:26 +0300 Subject: [PATCH 4/5] Address deprecation --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 54372de5..cc143c72 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -36,5 +36,5 @@ repositories { detekt { source.from("buildSrc/src/main/kotlin") - config = files("quality/detekt-config.yml") + config.from("quality/detekt-config.yml") } From d765d02940d61c06ec5038474b6f136046b6fd59 Mon Sep 17 00:00:00 2001 From: Yevhenii Nadtochii Date: Thu, 12 Oct 2023 13:33:41 +0300 Subject: [PATCH 5/5] Override script plugin defaults --- build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index cc143c72..1406d2e0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -35,6 +35,6 @@ repositories { } detekt { - source.from("buildSrc/src/main/kotlin") - config.from("quality/detekt-config.yml") + config.setFrom("quality/detekt-config.yml") + source.setFrom("buildSrc/src/main/kotlin") }