Skip to content

Commit 345fd4f

Browse files
ligeeligee
committed
Switch to Kotlin 1.4.0
1 parent eb83a6f commit 345fd4f

File tree

15 files changed

+111
-73
lines changed

15 files changed

+111
-73
lines changed

‎build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11

22
plugins {
3-
kotlin("jvm") version "1.3.70"
3+
kotlin("jvm") version "1.4.0"
44
}
55

6-
val kotlinVersion: String by extra("1.3.70")
6+
val kotlinVersion: String by extra("1.4.0")
77

88
allprojects {
99
repositories {

‎jvm/basic/jvm-embeddable-host/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies {
99
implementation(project(":jvm:basic:jvm-simple-script:script"))
1010
implementation("org.jetbrains.kotlin:kotlin-scripting-jvm:$kotlinVersion")
1111
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")
1313
testRuntimeOnly("com.google.guava:guava:28.2-jre")
1414
testImplementation("junit:junit:4.12")
1515
}

‎jvm/basic/jvm-maven-deps/host/build.gradle.kts

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ val kotlinVersion: String by rootProject.extra
77

88
dependencies {
99
implementation(project(":jvm:basic:jvm-maven-deps:script"))
10+
implementation("org.jetbrains.kotlin:kotlin-scripting-common:$kotlinVersion")
11+
implementation("org.jetbrains.kotlin:kotlin-scripting-jvm:$kotlinVersion")
1012
implementation("org.jetbrains.kotlin:kotlin-scripting-jvm-host:$kotlinVersion")
1113
testImplementation("junit:junit:4.12")
1214
testRuntimeOnly("org.slf4j:slf4j-nop:1.7.28")

‎jvm/basic/jvm-maven-deps/host/src/test/kotlin/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/test/resolveTest.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ class ResolveTest {
3939
val res = evalFile(File("testData/hello-maven-resolve-error.scriptwithdeps.kts"))
4040

4141
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") })
4646
}
4747
}

‎jvm/basic/jvm-maven-deps/script/build.gradle.kts

+3-4
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ plugins {
66
val kotlinVersion: String by rootProject.extra
77

88
dependencies {
9+
implementation("org.jetbrains.kotlin:kotlin-scripting-common:$kotlinVersion")
910
implementation("org.jetbrains.kotlin:kotlin-scripting-jvm:$kotlinVersion")
10-
implementation("org.jetbrains.kotlin:kotlin-script-util:$kotlinVersion")
11-
runtimeOnly("com.jcabi:jcabi-aether:0.10.1")
12-
runtimeOnly("org.sonatype.aether:aether-api:1.13.1")
13-
runtimeOnly("org.apache.maven:maven-core:3.0.3")
11+
implementation("org.jetbrains.kotlin:kotlin-scripting-dependencies:$kotlinVersion")
12+
implementation("org.jetbrains.kotlin:kotlin-scripting-dependencies-maven:$kotlinVersion")
1413
}

‎jvm/basic/jvm-maven-deps/script/src/main/kotlin/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/scriptDef.kt

+15-37
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,14 @@
55

66
package org.jetbrains.kotlin.script.examples.jvm.resolve.maven
77

8-
import org.jetbrains.kotlin.script.util.DependsOn
9-
import org.jetbrains.kotlin.script.util.FilesAndMavenResolver
10-
import org.jetbrains.kotlin.script.util.Repository
11-
import java.io.File
12-
import kotlin.script.dependencies.ScriptContents
13-
import kotlin.script.dependencies.ScriptDependenciesResolver
8+
import kotlinx.coroutines.runBlocking
149
import kotlin.script.experimental.annotations.KotlinScript
1510
import kotlin.script.experimental.api.*
16-
import kotlin.script.experimental.jvm.compat.mapLegacyDiagnosticSeverity
17-
import kotlin.script.experimental.jvm.compat.mapLegacyScriptPosition
11+
import kotlin.script.experimental.dependencies.*
12+
import kotlin.script.experimental.dependencies.maven.MavenDependenciesResolver
13+
import kotlin.script.experimental.jvm.JvmDependency
1814
import kotlin.script.experimental.jvm.dependenciesFromCurrentContext
1915
import kotlin.script.experimental.jvm.jvm
20-
import kotlin.script.experimental.jvm.withUpdatedClasspath
2116

2217
@KotlinScript(
2318
fileExtension = "scriptwithdeps.kts",
@@ -31,7 +26,7 @@ object ScriptWithMavenDepsConfiguration : ScriptCompilationConfiguration(
3126
jvm {
3227
dependenciesFromCurrentContext(
3328
"script", // script library jar name
34-
"kotlin-script-util" // DependsOn annotation is taken from script-util
29+
"kotlin-scripting-dependencies" // DependsOn annotation is taken from this jar
3530
)
3631
}
3732
refineConfiguration {
@@ -40,35 +35,18 @@ object ScriptWithMavenDepsConfiguration : ScriptCompilationConfiguration(
4035
}
4136
)
4237

43-
private val resolver = FilesAndMavenResolver()
38+
private val resolver = CompoundDependenciesResolver(FileSystemDependenciesResolver(), MavenDependenciesResolver())
4439

4540
fun configureMavenDepsOnAnnotations(context: ScriptConfigurationRefinementContext): ResultWithDiagnostics<ScriptCompilationConfiguration> {
46-
val annotations = context.collectedData?.get(ScriptCollectedData.foundAnnotations)?.takeIf { it.isNotEmpty() }
47-
?: return context.compilationConfiguration.asSuccess()
48-
val scriptContents = object : ScriptContents {
49-
override val annotations: Iterable<Annotation> = annotations
50-
override val file: File? = null
51-
override val text: CharSequence? = null
52-
}
53-
val diagnostics = arrayListOf<ScriptDiagnostic>()
54-
fun report(severity: ScriptDependenciesResolver.ReportSeverity, message: String, position: ScriptContents.Position?) {
55-
diagnostics.add(
56-
ScriptDiagnostic(
57-
message,
58-
mapLegacyDiagnosticSeverity(severity),
59-
context.script.locationId,
60-
mapLegacyScriptPosition(position)
61-
)
62-
)
63-
}
64-
return try {
65-
val newDepsFromResolver = resolver.resolve(scriptContents, emptyMap(), ::report, null).get()
66-
?: return context.compilationConfiguration.asSuccess(diagnostics)
67-
val resolvedClasspath = newDepsFromResolver.classpath.toList().takeIf { it.isNotEmpty() }
68-
?: return context.compilationConfiguration.asSuccess(diagnostics)
69-
context.compilationConfiguration.withUpdatedClasspath(resolvedClasspath).asSuccess(diagnostics)
70-
} catch (e: Throwable) {
71-
ResultWithDiagnostics.Failure(*diagnostics.toTypedArray(), e.asDiagnostics(path = context.script.locationId))
41+
val annotations = context.collectedData?.get(ScriptCollectedData.collectedAnnotations)?.takeIf { it.isNotEmpty() }
42+
?: return context.compilationConfiguration.asSuccess()
43+
return runBlocking {
44+
resolver.resolveFromScriptSourceAnnotations(annotations)
45+
}.onSuccess {
46+
context.compilationConfiguration.with {
47+
dependencies.append(JvmDependency(it))
48+
}.asSuccess()
7249
}
7350
}
7451

52+

‎jvm/basic/jvm-simple-script/host/build.gradle.kts

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ val kotlinVersion: String by rootProject.extra
77

88
dependencies {
99
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")
1012
implementation("org.jetbrains.kotlin:kotlin-scripting-jvm-host:$kotlinVersion")
1113
testImplementation("junit:junit:4.12")
1214
}

‎jvm/simple-main-kts/simple-main-kts-test/build.gradle.kts

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ val kotlinVersion: String by rootProject.extra
77

88
dependencies {
99
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")
1012
testImplementation("org.jetbrains.kotlin:kotlin-scripting-jvm-host:$kotlinVersion")
1113
testImplementation("junit:junit:4.12")
1214
}

‎jvm/simple-main-kts/simple-main-kts-test/src/test/kotlin/org/jetbrains/kotlin/script/examples/simpleMainKts/test/SimpleMainKtsTest.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package org.jetbrains.kotlin.script.examples.simpleMainKts.test
66

77
import org.jetbrains.kotlin.script.examples.simpleMainKts.COMPILED_SCRIPTS_CACHE_DIR_PROPERTY
8+
import org.jetbrains.kotlin.script.examples.simpleMainKts.MainKtsEvaluationConfiguration
89
import org.jetbrains.kotlin.script.examples.simpleMainKts.SimpleMainKtsScript
910
import org.junit.Assert
1011
import org.junit.Test
@@ -21,7 +22,7 @@ fun evalFile(scriptFile: File, cacheDir: File? = null): ResultWithDiagnostics<Ev
2122
withMainKtsCacheDir(cacheDir?.absolutePath ?: "") {
2223
val scriptDefinition = createJvmCompilationConfigurationFromTemplate<SimpleMainKtsScript>()
2324

24-
val evaluationEnv = ScriptEvaluationConfiguration {
25+
val evaluationEnv = MainKtsEvaluationConfiguration.with {
2526
jvm {
2627
baseClassLoader(null)
2728
}

‎jvm/simple-main-kts/simple-main-kts-test/testData/compile-java6.smain.kts

+2
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,5 @@ TestImpl().run {
1616
printSuper()
1717
printRandom()
1818
}
19+
20+
val x = length // drop(4)

‎jvm/simple-main-kts/simple-main-kts/build.gradle.kts

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ plugins {
66
val kotlinVersion: String by rootProject.extra
77

88
dependencies {
9+
implementation("org.jetbrains.kotlin:kotlin-scripting-common:$kotlinVersion")
10+
implementation("org.jetbrains.kotlin:kotlin-scripting-jvm:$kotlinVersion")
911
implementation("org.jetbrains.kotlin:kotlin-scripting-jvm-host:$kotlinVersion")
1012
implementation("org.jetbrains.kotlin:kotlin-scripting-dependencies:$kotlinVersion")
11-
implementation("org.jetbrains.kotlin:kotlin-script-util:$kotlinVersion")
1213
implementation("org.apache.ivy:ivy:2.5.0")
1314
}
1415

‎jvm/simple-main-kts/simple-main-kts/src/main/kotlin/org/jetbrains/kotlin/script/examples/simpleMainKts/annotations.kt

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
/*
2+
* Copyright 2010-2020 JetBrains s.r.o.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package org.jetbrains.kotlin.script.examples.simpleMainKts
18+
19+
/**
20+
* Import other script(s)
21+
*/
22+
@Target(AnnotationTarget.FILE)
23+
@Repeatable
24+
@Retention(AnnotationRetention.SOURCE)
25+
annotation class Import(vararg val paths: String)
26+
27+
/**
28+
* Compiler options that will be applied on script compilation
29+
*
30+
* @see [kotlin.script.experimental.api.compilerOptions]
31+
*/
32+
@Target(AnnotationTarget.FILE)
33+
@Repeatable
34+
@Retention(AnnotationRetention.SOURCE)
35+
annotation class CompilerOptions(vararg val options: String)

‎jvm/simple-main-kts/simple-main-kts/src/main/kotlin/org/jetbrains/kotlin/script/examples/simpleMainKts/impl/ivy.kt

+13-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,11 @@ class IvyResolver : ExternalDependenciesResolver {
3636
override fun acceptsRepository(repositoryCoordinates: RepositoryCoordinates): Boolean =
3737
repositoryCoordinates.toRepositoryUrlOrNull() != null
3838

39-
override suspend fun resolve(artifactCoordinates: String): ResultWithDiagnostics<List<File>> {
39+
override suspend fun resolve(
40+
artifactCoordinates: String,
41+
options: ExternalDependenciesResolver.Options,
42+
sourceCodeLocation: SourceCode.LocationWithId?
43+
): ResultWithDiagnostics<List<File>> {
4044

4145
val artifactType = artifactCoordinates.substringAfterLast('@', "").trim()
4246
val stringCoordinates = if (artifactType.isNotEmpty()) artifactCoordinates.removeSuffix("@$artifactType") else artifactCoordinates
@@ -124,7 +128,11 @@ class IvyResolver : ExternalDependenciesResolver {
124128
else report.allArtifactsReports.map { it.localFile }.asSuccess(diagnostics)
125129
}
126130

127-
override fun addRepository(repositoryCoordinates: RepositoryCoordinates) {
131+
override fun addRepository(
132+
repositoryCoordinates: RepositoryCoordinates,
133+
options: ExternalDependenciesResolver.Options,
134+
sourceCodeLocation: SourceCode.LocationWithId?
135+
): ResultWithDiagnostics<Boolean> {
128136
val url = repositoryCoordinates.toRepositoryUrlOrNull()
129137
if (url != null) {
130138
ivyResolvers.add(
@@ -134,6 +142,9 @@ class IvyResolver : ExternalDependenciesResolver {
134142
root = url.toExternalForm()
135143
}
136144
)
145+
return true.asSuccess()
146+
} else {
147+
return false.asSuccess()
137148
}
138149
}
139150

‎jvm/simple-main-kts/simple-main-kts/src/main/kotlin/org/jetbrains/kotlin/script/examples/simpleMainKts/impl/resolve.kt

+20-16
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,36 @@
55

66
package org.jetbrains.kotlin.script.examples.simpleMainKts.impl
77

8-
import org.jetbrains.kotlin.script.util.DependsOn
9-
import org.jetbrains.kotlin.script.util.Repository
108
import java.io.File
11-
import kotlin.script.experimental.api.ResultWithDiagnostics
12-
import kotlin.script.experimental.api.flatMapSuccess
13-
import kotlin.script.experimental.api.makeFailureResult
9+
import kotlin.script.experimental.api.*
10+
import kotlin.script.experimental.dependencies.DependsOn
1411
import kotlin.script.experimental.dependencies.ExternalDependenciesResolver
15-
import kotlin.script.experimental.dependencies.tryAddRepository
12+
import kotlin.script.experimental.dependencies.Repository
13+
import kotlin.script.experimental.dependencies.addRepository
1614

1715
suspend fun resolveFromAnnotations(resolver: ExternalDependenciesResolver, annotations: Iterable<Annotation>): ResultWithDiagnostics<List<File>> {
16+
val reports = mutableListOf<ScriptDiagnostic>()
1817
annotations.forEach { annotation ->
1918
when (annotation) {
2019
is Repository -> {
21-
val repositoryCoordinates = with(annotation) { value.takeIf { it.isNotBlank() } ?: url }
22-
if (!resolver.tryAddRepository(repositoryCoordinates))
23-
return makeFailureResult("Unrecognized repository coordinates: $repositoryCoordinates")
24-
}
25-
is DependsOn -> {}
20+
for (coordinates in annotation.repositoriesCoordinates) {
21+
val added = resolver.addRepository(coordinates)
22+
.also { reports.addAll(it.reports) }
23+
.valueOr { return it }
24+
25+
if (!added)
26+
return reports + makeFailureResult(
27+
"Unrecognized repository coordinates: $coordinates"
28+
)
29+
}
30+
} is DependsOn -> {}
2631
else -> return makeFailureResult("Unknown annotation ${annotation.javaClass}")
2732
}
2833
}
29-
return annotations.filterIsInstance(DependsOn::class.java).flatMapSuccess { dep ->
30-
val artifactCoordinates =
31-
if (dep.value.isNotBlank()) dep.value
32-
else listOf(dep.groupId, dep.artifactId, dep.version).filter(String::isNotBlank).joinToString(":")
33-
resolver.resolve(artifactCoordinates)
34+
return annotations.filterIsInstance(DependsOn::class.java).flatMapSuccess { annotation ->
35+
annotation.artifactsCoordinates.asIterable().flatMapSuccess { artifactCoordinates ->
36+
resolver.resolve(artifactCoordinates)
37+
}
3438
}
3539
}
3640

‎jvm/simple-main-kts/simple-main-kts/src/main/kotlin/org/jetbrains/kotlin/script/examples/simpleMainKts/scriptDef.kt

+6-5
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,16 @@ package org.jetbrains.kotlin.script.examples.simpleMainKts
88
import kotlinx.coroutines.runBlocking
99
import org.jetbrains.kotlin.script.examples.simpleMainKts.impl.IvyResolver
1010
import org.jetbrains.kotlin.script.examples.simpleMainKts.impl.resolveFromAnnotations
11-
import org.jetbrains.kotlin.script.util.CompilerOptions
12-
import org.jetbrains.kotlin.script.util.DependsOn
13-
import org.jetbrains.kotlin.script.util.Import
14-
import org.jetbrains.kotlin.script.util.Repository
1511
import java.io.File
1612
import java.net.JarURLConnection
1713
import java.net.URL
1814
import java.security.MessageDigest
1915
import kotlin.script.experimental.annotations.KotlinScript
2016
import kotlin.script.experimental.api.*
2117
import kotlin.script.experimental.dependencies.CompoundDependenciesResolver
18+
import kotlin.script.experimental.dependencies.DependsOn
2219
import kotlin.script.experimental.dependencies.FileSystemDependenciesResolver
20+
import kotlin.script.experimental.dependencies.Repository
2321
import kotlin.script.experimental.host.FileBasedScriptSource
2422
import kotlin.script.experimental.host.FileScriptSource
2523
import kotlin.script.experimental.host.ScriptingHostConfiguration
@@ -40,18 +38,20 @@ const val COMPILED_SCRIPTS_CACHE_DIR_PROPERTY = "kotlin.simple.main.kts.compiled
4038
class SimpleMainKtsScriptDefinition : ScriptCompilationConfiguration(
4139
{
4240
defaultImports(DependsOn::class, Repository::class, Import::class, CompilerOptions::class)
41+
implicitReceivers(String::class)
4342
jvm {
4443
val keyResource = SimpleMainKtsScriptDefinition::class.java.name.replace('.', '/') + ".class"
4544
val thisJarFile = SimpleMainKtsScriptDefinition::class.java.classLoader.getResource(keyResource)?.toContainingJarOrNull()
4645
if (thisJarFile != null) {
4746
dependenciesFromClassContext(
4847
SimpleMainKtsScriptDefinition::class,
49-
thisJarFile.name, "kotlin-stdlib", "kotlin-reflect", "kotlin-script-util"
48+
thisJarFile.name, "kotlin-stdlib", "kotlin-reflect", "kotlin-scripting-dependencies"
5049
)
5150
} else {
5251
dependenciesFromClassContext(SimpleMainKtsScriptDefinition::class, wholeClasspath = true)
5352
}
5453
}
54+
5555
refineConfiguration {
5656
onAnnotations(DependsOn::class, Repository::class, Import::class, CompilerOptions::class, handler = MainKtsConfigurator())
5757
}
@@ -82,6 +82,7 @@ class SimpleMainKtsScriptDefinition : ScriptCompilationConfiguration(
8282
object MainKtsEvaluationConfiguration : ScriptEvaluationConfiguration(
8383
{
8484
scriptsInstancesSharing(true)
85+
implicitReceivers("")
8586
refineConfigurationBeforeEvaluate(::configureConstructorArgsFromMainArgs)
8687
}
8788
)

0 commit comments

Comments
 (0)