diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 9576bad56..368e5ac15 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -6,6 +6,7 @@ import java.io.ByteArrayOutputStream
 import java.io.PrintWriter
 import org.jetbrains.dokka.gradle.AbstractDokkaLeafTask
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
     kotlin("multiplatform")
@@ -19,7 +20,7 @@ mavenPublicationsPom {
 }
 
 base {
-    archivesBaseName = "kotlinx-datetime" // doesn't work
+    archivesName.set("kotlinx-datetime")
 }
 
 val mainJavaToolchainVersion: String by project
@@ -118,6 +119,7 @@ kotlin {
 //        }
     }
 
+    @OptIn(ExperimentalWasmDsl::class)
     wasmJs {
         nodejs {
             testTask {
@@ -308,7 +310,7 @@ tasks {
     // Workaround for https://youtrack.jetbrains.com/issue/KT-58303:
     // the `clean` task can't delete the expanded.lock file on Windows as it's still held by Gradle, failing the build
     val clean by existing(Delete::class) {
-        setDelete(fileTree(buildDir) {
+        setDelete(fileTree(layout.buildDirectory) {
             exclude("tmp/.cache/expanded/expanded.lock")
         })
     }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 19acfb4ef..43a6e163d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/serialization/build.gradle.kts b/serialization/build.gradle.kts
index 5d56fe4eb..ca5643f69 100644
--- a/serialization/build.gradle.kts
+++ b/serialization/build.gradle.kts
@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 import java.util.Locale
 
 plugins {
@@ -51,7 +52,7 @@ kotlin {
         }
     }
 
-
+    @OptIn(ExperimentalWasmDsl::class)
     wasmJs {
         nodejs {
         }
@@ -60,7 +61,7 @@ kotlin {
     sourceSets.all {
         val suffixIndex = name.indexOfLast { it.isUpperCase() }
         val targetName = name.substring(0, suffixIndex)
-        val suffix = name.substring(suffixIndex).toLowerCase(Locale.ROOT).takeIf { it != "main" }
+        val suffix = name.substring(suffixIndex).lowercase(Locale.ROOT).takeIf { it != "main" }
         kotlin.srcDir("$targetName/${suffix ?: "src"}")
         resources.srcDir("$targetName/${suffix?.let { it + "Resources" } ?: "resources"}")
     }