Update Kotlin and Gradle

Add necessary new scripting libraries

Add `public` modifiers to library api

build.gradle.kts

@@ -6,29 +6,28 @@ import org.gradle.api.publish.maven.MavenPom
 val kotlinVersion = plugins.getPlugin(KotlinPluginWrapper::class.java).kotlinPluginVersion
 
 project.group = "de.swirtz"
-project.version = "0.0.7"
+project.version = "0.0.8"
 val artifactID = "ktsRunner"
 
 plugins {
-    kotlin("jvm") version "1.3.10"
+    kotlin("jvm") version "1.3.70"
     `maven-publish`
     `java-library`
     id("com.jfrog.bintray") version "1.8.0"
 }
-tasks {
-    "test"(Test::class) {
-        useJUnitPlatform()
-    }
-}
+
 
 dependencies {
     implementation(kotlin("stdlib-jdk8", kotlinVersion))
     implementation(kotlin("reflect", kotlinVersion))
-    implementation("org.slf4j:slf4j-api:1.7.14")
-    implementation("ch.qos.logback:logback-classic:1.1.3")
     implementation(kotlin("script-runtime", kotlinVersion))
+    implementation(kotlin("script-util", kotlinVersion))
     implementation(kotlin("compiler-embeddable", kotlinVersion))
+    implementation(kotlin("scripting-compiler-embeddable", kotlinVersion))
     implementation(kotlin("script-util", kotlinVersion))
+    implementation("org.slf4j:slf4j-api:1.7.14")
+    implementation("ch.qos.logback:logback-classic:1.1.3")
+    implementation("net.java.dev.jna:jna:4.2.2")
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.3.2")
     testImplementation("org.assertj:assertj-core:3.11.1")
@@ -42,14 +41,14 @@ repositories {
 }
 
 val sourcesJar by tasks.creating(Jar::class) {
-    classifier = "sources"
-    from(java.sourceSets["main"].allSource)
+    archiveClassifier.set("sources")
+    from(sourceSets.getByName("main").allSource)
 }
 
 val publicationName = "${artifactID}_pub"
 publishing {
-    publications.invoke {
-        publicationName(MavenPublication::class) {
+    publications {
+        create<MavenPublication>(publicationName) {
             artifactId = artifactID
             from(components["java"])
             artifact(sourcesJar)
@@ -84,6 +83,7 @@ tasks {
     }
     withType(Test::class.java) {
         testLogging.showStandardStreams = true
+        useJUnitPlatform()
     }
     withType<GenerateMavenPom> {
         destination = file("$buildDir/libs/$artifactID.pom")

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
@@ -138,19 +154,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -159,14 +175,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -13,8 +29,11 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

src/main/kotlin/de/swirtz/ktsrunner/objectloader/KtsObjectLoader.kt

@@ -2,30 +2,31 @@ package de.swirtz.ktsrunner.objectloader
 
 import java.io.InputStream
 import java.io.Reader
+import javax.script.ScriptEngine
 import javax.script.ScriptEngineManager
 
 /**
  * This class is not thread-safe, don't use it for parallel executions and create new instances instead.
  */
-class KtsObjectLoader(classLoader: ClassLoader? = Thread.currentThread().contextClassLoader) {
+public class KtsObjectLoader(classLoader: ClassLoader? = Thread.currentThread().contextClassLoader) {
 
-    val engine = ScriptEngineManager(classLoader).getEngineByExtension("kts")
+    public val engine: ScriptEngine = ScriptEngineManager(classLoader).getEngineByExtension("kts")
 
-    inline fun <R> safeEval(evaluation: () -> R?) = try {
-        evaluation()
-    } catch (e: Exception) {
-        throw LoadException("Cannot load script", e)
-    }
-
-    inline fun <reified T> Any?.castOrError() = takeIf { it is T }?.let { it as T }
+    public inline fun <reified T> Any?.castOrError() = takeIf { it is T }?.let { it as T }
         ?: throw IllegalArgumentException("Cannot cast $this to expected type ${T::class}")
 
-    inline fun <reified T> load(script: String): T = safeEval { engine.eval(script) }.castOrError()
+    public inline fun <reified T> load(script: String): T =
+        kotlin.runCatching { engine.eval(script) }
+            .getOrElse { throw LoadException("Cannot load script", it) }
+            .castOrError()
 
-    inline fun <reified T> load(reader: Reader): T = safeEval { engine.eval(reader) }.castOrError()
+    public inline fun <reified T> load(reader: Reader): T =
+        kotlin.runCatching { engine.eval(reader) }
+            .getOrElse { throw LoadException("Cannot load script", it) }
+            .castOrError()
 
-    inline fun <reified T> load(inputStream: InputStream): T = load(inputStream.reader())
+    public inline fun <reified T> load(inputStream: InputStream): T = load(inputStream.reader())
 
-    inline fun <reified T> loadAll(vararg inputStream: InputStream): List<T> = inputStream.map(::load)
-}
+    public inline fun <reified T> loadAll(vararg inputStream: InputStream): List<T> = inputStream.map(::load)
 
+}

src/main/kotlin/de/swirtz/ktsrunner/objectloader/LoadException.kt

@@ -1,3 +1,3 @@
 package de.swirtz.ktsrunner.objectloader
 
-class LoadException(message: String? = null, cause: Throwable? = null) : RuntimeException(message, cause)
+public class LoadException(message: String? = null, cause: Throwable? = null) : RuntimeException(message, cause)