Skip to content

Commit 87b87ac

Browse files
committed
Upgraded version of support api to 1.2.5 to fix multiple stdlibs in classpath
1 parent 09a0bf1 commit 87b87ac

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
22

33
plugins {
4-
kotlin("jvm") version "1.2.30"
4+
kotlin("jvm") version "1.2.41"
55
id("com.github.johnrengelman.plugin-shadow") version "2.0.2"
66
}
77

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ fun launchIdeaWithKscriptlet(scriptFile: File, dependencies: List<String>, custo
214214

215215
val gradleScript = """
216216
plugins {
217-
id "org.jetbrains.kotlin.jvm" version "1.2.10"
217+
id "org.jetbrains.kotlin.jvm" version "1.2.41"
218218
}
219219
220220
repositories {
@@ -296,7 +296,7 @@ fun packageKscript(scriptJar: File, wrapperClassName: String, dependencies: List
296296

297297
val gradleScript = """
298298
plugins {
299-
id "org.jetbrains.kotlin.jvm" version "1.2.10"
299+
id "org.jetbrains.kotlin.jvm" version "1.2.41"
300300
id "us.kirchmeier.capsule" version "1.0.2"
301301
}
302302
@@ -310,7 +310,7 @@ dependencies {
310310
compile "org.jetbrains.kotlin:kotlin-stdlib"
311311
$stringifiedDeps
312312
313-
compile group: 'org.jetbrains.kotlin', name: 'kotlin-script-runtime', version: '1.2.21'
313+
compile group: 'org.jetbrains.kotlin', name: 'kotlin-script-runtime', version: '1.2.41'
314314
315315
// https://stackoverflow.com/questions/20700053/how-to-add-local-jar-file-dependency-to-build-gradle-file
316316
compile files('${scriptJar}')

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ private fun resolvePreambles(rawScript: File, enableSupportApi: Boolean): File {
372372
// prefix with text-processing preamble if kscript-support api is enabled
373373
if (enableSupportApi) {
374374
val textProcPreamble = """
375-
//DEPS com.github.holgerbrandl:kscript-support:1.2.4
375+
//DEPS com.github.holgerbrandl:kscript-support:1.2.5
376376
377377
import kscript.text.*
378378
val lines = resolveArgFile(args)

0 commit comments

Comments
 (0)