fix build

irmen · Nov 29, 2024 · da03941 · da03941
1 parent dcbb36a
commit da03941
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 22 deletions.
diff --git a/beanshell/build.gradle.kts b/beanshell/build.gradle.kts
@@ -5,9 +5,17 @@ plugins {
     kotlin("jvm")
 }
 
+java {
+    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_11
+}
+
+kotlin {
+    compilerOptions.jvmTarget = JvmTarget.JVM_11
+}
+
 val serverMainClassName = "prog8lsp.MainKt"
 val applicationName = "prog8-beanshell"
-val javaVersion: String by project
 
 application {
     mainClass.set(serverMainClassName)
@@ -45,11 +53,6 @@ sourceSets.main {
     resources.srcDir("resources")
 }
 
-sourceSets.test {
-    java.srcDir("src")
-    resources.srcDir("resources")
-}
-
 tasks.startScripts {
     applicationName = "prog8-beanshell"
 }
@@ -62,26 +65,10 @@ tasks.register<Exec>("fixFilePermissions") {
     commandLine("chmod", "+x", "${tasks.installDist.get().destinationDir}/bin/prog8-beanshell")
 }
 
-tasks.withType<Test>() {
-    testLogging {
-        events("failed")
-        exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
-    }
-}
-
 tasks.installDist {
     finalizedBy("fixFilePermissions")
 }
 
 tasks.build {
     finalizedBy("installDist")
 }
-
-java {
-    targetCompatibility = JavaVersion.VERSION_11
-    sourceCompatibility = JavaVersion.VERSION_11
-}
-
-kotlin {
-    compilerOptions.jvmTarget = JvmTarget.JVM_11
-}
diff --git a/examples/cx16/zsmkit_v1/lib/zsmkit-0830.bin b/examples/cx16/zsmkit_v1/lib/zsmkit-0830.bin
diff --git a/examples/cx16/zsmkit_v1/lib/zsmkit-8c00.bin b/examples/cx16/zsmkit_v1/lib/zsmkit-8c00.bin