Skip to content

Commit f987670

Browse files
committed
Tidy dependencies. Add dependency analysis plugin
1 parent d3fd656 commit f987670

File tree

4 files changed

+37
-40
lines changed

4 files changed

+37
-40
lines changed

build.gradle.kts

-3
This file was deleted.

gradle/libs.versions.toml

+26-27
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11

22
[versions]
33
arrow_version = "2.0.0"
4+
dependency_analysis_version = "2.6.1"
45
detekt_version = "1.23.7"
56
gradle_versions_filter_version = "0.1.16"
6-
kotest-version = "6.0.0.M1"
7-
kotlin-version = "2.1.0"
7+
kotest_version = "6.0.0.M1"
8+
kotlin_version = "2.1.0"
89
kotlin_logging_version = "7.0.3"
910
kotlinter_version = "5.0.1"
1011
kotlinx_serialization_version = "1.7.3"
11-
ktor-version = "3.0.3"
12-
logback-version = "1.5.13"
12+
ktor_version = "3.0.3"
13+
logback_version = "1.5.13"
1314
mockk_version = "1.13.13"
14-
node_version = "7.1.0"
15-
prometheus-version = "1.14.2"
15+
prometheus_version = "1.14.2"
1616
search_client_version = "2.3.3"
1717

1818
[libraries]
@@ -25,37 +25,36 @@ ktor-client-content-negotiation = { group = "io.ktor", name = "ktor-client-conte
2525
ktor-client-core = { group = "io.ktor", name = "ktor-client-core", version.ref = "ktor_version" }
2626
ktor-client-logging = { group = "io.ktor", name = "ktor-client-logging", version.ref = "ktor_version" }
2727
ktor-serialization = { group = "io.ktor", name = "ktor-serialization-kotlinx-json", version.ref = "ktor_version" }
28-
ktor-server-call-id = { module = "io.ktor:ktor-server-call-id-jvm", version.ref = "ktor-version" }
29-
ktor-server-call-logging = { module = "io.ktor:ktor-server-call-logging-jvm", version.ref = "ktor-version" }
30-
ktor-server-cio = { module = "io.ktor:ktor-server-cio-jvm", version.ref = "ktor-version" }
31-
ktor-server-content-negotiation = { module = "io.ktor:ktor-server-content-negotiation-jvm", version.ref = "ktor-version" }
32-
ktor-server-core = { module = "io.ktor:ktor-server-core-jvm", version.ref = "ktor-version" }
33-
ktor-server-host-common = { module = "io.ktor:ktor-server-host-common-jvm", version.ref = "ktor-version" }
34-
ktor-server-metrics-micrometer = { module = "io.ktor:ktor-server-metrics-micrometer-jvm", version.ref = "ktor-version" }
35-
ktor-server-status-pages = { module = "io.ktor:ktor-server-status-pages-jvm", version.ref = "ktor-version" }
36-
logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback-version" }
37-
micrometer-registry-prometheus = { module = "io.micrometer:micrometer-registry-prometheus", version.ref = "prometheus-version" }
28+
ktor-server-call-id = { module = "io.ktor:ktor-server-call-id-jvm", version.ref = "ktor_version" }
29+
ktor-server-call-logging = { module = "io.ktor:ktor-server-call-logging-jvm", version.ref = "ktor_version" }
30+
ktor-server-cio = { module = "io.ktor:ktor-server-cio-jvm", version.ref = "ktor_version" }
31+
ktor-server-content-negotiation = { module = "io.ktor:ktor-server-content-negotiation-jvm", version.ref = "ktor_version" }
32+
ktor-server-core = { module = "io.ktor:ktor-server-core-jvm", version.ref = "ktor_version" }
33+
ktor-server-metrics-micrometer = { module = "io.ktor:ktor-server-metrics-micrometer-jvm", version.ref = "ktor_version" }
34+
ktor-server-status-pages = { module = "io.ktor:ktor-server-status-pages-jvm", version.ref = "ktor_version" }
35+
logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback_version" }
36+
micrometer-registry-prometheus = { module = "io.micrometer:micrometer-registry-prometheus", version.ref = "prometheus_version" }
3837
search-client = { group = "com.jillesvangurp", name = "search-client", version.ref = "search_client_version" }
3938

40-
ktor-server-test-host = { module = "io.ktor:ktor-server-test-host-jvm", version.ref = "ktor-version" }
41-
kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin-version" }
42-
kotest = { module = "io.kotest:kotest-runner-junit5", version.ref = "kotest-version" }
43-
kotest-assertions = { module = "io.kotest:kotest-assertions-core", version.ref = "kotest-version" }
44-
ktor-client-mock = { module = "io.ktor:ktor-client-mock", version.ref = "ktor-version" }
39+
ktor-server-test-host = { module = "io.ktor:ktor-server-test-host-jvm", version.ref = "ktor_version" }
40+
kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin_version" }
41+
kotest = { module = "io.kotest:kotest-runner-junit5", version.ref = "kotest_version" }
42+
kotest-assertions = { module = "io.kotest:kotest-assertions-core", version.ref = "kotest_version" }
43+
ktor-client-mock = { module = "io.ktor:ktor-client-mock", version.ref = "ktor_version" }
4544
mockk = { group = "io.mockk", name="mockk", version.ref = "mockk_version" }
4645

4746
[bundles]
4847
monitoring = ["ktor-server-metrics-micrometer", "micrometer-registry-prometheus", "ktor-server-call-id", "ktor-server-call-logging"]
4948
ktor-client = ["ktor-client-content-negotiation", "ktor-client-core", "ktor-client-logging", "ktor-client-cio"]
5049
serialization = ["ktor-serialization","kotlinx-serialization"]
5150
search = ["search-client"]
52-
test = ["ktor-server-test-host", "kotlin-test-junit", "kotest", "kotest-assertions", "ktor-client-mock", "mockk"]
51+
test = ["ktor-server-test-host", "kotest", "kotest-assertions", "ktor-client-mock", "mockk"]
5352

5453
[plugins]
55-
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin-version" }
56-
ktor = { id = "io.ktor.plugin", version.ref = "ktor-version" }
57-
kotlinter = { id = "org.jmailen.kotlinter", version.ref = "kotlinter_version" }
54+
dependency-analysis = { id = "com.autonomousapps.dependency-analysis", version.ref = "dependency_analysis_version" }
5855
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt_version" }
59-
versions = { id = "se.ascp.gradle.gradle-versions-filter", version.ref = "gradle_versions_filter_version" }
56+
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin_version" }
57+
kotlinter = { id = "org.jmailen.kotlinter", version.ref = "kotlinter_version" }
58+
ktor = { id = "io.ktor.plugin", version.ref = "ktor_version" }
6059
serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin_version" }
61-
node = { id = "com.github.node-gradle.node", version.ref = "node_version" }
60+
versions = { id = "se.ascp.gradle.gradle-versions-filter", version.ref = "gradle_versions_filter_version" }

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

search/build.gradle.kts

+10-9
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ plugins {
55
alias(libs.plugins.detekt)
66
alias(libs.plugins.versions)
77
alias(libs.plugins.serialization)
8+
alias(libs.plugins.dependency.analysis)
89
jacoco
910
}
1011

@@ -29,19 +30,19 @@ repositories {
2930
}
3031

3132
dependencies {
32-
implementation(libs.ktor.server.core)
33-
implementation(libs.ktor.server.host.common)
34-
implementation(libs.ktor.server.status.pages)
35-
implementation(libs.ktor.server.cio)
36-
implementation(libs.ktor.server.content.negotiation)
37-
implementation(libs.logback.classic)
33+
implementation(libs.arrow.core)
34+
implementation(libs.bundles.ktor.client)
3835
implementation(libs.bundles.monitoring)
36+
implementation(libs.bundles.search)
3937
implementation(libs.bundles.serialization)
40-
implementation(libs.bundles.ktor.client)
41-
implementation(libs.arrow.core)
4238
implementation(libs.kotlin.logging)
43-
implementation(libs.bundles.search)
39+
implementation(libs.ktor.server.cio)
40+
implementation(libs.ktor.server.content.negotiation)
41+
implementation(libs.ktor.server.core)
42+
implementation(libs.ktor.server.status.pages)
43+
runtimeOnly(libs.logback.classic)
4444
testImplementation(libs.bundles.test)
45+
testRuntimeOnly(libs.kotlin.test.junit)
4546
}
4647

4748
tasks.shadowJar {

0 commit comments

Comments
 (0)