diff --git a/build.gradle b/build.gradle
index 25361ed200b..6960ca82654 100644
--- a/build.gradle
+++ b/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")
 }
 
diff --git a/demo/common-util/src/jvmMain/kotlin/demo/common/util/demoUtils/browser/BrowserDemoUtil.kt b/demo/common-util/src/jvmMain/kotlin/demo/common/util/demoUtils/browser/BrowserDemoUtil.kt
index 0b7bb53d3de..2720c600ee6 100644
--- a/demo/common-util/src/jvmMain/kotlin/demo/common/util/demoUtils/browser/BrowserDemoUtil.kt
+++ b/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)
diff --git a/demo/livemap/build.gradle b/demo/livemap/build.gradle
index 49686d307d2..d9df73ac9ee 100644
--- a/demo/livemap/build.gradle
+++ b/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()
diff --git a/demo/livemap/src/jvmBrowserMain/kotlin/demo/livemap/demo/BarsDemoBrowser.kt b/demo/livemap/src/jvmBrowserMain/kotlin/demo/livemap/demo/BarsDemoBrowser.kt
deleted file mode 100644
index a7b3873cf48..00000000000
--- a/demo/livemap/src/jvmBrowserMain/kotlin/demo/livemap/demo/BarsDemoBrowser.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) 2019. JetBrains s.r.o.
- * Use of this source code is governed by the MIT license that can be found in the LICENSE file.
- */
-
-package demo.livemap.demo
-
-private const val DEMO_PROJECT = "demo-livemap"
-private const val CALL_FUN = "demo.livemap.demo.barsDemo"
-
-fun main() {
-    BrowserDemoUtil.openInBrowser {
-        BrowserDemoUtil.mapperDemoHtml(DEMO_PROJECT, CALL_FUN, "Bars Demo")
-    }
-}
\ No newline at end of file
diff --git a/demo/plot/build.gradle b/demo/plot/build.gradle
index bc20f35dbf0..62c0de738e0 100644
--- a/demo/plot/build.gradle
+++ b/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()
diff --git a/demo/svg/build.gradle b/demo/svg/build.gradle
index 3522e0d7018..ad4b2804d0b 100644
--- a/demo/svg/build.gradle
+++ b/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()
diff --git a/gradle.properties b/gradle.properties
index e82da6b4a64..9f72baccbdd 100644
--- a/gradle.properties
+++ b/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
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 98debb84d51..e411586a54a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists