Switch to Kotlin 1.4.0

ligee · ligee · commit 345fd4f81a00 · 2020-08-18T19:28:22.000+02:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,9 +1,9 @@
 
 plugins {
-    kotlin("jvm") version "1.3.70"
+    kotlin("jvm") version "1.4.0"
 }
 
-val kotlinVersion: String by extra("1.3.70")
+val kotlinVersion: String by extra("1.4.0")
 
 allprojects {
     repositories {
diff --git a/jvm/basic/jvm-embeddable-host/build.gradle.kts b/jvm/basic/jvm-embeddable-host/build.gradle.kts
@@ -9,7 +9,7 @@ dependencies {
     implementation(project(":jvm:basic:jvm-simple-script:script"))
     implementation("org.jetbrains.kotlin:kotlin-scripting-jvm:$kotlinVersion")
     compileOnly("org.jetbrains.kotlin:kotlin-scripting-jvm-host:$kotlinVersion")
-    testRuntimeOnly("org.jetbrains.kotlin:kotlin-scripting-jvm-host-embeddable:$kotlinVersion")
+    testRuntimeOnly("org.jetbrains.kotlin:kotlin-scripting-jvm-host:$kotlinVersion")
     testRuntimeOnly("com.google.guava:guava:28.2-jre")
     testImplementation("junit:junit:4.12")
 }
diff --git a/jvm/basic/jvm-maven-deps/host/build.gradle.kts b/jvm/basic/jvm-maven-deps/host/build.gradle.kts
@@ -7,6 +7,8 @@ val kotlinVersion: String by rootProject.extra
 
 dependencies {
     implementation(project(":jvm:basic:jvm-maven-deps:script"))
+    implementation("org.jetbrains.kotlin:kotlin-scripting-common:$kotlinVersion")
+    implementation("org.jetbrains.kotlin:kotlin-scripting-jvm:$kotlinVersion")
     implementation("org.jetbrains.kotlin:kotlin-scripting-jvm-host:$kotlinVersion")
     testImplementation("junit:junit:4.12")
     testRuntimeOnly("org.slf4j:slf4j-nop:1.7.28")
diff --git a/jvm/basic/jvm-maven-deps/host/src/test/kotlin/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/test/resolveTest.kt b/jvm/basic/jvm-maven-deps/host/src/test/kotlin/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/test/resolveTest.kt
@@ -39,9 +39,9 @@ class ResolveTest {
         val res = evalFile(File("testData/hello-maven-resolve-error.scriptwithdeps.kts"))
 
         Assert.assertTrue(
-            "test failed - expecting a failure with the message \"Unknown set of arguments to maven resolver: abracadabra\" but received " +
-                    (if (res is ResultWithDiagnostics.Failure) "failure" else "success") +
-                    ":\n  ${res.reports.joinToString("\n  ") { it.message + if (it.exception == null) "" else ": ${it.exception}" }}",
-            res is ResultWithDiagnostics.Failure && res.reports.any { it.message.contains("Unknown set of arguments to maven resolver: abracadabra") })
+                "test failed - expecting a failure with the message \"File 'abracadabra' not found\" but received " +
+                        (if (res is ResultWithDiagnostics.Failure) "failure" else "success") +
+                        ":\n  ${res.reports.joinToString("\n  ") { it.message + if (it.exception == null) "" else ": ${it.exception}" }}",
+                res is ResultWithDiagnostics.Failure && res.reports.any { it.message.contains("File 'abracadabra' not found") })
     }
 }
diff --git a/jvm/basic/jvm-maven-deps/script/build.gradle.kts b/jvm/basic/jvm-maven-deps/script/build.gradle.kts
@@ -6,9 +6,8 @@ plugins {
 val kotlinVersion: String by rootProject.extra
 
 dependencies {
+    implementation("org.jetbrains.kotlin:kotlin-scripting-common:$kotlinVersion")
     implementation("org.jetbrains.kotlin:kotlin-scripting-jvm:$kotlinVersion")
-    implementation("org.jetbrains.kotlin:kotlin-script-util:$kotlinVersion")
-    runtimeOnly("com.jcabi:jcabi-aether:0.10.1")
-    runtimeOnly("org.sonatype.aether:aether-api:1.13.1")
-    runtimeOnly("org.apache.maven:maven-core:3.0.3")
+    implementation("org.jetbrains.kotlin:kotlin-scripting-dependencies:$kotlinVersion")
+    implementation("org.jetbrains.kotlin:kotlin-scripting-dependencies-maven:$kotlinVersion")
 }
diff --git a/jvm/basic/jvm-maven-deps/script/src/main/kotlin/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/scriptDef.kt b/jvm/basic/jvm-maven-deps/script/src/main/kotlin/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/scriptDef.kt
@@ -5,19 +5,14 @@
 
 package org.jetbrains.kotlin.script.examples.jvm.resolve.maven
 
-import org.jetbrains.kotlin.script.util.DependsOn
-import org.jetbrains.kotlin.script.util.FilesAndMavenResolver
-import org.jetbrains.kotlin.script.util.Repository
-import java.io.File
-import kotlin.script.dependencies.ScriptContents
-import kotlin.script.dependencies.ScriptDependenciesResolver
+import kotlinx.coroutines.runBlocking
 import kotlin.script.experimental.annotations.KotlinScript
 import kotlin.script.experimental.api.*
-import kotlin.script.experimental.jvm.compat.mapLegacyDiagnosticSeverity
-import kotlin.script.experimental.jvm.compat.mapLegacyScriptPosition
+import kotlin.script.experimental.dependencies.*
+import kotlin.script.experimental.dependencies.maven.MavenDependenciesResolver
+import kotlin.script.experimental.jvm.JvmDependency
 import kotlin.script.experimental.jvm.dependenciesFromCurrentContext
 import kotlin.script.experimental.jvm.jvm
-import kotlin.script.experimental.jvm.withUpdatedClasspath
 
 @KotlinScript(
     fileExtension = "scriptwithdeps.kts",
@@ -31,7 +26,7 @@ object ScriptWithMavenDepsConfiguration : ScriptCompilationConfiguration(
         jvm {
             dependenciesFromCurrentContext(
                 "script", // script library jar name
-                "kotlin-script-util" // DependsOn annotation is taken from script-util
+                "kotlin-scripting-dependencies" // DependsOn annotation is taken from this jar
             )
         }
         refineConfiguration {
@@ -40,35 +35,18 @@ object ScriptWithMavenDepsConfiguration : ScriptCompilationConfiguration(
     }
 )
 
-private val resolver = FilesAndMavenResolver()
+private val resolver = CompoundDependenciesResolver(FileSystemDependenciesResolver(), MavenDependenciesResolver())
 
 fun configureMavenDepsOnAnnotations(context: ScriptConfigurationRefinementContext): ResultWithDiagnostics<ScriptCompilationConfiguration> {
-    val annotations = context.collectedData?.get(ScriptCollectedData.foundAnnotations)?.takeIf { it.isNotEmpty() }
-        ?: return context.compilationConfiguration.asSuccess()
-    val scriptContents = object : ScriptContents {
-        override val annotations: Iterable<Annotation> = annotations
-        override val file: File? = null
-        override val text: CharSequence? = null
-    }
-    val diagnostics = arrayListOf<ScriptDiagnostic>()
-    fun report(severity: ScriptDependenciesResolver.ReportSeverity, message: String, position: ScriptContents.Position?) {
-        diagnostics.add(
-            ScriptDiagnostic(
-                message,
-                mapLegacyDiagnosticSeverity(severity),
-                context.script.locationId,
-                mapLegacyScriptPosition(position)
-            )
-        )
-    }
-    return try {
-        val newDepsFromResolver = resolver.resolve(scriptContents, emptyMap(), ::report, null).get()
-            ?: return context.compilationConfiguration.asSuccess(diagnostics)
-        val resolvedClasspath = newDepsFromResolver.classpath.toList().takeIf { it.isNotEmpty() }
-            ?: return context.compilationConfiguration.asSuccess(diagnostics)
-        context.compilationConfiguration.withUpdatedClasspath(resolvedClasspath).asSuccess(diagnostics)
-    } catch (e: Throwable) {
-        ResultWithDiagnostics.Failure(*diagnostics.toTypedArray(), e.asDiagnostics(path = context.script.locationId))
+    val annotations = context.collectedData?.get(ScriptCollectedData.collectedAnnotations)?.takeIf { it.isNotEmpty() }
+            ?: return context.compilationConfiguration.asSuccess()
+    return runBlocking {
+        resolver.resolveFromScriptSourceAnnotations(annotations)
+    }.onSuccess {
+        context.compilationConfiguration.with {
+            dependencies.append(JvmDependency(it))
+        }.asSuccess()
     }
 }
 
+
diff --git a/jvm/basic/jvm-simple-script/host/build.gradle.kts b/jvm/basic/jvm-simple-script/host/build.gradle.kts
@@ -7,6 +7,8 @@ val kotlinVersion: String by rootProject.extra
 
 dependencies {
     implementation(project(":jvm:basic:jvm-simple-script:script"))
+    implementation("org.jetbrains.kotlin:kotlin-scripting-common:$kotlinVersion")
+    implementation("org.jetbrains.kotlin:kotlin-scripting-jvm:$kotlinVersion")
     implementation("org.jetbrains.kotlin:kotlin-scripting-jvm-host:$kotlinVersion")
     testImplementation("junit:junit:4.12")
 }
diff --git a/jvm/simple-main-kts/simple-main-kts-test/build.gradle.kts b/jvm/simple-main-kts/simple-main-kts-test/build.gradle.kts
@@ -7,6 +7,8 @@ val kotlinVersion: String by rootProject.extra
 
 dependencies {
     testImplementation(project(":jvm:simple-main-kts:simple-main-kts"))
+    testImplementation("org.jetbrains.kotlin:kotlin-scripting-common:$kotlinVersion")
+    testImplementation("org.jetbrains.kotlin:kotlin-scripting-jvm:$kotlinVersion")
     testImplementation("org.jetbrains.kotlin:kotlin-scripting-jvm-host:$kotlinVersion")
     testImplementation("junit:junit:4.12")
 }
diff --git a/jvm/simple-main-kts/simple-main-kts-test/src/test/kotlin/org/jetbrains/kotlin/script/examples/simpleMainKts/test/SimpleMainKtsTest.kt b/jvm/simple-main-kts/simple-main-kts-test/src/test/kotlin/org/jetbrains/kotlin/script/examples/simpleMainKts/test/SimpleMainKtsTest.kt
@@ -5,6 +5,7 @@
 package org.jetbrains.kotlin.script.examples.simpleMainKts.test
 
 import org.jetbrains.kotlin.script.examples.simpleMainKts.COMPILED_SCRIPTS_CACHE_DIR_PROPERTY
+import org.jetbrains.kotlin.script.examples.simpleMainKts.MainKtsEvaluationConfiguration
 import org.jetbrains.kotlin.script.examples.simpleMainKts.SimpleMainKtsScript
 import org.junit.Assert
 import org.junit.Test
@@ -21,7 +22,7 @@ fun evalFile(scriptFile: File, cacheDir: File? = null): ResultWithDiagnostics<Ev
         withMainKtsCacheDir(cacheDir?.absolutePath ?: "") {
             val scriptDefinition = createJvmCompilationConfigurationFromTemplate<SimpleMainKtsScript>()
 
-            val evaluationEnv = ScriptEvaluationConfiguration {
+            val evaluationEnv = MainKtsEvaluationConfiguration.with {
                 jvm {
                     baseClassLoader(null)
                 }
diff --git a/jvm/simple-main-kts/simple-main-kts-test/testData/compile-java6.smain.kts b/jvm/simple-main-kts/simple-main-kts-test/testData/compile-java6.smain.kts
@@ -16,3 +16,5 @@ TestImpl().run {
     printSuper()
     printRandom()
 }
+
+val x = length // drop(4)
diff --git a/jvm/simple-main-kts/simple-main-kts/build.gradle.kts b/jvm/simple-main-kts/simple-main-kts/build.gradle.kts
@@ -6,9 +6,10 @@ plugins {
 val kotlinVersion: String by rootProject.extra
 
 dependencies {
+    implementation("org.jetbrains.kotlin:kotlin-scripting-common:$kotlinVersion")
+    implementation("org.jetbrains.kotlin:kotlin-scripting-jvm:$kotlinVersion")
     implementation("org.jetbrains.kotlin:kotlin-scripting-jvm-host:$kotlinVersion")
     implementation("org.jetbrains.kotlin:kotlin-scripting-dependencies:$kotlinVersion")
-    implementation("org.jetbrains.kotlin:kotlin-script-util:$kotlinVersion")
     implementation("org.apache.ivy:ivy:2.5.0")
 }
 
diff --git a/jvm/simple-main-kts/simple-main-kts/src/main/kotlin/org/jetbrains/kotlin/script/examples/simpleMainKts/annotations.kt b/jvm/simple-main-kts/simple-main-kts/src/main/kotlin/org/jetbrains/kotlin/script/examples/simpleMainKts/annotations.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o.
+ *
+ * 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
+ *
+ * http://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.
+ */
+
+package org.jetbrains.kotlin.script.examples.simpleMainKts
+
+/**
+ * Import other script(s)
+ */
+@Target(AnnotationTarget.FILE)
+@Repeatable
+@Retention(AnnotationRetention.SOURCE)
+annotation class Import(vararg val paths: String)
+
+/**
+ * Compiler options that will be applied on script compilation
+ *
+ * @see [kotlin.script.experimental.api.compilerOptions]
+ */
+@Target(AnnotationTarget.FILE)
+@Repeatable
+@Retention(AnnotationRetention.SOURCE)
+annotation class CompilerOptions(vararg val options: String)
diff --git a/jvm/simple-main-kts/simple-main-kts/src/main/kotlin/org/jetbrains/kotlin/script/examples/simpleMainKts/impl/ivy.kt b/jvm/simple-main-kts/simple-main-kts/src/main/kotlin/org/jetbrains/kotlin/script/examples/simpleMainKts/impl/ivy.kt
@@ -36,7 +36,11 @@ class IvyResolver : ExternalDependenciesResolver {
     override fun acceptsRepository(repositoryCoordinates: RepositoryCoordinates): Boolean =
         repositoryCoordinates.toRepositoryUrlOrNull() != null
 
-    override suspend fun resolve(artifactCoordinates: String): ResultWithDiagnostics<List<File>> {
+    override suspend fun resolve(
+            artifactCoordinates: String,
+            options: ExternalDependenciesResolver.Options,
+            sourceCodeLocation: SourceCode.LocationWithId?
+    ): ResultWithDiagnostics<List<File>> {
 
         val artifactType = artifactCoordinates.substringAfterLast('@', "").trim()
         val stringCoordinates = if (artifactType.isNotEmpty()) artifactCoordinates.removeSuffix("@$artifactType") else artifactCoordinates
@@ -124,7 +128,11 @@ class IvyResolver : ExternalDependenciesResolver {
         else report.allArtifactsReports.map { it.localFile }.asSuccess(diagnostics)
     }
 
-    override fun addRepository(repositoryCoordinates: RepositoryCoordinates) {
+    override fun addRepository(
+            repositoryCoordinates: RepositoryCoordinates,
+            options: ExternalDependenciesResolver.Options,
+            sourceCodeLocation: SourceCode.LocationWithId?
+    ): ResultWithDiagnostics<Boolean> {
         val url = repositoryCoordinates.toRepositoryUrlOrNull()
         if (url != null) {
             ivyResolvers.add(
@@ -134,6 +142,9 @@ class IvyResolver : ExternalDependenciesResolver {
                     root = url.toExternalForm()
                 }
             )
+            return true.asSuccess()
+        } else {
+            return false.asSuccess()
         }
     }
 
diff --git a/jvm/simple-main-kts/simple-main-kts/src/main/kotlin/org/jetbrains/kotlin/script/examples/simpleMainKts/impl/resolve.kt b/jvm/simple-main-kts/simple-main-kts/src/main/kotlin/org/jetbrains/kotlin/script/examples/simpleMainKts/impl/resolve.kt
@@ -5,32 +5,36 @@
 
 package org.jetbrains.kotlin.script.examples.simpleMainKts.impl
 
-import org.jetbrains.kotlin.script.util.DependsOn
-import org.jetbrains.kotlin.script.util.Repository
 import java.io.File
-import kotlin.script.experimental.api.ResultWithDiagnostics
-import kotlin.script.experimental.api.flatMapSuccess
-import kotlin.script.experimental.api.makeFailureResult
+import kotlin.script.experimental.api.*
+import kotlin.script.experimental.dependencies.DependsOn
 import kotlin.script.experimental.dependencies.ExternalDependenciesResolver
-import kotlin.script.experimental.dependencies.tryAddRepository
+import kotlin.script.experimental.dependencies.Repository
+import kotlin.script.experimental.dependencies.addRepository
 
 suspend fun resolveFromAnnotations(resolver: ExternalDependenciesResolver, annotations: Iterable<Annotation>): ResultWithDiagnostics<List<File>> {
+    val reports = mutableListOf<ScriptDiagnostic>()
     annotations.forEach { annotation ->
         when (annotation) {
             is Repository -> {
-                val repositoryCoordinates = with(annotation) { value.takeIf { it.isNotBlank() } ?: url }
-                if (!resolver.tryAddRepository(repositoryCoordinates))
-                    return makeFailureResult("Unrecognized repository coordinates: $repositoryCoordinates")
-            }
-            is DependsOn -> {}
+                for (coordinates in annotation.repositoriesCoordinates) {
+                    val added = resolver.addRepository(coordinates)
+                            .also { reports.addAll(it.reports) }
+                            .valueOr { return it }
+
+                    if (!added)
+                        return reports + makeFailureResult(
+                                "Unrecognized repository coordinates: $coordinates"
+                        )
+                }
+            }            is DependsOn -> {}
             else -> return makeFailureResult("Unknown annotation ${annotation.javaClass}")
         }
     }
-    return annotations.filterIsInstance(DependsOn::class.java).flatMapSuccess { dep ->
-        val artifactCoordinates =
-            if (dep.value.isNotBlank()) dep.value
-            else listOf(dep.groupId, dep.artifactId, dep.version).filter(String::isNotBlank).joinToString(":")
-        resolver.resolve(artifactCoordinates)
+    return annotations.filterIsInstance(DependsOn::class.java).flatMapSuccess { annotation ->
+        annotation.artifactsCoordinates.asIterable().flatMapSuccess { artifactCoordinates ->
+            resolver.resolve(artifactCoordinates)
+        }
     }
 }
 
diff --git a/jvm/simple-main-kts/simple-main-kts/src/main/kotlin/org/jetbrains/kotlin/script/examples/simpleMainKts/scriptDef.kt b/jvm/simple-main-kts/simple-main-kts/src/main/kotlin/org/jetbrains/kotlin/script/examples/simpleMainKts/scriptDef.kt
@@ -8,18 +8,16 @@ package org.jetbrains.kotlin.script.examples.simpleMainKts
 import kotlinx.coroutines.runBlocking
 import org.jetbrains.kotlin.script.examples.simpleMainKts.impl.IvyResolver
 import org.jetbrains.kotlin.script.examples.simpleMainKts.impl.resolveFromAnnotations
-import org.jetbrains.kotlin.script.util.CompilerOptions
-import org.jetbrains.kotlin.script.util.DependsOn
-import org.jetbrains.kotlin.script.util.Import
-import org.jetbrains.kotlin.script.util.Repository
 import java.io.File
 import java.net.JarURLConnection
 import java.net.URL
 import java.security.MessageDigest
 import kotlin.script.experimental.annotations.KotlinScript
 import kotlin.script.experimental.api.*
 import kotlin.script.experimental.dependencies.CompoundDependenciesResolver
+import kotlin.script.experimental.dependencies.DependsOn
 import kotlin.script.experimental.dependencies.FileSystemDependenciesResolver
+import kotlin.script.experimental.dependencies.Repository
 import kotlin.script.experimental.host.FileBasedScriptSource
 import kotlin.script.experimental.host.FileScriptSource
 import kotlin.script.experimental.host.ScriptingHostConfiguration
@@ -40,18 +38,20 @@ const val COMPILED_SCRIPTS_CACHE_DIR_PROPERTY = "kotlin.simple.main.kts.compiled
 class SimpleMainKtsScriptDefinition : ScriptCompilationConfiguration(
     {
         defaultImports(DependsOn::class, Repository::class, Import::class, CompilerOptions::class)
+        implicitReceivers(String::class)
         jvm {
             val keyResource = SimpleMainKtsScriptDefinition::class.java.name.replace('.', '/') + ".class"
             val thisJarFile = SimpleMainKtsScriptDefinition::class.java.classLoader.getResource(keyResource)?.toContainingJarOrNull()
             if (thisJarFile != null) {
                 dependenciesFromClassContext(
                         SimpleMainKtsScriptDefinition::class,
-                        thisJarFile.name, "kotlin-stdlib", "kotlin-reflect", "kotlin-script-util"
+                        thisJarFile.name, "kotlin-stdlib", "kotlin-reflect", "kotlin-scripting-dependencies"
                 )
             } else {
                 dependenciesFromClassContext(SimpleMainKtsScriptDefinition::class, wholeClasspath = true)
             }
         }
+
         refineConfiguration {
             onAnnotations(DependsOn::class, Repository::class, Import::class, CompilerOptions::class, handler = MainKtsConfigurator())
         }
@@ -82,6 +82,7 @@ class SimpleMainKtsScriptDefinition : ScriptCompilationConfiguration(
 object MainKtsEvaluationConfiguration : ScriptEvaluationConfiguration(
     {
         scriptsInstancesSharing(true)
+        implicitReceivers("")
         refineConfigurationBeforeEvaluate(::configureConstructorArgsFromMainArgs)
     }
 )

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`
`2`	`2`	`plugins {`
`3`		`- kotlin("jvm") version "1.3.70"`
	`3`	`+ kotlin("jvm") version "1.4.0"`
`4`	`4`	`}`
`5`	`5`
`6`		`-val kotlinVersion: String by extra("1.3.70")`
	`6`	`+val kotlinVersion: String by extra("1.4.0")`
`7`	`7`
`8`	`8`	`allprojects {`
`9`	`9`	`repositories {`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ dependencies {`
`9`	`9`	`implementation(project(":jvm:basic:jvm-simple-script:script"))`
`10`	`10`	`implementation("org.jetbrains.kotlin:kotlin-scripting-jvm:$kotlinVersion")`
`11`	`11`	`compileOnly("org.jetbrains.kotlin:kotlin-scripting-jvm-host:$kotlinVersion")`
`12`		`- testRuntimeOnly("org.jetbrains.kotlin:kotlin-scripting-jvm-host-embeddable:$kotlinVersion")`
	`12`	`+ testRuntimeOnly("org.jetbrains.kotlin:kotlin-scripting-jvm-host:$kotlinVersion")`
`13`	`13`	`testRuntimeOnly("com.google.guava:guava:28.2-jre")`
`14`	`14`	`testImplementation("junit:junit:4.12")`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,9 +39,9 @@ class ResolveTest {`
`39`	`39`	`val res = evalFile(File("testData/hello-maven-resolve-error.scriptwithdeps.kts"))`
`40`	`40`
`41`	`41`	`Assert.assertTrue(`
`42`		`- "test failed - expecting a failure with the message \"Unknown set of arguments to maven resolver: abracadabra\" but received " +`
`43`		`- (if (res is ResultWithDiagnostics.Failure) "failure" else "success") +`
`44`		`- ":\n ${res.reports.joinToString("\n ") { it.message + if (it.exception == null) "" else ": ${it.exception}" }}",`
`45`		`- res is ResultWithDiagnostics.Failure && res.reports.any { it.message.contains("Unknown set of arguments to maven resolver: abracadabra") })`
	`42`	`+ "test failed - expecting a failure with the message \"File 'abracadabra' not found\" but received " +`
	`43`	`+ (if (res is ResultWithDiagnostics.Failure) "failure" else "success") +`
	`44`	`+ ":\n ${res.reports.joinToString("\n ") { it.message + if (it.exception == null) "" else ": ${it.exception}" }}",`
	`45`	`+ res is ResultWithDiagnostics.Failure && res.reports.any { it.message.contains("File 'abracadabra' not found") })`
`46`	`46`	`}`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@ val kotlinVersion: String by rootProject.extra`
`7`	`7`
`8`	`8`	`dependencies {`
`9`	`9`	`implementation(project(":jvm:basic:jvm-simple-script:script"))`
	`10`	`+ implementation("org.jetbrains.kotlin:kotlin-scripting-common:$kotlinVersion")`
	`11`	`+ implementation("org.jetbrains.kotlin:kotlin-scripting-jvm:$kotlinVersion")`
`10`	`12`	`implementation("org.jetbrains.kotlin:kotlin-scripting-jvm-host:$kotlinVersion")`
`11`	`13`	`testImplementation("junit:junit:4.12")`
`12`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@ val kotlinVersion: String by rootProject.extra`
`7`	`7`
`8`	`8`	`dependencies {`
`9`	`9`	`testImplementation(project(":jvm:simple-main-kts:simple-main-kts"))`
	`10`	`+ testImplementation("org.jetbrains.kotlin:kotlin-scripting-common:$kotlinVersion")`
	`11`	`+ testImplementation("org.jetbrains.kotlin:kotlin-scripting-jvm:$kotlinVersion")`
`10`	`12`	`testImplementation("org.jetbrains.kotlin:kotlin-scripting-jvm-host:$kotlinVersion")`
`11`	`13`	`testImplementation("junit:junit:4.12")`
`12`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,3 +16,5 @@ TestImpl().run {`
`16`	`16`	`printSuper()`
`17`	`17`	`printRandom()`
`18`	`18`	`}`
	`19`	`+`
	`20`	`+val x = length // drop(4)`