Skip to content

Commit 68ac72c

Browse files
sureshgsureshg
committed
chore: refactor plugin to better support otel
1 parent 24ec730 commit 68ac72c

File tree

7 files changed

+48
-45
lines changed

7 files changed

+48
-45
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ val dslJavaVersion = libs.versions.kotlin.dsl.jvmtarget
1616
idea {
1717
module {
1818
isDownloadJavadoc = false
19-
isDownloadSources = true
19+
isDownloadSources = false
2020
}
2121
}
2222

‎gradle/build-logic/src/main/kotlin/plugin.root.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ gradle.projectsEvaluated { logger.lifecycle(magenta("=== Projects Configuration
2929
idea {
3030
module {
3131
isDownloadJavadoc = false
32-
isDownloadSources = true
32+
isDownloadSources = false
3333
}
3434
project.vcs = "Git"
3535
}
@@ -117,7 +117,7 @@ tasks {
117117

118118
wrapper {
119119
gradleVersion = libs.versions.gradle.asProvider().get()
120-
distributionType = Wrapper.DistributionType.ALL
120+
distributionType = Wrapper.DistributionType.BIN
121121
// distributionUrl = "${Repo.GRADLE_DISTRO}/gradle-$gradleVersion-bin.zip"
122122
}
123123

‎gradle/libs.versions.toml

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ org-name = "suresh.dev"
2020
org-url = "https://suresh.dev"
2121

2222
# Dependency Versions
23-
bc-plugins = "1.37.0"
23+
bc-plugins = "1.38.0"
2424
kotlinx-kover = "0.9.1"
2525
kotlinx-bcv = "0.17.0"
2626
kotlin-dokka = "2.0.0"
@@ -30,38 +30,38 @@ kotlinx-coroutines = "1.10.2"
3030
kotlinx-datetime = "0.6.2"
3131
kotlinx-datetime-zoneinfo = "2025a-spi.0.6.2"
3232
kotlinx-serialization = "1.8.1"
33-
kotlinx-rpc = "0.6.2"
34-
kotlinx-collections-immutable = "0.3.8"
33+
kotlinx-rpc = "0.7.0"
34+
kotlinx-collections-immutable = "0.4.0"
3535
kotlinx-lincheck = "2.39"
3636
kotlinx-html = "0.12.0"
3737
kotlinx-browser = "0.3"
38-
kotlinx-benchmark = "0.4.13"
38+
kotlinx-benchmark = "0.4.14"
3939
kotlinx-fuzz = "0.2.2"
4040
kotlinx-metadata = "0.9.0"
4141
kotlinx-reflect-lite = "1.1.0"
42-
kotlin-wrappers = "2025.5.5"
42+
kotlin-wrappers = "2025.5.7"
4343
kotlin-redacted = "1.14.0-alpha01"
4444
kotlin-serviceloader = "0.0.15"
4545
kotlinx-multik = "0.2.3"
46-
kotlinx-dataframe = "1.0.0-dev-7089"
46+
kotlinx-dataframe = "1.0.0-Beta1"
4747
kotlinx-kandy = "0.8.0"
4848
kotlin-statistics = "0.4.0-RC1"
49-
gradle-kotlin-dsl = "6.1.1"
50-
exoquery-plugin = "2.1.20-1.2.2.PL"
51-
exoquery-sql = "1.2.2.PL-1.2.2"
52-
exposed = "0.61.0"
49+
gradle-kotlin-dsl = "6.1.2"
50+
exoquery-plugin = "2.1.20-1.2.3.PL"
51+
exoquery-sql = "1.2.3.PL-1.2.3"
52+
exposed = "1.0.0-beta-1"
5353
postgresql = "42.7.5"
5454
embedded-postgres = "2.1.0"
55-
embedded-postgres-bom = "17.2.0"
55+
embedded-postgres-bom = "17.4.0"
5656
evas = "1.3.0"
5757
kopy = "0.15.0+2.1.20"
5858
poko = "0.18.6"
5959
mappie = "2.1.20-1.2.3"
6060
akkurate = "0.11.0"
61-
kaml = "0.77.1"
61+
kaml = "0.78.0"
6262
snakeyaml-engine-kmp = "3.1.1"
6363
konsist = "0.17.3"
64-
decoroutinator = "2.4.9"
64+
decoroutinator = "2.5.0"
6565
spring-boot = "3.4.5"
6666
spring-depmgmt = "1.1.7"
6767
ktor = "3.1.3"
@@ -80,7 +80,7 @@ zip-prefixer = "0.3.1"
8080
ajalt-mordant = "3.0.2"
8181
ajalt-clikt = "5.0.3"
8282
ajalt-colormath = "3.6.1"
83-
jline = "3.30.0"
83+
jline = "3.30.1"
8484
classgraph = "4.8.179"
8585
cache4k = "0.14.0"
8686
intellij-coverage = "1.0.766"
@@ -93,13 +93,13 @@ jsch = "2.27.0"
9393
pty4j = "0.13.4"
9494
oshi = "6.8.1"
9595
junit = "5.13.0-M3"
96-
koin = "4.1.0-Beta10"
96+
koin = "4.1.0-Beta11"
9797
koin-annotations = "2.0.1-RC1"
98-
metro = "0.3.0"
98+
metro = "0.3.2"
9999
kotest = "6.0.0.M4"
100100
mockk = "1.14.2"
101101
mokkery = "2.7.2"
102-
wiremock = "4.0.0-beta.4"
102+
wiremock = "4.0.0-beta.6"
103103
wiremock-kotlin = "2.1.1"
104104
okhttp = "5.0.0-alpha.14"
105105
slf4j = "2.1.0-alpha1"
@@ -110,7 +110,7 @@ jmh = "1.37"
110110
mrjar = "0.1.1"
111111
ktfmt = "0.54"
112112
google-javaformat = "1.27.0"
113-
palantir-javaformat = "2.66.0"
113+
palantir-javaformat = "2.67.0"
114114
google-auto-service = "1.1.1"
115115
google-tink = "1.17.0"
116116
graalvm = "24.2.1"
@@ -183,7 +183,7 @@ cel = "0.9.1"
183183
kfswatch = "1.3.0"
184184
kmp-process = "0.2.1"
185185
kmbed = "1.8.4"
186-
langchain4j = "1.0.0-rc1"
186+
langchain4j = "1.0.0"
187187
langchain4j-kotlin = "0.1.12"
188188
jlama = "0.8.4"
189189
mcp-kotlin = "0.5.1"
@@ -206,12 +206,12 @@ jetbrains-compose-icons = "1.7.3"
206206
kobweb = "0.21.1"
207207
detekt = "1.23.8"
208208
detekt-compose-rules = "0.4.22"
209-
compose-hotreload = "1.0.0-alpha09"
209+
compose-hotreload = "1.0.0-alpha10"
210210
compose-icons = "1.1.1"
211211
compose-routing = "0.4.0"
212212
kottie = "2.0.1"
213213
mosaic = "0.17.0"
214-
filekit-dialogs = "0.10.0-beta03"
214+
filekit-dialogs = "0.10.0-beta04"
215215

216216
# NPM Dependencies
217217
npm-highlightjs = "11.11.0"
@@ -225,9 +225,9 @@ swagger-style = "https://unpkg.com/[email protected]/them
225225
benmanes = "0.52.0"
226226
foojay-resolver = "0.10.0"
227227
gradle-develocity = "4.0.1"
228-
nmcp = "0.1.3"
228+
nmcp = "0.1.4"
229229
nexus-publish = "2.0.0"
230-
vanniktech-publish = "0.31.0"
230+
vanniktech-publish = "0.32.0"
231231
gradle-publish = "1.3.1"
232232
shadow = "9.0.0-beta13"
233233
spotless = "7.0.3"
@@ -245,7 +245,7 @@ github-depgraph = "0.1.0"
245245
github-changelog = "2.2.0"
246246
wire-plugin = "5.3.1"
247247
buildkonfig = "0.17.1"
248-
gmazzo-buildconfig = "5.6.5"
248+
gmazzo-buildconfig = "5.6.4"
249249
cyclonedx-plugin = "1.10.0"
250250
modulegraph = "0.12.0"
251251
npm-publish-plugin = "3.5.3"
@@ -651,6 +651,7 @@ weh-chicory-emscripten = { module = "at.released.weh:bindings-chic
651651

652652
# AI/ML
653653
langchain4j = { module = "dev.langchain4j:langchain4j" , version.ref = "langchain4j" }
654+
langchain4j-bom = { module = "dev.langchain4j:langchain4j-bom" , version.ref = "langchain4j" }
654655
langchain4j-jlama = { module = "dev.langchain4j:langchain4j-jlama" , version.ref = "langchain4j" }
655656
langchain4j-kotlin = { module = "me.kpavlov.langchain4j.kotlin:langchain4j-kotlin" , version.ref = "langchain4j-kotlin" }
656657
jlama-core = { module = "com.github.tjake:jlama-core" , version.ref = "jlama" }
@@ -683,8 +684,6 @@ dataviz = ["kotlinx-dataframe-csv",
683684
json-extra = ["kotlinx-jsonpath","json-schema-validator"]
684685
keystore = ["sslcontext-kickstart","directory-keystore"]
685686
otel = ["otel-instr-annotations",
686-
"otel-sdk-autoconf",
687-
"otel-sdk-extn",
688687
"otel-semconv",
689688
"otel-instr-ktor",
690689
"otel-instr-logback-mdc",

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
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.14-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎plugins/project/src/main/kotlin/common/Multiplatform.kt

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,6 @@ fun KotlinMultiplatformExtension.commonTarget(project: Project) =
4242
api(libs.kotlin.retry)
4343
api(libs.kotlin.logging)
4444
api(libs.kotlinx.html)
45-
api(libs.bundles.ajalt)
46-
api(libs.kotlinx.jsonpath)
47-
api(libs.kotlin.cryptography.core)
48-
api(libs.kotlin.cryptography.random)
49-
api(libs.kotlin.bignum)
50-
api(libs.kotlin.bignum.serialization)
5145
api(libs.ktor.client.core)
5246
api(libs.ktor.client.cio)
5347
api(libs.ktor.client.content.negotiation)
@@ -301,7 +295,7 @@ fun KotlinMultiplatformExtension.nativeTargets(
301295
with(project) {
302296
fun KotlinNativeTarget.configureAll() {
303297
compilerOptions {
304-
// freeCompilerArgs.addAll("-Xverbose-phases=Linker", "-Xruntime-logs=gc=info")
298+
// freeCompilerArgs.addAll()
305299
}
306300
configure()
307301
}

‎plugins/project/src/main/kotlin/dev.suresh.plugin.kotlin.jvm.gradle.kts

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,14 @@ tasks {
196196
pluginManager.withPlugin("com.google.cloud.tools.jib") {
197197
val copyOtelAgent by
198198
registering(Copy::class) {
199-
from(javaAgent)
199+
from(javaAgent) {
200+
eachFile {
201+
if (name.startsWith("opentelemetry-javaagent")) {
202+
name = "otel-javaagent.jar"
203+
}
204+
}
205+
}
200206
into(layout.buildDirectory.dir("otel"))
201-
rename { "otel-javaagent.jar" }
202207
duplicatesStrategy = DuplicatesStrategy.INCLUDE
203208
}
204209

@@ -207,20 +212,26 @@ tasks {
207212
// Docker command to run the image
208213
withType<BuildDockerTask>().configureEach {
209214
doLast {
210-
val portMapping = jib?.container?.ports.orEmpty().joinToString(" ") { "-p $it:$it" }
215+
val portMapping =
216+
jib?.container?.ports.orEmpty().joinToString(" \\\n ") { "-p $it:$it" }
211217
val image = jib?.to?.image ?: project.name
212218
val tag = jib?.to?.tags?.firstOrNull() ?: "latest"
213219
val env =
214220
jib?.container
215221
?.environment
216222
.orEmpty()
217223
.map { "-e ${it.key}=${it.value}" }
218-
.joinToString(" ")
224+
.joinToString(" \\\n ")
219225
logger.lifecycle(
220226
TextColors.cyan(
221227
"""
222-
|Run: docker run -it --rm --name ${project.name} $portMapping $env $image:$tag
223-
"""
228+
|Run: docker run \
229+
| -it --rm \
230+
| --name ${project.name} \
231+
| $portMapping \
232+
| $env \
233+
| $image:$tag
234+
"""
224235
.trimMargin()))
225236
}
226237
}
@@ -256,7 +267,6 @@ dependencies {
256267
implementation(libs.kotlin.redacted.annotations)
257268
implementation(libs.jspecify)
258269
implementation(libs.bundles.keystore)
259-
implementation(libs.bundles.ajalt)
260270
implementation(libs.slf4j.api)
261271
// implementation(libs.slf4j.jul)
262272

‎plugins/project/src/main/kotlin/dev.suresh.plugin.root.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ tasks {
174174

175175
wrapper {
176176
gradleVersion = libs.versions.gradle.asProvider().get()
177-
distributionType = Wrapper.DistributionType.ALL
177+
distributionType = Wrapper.DistributionType.BIN
178178
// distributionUrl = "${Repo.GRADLE_DISTRO}/gradle-$gradleVersion-bin.zip"
179179
}
180180

0 commit comments

Comments
 (0)