Reapply kotlin-1.8 upgrade.

Revert "Merge pull request #526 from baaahs/kotlin-1.8" This reverts commit 3251bcf, reversing changes made to 7c82d15.
baaahs · Mar 31, 2023 · 6227e33 · 6227e33
1 parent 8bc8f38
commit 6227e33
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -278,7 +278,7 @@ tasks.named<ProcessResources>("jsProcessResources") {
 }
 
 tasks.named<ProcessResources>("jvmProcessResources") {
-    dependsOn("packageClientResources")
+    dependsOn(webpackTask)
 
     from("build/developmentExecutable") { include("sparklemotion.js") }
 
@@ -293,7 +293,7 @@ tasks.named<DokkaTask>("dokkaHtml") {
 
 tasks.create<JavaExec>("runPinkyJvm") {
     dependsOn("compileKotlinJvm")
-    dependsOn("packageClientResources")
+    dependsOn(webpackTask)
     main = "baaahs.sm.server.PinkyMainKt"
 
     systemProperties["java.library.path"] = file("src/jvmMain/jni")