From 6227e33819bff1af1973627ee9f53d176a2cf9a1 Mon Sep 17 00:00:00 2001
From: Christian Williams <antixian666@gmail.com>
Date: Fri, 31 Mar 2023 10:34:03 -0700
Subject: [PATCH] Reapply kotlin-1.8 upgrade.

Revert "Merge pull request #526 from baaahs/kotlin-1.8"

This reverts commit 3251bcfdcfd885d3c24e7311f16aeadf11bad9ef, reversing
changes made to 7c82d15fde755234f20f8541f1cc4aeacf75e69f.
---
 build.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index b9cc3cb673..c2caa5088a 100644
--- 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")