Skip to content

Commit fa52c63

Browse files
committed
Migrate utils-benchmarks to version catalogs
1 parent 2a385b4 commit fa52c63

File tree

3 files changed

+32
-26
lines changed

3 files changed

+32
-26
lines changed

libs.versions.toml

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ apache-httpclient = "4.5.14"
99
logback = "1.5.7"
1010

1111
instrumenter = "3.3.4"
12-
jmh-plugin = "0.6.7"
12+
jmh-plugin = "0.7.2"
1313

1414
junit = "5.11.1"
15+
junit4 = "4.13.2"
1516

1617
[libraries]
1718

@@ -38,6 +39,7 @@ instrumenter = { module = "com.google.code.java-allocation-instrumenter:java-all
3839

3940
junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" }
4041
junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit" }
42+
junit4 = { module = "junit:junit", version.ref = "junit4" }
4143

4244
[plugins]
4345

utils-benchmarks/build.gradle.kts

+13-24
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
plugins {
2-
kotlin("jvm") version "2.0.20"
3-
kotlin("plugin.allopen") version "2.0.20"
4-
kotlin("plugin.serialization") version "2.0.20"
5-
id("org.jetbrains.kotlinx.atomicfu") version "0.25.0"
6-
id("me.champeau.jmh") version "0.6.5"
2+
alias(libs.plugins.kotlin.jvm)
3+
alias(libs.plugins.kotlin.allopen)
4+
alias(libs.plugins.kotlin.serialization)
5+
alias(libs.plugins.kotlinx.atomicfu)
6+
alias(libs.plugins.jmh)
77
}
88

99
allOpen {
@@ -13,27 +13,19 @@ allOpen {
1313
group = "org.example"
1414
version = "1.0-SNAPSHOT"
1515

16-
val serialization_version= "1.7.1"
1716
val instrumenter by configurations.creating
18-
val instrumenterName = "java-allocation-instrumenter"
19-
val instrumenter_version = "3.3.4"
20-
21-
repositories {
22-
mavenCentral()
23-
}
2417

2518
dependencies {
2619
implementation(kotlin("stdlib"))
27-
implementation("junit:junit:4.13.2")
20+
implementation(libs.junit4)
2821

29-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$serialization_version")
30-
implementation("io.ktor:ktor-io:2.1.0")
31-
implementation("io.ktor:ktor-utils:2.1.0")
32-
implementation("io.ktor:ktor-network:2.1.0")
33-
34-
instrumenter("com.google.code.java-allocation-instrumenter:$instrumenterName:$instrumenter_version")
35-
implementation("com.google.code.java-allocation-instrumenter:$instrumenterName:$instrumenter_version")
22+
implementation(libs.kotlinx.serialization.json)
23+
implementation(libs.ktor.io)
24+
implementation(libs.ktor.utils)
25+
implementation(libs.ktor.network)
3626

27+
instrumenter(libs.instrumenter)
28+
implementation(libs.instrumenter)
3729
}
3830

3931
jmh {
@@ -57,10 +49,7 @@ jmh {
5749

5850
}
5951

60-
val agentPath = instrumenter.toList().find {
61-
it.name.contains("$instrumenterName-$instrumenter_version.jar")
62-
}?.path
63-
52+
val agentPath = instrumenter.singleOrNull()?.path
6453
check(agentPath != null) { "Instrumentation agent is not found. Please check the configuration" }
6554

6655
tasks.test {

utils-benchmarks/settings.gradle.kts

+16-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,17 @@
1-
rootProject.name = "utils-benchmarks"
1+
@file:Suppress("UnstableApiUsage")
2+
3+
dependencyResolutionManagement {
4+
repositories {
5+
mavenCentral()
6+
}
7+
8+
versionCatalogs {
9+
create("libs") {
10+
from(files("../libs.versions.toml"))
211

12+
version("ktor", "2.1.0")
13+
}
14+
}
15+
}
16+
17+
rootProject.name = "utils-benchmarks"

0 commit comments

Comments
 (0)