Fix OVERRIDE_DEPRECATION warnings in project code

This commit is contained in:
Dmitriy Novozhilov
2021-08-30 12:31:11 +03:00
parent 69c3831865
commit d46e2dd749
34 changed files with 70 additions and 33 deletions
@@ -76,6 +76,7 @@ abstract class KotlinScriptDefinitionAdapterFromNewAPIBase : KotlinScriptDefinit
?.map { (k, v) -> k to getScriptingClass(v).starProjectedType }.orEmpty()
}
@Deprecated("temporary workaround for missing functionality, will be replaced by the new API soon")
override val additionalCompilerArguments: List<String>
get() = scriptCompilationConfiguration[ScriptCompilationConfiguration.compilerOptions]
.orEmpty()
@@ -78,7 +78,7 @@ abstract class LazyScriptDefinitionProvider : ScriptDefinitionProvider {
cachedDefinitions.firstOrNull { it.isScript(script) }
}
@Suppress("OverridingDeprecatedMember", "DEPRECATION")
@Suppress("OverridingDeprecatedMember", "DEPRECATION", "OVERRIDE_DEPRECATION")
override fun findScriptDefinition(fileName: String): KotlinScriptDefinition? =
if (nonScriptId(fileName)) {
null
@@ -91,7 +91,7 @@ abstract class LazyScriptDefinitionProvider : ScriptDefinitionProvider {
override fun getKnownFilenameExtensions(): Sequence<String> =
cachedDefinitions.map { it.fileExtension }
@Suppress("OverridingDeprecatedMember", "DEPRECATION")
@Suppress("OverridingDeprecatedMember", "DEPRECATION", "OVERRIDE_DEPRECATION")
override fun getDefaultScriptDefinition(): KotlinScriptDefinition = getDefaultDefinition().legacyDefinition
companion object {
@@ -61,7 +61,7 @@ abstract class ScriptDefinition : UserDataHolderBase() {
return "ScriptDefinition($name)"
}
@Suppress("OverridingDeprecatedMember", "DEPRECATION")
@Suppress("OverridingDeprecatedMember", "DEPRECATION", "OVERRIDE_DEPRECATION")
open class FromLegacy(
override val hostConfiguration: ScriptingHostConfiguration,
override val legacyDefinition: KotlinScriptDefinition,
@@ -127,7 +127,7 @@ abstract class ScriptDefinition : UserDataHolderBase() {
abstract class FromConfigurationsBase() : ScriptDefinition() {
@Suppress("OverridingDeprecatedMember", "DEPRECATION")
@Suppress("OverridingDeprecatedMember", "DEPRECATION", "OVERRIDE_DEPRECATION")
override val legacyDefinition by lazy {
KotlinScriptDefinitionAdapterFromNewAPI(
compilationConfiguration,
@@ -220,4 +220,4 @@ abstract class ScriptDefinition : UserDataHolderBase() {
override val isDefault = true
}
}
}
}
@@ -133,6 +133,7 @@ open class KotlinScriptDefinitionFromAnnotatedTemplate(
override val annotationsForSamWithReceivers: List<String>
get() = samWithReceiverAnnotations ?: super.annotationsForSamWithReceivers
@Deprecated("temporary workaround for missing functionality, will be replaced by the new API soon")
override val additionalCompilerArguments: Iterable<String>? by lazy(LazyThreadSafetyMode.PUBLICATION) {
takeUnlessError {
template.annotations.firstIsInstanceOrNull<kotlin.script.templates.ScriptTemplateAdditionalCompilerArguments>()?.let {
@@ -148,7 +148,7 @@ abstract class ScriptCompilationConfigurationWrapper(val script: SourceCode) {
override val importedScripts: List<SourceCode>
get() = configuration?.get(ScriptCompilationConfiguration.importScripts).orEmpty()
@Suppress("OverridingDeprecatedMember")
@Suppress("OverridingDeprecatedMember", "OVERRIDE_DEPRECATION")
override val legacyDependencies: ScriptDependencies?
get() = configuration?.toDependencies(dependenciesClassPath)
@@ -162,7 +162,7 @@ abstract class ScriptCompilationConfigurationWrapper(val script: SourceCode) {
}
}
@Suppress("OverridingDeprecatedMember", "DEPRECATION")
@Suppress("OverridingDeprecatedMember", "DEPRECATION", "OVERRIDE_DEPRECATION")
class FromLegacy(
script: SourceCode,
override val legacyDependencies: ScriptDependencies?,
@@ -419,4 +419,4 @@ private fun Document.offsetToPosition(offset: Int): SourceCode.Position {
val line = getLineNumber(offset)
val column = offset - getLineStartOffset(line)
return SourceCode.Position(line + 1, column + 1, offset)
}
}