azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add dependency scopes option for scripting resolvers

Browse Source
This commit is contained in:
Ilya Muradyan
2020-07-12 04:27:28 +03:00
parent 742b98bed6
commit 1ac9b4c38f
8 changed files with 108 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-main-kts/src/org/jetbrains/kotlin/mainKts/impl/ivy.kt
+6 -2
View File
@@ -24,6 +24,8 @@ import kotlin.script.experimental.api.*
import kotlin.script.experimental.dependencies.ExternalDependenciesResolver
import kotlin.script.experimental.dependencies.RepositoryCoordinates
import kotlin.script.experimental.dependencies.impl.toRepositoryUrlOrNull
import kotlin.script.experimental.dependencies.impl.dependencyScopes
import kotlin.script.experimental.dependencies.impl.transitive
class IvyResolver : ExternalDependenciesResolver {
@@ -111,10 +113,12 @@ class IvyResolver : ExternalDependenciesResolver {
val depArtifact = DefaultDependencyArtifactDescriptor(depsDescriptor, artifactName, type, type, null, null)
depsDescriptor.addDependencyArtifact(conf, depArtifact)
}
depsDescriptor.addDependencyConfiguration("default", "master,compile")
val dependencyScopes = listOf("master") + (options.dependencyScopes ?: listOf("compile"))
depsDescriptor.addDependencyConfiguration("default", dependencyScopes.joinToString(","))
moduleDescriptor.addDependency(depsDescriptor)
val isTransitive = options.flag("transitive") != false
val isTransitive = options.transitive != false
val resolveOptions = ResolveOptions().apply {
confs = arrayOf("default")