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

Scripting: Remove deprecated MavenRepositoryCoordinates class

Browse Source
This commit is contained in:
Ilya Muradyan
2023-09-01 22:16:03 +02:00
committed by Space Team
parent f1f12bc192
commit 337054ba92
1 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/scripting/dependencies-maven/src/kotlin/script/experimental/dependencies/maven/MavenDependenciesResolver.kt
+2 -15
View File
@@ -21,17 +21,6 @@ import kotlin.script.experimental.dependencies.maven.impl.AetherResolveSession
import kotlin.script.experimental.dependencies.maven.impl.ResolutionKind import kotlin.script.experimental.dependencies.maven.impl.ResolutionKind
import kotlin.script.experimental.dependencies.maven.impl.mavenCentral import kotlin.script.experimental.dependencies.maven.impl.mavenCentral
@Deprecated(
"This class is not functional and left only for compatibility reasons. Use kotlin.script.experimental.dependencies.ExternalDependenciesResolver.Options for passing authorization options",
replaceWith = ReplaceWith("RepositoryCoordinates(url)", "kotlin.script.experimental.dependencies.RepositoryCoordinates")
)
class MavenRepositoryCoordinates(
url: String,
val username: String?,
val password: String?,
val privateKeyFile: String?,
val passPhrase: String?
) : RepositoryCoordinates(url)
class MavenDependenciesResolver( class MavenDependenciesResolver(
cacheResolveSession: Boolean = false cacheResolveSession: Boolean = false
@@ -116,10 +105,8 @@ class MavenDependenciesResolver(
?: return false.asSuccess() ?: return false.asSuccess()
val repoId = repositoryCoordinates.string.replace(FORBIDDEN_CHARS, "_") val repoId = repositoryCoordinates.string.replace(FORBIDDEN_CHARS, "_")
@Suppress("DEPRECATION") val usernameRaw = options.username
val mavenRepo = repositoryCoordinates as? MavenRepositoryCoordinates val passwordRaw = options.password
val usernameRaw = options.username ?: mavenRepo?.username
val passwordRaw = options.password ?: mavenRepo?.password
val reports = mutableListOf<ScriptDiagnostic>() val reports = mutableListOf<ScriptDiagnostic>()
fun getFinalValue(optionName: String, rawValue: String?): String? { fun getFinalValue(optionName: String, rawValue: String?): String? {