From 7913c0e0cd4c36d3dd41dfb20f0144c71a978a2d Mon Sep 17 00:00:00 2001 From: Ronald Holshausen Date: Mon, 21 Nov 2022 14:55:13 +1100 Subject: [PATCH] fix: remove kotlin-logging from the convention plugin project constraints #1639 --- .../groovy/au.com.dius.pact.kotlin-common-conventions.gradle | 1 - core/pactbroker/build.gradle | 4 ++-- core/support/build.gradle | 2 +- provider/gradle/build.gradle | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/buildSrc/src/main/groovy/au.com.dius.pact.kotlin-common-conventions.gradle b/buildSrc/src/main/groovy/au.com.dius.pact.kotlin-common-conventions.gradle index f56e6b16b..a83a9205a 100644 --- a/buildSrc/src/main/groovy/au.com.dius.pact.kotlin-common-conventions.gradle +++ b/buildSrc/src/main/groovy/au.com.dius.pact.kotlin-common-conventions.gradle @@ -33,7 +33,6 @@ dependencies { implementation 'org.apache.commons:commons-text:1.10.0' implementation 'org.apache.commons:commons-collections4:4.4' implementation 'org.apache.tika:tika-core:1.28.5' - implementation 'io.github.microutils:kotlin-logging:2.1.23' implementation 'org.apache.httpcomponents.client5:httpclient5:5.1.1' implementation 'org.apache.httpcomponents.client5:httpclient5-fluent:5.1.1' implementation 'com.google.guava:guava:30.1.1-jre' diff --git a/core/pactbroker/build.gradle b/core/pactbroker/build.gradle index 7d48830ab..365ec45ed 100644 --- a/core/pactbroker/build.gradle +++ b/core/pactbroker/build.gradle @@ -7,11 +7,11 @@ group = 'au.com.dius.pact.core' dependencies { api project(':core:support') + api 'io.github.microutils:kotlin-logging-jvm:2.1.23' + api 'org.apache.httpcomponents.client5:httpclient5' implementation 'org.apache.commons:commons-lang3' implementation 'com.google.guava:guava' - api 'io.github.microutils:kotlin-logging' - api 'org.apache.httpcomponents.client5:httpclient5' implementation 'org.slf4j:slf4j-api' testImplementation 'org.apache.groovy:groovy' diff --git a/core/support/build.gradle b/core/support/build.gradle index 58b3aae5f..879d18b16 100644 --- a/core/support/build.gradle +++ b/core/support/build.gradle @@ -6,7 +6,7 @@ description = 'Pact-JVM Support module with common utilities' group = 'au.com.dius.pact.core' dependencies { - api 'io.github.microutils:kotlin-logging' + api 'io.github.microutils:kotlin-logging-jvm:2.1.23' api 'org.apache.httpcomponents.client5:httpclient5' api 'org.apache.httpcomponents.client5:httpclient5-fluent' diff --git a/provider/gradle/build.gradle b/provider/gradle/build.gradle index 64482ba68..eebebc44a 100644 --- a/provider/gradle/build.gradle +++ b/provider/gradle/build.gradle @@ -15,7 +15,7 @@ dependencies { implementation 'com.github.ajalt:mordant:1.2.1' implementation 'commons-io:commons-io:2.11.0' implementation 'org.apache.commons:commons-lang3' - implementation 'io.github.microutils:kotlin-logging' + implementation 'io.github.microutils:kotlin-logging-jvm:2.1.23' testImplementation 'junit:junit' testImplementation 'org.mockito:mockito-core:2.28.2'