Merge pull request #527 from baaahs/eve-rafters-fixes

Eve rafters fixes
baaahs · Mar 31, 2023 · 8bc8f38 · 8bc8f38
2 parents 3251bcf + c845283
commit 8bc8f38
Show file tree

Hide file tree

Showing 40 changed files with 2,752 additions and 300 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -280,7 +280,7 @@ tasks.named<ProcessResources>("jsProcessResources") {
 tasks.named<ProcessResources>("jvmProcessResources") {
     dependsOn("packageClientResources")
 
-    from("build/distributions") { include("sparklemotion.js") }
+    from("build/developmentExecutable") { include("sparklemotion.js") }
 
     doLast {
         createResourceFilesList(File(buildDir, "processedResources/jvm/main"))
@@ -294,7 +294,7 @@ tasks.named<DokkaTask>("dokkaHtml") {
 tasks.create<JavaExec>("runPinkyJvm") {
     dependsOn("compileKotlinJvm")
     dependsOn("packageClientResources")
-    mainClass.set("baaahs.sm.server.PinkyMainKt")
+    main = "baaahs.sm.server.PinkyMainKt"
 
     systemProperties["java.library.path"] = file("src/jvmMain/jni")
 
@@ -310,23 +310,23 @@ tasks.create<JavaExec>("runPinkyJvm") {
 
 tasks.create<JavaExec>("runBrainJvm") {
     dependsOn("compileKotlinJvm")
-    mainClass.set("baaahs.sm.brain.sim.BrainMainKt")
+    main = "baaahs.sm.brain.sim.BrainMainKt"
 
     val jvmMain = kotlin.targets["jvm"].compilations["main"] as KotlinCompilationToRunnableFiles
     classpath = files(jvmMain.output) + jvmMain.runtimeDependencyFiles
 }
 
 tasks.create<JavaExec>("runBridgeJvm") {
     dependsOn("compileKotlinJvm")
-    mainClass.set("baaahs.sm.bridge.SimulatorBridgeKt")
+    main = "baaahs.sm.bridge.SimulatorBridgeKt"
 
     val jvmMain = kotlin.targets["jvm"].compilations["main"] as KotlinCompilationToRunnableFiles
     classpath = files(jvmMain.output) + jvmMain.runtimeDependencyFiles
 }
 
 tasks.create<JavaExec>("runGlslJvmTests") {
     dependsOn("compileTestKotlinJvm")
-    mainClass.set("baaahs.RunOpenGLTestsKt")
+    main = "baaahs.RunOpenGLTestsKt"
 
     val jvmTest = kotlin.targets["jvm"].compilations["test"] as KotlinCompilationToRunnableFiles
     classpath = files(jvmTest.output) + jvmTest.runtimeDependencyFiles
@@ -336,7 +336,6 @@ tasks.create<JavaExec>("runGlslJvmTests") {
 }
 
 tasks.create<Copy>("packageClientResources") {
-    dependsOn("jsBrowserDistribution")
     dependsOn("jsProcessResources", webpackTask)
     duplicatesStrategy = DuplicatesStrategy.WARN
     from(project.file("build/processedResources/js/main"))

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -1,8 +1,8 @@
 object Versions {
-    const val kotlin = "1.8.10"
+    const val kotlin = "1.7.21"
     const val kotlinGradlePlugin = kotlin
     const val coroutines = "1.6.4"
-    const val serializationRuntime = "1.4.1"
+    const val serializationRuntime = "1.4.0"
     const val koin = "3.1.3"
     const val dokka = "1.7.10"
 

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
-networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists