chore: align build-logic and dep updates

sureshg · Oct 9, 2024 · 42853b4 · 42853b4
1 parent c507ff9
commit 42853b4
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 17 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -36,12 +36,12 @@ kotlinx-metadata               = "0.9.0"
 kotlinx-reflect-lite           = "1.1.0"
 kotlinx-bcv                    = "0.16.3"
 kotlin-dokka                   = "1.9.20"
-kotlin-wrappers                = "1.0.0-pre.816"
+kotlin-wrappers                = "1.0.0-pre.817"
 kotlin-redacted                = "1.11.0-alpha01"
 kotlinx-multik                 = "0.2.3"
 kotlinx-dataframe              = "0.13.1"
 kotlinx-kandy                  = "0.5.0"
-evas                           = "1.0.0"
+evas                           = "1.1.0"
 kopy                           = "0.11.0+2.0.20"
 poko                           = "0.17.1"
 mappie                         = "0.8.0"
@@ -51,7 +51,7 @@ karakum                        = "1.0.0-alpha.40-K2"
 seskar                         = "3.42.0"
 spring-boot                    = "3.3.4"
 spring-depmgmt                 = "1.1.6"
-ktor                           = "3.0.0-rc-2"
+ktor                           = "3.0.0"
 ktor-cohort                    = "2.5.1"
 otel                           = "1.42.1"
 otel-instr                     = "2.8.0"
@@ -86,7 +86,7 @@ wiremock                       = "3.9.1"
 wiremock-kotlin                = "2.1.1"
 okhttp                         = "5.0.0-alpha.14"
 slf4j                          = "2.1.0-alpha1"
-logback                        = "1.5.8"
+logback                        = "1.5.9"
 logback-tyler                  = "0.7"
 log4j                          = "3.0.0-beta2"
 jmh                            = "1.37"

diff --git a/plugins/src/main/kotlin/common/Multiplatform.kt b/plugins/src/main/kotlin/common/Multiplatform.kt
@@ -121,7 +121,6 @@ fun KotlinMultiplatformExtension.jvmTarget() {
         api(libs.slf4j.jul)
         api(libs.kotlinx.coroutines.slf4j)
         api(libs.jspecify)
-        api(libs.password4j)
         api(libs.bundles.keystore)
         // https://kotlinlang.org/docs/ksp-multiplatform.html
         api(libs.google.auto.annotations)

diff --git a/plugins/src/main/kotlin/common/ProjectExtns.kt b/plugins/src/main/kotlin/common/ProjectExtns.kt
@@ -245,7 +245,7 @@ fun Project.jvmArguments(appRun: Boolean = false, headless: Boolean = true) = bu
             "-Djdk.attach.allowAttachSelf=true",
             "-Djdk.traceVirtualThreadLocals=false",
             "-Djdk.tracePinnedThreads=full",
-            "-Djava.security.debug=properties",
+            // "-Djava.security.debug=properties",
             "-Djava.security.egd=file:/dev/./urandom",
             "-Djdk.includeInExceptions=hostInfo,jar",
             "-Dkotlinx.coroutines.debug",

diff --git a/plugins/src/main/kotlin/dev.suresh.plugin.kotlin.benchmark.gradle.kts b/plugins/src/main/kotlin/dev.suresh.plugin.kotlin.benchmark.gradle.kts
@@ -1,7 +1,6 @@
 import common.libs
 import kotlinx.benchmark.gradle.BenchmarkTarget
 import kotlinx.benchmark.gradle.KotlinJvmBenchmarkTarget
-import kotlinx.benchmark.gradle.benchmark
 
 /**
  * It's not allowed to access `libs` from pre-compiled script plugins. The `plugins {}` block in the

diff --git a/plugins/src/main/kotlin/dev.suresh.plugin.kotlin.jvm.gradle.kts b/plugins/src/main/kotlin/dev.suresh.plugin.kotlin.jvm.gradle.kts
@@ -262,7 +262,6 @@ dependencies {
   implementation(libs.kotlinx.collections.immutable)
   implementation(libs.kotlin.redacted.annotations)
   implementation(libs.jspecify)
-  implementation(libs.password4j)
   implementation(libs.bundles.keystore)
   implementation(libs.bundles.ajalt)
   implementation(libs.slf4j.api)

diff --git a/plugins/src/main/kotlin/dev.suresh.plugin.publishing.gradle.kts b/plugins/src/main/kotlin/dev.suresh.plugin.publishing.gradle.kts
@@ -1,6 +1,6 @@
 import com.google.cloud.tools.jib.gradle.JibExtension
 import common.*
-import kotlin.text.get
+import java.time.Year
 import nmcp.NmcpPublishTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinNativeLink
 
@@ -141,7 +141,7 @@ fun MavenPublication.configurePom() {
   pom {
     name = provider { "${project.group}:${project.name}" }
     description = provider { project.description }
-    inceptionYear = "2024"
+    inceptionYear = Year.now().toString()
     url = githubRepo
 
     developers {

diff --git a/plugins/src/main/kotlin/dev.suresh.plugin.repos.settings.gradle.kts b/plugins/src/main/kotlin/dev.suresh.plugin.repos.settings.gradle.kts
@@ -1,6 +1,7 @@
 @file:Suppress("UnstableApiUsage")
 
 import com.gradle.develocity.agent.gradle.scan.PublishedBuildScan
+import com.javiersc.semver.settings.gradle.plugin.SemverSettingsExtension
 import common.GithubAction
 import kotlinx.kover.gradle.aggregation.settings.dsl.KoverSettingsExtension
 import org.gradle.api.JavaVersion.VERSION_17
@@ -50,8 +51,7 @@ plugins {
   id("org.jetbrains.kotlinx.kover.aggregation")
   id("com.autonomousapps.build-health")
   id("com.javiersc.semver")
-  // Include other pre-compiled settings plugin
-  // id("dev.suresh.plugin.settings.include")
+  // id("dev.suresh.plugin.include")
 }
 
 // Centralizing repositories declaration
@@ -77,6 +77,11 @@ toolchainManagement {
   }
 }
 
+configure<SemverSettingsExtension> {
+  // val ktVersion = versionCatalog.getString("kotlin").orEmpty()
+  // mapVersion { it.copy(metadata = ktVersion).toString() }
+}
+
 configure<KoverSettingsExtension> {
   enableCoverage()
   reports { excludedClasses.addAll("*.generated.*", "dev.suresh.example.*") }

diff --git a/sandbox/gradle.properties b/sandbox/gradle.properties
@@ -21,4 +21,4 @@ semver.commitsMaxCount=100
 # semver.logOnlyOnRootProject=true
 
 # Sandbox Testing
-test.version=0.10.0
+test.version=0.11.0
diff --git a/sandbox/gradle/libs.versions.toml b/sandbox/gradle/libs.versions.toml
@@ -36,12 +36,12 @@ kotlinx-metadata               = "0.9.0"
 kotlinx-reflect-lite           = "1.1.0"
 kotlinx-bcv                    = "0.16.3"
 kotlin-dokka                   = "1.9.20"
-kotlin-wrappers                = "1.0.0-pre.816"
+kotlin-wrappers                = "1.0.0-pre.817"
 kotlin-redacted                = "1.11.0-alpha01"
 kotlinx-multik                 = "0.2.3"
 kotlinx-dataframe              = "0.13.1"
 kotlinx-kandy                  = "0.5.0"
-evas                           = "1.0.0"
+evas                           = "1.1.0"
 kopy                           = "0.11.0+2.0.20"
 poko                           = "0.17.1"
 mappie                         = "0.8.0"
@@ -51,7 +51,7 @@ karakum                        = "1.0.0-alpha.40-K2"
 seskar                         = "3.42.0"
 spring-boot                    = "3.3.4"
 spring-depmgmt                 = "1.1.6"
-ktor                           = "3.0.0-rc-2"
+ktor                           = "3.0.0"
 ktor-cohort                    = "2.5.1"
 otel                           = "1.42.1"
 otel-instr                     = "2.8.0"
@@ -86,7 +86,7 @@ wiremock                       = "3.9.1"
 wiremock-kotlin                = "2.1.1"
 okhttp                         = "5.0.0-alpha.14"
 slf4j                          = "2.1.0-alpha1"
-logback                        = "1.5.8"
+logback                        = "1.5.9"
 logback-tyler                  = "0.7"
 log4j                          = "3.0.0-beta2"
 jmh                            = "1.37"