From da03941582dd739c438695c75017899aa4404b13 Mon Sep 17 00:00:00 2001 From: Irmen de Jong Date: Fri, 29 Nov 2024 01:01:59 +0100 Subject: [PATCH] fix build --- beanshell/build.gradle.kts | 31 ++++++-------------- examples/cx16/zsmkit_v1/lib/zsmkit-0830.bin | Bin 0 -> 6122 bytes examples/cx16/zsmkit_v1/lib/zsmkit-8c00.bin | Bin 0 -> 4643 bytes 3 files changed, 9 insertions(+), 22 deletions(-) create mode 100644 examples/cx16/zsmkit_v1/lib/zsmkit-0830.bin create mode 100644 examples/cx16/zsmkit_v1/lib/zsmkit-8c00.bin diff --git a/beanshell/build.gradle.kts b/beanshell/build.gradle.kts index f4cd47b0a..ce7a83531 100644 --- 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,13 +65,6 @@ tasks.register("fixFilePermissions") { commandLine("chmod", "+x", "${tasks.installDist.get().destinationDir}/bin/prog8-beanshell") } -tasks.withType() { - testLogging { - events("failed") - exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL - } -} - tasks.installDist { finalizedBy("fixFilePermissions") } @@ -76,12 +72,3 @@ tasks.installDist { 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 new file mode 100644 index 0000000000000000000000000000000000000000..7a4a97221eaeabacb3091f2186567bfb7781c448 GIT binary patch literal 6122 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 literal 0 HcmV?d00001