* Updated to Java 11 version

aartiPl · aartiPl · commit 429091e5d44f · 2022-12-09T22:30:27.000+01:00
* Reverted changes in distribution package structure

Signed-off-by: Marcin Kuszczak &lt;1508798+aartiPl@users.noreply.github.com&gt;
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -71,7 +71,7 @@ idea {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(8))
+        languageVersion.set(JavaLanguageVersion.of(11))
     }
 
     withJavadocJar()
@@ -80,7 +80,7 @@ java {
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 }
 
@@ -176,7 +176,7 @@ val createKscriptLayout by tasks.register<Copy>("createKscriptLayout") {
     into(layout.projectDirectory)
 
     from(shadowJar) {
-        into("build/kscript/lib")
+        into("build/kscript/bin")
     }
 
     from("src/kscript") {
diff --git a/src/kscript b/src/kscript
@@ -32,7 +32,7 @@ findJavaVersion() {
 
 # Resolve KSCRIPT_HOME
 KSCRIPT_HOME=$(dirname $(dirname $(resolveSymlinks $(resolveAbsolutePath $0))))
-KSCRIPT_LIB="$KSCRIPT_HOME/lib"
+KSCRIPT_LIB="$KSCRIPT_HOME/bin"
 
 # Resolve JAVA_CMD
 if [ -z "$JAVACMD" -a -n "$JAVA_HOME" -a -x "$JAVA_HOME/bin/java" ]; then
diff --git a/src/kscript.bat b/src/kscript.bat
@@ -46,7 +46,7 @@ if !_java_major_version! geq 9 (
 )
 
 for /f "tokens=* USEBACKQ" %%o in (`where kscript.bat`) do set ABS_KSCRIPT_PATH=%%o
-set JAR_PATH=%ABS_KSCRIPT_PATH:~0,-16%\lib\*
+set JAR_PATH=%ABS_KSCRIPT_PATH:~0,-16%\bin\*
 
 java !JAVA_OPTS! -classpath %JAR_PATH% io.github.kscripting.kscript.KscriptKt windows %KOTLIN_OPTS%
 

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ idea {`
`71`	`71`
`72`	`72`	`java {`
`73`	`73`	`toolchain {`
`74`		`- languageVersion.set(JavaLanguageVersion.of(8))`
	`74`	`+ languageVersion.set(JavaLanguageVersion.of(11))`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`withJavadocJar()`
`@@ -80,7 +80,7 @@ java {`
`80`	`80`
`81`	`81`	`tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {`
`82`	`82`	`kotlinOptions {`
`83`		`- jvmTarget = "1.8"`
	`83`	`+ jvmTarget = "11"`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`
`@@ -176,7 +176,7 @@ val createKscriptLayout by tasks.register<Copy>("createKscriptLayout") {`
`176`	`176`	`into(layout.projectDirectory)`
`177`	`177`
`178`	`178`	`from(shadowJar) {`
`179`		`- into("build/kscript/lib")`
	`179`	`+ into("build/kscript/bin")`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`from("src/kscript") {`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ if !_java_major_version! geq 9 (`
`46`	`46`	`)`
`47`	`47`
`48`	`48`	for /f "tokens=* USEBACKQ" %%o in (`where kscript.bat`) do set ABS_KSCRIPT_PATH=%%o
`49`		`-set JAR_PATH=%ABS_KSCRIPT_PATH:~0,-16%\lib\*`
	`49`	`+set JAR_PATH=%ABS_KSCRIPT_PATH:~0,-16%\bin\*`
`50`	`50`
`51`	`51`	`java !JAVA_OPTS! -classpath %JAR_PATH% io.github.kscripting.kscript.KscriptKt windows %KOTLIN_OPTS%`
`52`	`52`