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
@@ -41,6 +41,7 @@ class LazyJavaPackageFragmentProvider(
}
}
@Deprecated("for usages use #packageFragments(FqName) at final point, for impl use #collectPackageFragments(FqName, MutableCollection<PackageFragmentDescriptor>)")
override fun getPackageFragments(fqName: FqName) = listOfNotNull(getPackageFragment(fqName))
override fun collectPackageFragments(fqName: FqName, packageFragments: MutableCollection<PackageFragmentDescriptor>) =
@@ -26,6 +26,7 @@ interface PackageFragmentProvider {
fun getSubPackagesOf(fqName: FqName, nameFilter: (Name) -> Boolean): Collection<FqName>
object Empty : PackageFragmentProvider {
@Deprecated("for usages use #packageFragments(FqName) at final point, for impl use #collectPackageFragments(FqName, MutableCollection<PackageFragmentDescriptor>)")
override fun getPackageFragments(fqName: FqName) = emptyList<PackageFragmentDescriptor>()
override fun getSubPackagesOf(fqName: FqName, nameFilter: (Name) -> Boolean) = emptySet<FqName>()
@@ -29,6 +29,7 @@ class PackageFragmentProviderImpl(
override fun isEmpty(fqName: FqName): Boolean =
this.packageFragments.none { it.fqName == fqName }
@Deprecated("for usages use #packageFragments(FqName) at final point, for impl use #collectPackageFragments(FqName, MutableCollection<PackageFragmentDescriptor>)")
override fun getPackageFragments(fqName: FqName): List<PackageFragmentDescriptor> =
packageFragments.filter { it.fqName == fqName }
@@ -108,7 +108,7 @@ class CompositeAnnotations(
override fun findAnnotation(fqName: FqName) = delegates.asSequence().mapNotNull { it.findAnnotation(fqName) }.firstOrNull()
@Suppress("DEPRECATION", "OverridingDeprecatedMember")
@Suppress("DEPRECATION", "OverridingDeprecatedMember", "OVERRIDE_DEPRECATION")
override fun getUseSiteTargetedAnnotations() = delegates.flatMap { it.getUseSiteTargetedAnnotations() }
override fun iterator() = delegates.asSequence().flatMap { it.asSequence() }.iterator()
@@ -32,6 +32,7 @@ class CompositePackageFragmentProvider(// can be modified from outside
}
}
@Deprecated("for usages use #packageFragments(FqName) at final point, for impl use #collectPackageFragments(FqName, MutableCollection<PackageFragmentDescriptor>)")
override fun getPackageFragments(fqName: FqName): List<PackageFragmentDescriptor> {
val result = ArrayList<PackageFragmentDescriptor>()
for (provider in providers) {
@@ -52,6 +52,7 @@ abstract class AbstractDeserializedPackageFragmentProvider(
return descriptor == null
}
@Deprecated("for usages use #packageFragments(FqName) at final point, for impl use #collectPackageFragments(FqName, MutableCollection<PackageFragmentDescriptor>)")
override fun getPackageFragments(fqName: FqName): List<PackageFragmentDescriptor> = listOfNotNull(fragments(fqName))
override fun getSubPackagesOf(fqName: FqName, nameFilter: (Name) -> Boolean): Collection<FqName> = emptySet()