Merge remote-tracking branch 'origin/master'

# Conflicts:
#	build.gradle.kts
#	src/main/kotlin/kscript/app/AppHelpers.kt

Author: holgerbrandl

README.md

@@ -47,10 +47,10 @@ Installation
 
 To use `kscript` just Kotlin and Maven are required. To [install Kotlin](https://kotlinlang.org/docs/tutorials/command-line.html) we recommend [sdkman](http://sdkman.io/install):
 ```
-curl -s "https://get.sdkman.io" | bash  # install sdkman
-source ~/.bash_profile                  # add sdkman to PATH
+curl -s "https://get.sdkman.io" | bash     # install sdkman
+source "$HOME/.sdkman/bin/sdkman-init.sh"  # add sdkman to PATH
 
-sdk install kotlin                      # install Kotlin
+sdk install kotlin                         # install Kotlin
 ```
 
 Once Kotlin is ready, you can install `kscript` with
@@ -64,7 +64,7 @@ To test your installation simply run
 kscript --help
 ```
 
-This will check and inform about udpates. To update `kscript` simply install it again as described above.
+This will check and inform about updates. To update `kscript` simply install it again as described above.
 
 #### Run with docker
 

build.gradle.kts

@@ -2,7 +2,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
     kotlin("jvm") version "1.4.10"
-    id("com.github.johnrengelman.shadow") version "2.0.4"
+    id("com.github.johnrengelman.shadow") version "5.2.0"
 }
 
 group = "com.github.holgerbrandl.kscript.launcher"
@@ -11,32 +11,18 @@ group = "com.github.holgerbrandl.kscript.launcher"
 val kotlinVersion: String ="1.4.10"
 
 dependencies {
-    compile("org.jetbrains.kotlin:kotlin-stdlib")
-
     compile("com.offbytwo:docopt:0.6.0.20150202")
 
-//    compile("com.jcabi:jcabi-aether:0.10.1") {
-//        exclude("org.hibernate", "hibernate-validator")
-//        exclude("org.slf4j", "slf4j-api")
-//        exclude("org.slf4j", "jcl-over-slf4j")
-//        exclude("org.apache.commons", "commons-lang3")
-//        exclude("cglib", "cglib")
-//        exclude("org.kuali.maven.wagons", "maven-s3-wagon")
-//    }
-    // compile("com.jcabi:jcabi-aether:0.10.1:sources") //can be used for debugging, but somehow adds logging to dependency resolvement?
-//    compile("org.apache.maven:maven-core:3.0.3")
-//    compile("org.slf4j:slf4j-nop:1.7.25")
-
     implementation("org.jetbrains.kotlin:kotlin-scripting-common:$kotlinVersion")
     implementation("org.jetbrains.kotlin:kotlin-scripting-jvm:$kotlinVersion")
     implementation("org.jetbrains.kotlin:kotlin-scripting-dependencies:$kotlinVersion")
     implementation("org.jetbrains.kotlin:kotlin-scripting-dependencies-maven:$kotlinVersion")
 
-    compile("org.slf4j:slf4j-simple:1.7.30")
+    compile("org.slf4j:slf4j-nop:1.7.30")
 
-    testCompile("junit:junit:4.12")
-    testCompile( "io.kotlintest:kotlintest:2.0.7")
-    testCompile(kotlin("script-runtime"))
+    testImplementation("junit:junit:4.12")
+    testImplementation( "io.kotlintest:kotlintest:2.0.7")
+    testImplementation(kotlin("script-runtime"))
 }
 
 repositories {
@@ -45,11 +31,11 @@ repositories {
 
 val shadowJar by tasks.getting(ShadowJar::class) {
     // set empty string to classifier and version to get predictable jar file name: build/libs/kscript.jar
-    archiveName = "kscript.jar"
+    archiveFileName.set("kscript.jar")
     doLast {
         copy {
             from(File(projectDir, "src/kscript"))
-            into(archivePath.parentFile)
+            into(archiveFile.get().asFile.parentFile)
         }
     }
 }

gradle/wrapper/gradle-wrapper.properties

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

src/main/kotlin/kscript/app/AppHelpers.kt

@@ -207,6 +207,8 @@ fun launchIdeaWithKscriptlet(scriptFile: File,
                              includeURLs: List<URL>,
                              compilerOpts: String): String {
     val intellijCommand = System.getenv("KSCRIPT_IDEA_COMMAND") ?: "idea"
+    val gradleCommand = System.getenv("KSCRIPT_GRADLE_COMMAND") ?: "gradle"
+
     requireInPath(intellijCommand, "Could not find '$intellijCommand' in your PATH. You must set the command used to launch your intellij as 'KSCRIPT_IDEA_COMMAND' env property")
 
     infoMsg("Setting up idea project from ${scriptFile}")
@@ -229,20 +231,10 @@ fun launchIdeaWithKscriptlet(scriptFile: File,
             mkdirs()
         }
     File(tmpProjectDir, ".idea/runConfigurations/Main.xml").writeText(
-        """
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Main" type="BashConfigurationType" factoryName="Bash">
-    <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="INTERPRETER_PATH" value="kscript" />
-    <option name="PROJECT_INTERPRETER" value="false" />
-    <option name="WORKING_DIRECTORY" value="" />
-    <option name="PARENT_ENVS" value="true" />
-    <option name="SCRIPT_NAME" value="${'$'}PROJECT_DIR${'$'}/src/${scriptFile.name}" />
-    <option name="PARAMETERS" value="${userArgs.joinToString(" ")}" />
-    <module name="" />
-    <method v="2" />
-  </configuration>
-</component>
+            """
+        <component name="ProjectRunConfigurationManager">
+        ${runConfig(scriptFile, tmpProjectDir, userArgs)}
+        </component>
         """.trimIndent()
     )
 
@@ -328,15 +320,15 @@ $kotlinOptions
 
         // https://stackoverflow.com/questions/17926459/creating-a-symbolic-link-with-java
         createSymLink(File(this, scriptFile.name), scriptFile)
-        val scriptDir = Paths.get(scriptFile.path).parent
+        val scriptDir = Paths.get(scriptFile.absolutePath).parent
 
         // also symlink all includes
         includeURLs.distinctBy { it.fileName() }
                 .forEach {
                     val symlinkSrcDirAndDestination = when {
                         it.protocol == "file" -> {
                             val includeFile = File(it.toURI())
-                            val includeDir = Paths.get(includeFile.path).parent
+                            val includeDir = Paths.get(includeFile.absolutePath).parent
                             val symlinkRelativePathToScript = File(this, scriptDir.relativize(includeDir).toFile().path)
                             symlinkRelativePathToScript.mkdirs()
                             Pair(symlinkRelativePathToScript, includeFile)
@@ -351,11 +343,50 @@ $kotlinOptions
     }
 
     val projectPath = tmpProjectDir.absolutePath
+
+    // Create gradle wrapper
+    requireInPath("$gradleCommand", "Could not find '$gradleCommand' in your PATH. You must set the command used to launch your intellij as 'KSCRIPT_GRADLE_COMMAND' env property")
+    runProcess("$gradleCommand wrapper", wd = tmpProjectDir)
+
     infoMsg("Project set up at $projectPath")
 
     return "$intellijCommand \"$projectPath\""
 }
 
+private fun runConfig(scriptFile: File, tmpProjectDir: File, userArgs: List<String>): String {
+    return if (scriptFile.extension == "kt") {
+        """
+        <configuration name="${scriptFile.name.substringBeforeLast(".")}" type="JetRunConfigurationType">
+            <module name="${tmpProjectDir.name}.main" />
+            <option name="VM_PARAMETERS" value="" />
+            <option name="PROGRAM_PARAMETERS" value="" />
+            <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+            <option name="ALTERNATIVE_JRE_PATH" />
+            <option name="PASS_PARENT_ENVS" value="true" />
+            <option name="MAIN_CLASS_NAME" value="${scriptFile.name.substringBeforeLast(".").capitalize()}Kt" />
+            <option name="WORKING_DIRECTORY" value="" />
+            <method v="2">
+                <option name="Make" enabled="true" />
+            </method>
+            </configuration>
+            """.trimIndent()
+    } else {
+        """  
+        <configuration default="false" name="Main" type="BashConfigurationType" factoryName="Bash">
+            <option name="INTERPRETER_OPTIONS" value="" />
+            <option name="INTERPRETER_PATH" value="kscript" />
+            <option name="PROJECT_INTERPRETER" value="false" />
+            <option name="WORKING_DIRECTORY" value="" />
+            <option name="PARENT_ENVS" value="true" />
+            <option name="SCRIPT_NAME" value="${'$'}PROJECT_DIR${'$'}/src/${scriptFile.name}" />
+            <option name="PARAMETERS" value="${userArgs.joinToString(" ")}" />
+            <module name="" />
+            <method v="2" />
+         </configuration>
+         """.trimIndent()
+    }
+}
+
 private fun URL.fileName() = this.toURI().path.split("/").last()
 
 private fun createSymLink(link: File, target: File) {
@@ -430,7 +461,6 @@ task simpleCapsule(type: FatCapsule){
   }
 }
     """.trimIndent()
-
     val pckgedJar = File(Paths.get("").toAbsolutePath().toFile(), appName).absoluteFile