From 5db9c2990ac0f6e45d3b0bd708ed75f14e6fa302 Mon Sep 17 00:00:00 2001 From: Bogdan Mukvich Date: Tue, 6 Dec 2022 09:52:17 +0000 Subject: [PATCH] Remove deprecated dependencies resolvers from kotlin-script-util along with outdated maven dependencies --- .../tools/kotlin-script-util/build.gradle.kts | 6 - .../jetbrains/kotlin/script/util/resolve.kt | 6 - .../kotlin/script/util/resolvers/maven.kt | 104 ------------------ .../kotlin/script/util/templates/templates.kt | 7 -- 4 files changed, 123 deletions(-) delete mode 100644 libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/util/resolvers/maven.kt diff --git a/libraries/tools/kotlin-script-util/build.gradle.kts b/libraries/tools/kotlin-script-util/build.gradle.kts index 40140c44285..6ad458537c6 100644 --- a/libraries/tools/kotlin-script-util/build.gradle.kts +++ b/libraries/tools/kotlin-script-util/build.gradle.kts @@ -15,17 +15,11 @@ dependencies { compileOnly(project(":daemon-common")) compileOnly(project(":kotlin-scripting-compiler")) api(project(":kotlin-daemon-client")) - compileOnly("org.jetbrains.kotlin:jcabi-aether:1.0-dev-3") - compileOnly("org.sonatype.aether:aether-api:1.13.1") - compileOnly("org.apache.maven:maven-core:3.0.3") testCompileOnly(project(":compiler:cli")) testApi(project(":kotlin-test:kotlin-test-junit")) testApi(commonDependency("junit:junit")) testApi(project(":kotlin-scripting-compiler")) testRuntimeOnly(project(":kotlin-compiler")) - testImplementation("org.jetbrains.kotlin:jcabi-aether:1.0-dev-3") - testImplementation("org.sonatype.aether:aether-api:1.13.1") - testImplementation("org.apache.maven:maven-core:3.0.3") testApi(intellijCore()) } diff --git a/libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/util/resolve.kt b/libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/util/resolve.kt index 39d2db55f46..5f45cc7a72b 100644 --- a/libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/util/resolve.kt +++ b/libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/util/resolve.kt @@ -20,7 +20,6 @@ package org.jetbrains.kotlin.script.util import org.jetbrains.kotlin.script.util.resolvers.DirectResolver import org.jetbrains.kotlin.script.util.resolvers.FlatLibDirectoryResolver -import org.jetbrains.kotlin.script.util.resolvers.MavenResolver import org.jetbrains.kotlin.script.util.resolvers.Resolver import org.jetbrains.kotlin.scripting.resolve.InvalidScriptResolverAnnotation import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull @@ -81,8 +80,3 @@ open class KotlinAnnotatedScriptDependenciesResolver(val baseClassPath: List Unit)? = null): GenericRepositoryWithBridge { - - // TODO: make robust - val localRepo = File(File(System.getProperty("user.home")!!, ".m2"), "repository") - - val repos: ArrayList = arrayListOf() - - private fun currentRepos() = if (repos.isEmpty()) arrayListOf(mavenCentral) else repos - - private fun String?.isValidParam() = this?.isNotBlank() ?: false - - override fun tryResolve(artifactCoordinates: GenericArtifactCoordinates): Iterable? { - - fun error(msg: String) { - reportError?.invoke(msg) ?: throw RuntimeException(msg) - } - - fun String?.orNullIfBlank(): String? = this?.takeUnless(String::isBlank) - - val artifactId: DefaultArtifact = with(artifactCoordinates) { - if (this is MavenArtifactCoordinates && (groupId.isValidParam() || artifactId.isValidParam())) { - DefaultArtifact( - groupId.orNullIfBlank(), - artifactId.orNullIfBlank(), - null, - version.orNullIfBlank() - ) - } else { - val coordinatesString = string - if (coordinatesString.isValidParam() && coordinatesString.count { it == ':' } == 2) { - DefaultArtifact(coordinatesString) - } else { - error("Unknown set of arguments to maven resolver: $coordinatesString") - return null - } - } - } - - try { - val deps = Aether(currentRepos(), localRepo).resolve( artifactId, JavaScopes.RUNTIME) - if (deps != null) - return deps.map { it.file } - else { - error("resolving ${artifactId.artifactId} failed: no results") - } - } catch (e: DependencyResolutionException) { - reportError?.invoke("resolving ${artifactId.artifactId} failed: $e") ?: throw e - } - return null - } - - override fun tryAddRepository(repositoryCoordinates: GenericRepositoryCoordinates): Boolean { - val url = repositoryCoordinates.url - if (url != null) { - repos.add( - RemoteRepository( - if (repositoryCoordinates.name.isValidParam()) repositoryCoordinates.name else url.host, - "default", - url.toString() - ) - ) - return true - } - return false - } -} diff --git a/libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/util/templates/templates.kt b/libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/util/templates/templates.kt index 5f045f5cd32..b2edbaeb73e 100644 --- a/libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/util/templates/templates.kt +++ b/libraries/tools/kotlin-script-util/src/main/kotlin/org/jetbrains/kotlin/script/util/templates/templates.kt @@ -18,18 +18,11 @@ package org.jetbrains.kotlin.script.util.templates -import org.jetbrains.kotlin.script.util.FilesAndMavenResolver import org.jetbrains.kotlin.script.util.LocalFilesResolver import kotlin.script.templates.ScriptTemplateDefinition @ScriptTemplateDefinition(resolver = LocalFilesResolver::class, scriptFilePattern = ".*\\.kts") abstract class StandardArgsScriptTemplateWithLocalResolving(val args: Array) -@ScriptTemplateDefinition(resolver = FilesAndMavenResolver::class, scriptFilePattern = ".*\\.kts") -abstract class StandardArgsScriptTemplateWithMavenResolving(val args: Array) - @ScriptTemplateDefinition(resolver = LocalFilesResolver::class, scriptFilePattern = ".*\\.kts") abstract class BindingsScriptTemplateWithLocalResolving(val bindings: Map) - -@ScriptTemplateDefinition(resolver = FilesAndMavenResolver::class, scriptFilePattern = ".*\\.kts") -abstract class BindingsScriptTemplateWithMavenResolving(val bindings: Map)