chore: dependency updates and misc fixes

sureshg · sureshg · commit ef57c2d56bd3 · 2023-08-14T03:19:42.000-07:00
diff --git a/README.md b/README.md
@@ -116,43 +116,42 @@ $ actionlint
 
 [simple-icons-logo]: https://simpleicons.org/icons/kotlin.svg
 
-
 ### Module Dependency
 
 ```mermaid
 %%{
-  init: {
-    'theme': 'neutral'
-  }
+init: {
+'theme': 'neutral'
+}
 }%%
 
 graph LR
 
-  subgraph compose
-    desktop
-    web
-  end
-  subgraph dep-mgmt
-    bom
-    catalog
-  end
-  subgraph devtools
-    compiler
-    ksp
-  end
-  subgraph compiler
-    compiler
-    plugin
-  end
-  subgraph ksp
-    ksp
-    processor
-  end
-  web --> common
-  web --> common
-  desktop --> common
-  backend --> common
-  web --> common
-  benchmarks --> common
+    subgraph compose
+        desktop
+        web
+    end
+    subgraph dep-mgmt
+        bom
+        catalog
+    end
+    subgraph devtools
+        compiler
+        ksp
+    end
+    subgraph compiler
+        compiler
+        plugin
+    end
+    subgraph ksp
+        ksp
+        processor
+    end
+    web --> common
+    web --> common
+    desktop --> common
+    backend --> common
+    web --> common
+    benchmarks --> common
 
 ```
diff --git a/gradle/build-logic/common-plugins/src/main/kotlin/plugins/common.gradle.kts b/gradle/build-logic/common-plugins/src/main/kotlin/plugins/common.gradle.kts
@@ -160,13 +160,13 @@ tasks {
     val publish = GithubAction.isTagBuild && Platform.isLinux
     if (publish) {
       logger.lifecycle("Publishing task is enabled for this build!")
-      subprojects.mapNotNull { it.tasks.findByName("publish") }.forEach { dependsOn(it) }
+      subprojects.mapNotNull { it.tasks.findByName(":publish") }.forEach { dependsOn(it) }
     }
   }
 
   // Task to print the project version
   register("v") {
-    description = "Print the ${project.name} version!"
-    doLast { println(project.version.toString()) }
+    description = "Print the ${rootProject.name} version!"
+    doLast { println(rootProject.version.toString()) }
   }
 }
diff --git a/gradle/build-logic/common-plugins/src/main/kotlin/plugins/kotlin.docs.gradle.kts b/gradle/build-logic/common-plugins/src/main/kotlin/plugins/kotlin.docs.gradle.kts
@@ -11,6 +11,7 @@ import org.jetbrains.dokka.gradle.DokkaTaskPartial
 plugins {
   id("org.jetbrains.dokka")
   id("org.jetbrains.kotlinx.kover")
+  id("test-report-aggregation")
 }
 
 // The following plugins and config apply only to a root project.
diff --git a/gradle/build-logic/common-plugins/src/main/kotlin/plugins/misc.gradle.kts b/gradle/build-logic/common-plugins/src/main/kotlin/plugins/misc.gradle.kts
@@ -89,15 +89,17 @@ tasks {
 
   // Clean all composite builds
   register("cleanAll") {
-    description = "Clean all composite builds"
+    description = "Clean all projects including composite builds"
     group = LifecycleBasePlugin.CLEAN_TASK_NAME
+
     dependsOn(gradle.includedBuilds.map { it.task(":clean") })
-    dependsOn(subprojects.map { it.tasks.clean })
+    subprojects.mapNotNull { it.tasks.findByName("clean") }.forEach { dependsOn(it) }
   }
 
   wrapper {
     gradleVersion = libs.versions.gradle.asProvider().get()
     distributionType = Wrapper.DistributionType.ALL
+    // distributionUrl = "${Repo.GRADLE_DISTRO}/gradle-$gradleVersion-bin.zip"
   }
 
   defaultTasks("clean", "tasks", "--all")
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,12 +1,12 @@
 [versions]
 java                           = "22"
 kotlin                         = "1.9.0"
-kotlin-ksp                     = "1.9.0-1.0.12"
+kotlin-ksp                     = "1.9.0-1.0.13"
 kotlin-jvmtarget               = "20"
 kotlin-dsl-jvmtarget           = "17"
 kotlin-api-version             = "1.9"
 kotlin-lang-version            = "2.0"
-gradle                         = "8.3-rc-2"
+gradle                         = "8.3-rc-4"
 node-version                   = "20.4.0"
 java-vendor                    = "Oracle"
 java-jvmArguments              = "--enable-preview"
@@ -27,14 +27,14 @@ kotlinx-io                     = "0.2.1"
 kotlinx-atomicfu               = "0.21.0"
 kotlinx-coroutines             = "1.7.3"
 kotlinx-datetime               = "0.4.0"
-kotlinx-serialization          = "1.5.1"
+kotlinx-serialization          = "1.6.0-RC"
 kotlinx-collections-immutable  = "0.3.5"
-kotlinx-lincheck               = "2.22"
+kotlinx-lincheck               = "2.23"
 kotlinx-html                   = "0.9.1"
-kotlinx-benchmark              = "0.4.8"
+kotlinx-benchmark              = "0.4.9"
 kotlinx-reflect-lite           = "1.1.0"
 kotlinx-bincompat              = "0.13.2"
-kotlin-wrappers                = "1.0.0-pre.603"
+kotlin-wrappers                = "1.0.0-pre.614"
 zip-prefixer                   = "0.3.1"
 ajalt-mordant                  = "2.1.0"
 ajalt-clikt                    = "4.1.0"
@@ -43,21 +43,22 @@ compose-routing                = "0.2.12"
 classgraph                     = "4.8.161"
 cache4k                        = "0.11.0"
 dokka                          = "1.8.20"
-intellij-markdown              = "0.4.1"
+intellij-coverage              = "1.0.733"
+intellij-markdown              = "0.5.0"
 jgit                           = "6.5.0.202303070854-r"
 jte                            = "3.0.2"
 junit                          = "5.10.0"
 koin                           = "3.4.1"
 kotest                         = "5.6.2"
 mockk                          = "1.13.5"
-mokkery                        = "1.9.0-1.1.0"
+mokkery                        = "1.9.0-1.3.0"
 ksp-auto-service               = "1.1.0"
 ksp-redacted                   = "1.6.0"
-ksp-powerassert                = "0.13.0"
+powerassert                    = "0.13.0"
 slf4j                          = "2.0.7"
 logback                        = "1.4.8"
 log4j                          = "3.0.0-alpha1"
-jmh                            = "1.36"
+jmh                            = "1.37"
 ktfmt                          = "0.44"
 google-javaformat              = "1.17.0"
 palantir-javaformat            = "2.33.0"
@@ -82,7 +83,7 @@ parsus                         = "0.4.0"
 java-keyring                   = "1.0.3"
 java-keychain                  = "1.1.0"
 webjars-xterm                  = "5.1.0"
-ktor                           = "2.3.2"
+ktor                           = "2.3.3"
 ktor-cohort                    = "2.1.3"
 kobweb                         = "0.13.9"
 exposed                        = "0.41.1"
@@ -97,6 +98,8 @@ shedlock                       = "5.6.0"
 sherlock                       = "0.4.19"
 expiringmap                    = "0.5.10"
 apache-commons-imaging         = "1.0-alpha3"
+testcontainers                 = "1.18.3"
+kubernetes-client              = "18.0.1"
 
 # NPM Dependencies
 npm-highlightjs                = "11.8.0"
@@ -111,11 +114,11 @@ gradle-enterprise              = "3.14.1"
 nexus-publish                  = "2.0.0-rc-1"
 shadow                         = "8.1.1"
 spotless                       = "6.20.0"
-semver-plugin                  = "0.5.0-rc.1"
+semver-plugin                  = "0.5.0-rc.5"
 taskinfo                       = "2.1.0"
 dependency-analysis            = "1.20.0"
 best-practices-plugin          = "0.10"
-graalvm-nativeimage            = "0.9.23"
+graalvm-nativeimage            = "0.9.24"
 github-depgraph                = "0.1.0"
 wire-plugin                    = "4.8.0"
 poko-plugin                    = "0.14.0"
@@ -125,7 +128,7 @@ cyclonedx-plugin               = "1.7.4"
 modulegraph                    = "0.4.0"
 jetbrains-compose              = "1.4.3"
 jetbrains-compose-compiler     = "1.5.0"
-cash-molecule                  = "1.1.0"
+cash-molecule                  = "1.2.0"
 npm-publish-plugin             = "3.4.1"
 exposed-plugin                 = "0.2.1"
 
@@ -140,6 +143,7 @@ build-kotlinx-atomicfu               = { module = "org.jetbrains.kotlinx:atomicf
 build-kotlinx-benchmark              = { module = "org.jetbrains.kotlinx:kotlinx-benchmark-plugin"                  , version.ref = "kotlinx-benchmark"}
 build-dokka                          = { module = "org.jetbrains.dokka:dokka-gradle-plugin"                         , version.ref = "dokka"}
 build-kotlin-ksp                     = { module = "com.google.devtools.ksp:symbol-processing-gradle-plugin"         , version.ref = "kotlin-ksp"}
+build-powerassert                    = { module = "com.bnorm.power:kotlin-power-assert-gradle"                      , version.ref = "powerassert"}
 build-ksp-redacted                   = { module = "dev.zacsweers.redacted:redacted-compiler-plugin-gradle"          , version.ref = "ksp-redacted"}
 build-benmanesversions               = { module = "com.github.ben-manes:gradle-versions-plugin"                     , version.ref = "benmanes"}
 build-gradle-enterprise              = { module = "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin"       , version.ref = "gradle-enterprise" }
@@ -170,6 +174,7 @@ build-jetbrains-compose-runtime      = { module = "org.jetbrains.compose.runtime
 build-jetbrains-compose-compiler     = { module = "org.jetbrains.compose.compiler:compiler"                         , version.ref = "jetbrains-compose-compiler"}
 build-npm-publish-plugin             = { module = "dev.petuska:npm-publish-gradle-plugin"                           , version.ref = "npm-publish-plugin"}
 build-exposed-plugin                 = { module = "gradle.plugin.com.jetbrains.exposed.gradle:plugin"               , version.ref = "exposed-plugin"}
+build-intellij-coverage              = { module = "org.jetbrains.intellij.deps:intellij-coverage-reporter"          , version.ref = "intellij-coverage" }
 
 # Gradle Dependencies
 kotlin-bom                           = { module = "org.jetbrains.kotlin:kotlin-bom"                                 , version.ref = "kotlin"}
@@ -332,6 +337,11 @@ multiplatform-settings-core          = { module = "com.russhwolf:multiplatform-s
 multiplatform-settings-coroutines    = { module = "com.russhwolf:multiplatform-settings-coroutines"            , version.ref = "kmp-settings" }
 
 apache-commons-imaging               = { module = "org.apache.commons:commons-imaging"                         , version.ref = "apache-commons-imaging" }
+testcontainers-bom                   = { module = "org.testcontainers:testcontainers-bom"                      , version.ref = "testcontainers"}
+testcontainers-core                  = { module = "org.testcontainers:testcontainers" }
+testcontainers-postgresql            = { module = "org.testcontainers:postgresql" }
+testcontainers-junit                 = { module = "org.testcontainers:junit-jupiter" }
+kubernetes-client                    = { module = "io.kubernetes:client-java"                                  , version.ref = "kubernetes-client"}
 
 [bundles]
 ktor-server = [
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-rc-2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-rc-4-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -18,17 +18,16 @@ include(":compose:web")
 
 include(":compose:desktop")
 
+// includeBuild("misc/build") {
+//    dependencySubstitution {
+//        substitute(module("dev.suresh:misc-build")).using(project(":"))
+//    }
+// }
+
 include(":dep-mgmt:bom")
 
 include(":dep-mgmt:catalog")
 
 include(":devtools:ksp:processor")
 
-include(
-    ":devtools:compiler:plugin")
-
-// includeBuild("misc/build") {
-//    dependencySubstitution {
-//        substitute(module("dev.suresh:misc-build")).using(project(":"))
-//    }
-// }
+include(":devtools:compiler:plugin")

Original file line number	Diff line number	Diff line change
`@@ -160,13 +160,13 @@ tasks {`
`160`	`160`	`val publish = GithubAction.isTagBuild && Platform.isLinux`
`161`	`161`	`if (publish) {`
`162`	`162`	`logger.lifecycle("Publishing task is enabled for this build!")`
`163`		`- subprojects.mapNotNull { it.tasks.findByName("publish") }.forEach { dependsOn(it) }`
	`163`	`+ subprojects.mapNotNull { it.tasks.findByName(":publish") }.forEach { dependsOn(it) }`
`164`	`164`	`}`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`// Task to print the project version`
`168`	`168`	`register("v") {`
`169`		`- description = "Print the ${project.name} version!"`
`170`		`- doLast { println(project.version.toString()) }`
	`169`	`+ description = "Print the ${rootProject.name} version!"`
	`170`	`+ doLast { println(rootProject.version.toString()) }`
`171`	`171`	`}`
`172`	`172`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ import org.jetbrains.dokka.gradle.DokkaTaskPartial`
`11`	`11`	`plugins {`
`12`	`12`	`id("org.jetbrains.dokka")`
`13`	`13`	`id("org.jetbrains.kotlinx.kover")`
	`14`	`+ id("test-report-aggregation")`
`14`	`15`	`}`
`15`	`16`
`16`	`17`	`// The following plugins and config apply only to a root project.`