Skip to content

Commit 42853b4

Browse files
committed
chore: align build-logic and dep updates
1 parent c507ff9 commit 42853b4

9 files changed

+19
-17
lines changed

gradle/libs.versions.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ kotlinx-metadata = "0.9.0"
3636
kotlinx-reflect-lite = "1.1.0"
3737
kotlinx-bcv = "0.16.3"
3838
kotlin-dokka = "1.9.20"
39-
kotlin-wrappers = "1.0.0-pre.816"
39+
kotlin-wrappers = "1.0.0-pre.817"
4040
kotlin-redacted = "1.11.0-alpha01"
4141
kotlinx-multik = "0.2.3"
4242
kotlinx-dataframe = "0.13.1"
4343
kotlinx-kandy = "0.5.0"
44-
evas = "1.0.0"
44+
evas = "1.1.0"
4545
kopy = "0.11.0+2.0.20"
4646
poko = "0.17.1"
4747
mappie = "0.8.0"
@@ -51,7 +51,7 @@ karakum = "1.0.0-alpha.40-K2"
5151
seskar = "3.42.0"
5252
spring-boot = "3.3.4"
5353
spring-depmgmt = "1.1.6"
54-
ktor = "3.0.0-rc-2"
54+
ktor = "3.0.0"
5555
ktor-cohort = "2.5.1"
5656
otel = "1.42.1"
5757
otel-instr = "2.8.0"
@@ -86,7 +86,7 @@ wiremock = "3.9.1"
8686
wiremock-kotlin = "2.1.1"
8787
okhttp = "5.0.0-alpha.14"
8888
slf4j = "2.1.0-alpha1"
89-
logback = "1.5.8"
89+
logback = "1.5.9"
9090
logback-tyler = "0.7"
9191
log4j = "3.0.0-beta2"
9292
jmh = "1.37"

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ fun KotlinMultiplatformExtension.jvmTarget() {
121121
api(libs.slf4j.jul)
122122
api(libs.kotlinx.coroutines.slf4j)
123123
api(libs.jspecify)
124-
api(libs.password4j)
125124
api(libs.bundles.keystore)
126125
// https://kotlinlang.org/docs/ksp-multiplatform.html
127126
api(libs.google.auto.annotations)

plugins/src/main/kotlin/common/ProjectExtns.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ fun Project.jvmArguments(appRun: Boolean = false, headless: Boolean = true) = bu
245245
"-Djdk.attach.allowAttachSelf=true",
246246
"-Djdk.traceVirtualThreadLocals=false",
247247
"-Djdk.tracePinnedThreads=full",
248-
"-Djava.security.debug=properties",
248+
// "-Djava.security.debug=properties",
249249
"-Djava.security.egd=file:/dev/./urandom",
250250
"-Djdk.includeInExceptions=hostInfo,jar",
251251
"-Dkotlinx.coroutines.debug",

plugins/src/main/kotlin/dev.suresh.plugin.kotlin.benchmark.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import common.libs
22
import kotlinx.benchmark.gradle.BenchmarkTarget
33
import kotlinx.benchmark.gradle.KotlinJvmBenchmarkTarget
4-
import kotlinx.benchmark.gradle.benchmark
54

65
/**
76
* It's not allowed to access `libs` from pre-compiled script plugins. The `plugins {}` block in the

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,6 @@ dependencies {
262262
implementation(libs.kotlinx.collections.immutable)
263263
implementation(libs.kotlin.redacted.annotations)
264264
implementation(libs.jspecify)
265-
implementation(libs.password4j)
266265
implementation(libs.bundles.keystore)
267266
implementation(libs.bundles.ajalt)
268267
implementation(libs.slf4j.api)

plugins/src/main/kotlin/dev.suresh.plugin.publishing.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import com.google.cloud.tools.jib.gradle.JibExtension
22
import common.*
3-
import kotlin.text.get
3+
import java.time.Year
44
import nmcp.NmcpPublishTask
55
import org.jetbrains.kotlin.gradle.tasks.KotlinNativeLink
66

@@ -141,7 +141,7 @@ fun MavenPublication.configurePom() {
141141
pom {
142142
name = provider { "${project.group}:${project.name}" }
143143
description = provider { project.description }
144-
inceptionYear = "2024"
144+
inceptionYear = Year.now().toString()
145145
url = githubRepo
146146

147147
developers {

plugins/src/main/kotlin/dev.suresh.plugin.repos.settings.gradle.kts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@file:Suppress("UnstableApiUsage")
22

33
import com.gradle.develocity.agent.gradle.scan.PublishedBuildScan
4+
import com.javiersc.semver.settings.gradle.plugin.SemverSettingsExtension
45
import common.GithubAction
56
import kotlinx.kover.gradle.aggregation.settings.dsl.KoverSettingsExtension
67
import org.gradle.api.JavaVersion.VERSION_17
@@ -50,8 +51,7 @@ plugins {
5051
id("org.jetbrains.kotlinx.kover.aggregation")
5152
id("com.autonomousapps.build-health")
5253
id("com.javiersc.semver")
53-
// Include other pre-compiled settings plugin
54-
// id("dev.suresh.plugin.settings.include")
54+
// id("dev.suresh.plugin.include")
5555
}
5656

5757
// Centralizing repositories declaration
@@ -77,6 +77,11 @@ toolchainManagement {
7777
}
7878
}
7979

80+
configure<SemverSettingsExtension> {
81+
// val ktVersion = versionCatalog.getString("kotlin").orEmpty()
82+
// mapVersion { it.copy(metadata = ktVersion).toString() }
83+
}
84+
8085
configure<KoverSettingsExtension> {
8186
enableCoverage()
8287
reports { excludedClasses.addAll("*.generated.*", "dev.suresh.example.*") }

sandbox/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ semver.commitsMaxCount=100
2121
# semver.logOnlyOnRootProject=true
2222

2323
# Sandbox Testing
24-
test.version=0.10.0
24+
test.version=0.11.0

sandbox/gradle/libs.versions.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ kotlinx-metadata = "0.9.0"
3636
kotlinx-reflect-lite = "1.1.0"
3737
kotlinx-bcv = "0.16.3"
3838
kotlin-dokka = "1.9.20"
39-
kotlin-wrappers = "1.0.0-pre.816"
39+
kotlin-wrappers = "1.0.0-pre.817"
4040
kotlin-redacted = "1.11.0-alpha01"
4141
kotlinx-multik = "0.2.3"
4242
kotlinx-dataframe = "0.13.1"
4343
kotlinx-kandy = "0.5.0"
44-
evas = "1.0.0"
44+
evas = "1.1.0"
4545
kopy = "0.11.0+2.0.20"
4646
poko = "0.17.1"
4747
mappie = "0.8.0"
@@ -51,7 +51,7 @@ karakum = "1.0.0-alpha.40-K2"
5151
seskar = "3.42.0"
5252
spring-boot = "3.3.4"
5353
spring-depmgmt = "1.1.6"
54-
ktor = "3.0.0-rc-2"
54+
ktor = "3.0.0"
5555
ktor-cohort = "2.5.1"
5656
otel = "1.42.1"
5757
otel-instr = "2.8.0"
@@ -86,7 +86,7 @@ wiremock = "3.9.1"
8686
wiremock-kotlin = "2.1.1"
8787
okhttp = "5.0.0-alpha.14"
8888
slf4j = "2.1.0-alpha1"
89-
logback = "1.5.8"
89+
logback = "1.5.9"
9090
logback-tyler = "0.7"
9191
log4j = "3.0.0-beta2"
9292
jmh = "1.37"

0 commit comments

Comments
 (0)