Merge pull request #6 from jakubriegel/develop

more default imports and 0.2 release
jakubriegel · Aug 30, 2019 · 782ad40 · 782ad40
2 parents cccda87 + 38ec3a6
commit 782ad40
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -83,7 +83,7 @@ val uploadConfig by extra {
 
 allprojects {
     group = "eu.jrie.jetbrains"
-    version = "0.2-dev"
+    version = "0.2"
 
     repositories {
         maven { setUrl("https://dl.bintray.com/kotlin/kotlin-eap") }

diff --git a/kotlin-shell-kts/build.gradle.kts b/kotlin-shell-kts/build.gradle.kts
@@ -104,7 +104,7 @@ publishing(
     publicationConfig(
         project,
         bintrayPublication,
-        listOf(tasks.jar.get(), sourcesJar, dokkaJar)
+        listOf(tasks.jar.get(), sourcesJar, dokkaJar, tasks.shadowJar.get())
     )
 )
 

diff --git a/kotlin-shell-kts/src/main/kotlin/eu/jrie/jetbrains/kotlinshell/KotlinShellScript.kt b/kotlin-shell-kts/src/main/kotlin/eu/jrie/jetbrains/kotlinshell/KotlinShellScript.kt
@@ -1,5 +1,7 @@
 package eu.jrie.jetbrains.kotlinshell
 
+import eu.jrie.jetbrains.kotlinshell.processes.execution.ExecutionContext
+import eu.jrie.jetbrains.kotlinshell.processes.execution.ProcessExecutable
 import eu.jrie.jetbrains.kotlinshell.processes.pipeline.Pipeline
 import eu.jrie.jetbrains.kotlinshell.processes.process.Process
 import eu.jrie.jetbrains.kotlinshell.processes.process.ProcessState
@@ -71,7 +73,8 @@ class KotlinShellScriptConfiguration : ScriptCompilationConfiguration (
     companion object {
         private val ESSENTIAL_KOTLIN_SHELL_CLASSES = arrayOf(
             Shell::class,
-            Process::class, SystemProcess::class, ProcessState::class,
+            ExecutionContext::class,
+            Process::class, SystemProcess::class, ProcessState::class, ProcessExecutable::class,
             Pipeline::class
         )
         private val ESSENTIAL_KOTLIN_SHELL_IMPORTS = arrayOf(
@@ -93,7 +96,19 @@ class KotlinShellScriptConfiguration : ScriptCompilationConfiguration (
             "eu.jrie.jetbrains.kotlinshell.shell.readonly",
 
             "kotlinx.coroutines.channels.Channel",
-            "kotlinx.coroutines.delay"
+            "kotlinx.coroutines.delay",
+            "kotlinx.coroutines.channels.consumeEach",
+            "kotlinx.coroutines.delay",
+
+            "java.io.OutputStream",
+            "java.io.InputStream",
+
+            "kotlinx.io.core.ByteReadPacket",
+            "kotlinx.io.core.readBytes",
+            "kotlinx.io.core.writeFully",
+            "kotlinx.io.core.readText",
+            "kotlinx.io.core.writeText",
+            "kotlinx.io.streams.writePacket"
         )
     }
 }