Upgraded dependencies (Coroutines 1.10.1, Serialization 1.8.0-RC, Dok…

…ka 2.0.0, Jooby 3.5.5, Spring Boot 3.4.1, Ktor 3.0.3, Javalin 6.4.0, Micronaut 4.7.3, Gradle 8.12, kotlin-wrappers 856, logback 1.5.15, Chart.js 4.4.7, Fontawesome 6.7.2, React 19.0.0, Trix 2.1.12)

build.gradle.kts

@@ -1,3 +1,5 @@
+import java.net.URI
+
 plugins {
     val kotlinVersion: String by System.getProperties()
     kotlin("plugin.serialization") version kotlinVersion
@@ -17,7 +19,6 @@ allprojects {
 }
 
 // Versions
-val kotlinVersion: String by System.getProperties()
 val serializationVersion: String by project
 val coroutinesVersion: String by project
 
@@ -59,9 +60,6 @@ val tabulatorTablesVersion: String by project
 val toastifyjsVersion: String by project
 val tomSelectVersion: String by project
 
-// Custom Properties
-val webDir = file("src/jsMain/web")
-
 rootProject.plugins.withType<org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin> {
     rootProject.the<org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension>().apply {
         lockFileDirectory = project.rootDir.resolve(".kotlin-js-store")
@@ -138,7 +136,7 @@ kotlin {
 }
 
 val javadocJar by tasks.registering(Jar::class) {
-    dependsOn("dokkaHtml")
+    dependsOn("dokkaGenerate")
     archiveClassifier.set("javadoc")
     from(layout.buildDirectory.dir("dokka/html"))
 
@@ -147,79 +145,66 @@ val javadocJar by tasks.registering(Jar::class) {
 setupSigning()
 setupPublication(withSigning = true)
 
-tasks.dokkaHtml.configure {
+dependencies {
+    dokka(rootProject)
+    dokka(project(":kvision-modules:kvision-ballast"))
+    dokka(project(":kvision-modules:kvision-bootstrap"))
+    dokka(project(":kvision-modules:kvision-bootstrap-icons"))
+    dokka(project(":kvision-modules:kvision-bootstrap-upload"))
+    dokka(project(":kvision-modules:kvision-chart"))
+    dokka(project(":kvision-modules:kvision-common-annotations"))
+    dokka(project(":kvision-modules:kvision-common-remote"))
+    dokka(project(":kvision-modules:kvision-common-types"))
+    dokka(project(":kvision-modules:kvision-cordova"))
+    dokka(project(":kvision-modules:kvision-datetime"))
+    dokka(project(":kvision-modules:kvision-electron"))
+    dokka(project(":kvision-modules:kvision-fontawesome"))
+    dokka(project(":kvision-modules:kvision-handlebars"))
+    dokka(project(":kvision-modules:kvision-i18n"))
+    dokka(project(":kvision-modules:kvision-imask"))
+    dokka(project(":kvision-modules:kvision-jquery"))
+    dokka(project(":kvision-modules:kvision-maps"))
+    dokka(project(":kvision-modules:kvision-material"))
+    dokka(project(":kvision-modules:kvision-onsenui"))
+    dokka(project(":kvision-modules:kvision-pace"))
+    dokka(project(":kvision-modules:kvision-print"))
+    dokka(project(":kvision-modules:kvision-react"))
+    dokka(project(":kvision-modules:kvision-redux-kotlin"))
+    dokka(project(":kvision-modules:kvision-rest"))
+    dokka(project(":kvision-modules:kvision-richtext"))
+    dokka(project(":kvision-modules:kvision-routing-ballast"))
+    dokka(project(":kvision-modules:kvision-routing-navigo"))
+    dokka(project(":kvision-modules:kvision-routing-navigo-ng"))
+    dokka(project(":kvision-modules:kvision-select-remote"))
+    dokka(project(":kvision-modules:kvision-server-javalin"))
+    dokka(project(":kvision-modules:kvision-server-jooby"))
+    dokka(project(":kvision-modules:kvision-server-ktor"))
+    dokka(project(":kvision-modules:kvision-server-ktor-koin"))
+    dokka(project(":kvision-modules:kvision-server-micronaut"))
+    dokka(project(":kvision-modules:kvision-server-spring-boot"))
+    dokka(project(":kvision-modules:kvision-server-vertx"))
+    dokka(project(":kvision-modules:kvision-state"))
+    dokka(project(":kvision-modules:kvision-state-flow"))
+    dokka(project(":kvision-modules:kvision-tabulator"))
+    dokka(project(":kvision-modules:kvision-tabulator-remote"))
+    dokka(project(":kvision-modules:kvision-testutils"))
+    dokka(project(":kvision-modules:kvision-toastify"))
+    dokka(project(":kvision-modules:kvision-tom-select"))
+    dokka(project(":kvision-modules:kvision-tom-select-remote"))
+}
+
+dokka {
     dokkaSourceSets {
-        named("commonMain") {
-            suppress.set(true)
-        }
-        named("jsMain") {
-            suppress.set(true)
-        }
-        register("kvision") {
+        configureEach {
             includes.from("Module.md")
-            displayName.set("js")
-            platform.set(org.jetbrains.dokka.Platform.js)
-            includeNonPublic.set(false)
-            skipDeprecated.set(false)
-            reportUndocumented.set(false)
-            sourceRoots.from(file("src/jsMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-ballast/src/jsMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-bootstrap/src/jsMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-bootstrap-icons/src/jsMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-bootstrap-upload/src/jsMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-chart/src/jsMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-common-remote/src/jsMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-common-types/src/jsMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-cordova/src/jsMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-datetime/src/jsMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-electron/src/jsMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-fontawesome/src/jsMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-handlebars/src/jsMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-i18n/src/jsMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-imask/src/jsMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-jquery/src/jsMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-maps/src/jsMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-material/src/jsMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-onsenui/src/jsMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-pace/src/jsMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-react/src/jsMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-redux-kotlin/src/jsMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-rest/src/jsMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-richtext/src/jsMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-routing-navigo-ng/src/jsMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-server-ktor/src/jsMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-select-remote/src/jsMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-state/src/jsMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-state-flow/src/jsMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-tabulator/src/jsMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-tabulator-remote/src/jsMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-testutils/src/jsMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-toastify/src/jsMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-tom-select/src/jsMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-tom-select-remote/src/jsMain/kotlin"))
-        }
-        register("kvision-common") {
-            includes.from("Module.md")
-            displayName.set("common")
-            platform.set(org.jetbrains.dokka.Platform.common)
-            includeNonPublic.set(false)
-            skipDeprecated.set(false)
-            reportUndocumented.set(false)
-            sourceRoots.from(file("kvision-modules/kvision-common-annotations/src/commonMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-common-remote/src/commonMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-common-types/src/commonMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-server-ktor/src/commonMain/kotlin"))
-        }
-        register("kvision-jvm") {
-            includes.from("Module.md")
-            displayName.set("jvm")
-            platform.set(org.jetbrains.dokka.Platform.jvm)
-            includeNonPublic.set(false)
-            skipDeprecated.set(false)
-            reportUndocumented.set(false)
-            sourceRoots.from(file("kvision-modules/kvision-common-remote/src/jvmMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-common-types/src/jvmMain/kotlin"))
-            sourceRoots.from(file("kvision-modules/kvision-server-ktor/src/jvmMain/kotlin"))
+            sourceLink {
+                localDirectory.set(projectDir.resolve("src"))
+                remoteUrl.set(URI("https://github.com/rjaros/kvision/tree/master/src"))
+                remoteLineSuffix.set("#L")
+            }
         }
     }
+    dokkaGeneratorIsolation = ProcessIsolation {
+        maxHeapSize = "6g"
+    }
 }

buildSrc/build.gradle.kts

@@ -10,6 +10,6 @@ repositories {
 dependencies {
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0")
     implementation("io.github.gradle-nexus:publish-plugin:2.0.0")
-    implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.9.20")
+    implementation("org.jetbrains.dokka:dokka-gradle-plugin:2.0.0")
     implementation(gradleApi())
 }

buildSrc/src/main/kotlin/Shared.kt

@@ -11,7 +11,10 @@ import org.gradle.kotlin.dsl.named
 import org.gradle.kotlin.dsl.repositories
 import org.gradle.kotlin.dsl.withType
 import org.gradle.plugins.signing.SigningExtension
+import org.jetbrains.dokka.gradle.DokkaExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
+import java.net.URI
+import kotlin.text.set
 
 fun Project.repositories() {
     repositories {
@@ -162,65 +165,14 @@ fun Project.setupPublication(withJvm: Boolean = false, withSigning: Boolean = fa
 }
 
 fun Project.setupDokka() {
-    tasks.named<org.jetbrains.dokka.gradle.DokkaTask>("dokkaHtml").configure {
+    extensions.getByType<DokkaExtension>().run {
         dokkaSourceSets.invoke {
-            named("main") {
-                suppress.set(true)
-            }
-            register("kvision") {
-                includes.from("../../Module.md")
-                displayName.set("jvm")
-                platform.set(org.jetbrains.dokka.Platform.jvm)
-                includeNonPublic.set(false)
-                skipDeprecated.set(false)
-                reportUndocumented.set(false)
-                sourceRoots.from(file("src/main/kotlin"))
-            }
-        }
-    }
-}
-
-fun Project.setupDokkaMpp(withJvm: Boolean = false) {
-    tasks.named<org.jetbrains.dokka.gradle.DokkaTask>("dokkaHtml").configure {
-        dokkaSourceSets.invoke {
-            named("commonMain") {
-                suppress.set(true)
-            }
-            named("jsMain") {
-                suppress.set(true)
-            }
-            if (findByName("jvmMain") != null) {
-                named("jvmMain") {
-                    suppress.set(true)
-                }
-            }
-            register("kvision-common") {
-                includes.from("../../Module.md")
-                displayName.set("common")
-                platform.set(org.jetbrains.dokka.Platform.common)
-                includeNonPublic.set(false)
-                skipDeprecated.set(false)
-                reportUndocumented.set(false)
-                sourceRoots.from(file("src/commonMain/kotlin"))
-            }
-            register("kvision-js") {
+            configureEach {
                 includes.from("../../Module.md")
-                displayName.set("js")
-                platform.set(org.jetbrains.dokka.Platform.js)
-                includeNonPublic.set(false)
-                skipDeprecated.set(false)
-                reportUndocumented.set(false)
-                sourceRoots.from(file("src/jsMain/kotlin"))
-            }
-            if (withJvm) { // Workaround for StackOverflowError in Spring Boot module
-                register("kvision-jvm") {
-                    includes.from("../../Module.md")
-                    displayName.set("jvm")
-                    platform.set(org.jetbrains.dokka.Platform.jvm)
-                    includeNonPublic.set(false)
-                    skipDeprecated.set(false)
-                    reportUndocumented.set(false)
-                    sourceRoots.from(file("src/jvmMain/kotlin"))
+                sourceLink {
+                    localDirectory.set(projectDir.resolve("src"))
+                    remoteUrl.set(URI("https://github.com/rjaros/kvision/tree/master/kvision-modules/${project.name}/src"))
+                    remoteLineSuffix.set("#L")
                 }
             }
         }

gradle.properties

@@ -3,35 +3,36 @@ versionNumber=8.1.0
 
 systemProp.kotlinVersion=2.1.0
 javaVersion=17
-coroutinesVersion=1.9.0
-serializationVersion=1.7.3
-systemProp.dokkaVersion=1.9.20
+coroutinesVersion=1.10.1
+serializationVersion=1.8.0-RC
+systemProp.dokkaVersion=2.0.0
 systemProp.npmPublishVersion=3.4.2
 systemProp.gradlePluginPublishVersion=1.3.0
 systemProp.kspVersion=2.1.0-1.0.29
-joobyVersion=3.5.4
-springBootVersion=3.4.0
-springDataRelationalVersion=3.4.0
-ktorVersion=3.0.1
-javalinVersion=6.3.0
+joobyVersion=3.5.5
+springBootVersion=3.4.1
+springDataRelationalVersion=3.4.1
+ktorVersion=3.0.3
+javalinVersion=6.4.0
 vertxVersion=4.5.11
-micronautVersion=4.7.1
+micronautVersion=4.7.3
 guiceVersion=7.0.0
 koinVersion=4.1.0-Beta1
 jqueryKotlinVersion=1.0.0
 navigoKotlinVersion=1.0.0
 navigoKotlinNgVersion=0.0.3
 diffVersion=0.7.0
 jacksonModuleKotlinVersion=2.18.2
-logbackVersion=1.5.12
-kotlinNodeVersion=22.5.5-pre.841
-kotlinReactVersion=18.3.1-pre.841
+logbackVersion=1.5.15
+kotlinNodeVersion=22.5.5-pre.856
+kotlinReactVersion=19.0.0-pre.856
 reduxKotlinVersion=0.6.1
 reduxKotlinThunkVersion=0.6.0
 ballastVersion=4.2.1
 testNgVersion=7.10.2
 hamcrestVersion=3.0
 kotestVersion=5.9.1
+# do not upgrade from 8.3.3 in the Vert.x examples
 shadowVersion=8.3.5
 
 kvisionAssetsVersion=8.0.14
@@ -50,11 +51,11 @@ bootstrapVersion=5.3.3
 popperjsCoreVersion=2.11.8
 bootstrapIconsVersion=1.11.3
 bootstrapFileinputVersion=5.5.4
-chartjsVersion=4.4.6
+chartjsVersion=4.4.7
 tempusDominusVersion=6.9.11
 electronVersion=33.2.1
 electronRemoteVersion=2.1.2
-fontawesomeFreeVersion=6.7.1
+fontawesomeFreeVersion=6.7.2
 handlebarsVersion=4.7.8
 handlebarsLoaderVersion=1.7.3
 imaskVersion=7.6.1
@@ -66,8 +67,8 @@ materialVersion=2.2.0
 onsenuiVersion=2.12.8
 paceProgressbarVersion=1.0.10
 printjsVersion=1.6.0
-reactVersion=^18.3.1
-trixVersion=2.1.8
+reactVersion=^19.0.0
+trixVersion=2.1.12
 tabulatorTablesVersion=6.3.0
 toastifyjsVersion=1.12.0
 tomSelectVersion=2.4.1
@@ -81,3 +82,6 @@ org.gradle.parallel=true
 #org.gradle.unsafe.configuration-cache=true
 #org.gradle.unsafe.configuration-cache-problems=warn
 org.gradle.kotlin.dsl.precompiled.accessors.strict=true
+
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
+org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

kvision-modules/kvision-ballast/build.gradle.kts

@@ -30,11 +30,11 @@ kotlin {
 }
 
 val javadocJar by tasks.registering(Jar::class) {
-    dependsOn("dokkaHtml")
+    dependsOn("dokkaGenerate")
     archiveClassifier.set("javadoc")
     from(layout.buildDirectory.dir("dokka/html"))
 }
 
 setupSigning()
 setupPublication()
-setupDokkaMpp()
+setupDokka()

kvision-modules/kvision-bootstrap-icons/build.gradle.kts

@@ -25,12 +25,12 @@ kotlin {
 }
 
 val javadocJar by tasks.registering(Jar::class) {
-    dependsOn("dokkaHtml")
+    dependsOn("dokkaGenerate")
     archiveClassifier.set("javadoc")
     from(layout.buildDirectory.dir("dokka/html"))
 
 }
 
 setupSigning()
 setupPublication()
-setupDokkaMpp()
+setupDokka()

kvision-modules/kvision-bootstrap-upload/build.gradle.kts

@@ -29,12 +29,12 @@ kotlin {
 }
 
 val javadocJar by tasks.registering(Jar::class) {
-    dependsOn("dokkaHtml")
+    dependsOn("dokkaGenerate")
     archiveClassifier.set("javadoc")
     from(layout.buildDirectory.dir("dokka/html"))
 
 }
 
 setupSigning()
 setupPublication()
-setupDokkaMpp()
+setupDokka()