Update Kotlin to 1.9.20, Gradle to 8.4

build.gradle

@@ -144,7 +144,7 @@ nexusPublishing {
 // "JavaDoc" artifact for all publications.
 task jarJavaDocs(type: Jar) {
  group project.letsPlotTaskGroup
- classifier 'javadoc'
+ archiveClassifier.set("javadoc")
  from("$rootDir/README.md")
 }
 

demo/common-util/src/jvmMain/kotlin/demo/common/util/demoUtils/browser/BrowserDemoUtil.kt

@@ -78,7 +78,7 @@ object BrowserDemoUtil {
  }
 
  private fun projectJs(projectPath: String, projectName: String) =
- "${getRootPath()}/$projectPath/build/distributions/$projectName.js"
+ "${getRootPath()}/$projectPath/build/dist/js/productionExecutable/$projectName.js"
 
  fun mapperDemoHtml(demoProjectPath: String, demoProject: String, callFun: String, title: String): String {
  return mapperDemoHtml(demoProjectPath, demoProject, callFun, null, title)

demo/livemap/build.gradle

@@ -2,12 +2,27 @@ plugins {
  id "org.jetbrains.kotlin.multiplatform"
 }
 
+// KT-55751. MPP / Gradle: Consumable configurations must have unique attributes.
+// https://youtrack.jetbrains.com/issue/KT-55751/MPP-Gradle-Consumable-configurations-must-have-unique-attributes
+//
+def dummyAttribute = Attribute.of("dummyAttribute", String)
+
 kotlin {
- jvm("jvmJfx")
- jvm("jvmRawJfx")
- jvm("jvmRawAwt")
- jvm("jvmBrowser")
- jvm("jvmJfxPlot")
+ jvm("jvmJfx") {
+ attributes.attribute(dummyAttribute, "jvmJfx")
+ }
+ jvm("jvmRawJfx") {
+ attributes.attribute(dummyAttribute, "jvmRawJfx")
+ }
+ jvm("jvmRawAwt") {
+ attributes.attribute(dummyAttribute, "jvmRawAwt")
+ }
+ jvm("jvmBrowser") {
+ attributes.attribute(dummyAttribute, "jvmBrowser")
+ }
+ jvm("jvmJfxPlot") {
+ attributes.attribute(dummyAttribute, "jvmJfxPlot")
+ }
  jvm("jvmBatikPlot")
  js {
  browser()

demo/plot/build.gradle

@@ -8,10 +8,19 @@ plugins {
  * Use of this source code is governed by the MIT license that can be found in the LICENSE file.
  */
 
+// KT-55751. MPP / Gradle: Consumable configurations must have unique attributes.
+// https://youtrack.jetbrains.com/issue/KT-55751/MPP-Gradle-Consumable-configurations-must-have-unique-attributes
+//
+def dummyAttribute = Attribute.of("dummyAttribute", String)
+
 kotlin {
  jvm("jvmBatik")
- jvm("jvmJfx")
- jvm("jvmBrowser")
+ jvm("jvmJfx") {
+ attributes.attribute(dummyAttribute, "jvmJfx")
+ }
+ jvm("jvmBrowser") {
+ attributes.attribute(dummyAttribute, "jvmBrowser")
+ }
  js() {
  browser()
  binaries.executable()

demo/svg/build.gradle

@@ -7,10 +7,19 @@ plugins {
  id "org.jetbrains.kotlin.multiplatform"
 }
 
+// KT-55751. MPP / Gradle: Consumable configurations must have unique attributes.
+// https://youtrack.jetbrains.com/issue/KT-55751/MPP-Gradle-Consumable-configurations-must-have-unique-attributes
+//
+def dummyAttribute = Attribute.of("dummyAttribute", String)
+
 kotlin {
  jvm("jvmBatik")
- jvm("jvmJfx")
- jvm("jvmBrowser") // generates index.html and opens it in browser
+ jvm("jvmJfx") {
+ attributes.attribute(dummyAttribute, "jvmJfx")
+ }
+ jvm("jvmBrowser") { // generates index.html and opens it in browser
+ attributes.attribute(dummyAttribute, "jvmBrowser")
+ }
  js() {
  browser()
  binaries.executable()

gradle.properties

@@ -6,7 +6,7 @@
 kotlin.code.style=official
 
 
-kotlin_version=1.9.10
+kotlin_version=1.9.20
 kotlinLogging_version=2.0.5
 
 kotlinx_html_version=0.7.3

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\:https://services.gradle.org/distributions/gradle-7.6.2-bin.zip
+distributionUrl=https\:https://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists