Merge branch 'dev' into kotlin/2.3.0

# Conflicts:
#	gradle.properties

build.gradle.kts

@@ -39,17 +39,24 @@ subprojects {
 }
 
 
-ksciencePublish {
+kscienceProject {
     pom("https://github.com/SciProgCentre/visionforge") {
         useApache2Licence()
         useSPCTeam()
     }
-    repository("spc", "https://maven.sciprog.center/kscience")
-    central()
+    publishTo("spc", "https://maven.sciprog.center/kscience")
+    publishToCentral()
+
+    abiValidation {
+//        filters{
+//            excluded{
+//                byNames
+//            }
+//        }
+        //ignoredPackages.add("info.laht.threekt")
+    }
+
+    readme.readmeTemplate = file("docs/templates/README-TEMPLATE.md")
 }
 
-apiValidation {
-    ignoredPackages.add("info.laht.threekt")
-}
 
-readme.readmeTemplate = file("docs/templates/README-TEMPLATE.md")

demo/muon-monitor/build.gradle.kts

@@ -12,11 +12,7 @@ kscience {
         "muon-monitor.js",
         development = false,
         jvmConfig = {
-            binaries {
-                executable {
-                    mainClass.set("ru.mipt.npm.muon.monitor.MMServerKt")
-                }
-            }
+            application("ru.mipt.npm.muon.monitor.MMServerKt")
         },
         browserConfig = {
             commonWebpackConfig {

demo/playground/build.gradle.kts

@@ -12,7 +12,7 @@ repositories {
 }
 
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
     js {
         useEsModules()
         browser {

demo/sat-demo/build.gradle.kts

@@ -13,14 +13,10 @@ kscience {
 //    useSerialization {
 //        json()
 //    }
-    jvm{
-        binaries {
-            executable {
-                mainClass.set("ru.mipt.npm.sat.SatServerKt")
-            }
-        }
+    jvm {
+        application("ru.mipt.npm.sat.SatServerKt")
     }
-    jvmMain{
+    jvmMain {
         implementation("io.ktor:ktor-server-cio")
         implementation(projects.visionforgeThreejs.visionforgeThreejsServer)
         implementation(spclibs.logback.classic)

gradle.properties

@@ -8,4 +8,4 @@ org.gradle.workers.max=4
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 kotlin.native.enableKlibsCrossCompilation=true
 
-toolsVersion=0.19.2-kotlin-2.2.20
+toolsVersion=0.20.0-kotlin-2.3.0-Beta1

plotly-kt/build.gradle.kts

@@ -1,7 +1,10 @@
 plugins{
-    id("org.jetbrains.changelog")
+    id("space.kscience.gradle.project")
+}
+
+kscienceProject{
+    readme {
+        readmeTemplate = file("docs/templates/README-TEMPLATE.md")
+    }
 }
 
-readme {
-    readmeTemplate = file("docs/templates/README-TEMPLATE.md")
-}

plotly-kt/examples/build.gradle.kts

@@ -15,7 +15,7 @@ dependencies {
 }
 
 kotlin{
-    jvmToolchain(17)
+    jvmToolchain(21)
 }
 
 // A workaround for https://youtrack.jetbrains.com/issue/KT-44101

plotly-kt/examples/compose-demo/build.gradle.kts

@@ -12,7 +12,7 @@ repositories {
 
 kotlin {
     jvm()
-    jvmToolchain(17)
+    jvmToolchain(21)
     sourceSets {
         jvmMain {
             dependencies {

plotly-kt/plotly-kt-core/build.gradle.kts

@@ -31,10 +31,11 @@ kscience {
     }
 }
 
-//tasks.processJupyterApiResources {
-//    libraryProducers = listOf("space.kscience.plotly.PlotlyIntegration")
-//}
-
+kotlinJupyter {
+    integrations {
+        producer("space.kscience.plotly.PlotlyIntegration")
+    }
+}
 
 kotlin {
     compilerOptions {

visionforge-jupyter/visionforge-jupyter-common/build.gradle.kts

@@ -36,10 +36,11 @@ kscience {
     }
 }
 
-
-//tasks.processJupyterApiResources {
-//    libraryProducers = listOf("space.kscience.visionforge.jupyter.JupyterCommonIntegration")
-//}
+kotlinJupyter {
+    integrations {
+        producer("space.kscience.visionforge.jupyter.JupyterCommonIntegration")
+    }
+}
 
 readme {
     maturity = space.kscience.gradle.Maturity.EXPERIMENTAL