Skip to content

Commit

Permalink
Upgraded version of support api to 1.2.5 to fix multiple stdlibs in c…
Browse files Browse the repository at this point in the history
…lasspath
  • Loading branch information
holgerbrandl committed May 15, 2018
1 parent 09a0bf1 commit 87b87ac
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
@@ -1,7 +1,7 @@
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar

plugins {
kotlin("jvm") version "1.2.30"
kotlin("jvm") version "1.2.41"
id("com.github.johnrengelman.plugin-shadow") version "2.0.2"
}

Expand Down
6 changes: 3 additions & 3 deletions src/main/kotlin/kscript/app/AppHelpers.kt
Expand Up @@ -214,7 +214,7 @@ fun launchIdeaWithKscriptlet(scriptFile: File, dependencies: List<String>, custo

val gradleScript = """
plugins {
id "org.jetbrains.kotlin.jvm" version "1.2.10"
id "org.jetbrains.kotlin.jvm" version "1.2.41"
}
repositories {
Expand Down Expand Up @@ -296,7 +296,7 @@ fun packageKscript(scriptJar: File, wrapperClassName: String, dependencies: List

val gradleScript = """
plugins {
id "org.jetbrains.kotlin.jvm" version "1.2.10"
id "org.jetbrains.kotlin.jvm" version "1.2.41"
id "us.kirchmeier.capsule" version "1.0.2"
}
Expand All @@ -310,7 +310,7 @@ dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib"
$stringifiedDeps
compile group: 'org.jetbrains.kotlin', name: 'kotlin-script-runtime', version: '1.2.21'
compile group: 'org.jetbrains.kotlin', name: 'kotlin-script-runtime', version: '1.2.41'
// https://stackoverflow.com/questions/20700053/how-to-add-local-jar-file-dependency-to-build-gradle-file
compile files('${scriptJar}')
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/kscript/app/Kscript.kt
Expand Up @@ -372,7 +372,7 @@ private fun resolvePreambles(rawScript: File, enableSupportApi: Boolean): File {
// prefix with text-processing preamble if kscript-support api is enabled
if (enableSupportApi) {
val textProcPreamble = """
//DEPS com.github.holgerbrandl:kscript-support:1.2.4
//DEPS com.github.holgerbrandl:kscript-support:1.2.5
import kscript.text.*
val lines = resolveArgFile(args)
Expand Down

0 comments on commit 87b87ac

Please sign in to comment.