Skip to content

Commit ff810c2

Browse files
sureshgsureshg
committed
chore: build-logic changes
1 parent dd13802 commit ff810c2

File tree

3 files changed

+55
-39
lines changed

3 files changed

+55
-39
lines changed

‎gradle/build-logic/common-plugins/build.gradle.kts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,10 @@ dependencies {
105105
// Http client and JSON serialization
106106
implementation(libs.ktor.client.java)
107107
implementation(libs.ktor.client.content.negotiation)
108-
implementation(libs.ktor.serialization.json)
108+
implementation(libs.ktor.client.encoding)
109+
implementation(libs.ktor.client.logging)
109110
implementation(libs.ktor.client.resources)
111+
implementation(libs.ktor.serialization.json)
110112
// Text styling
111113
implementation(libs.ajalt.mordant)
112114
// Exec Jar

‎gradle/build-logic/common-plugins/src/main/kotlin/common/ServiceClient.kt‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ import io.ktor.client.*
44
import io.ktor.client.call.*
55
import io.ktor.client.engine.java.*
66
import io.ktor.client.plugins.*
7+
import io.ktor.client.plugins.compression.*
78
import io.ktor.client.plugins.contentnegotiation.*
9+
import io.ktor.client.plugins.logging.*
810
import io.ktor.client.plugins.resources.*
911
import io.ktor.client.plugins.resources.Resources
1012
import io.ktor.http.*
@@ -29,18 +31,27 @@ object ApiClient {
2931
ignoreUnknownKeys = true
3032
})
3133
}
34+
install(ContentEncoding) {
35+
deflate(1.0F)
36+
gzip(0.9F)
37+
}
3238
install(HttpTimeout) {
3339
requestTimeoutMillis = 20_000
3440
connectTimeoutMillis = 5_000
3541
socketTimeoutMillis = 5_000
3642
}
43+
install(Logging) {
44+
logger = Logger.DEFAULT
45+
level = LogLevel.INFO
46+
}
47+
engine { pipelining = true }
3748
defaultRequest {
3849
url {
3950
protocol = URLProtocol.HTTPS
4051
host = "api.github.com"
4152
}
4253
}
43-
engine { pipelining = true }
54+
followRedirects = true
4455
}
4556

4657
suspend fun user(name: String) = get().get(UserReq(name)).body<User>()

‎gradle/libs.versions.toml‎

Lines changed: 40 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -186,46 +186,48 @@ kotlinx-html = { module = "org.jetbrains.kotlinx:kotlinx
186186
kotlinx-bench-runtime = { module = "org.jetbrains.kotlinx:kotlinx-benchmark-runtime" , version.ref = "kotlinx-benchmark"}
187187
kotlin-ksp-api = { module = "com.google.devtools.ksp:symbol-processing-api" , version.ref = "kotlin-ksp"}
188188

189-
ktor-bom = { module = "io.ktor:ktor-bom" , version.ref = "ktor"}
190-
ktor-serialization = { module = "io.ktor:ktor-serialization" , version.ref = "ktor"}
191-
ktor-server-core = { module = "io.ktor:ktor-server-core" , version.ref = "ktor"}
192-
ktor-server-content-negotiation = { module = "io.ktor:ktor-server-content-negotiation" , version.ref = "ktor"}
193-
ktor-server-metrics-micrometer = { module = "io.ktor:ktor-server-metrics-micrometer" , version.ref = "ktor"}
194-
ktor-server-call-logging = { module = "io.ktor:ktor-server-call-logging" , version.ref = "ktor"}
195-
ktor-server-cors = { module = "io.ktor:ktor-server-cors" , version.ref = "ktor"}
196-
ktor-server-swagger = { module = "io.ktor:ktor-server-swagger" , version.ref = "ktor"}
197-
ktor-server-openapi = { module = "io.ktor:ktor-server-openapi" , version.ref = "ktor"}
198-
ktor-server-http-redirect = { module = "io.ktor:ktor-server-http-redirect" , version.ref = "ktor"}
199-
ktor-server-compression = { module = "io.ktor:ktor-server-compression" , version.ref = "ktor"}
200-
ktor-server-host-common = { module = "io.ktor:ktor-server-host-common" , version.ref = "ktor"}
201-
ktor-server-resources = { module = "io.ktor:ktor-server-resources" , version.ref = "ktor"}
202-
ktor-server-auth = { module = "io.ktor:ktor-server-auth" , version.ref = "ktor"}
203-
ktor-server-auth-jwt = { module = "io.ktor:ktor-server-auth-jwt" , version.ref = "ktor"}
204-
ktor-server-jetty = { module = "io.ktor:ktor-server-jetty" , version.ref = "ktor"}
205-
ktor-server-netty = { module = "io.ktor:ktor-server-netty" , version.ref = "ktor"}
206-
ktor-server-tests = { module = "io.ktor:ktor-server-tests" , version.ref = "ktor"}
207-
ktor-server-default-headers = { module = "io.ktor:ktor-server-default-headers" , version.ref = "ktor"}
208-
ktor-server-status-pages = { module = "io.ktor:ktor-server-status-pages" , version.ref = "ktor"}
209-
ktor-server-auto-head = { module = "io.ktor:ktor-server-auto-head-response" , version.ref = "ktor"}
210-
ktor-server-forwarded-header = { module = "io.ktor:ktor-server-forwarded-header" , version.ref = "ktor"}
189+
ktor-bom = { module = "io.ktor:ktor-bom" , version.ref = "ktor"}
190+
ktor-serialization = { module = "io.ktor:ktor-serialization" , version.ref = "ktor"}
191+
ktor-server-core = { module = "io.ktor:ktor-server-core" , version.ref = "ktor"}
192+
ktor-server-content-negotiation = { module = "io.ktor:ktor-server-content-negotiation" , version.ref = "ktor"}
193+
ktor-server-metrics-micrometer = { module = "io.ktor:ktor-server-metrics-micrometer" , version.ref = "ktor"}
194+
ktor-server-call-logging = { module = "io.ktor:ktor-server-call-logging" , version.ref = "ktor"}
195+
ktor-server-cors = { module = "io.ktor:ktor-server-cors" , version.ref = "ktor"}
196+
ktor-server-swagger = { module = "io.ktor:ktor-server-swagger" , version.ref = "ktor"}
197+
ktor-server-openapi = { module = "io.ktor:ktor-server-openapi" , version.ref = "ktor"}
198+
ktor-server-http-redirect = { module = "io.ktor:ktor-server-http-redirect" , version.ref = "ktor"}
199+
ktor-server-compression = { module = "io.ktor:ktor-server-compression" , version.ref = "ktor"}
200+
ktor-server-host-common = { module = "io.ktor:ktor-server-host-common" , version.ref = "ktor"}
201+
ktor-server-resources = { module = "io.ktor:ktor-server-resources" , version.ref = "ktor"}
202+
ktor-server-auth = { module = "io.ktor:ktor-server-auth" , version.ref = "ktor"}
203+
ktor-server-auth-jwt = { module = "io.ktor:ktor-server-auth-jwt" , version.ref = "ktor"}
204+
ktor-server-jetty = { module = "io.ktor:ktor-server-jetty" , version.ref = "ktor"}
205+
ktor-server-netty = { module = "io.ktor:ktor-server-netty" , version.ref = "ktor"}
206+
ktor-server-tests = { module = "io.ktor:ktor-server-tests" , version.ref = "ktor"}
207+
ktor-server-default-headers = { module = "io.ktor:ktor-server-default-headers" , version.ref = "ktor"}
208+
ktor-server-status-pages = { module = "io.ktor:ktor-server-status-pages" , version.ref = "ktor"}
209+
ktor-server-auto-head = { module = "io.ktor:ktor-server-auto-head-response" , version.ref = "ktor"}
210+
ktor-server-forwarded-header = { module = "io.ktor:ktor-server-forwarded-header" , version.ref = "ktor"}
211211

212-
ktor-serialization-json = { module = "io.ktor:ktor-serialization-kotlinx-json" , version.ref = "ktor"}
213-
ktor-cohort-core = { module = "com.sksamuel.cohort:cohort-core" , version.ref = "ktor-cohort"}
214-
ktor-cohort-hikari = { module = "com.sksamuel.cohort:cohort-hikari" , version.ref = "ktor-cohort"}
212+
ktor-serialization-json = { module = "io.ktor:ktor-serialization-kotlinx-json" , version.ref = "ktor"}
213+
ktor-cohort-core = { module = "com.sksamuel.cohort:cohort-core" , version.ref = "ktor-cohort"}
214+
ktor-cohort-hikari = { module = "com.sksamuel.cohort:cohort-hikari" , version.ref = "ktor-cohort"}
215215

216-
ktor-client-core = { module = "io.ktor:ktor-client-core" , version.ref = "ktor"}
217-
ktor-client-cio = { module = "io.ktor:ktor-client-cio" , version.ref = "ktor"}
218-
ktor-client-java = { module = "io.ktor:ktor-client-java" , version.ref = "ktor"}
219-
ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp" , version.ref = "ktor"}
220-
ktor-client-jetty = { module = "io.ktor:ktor-client-jetty" , version.ref = "ktor"}
221-
ktor-client-websockets = { module = "io.ktor:ktor-client-websockets" , version.ref = "ktor"}
222-
ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation" , version.ref = "ktor"}
223-
ktor-client-auth = { module = "io.ktor:ktor-client-auth" , version.ref = "ktor"}
224-
ktor-client-logging = { module = "io.ktor:ktor-client-logging" , version.ref = "ktor"}
225-
ktor-client-resources = { module = "io.ktor:ktor-client-resources" , version.ref = "ktor"}
216+
ktor-client-core = { module = "io.ktor:ktor-client-core" , version.ref = "ktor"}
217+
ktor-client-cio = { module = "io.ktor:ktor-client-cio" , version.ref = "ktor"}
218+
ktor-client-java = { module = "io.ktor:ktor-client-java" , version.ref = "ktor"}
219+
ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp" , version.ref = "ktor"}
220+
ktor-client-jetty = { module = "io.ktor:ktor-client-jetty" , version.ref = "ktor"}
221+
ktor-client-serialization = { module = "io.ktor:ktor-client-serialization" , version.ref = "ktor"}
222+
ktor-client-websockets = { module = "io.ktor:ktor-client-websockets" , version.ref = "ktor"}
223+
ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation" , version.ref = "ktor"}
224+
ktor-client-auth = { module = "io.ktor:ktor-client-auth" , version.ref = "ktor"}
225+
ktor-client-logging = { module = "io.ktor:ktor-client-logging" , version.ref = "ktor"}
226+
ktor-client-resources = { module = "io.ktor:ktor-client-resources" , version.ref = "ktor"}
227+
ktor-client-encoding = { module = "io.ktor:ktor-client-encoding" , version.ref = "ktor"}
226228

227-
rsocket-ktor-client = { module = "io.rsocket.kotlin:rsocket-ktor-client" , version.ref = "rsocket"}
228-
rsocket-ktor-server = { module = "io.rsocket.kotlin:rsocket-ktor-server" , version.ref = "rsocket"}
229+
rsocket-ktor-client = { module = "io.rsocket.kotlin:rsocket-ktor-client" , version.ref = "rsocket"}
230+
rsocket-ktor-server = { module = "io.rsocket.kotlin:rsocket-ktor-server" , version.ref = "rsocket"}
229231

230232
logback-classic = { module = "ch.qos.logback:logback-classic" , version.ref = "logback"}
231233
exposeb-bom = { module = "org.jetbrains.exposed:exposed-bom" , version.ref = "exposed"}
@@ -355,6 +357,7 @@ ktor-client = [
355357
"ktor-client-jetty",
356358
"ktor-client-websockets",
357359
"ktor-client-content-negotiation",
360+
"ktor-client-encoding",
358361
"ktor-serialization-json",
359362
"ktor-client-resources",
360363
"ktor-client-auth",

0 commit comments

Comments
 (0)