Skip to content

Commit ff763c0

Browse files
committed
wip
1 parent a4cf0be commit ff763c0

3 files changed

Lines changed: 21 additions & 10 deletions

File tree

api-client/build.gradle.kts

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@ java {
1919

2020
dependencies {
2121
constraints {
22-
implementation(libs.moshi) {
23-
version {
24-
strictly(libs.versions.moshiVersionrange.get())
25-
prefer(libs.versions.moshi.get())
22+
listOf(libs.bundles.moshi).forEach {
23+
implementation(it) {
24+
version {
25+
strictly(libs.versions.moshiVersionrange.get())
26+
prefer(libs.versions.moshi.get())
27+
}
2628
}
2729
}
2830
listOf(libs.bundles.okio).forEach {
@@ -33,10 +35,12 @@ dependencies {
3335
}
3436
}
3537
}
36-
implementation(libs.okhttp) {
37-
version {
38-
strictly(libs.versions.okhttpVersionrange.get())
39-
prefer(libs.versions.okhttp.get())
38+
listOf(libs.bundles.okhttp).forEach {
39+
implementation(it) {
40+
version {
41+
strictly(libs.versions.okhttpVersionrange.get())
42+
prefer(libs.versions.okhttp.get())
43+
}
4044
}
4145
}
4246
implementation("de.gesellix:docker-remote-api-model-1-41") {
@@ -76,7 +80,7 @@ dependencies {
7680
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
7781
implementation(libs.moshi)
7882
implementation(libs.okhttp)
79-
// implementation("com.squareup.okhttp3:logging-interceptor:[4.9,5)!!4.11.0")
83+
// implementation(libs.okhttpLoggingInterceptor)
8084
implementation("de.gesellix:docker-remote-api-model-1-41:2025-10-31T17-49-00")
8185
implementation("de.gesellix:docker-engine:2025-10-31T18-10-00")
8286
implementation("de.gesellix:docker-filesocket:2025-10-31T17-48-00")
@@ -173,6 +177,9 @@ publishing {
173177
}
174178

175179
signing {
180+
setRequired {
181+
project.version != "unspecified"
182+
}
176183
val signingKey: String? by project
177184
val signingPassword: String? by project
178185
useInMemoryPgpKeys(signingKey, signingPassword)

api-client/src/main/kotlin/de/gesellix/docker/remote/api/core/ApiClient.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,8 @@ open class ApiClient(
250250
.connectTimeout(requestConfig.timeout.toLong(), TimeUnit.MILLISECONDS)
251251
.readTimeout(requestConfig.timeout.toLong(), TimeUnit.MILLISECONDS)
252252
.addInterceptor(EnforceResponseContentTypeInterceptor())
253+
// .addInterceptor(HttpLoggingInterceptor().apply { level = HttpLoggingInterceptor.Level.BODY })
254+
// .eventListenerFactory(LoggingEventListener.Factory())
253255
return actualClient.build()
254256
}
255257

gradle/libs.versions.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ logback = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
3131
moshi = { module = "com.squareup.moshi:moshi", version.ref = "moshi" }
3232
moshiKotlin = { module = "com.squareup.moshi:moshi-kotlin", version.ref = "moshi" }
3333
okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
34+
okhttpLoggingInterceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp" }
35+
okhttpMockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp" }
3436
okhttpMockwebserverJunit5 = { module = "com.squareup.okhttp3:mockwebserver3-junit5", version.ref = "okhttp" }
3537
okio = { module = "com.squareup.okio:okio", version.ref = "okio" }
3638
okioJvm = { module = "com.squareup.okio:okio-jvm", version.ref = "okio" }
@@ -39,7 +41,7 @@ slf4j = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
3941
[bundles]
4042
kotlin = ["kotlin", "kotlinCommon", "kotlinJdk7", "kotlinJdk8", "kotlinReflect", "kotlinScriptingJvm", "kotlinStdlib", "kotlinTest"]
4143
moshi = ["moshi", "moshiKotlin"]
42-
okhttp = ["okhttp", "okhttpMockwebserverJunit5"]
44+
okhttp = ["okhttp", "okhttpLoggingInterceptor", "okhttpMockwebserver", "okhttpMockwebserverJunit5"]
4345
okio = ["okio", "okioJvm"]
4446

4547
[plugins]

0 commit comments

Comments
 (0)