Skip to content

Commit 9399736

Browse files
committed
Migrate to global toml versions
1 parent ce3021a commit 9399736

File tree

8 files changed

+73
-67
lines changed

8 files changed

+73
-67
lines changed

gradle/libs.versions.toml

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,60 @@
11
[versions]
22
com-google-devtools-ksp = "2.2.20-2.0.3"
3+
http4k = "6.18.0.1"
4+
jackson = "2.20.0"
35
jsoup = "1.21.2"
46
junit = "6.0.0-RC3"
57
junitPlatformLauncher = "6.0.0-RC3"
68
kotlin = "2.2.20"
9+
ktor = "3.3.0"
10+
logback = "1.5.18"
11+
micronaut = "4.9.3"
12+
micronautKotlin = "4.7.0"
13+
micronautSerde = "2.15.1"
14+
springBoot = "3.5.5"
715

816
[libraries]
917
http4k-ai-mcp-sdk = { module = "org.http4k.pro:http4k-ai-mcp-sdk" }
10-
http4k-bom = { module = "org.http4k:http4k-bom" }
18+
http4k-bom = { module = "org.http4k:http4k-bom", version.ref = "http4k" }
19+
http4k-bridge-ktor = { module = "org.http4k:http4k-bridge-ktor" }
20+
http4k-bridge-micronaut = { module = "org.http4k:http4k-bridge-micronaut" }
21+
http4k-bridge-spring = { module = "org.http4k:http4k-bridge-spring" }
1122
http4k-connect-amazon-kms = { module = "org.http4k:http4k-connect-amazon-kms" }
1223
http4k-connect-amazon-kms-fake = { module = "org.http4k:http4k-connect-amazon-kms-fake" }
1324
http4k-core = { module = "org.http4k:http4k-core" }
25+
http4k-format-jackson = { module = "org.http4k:http4k-format-jackson" }
1426
http4k-server-jetty = { module = "org.http4k:http4k-server-jetty" }
1527
http4k-serverless-lambda = { module = "org.http4k:http4k-serverless-lambda" }
1628
http4k-testing-hamkrest = { module = "org.http4k:http4k-testing-hamkrest" }
29+
jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson" }
1730
jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
1831
junit-bom = { module = "org.junit:junit-bom", version.ref = "junit" }
1932
junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api" }
2033
junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine" }
2134
junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junitPlatformLauncher" }
35+
kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect" }
36+
kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit" }
37+
kotlin-test-junit5 = { module = "org.jetbrains.kotlin:kotlin-test-junit5" }
38+
ktor-server-config-yaml = { module = "io.ktor:ktor-server-config-yaml", version.ref = "ktor" }
39+
ktor-server-core = { module = "io.ktor:ktor-server-core-jvm", version.ref = "ktor" }
40+
ktor-server-netty = { module = "io.ktor:ktor-server-netty", version.ref = "ktor" }
41+
ktor-server-test-host = { module = "io.ktor:ktor-server-test-host", version.ref = "ktor" }
42+
logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
43+
micronaut-http-client = { module = "io.micronaut:micronaut-http-client", version.ref = "micronaut" }
44+
micronaut-http-validation = { module = "io.micronaut:micronaut-http-validation", version.ref = "micronaut" }
45+
micronaut-kotlin-runtime = { module = "io.micronaut.kotlin:micronaut-kotlin-runtime", version.ref = "micronautKotlin" }
46+
micronaut-runtime = { module = "io.micronaut:micronaut-runtime", version.ref = "micronaut" }
47+
micronaut-serde-jackson = { module = "io.micronaut.serde:micronaut-serde-jackson", version.ref = "micronautSerde" }
48+
micronaut-serde-processor = { module = "io.micronaut.serde:micronaut-serde-processor", version.ref = "micronautSerde" }
49+
spring-boot-starter-actuator = { module = "org.springframework.boot:spring-boot-starter-actuator", version.ref = "springBoot" }
50+
spring-boot-starter-test = { module = "org.springframework.boot:spring-boot-starter-test", version.ref = "springBoot" }
51+
spring-boot-starter-web = { module = "org.springframework.boot:spring-boot-starter-web", version.ref = "springBoot" }
2252

2353
[plugins]
2454
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
2555
ksp = { id = "com.google.devtools.ksp", version.ref = "com-google-devtools-ksp" }
56+
micronaut-application = "io.micronaut.application:4.5.4"
57+
shadow = "com.github.johnrengelman.shadow:8.1.1"
2658
version-catalog-update = "nl.littlerobots.version-catalog-update:1.0.0"
2759
versions = "com.github.ben-manes.versions:0.52.0"
2860

http4k-connect/using-connect-api-clients/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22

33
dependencies {
4-
implementation(platform("${libs.http4k.bom.get()}:${project.property("http4kVersion")}"))
4+
implementation(platform(libs.http4k.bom))
55

66
implementation(libs.http4k.connect.amazon.kms)
77
testImplementation(libs.http4k.connect.amazon.kms.fake)

http4k-core/hello-world/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
}
66

77
dependencies {
8-
implementation(platform("${libs.http4k.bom.get()}:${project.property("http4kVersion")}"))
8+
implementation(platform(libs.http4k.bom))
99
implementation(libs.http4k.core)
1010
testImplementation(platform(libs.junit.bom))
1111
testImplementation(libs.http4k.testing.hamkrest)

http4k-core/migration-ktor/build.gradle.kts

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,17 @@ plugins {
44
application
55
}
66

7-
val ktorVersion = "3.0.3"
8-
val logbackVersion = "1.4.14"
9-
107
dependencies {
11-
implementation("io.ktor:ktor-server-core-jvm:$ktorVersion")
12-
implementation("io.ktor:ktor-server-netty:$ktorVersion")
13-
implementation("ch.qos.logback:logback-classic:$logbackVersion")
14-
implementation("io.ktor:ktor-server-config-yaml:$ktorVersion")
15-
implementation("org.http4k:http4k-bridge-ktor:${project.property("http4kVersion")}")
8+
implementation(platform(libs.http4k.bom))
9+
implementation(libs.ktor.server.core)
10+
implementation(libs.ktor.server.netty)
11+
implementation(libs.logback.classic)
12+
implementation(libs.ktor.server.config.yaml)
13+
implementation(libs.http4k.bridge.ktor)
1614

17-
testImplementation("io.ktor:ktor-server-test-host:$ktorVersion")
18-
testImplementation("org.jetbrains.kotlin:kotlin-test-junit:${project.property("kotlinVersion")}")
19-
testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.13.4")
15+
testImplementation(libs.ktor.server.test.host)
16+
testImplementation(libs.kotlin.test.junit)
17+
testRuntimeOnly(libs.junit.platform.launcher)
2018
}
2119

2220
application {

http4k-core/migration-ktor/gradle/libs.versions.toml

Lines changed: 0 additions & 17 deletions
This file was deleted.

http4k-core/migration-micronaut/build.gradle.kts

Lines changed: 18 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,32 @@
22

33
plugins {
44
application
5-
id("com.github.johnrengelman.shadow") version "7.1.2"
6-
id("com.google.devtools.ksp") version "2.2.20-2.0.3"
7-
id("io.micronaut.application") version "4.0.3"
5+
alias(libs.plugins.shadow)
6+
alias(libs.plugins.ksp)
7+
alias(libs.plugins.micronaut.application)
88
}
99

10-
val micronautVersion = "4.0.0"
11-
val micronautKotlinVersion = "4.0.0"
12-
val micronautSerdeVersion = "2.5.0"
13-
val logbackVersion = "1.4.11"
14-
val jacksonVersion = "2.15.2"
15-
1610
micronaut {
17-
version(micronautVersion)
11+
version(libs.versions.micronaut.get())
1812
}
1913

2014
dependencies {
21-
ksp("io.micronaut:micronaut-http-validation:$micronautVersion")
22-
ksp("io.micronaut.serde:micronaut-serde-processor:$micronautSerdeVersion")
15+
implementation(platform(libs.http4k.bom))
16+
ksp(libs.micronaut.http.validation)
17+
ksp(libs.micronaut.serde.processor)
2318

24-
implementation("io.micronaut.kotlin:micronaut-kotlin-runtime:$micronautKotlinVersion")
25-
implementation("io.micronaut.serde:micronaut-serde-jackson:$micronautSerdeVersion")
26-
implementation("org.jetbrains.kotlin:kotlin-reflect:${project.property("kotlinVersion")}")
27-
implementation("org.http4k:http4k-bridge-micronaut:${project.property("http4kVersion")}")
28-
implementation("org.http4k:http4k-format-jackson:${project.property("http4kVersion")}")
29-
implementation("io.micronaut:micronaut-runtime:$micronautVersion")
19+
implementation(libs.micronaut.kotlin.runtime)
20+
implementation(libs.micronaut.serde.jackson)
21+
implementation(libs.kotlin.reflect)
22+
implementation(libs.http4k.bridge.micronaut)
23+
implementation(libs.http4k.format.jackson)
24+
implementation(libs.micronaut.runtime)
3025

31-
compileOnly("io.micronaut:micronaut-http-client:$micronautVersion")
32-
runtimeOnly("ch.qos.logback:logback-classic:$logbackVersion")
33-
runtimeOnly("com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion")
34-
testImplementation("io.micronaut:micronaut-http-client:$micronautVersion")
35-
testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.13.4")
26+
compileOnly(libs.micronaut.http.client)
27+
runtimeOnly(libs.logback.classic)
28+
runtimeOnly(libs.jackson.module.kotlin)
29+
testImplementation(libs.micronaut.http.client)
30+
testRuntimeOnly(libs.junit.platform.launcher)
3631
}
3732

3833
application {
Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11

22

3-
val springBootVersion = "3.2.3"
4-
val jacksonVersion = "2.15.2"
5-
63
dependencies {
7-
implementation("org.springframework.boot:spring-boot-starter-web:$springBootVersion")
8-
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion")
9-
implementation("org.jetbrains.kotlin:kotlin-reflect:${project.property("kotlinVersion")}")
4+
implementation(platform(libs.http4k.bom))
5+
implementation(libs.spring.boot.starter.web)
6+
implementation(libs.jackson.module.kotlin)
7+
implementation(libs.kotlin.reflect)
108

11-
implementation("org.http4k:http4k-bridge-spring:${project.property("http4kVersion")}")
12-
implementation("org.http4k:http4k-format-jackson:${project.property("http4kVersion")}")
9+
implementation(libs.http4k.bridge.spring)
10+
implementation(libs.http4k.format.jackson)
1311

14-
implementation("org.springframework.boot:spring-boot-starter-actuator:$springBootVersion")
12+
implementation(libs.spring.boot.starter.actuator)
1513

16-
testImplementation("org.springframework.boot:spring-boot-starter-test:$springBootVersion")
17-
testImplementation("org.jetbrains.kotlin:kotlin-test-junit5:${project.property("kotlinVersion")}")
18-
testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.13.4")
14+
testImplementation(libs.spring.boot.starter.test)
15+
testImplementation(libs.kotlin.test.junit5)
16+
testRuntimeOnly(libs.junit.platform.launcher)
1917
}

http4k-pro/mcp/building-servers/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
implementation(platform("${libs.http4k.bom.get()}:${project.property("http4kVersion")}"))
2+
implementation(platform(libs.http4k.bom))
33
implementation(libs.http4k.server.jetty)
44
implementation(libs.http4k.ai.mcp.sdk)
55
implementation(libs.http4k.serverless.lambda)

0 commit comments

Comments
 (0)