From f8e6c59600d5ce1b4d8d69b01409764bd7010a1b Mon Sep 17 00:00:00 2001 From: Sergej Jaskiewicz Date: Mon, 19 Dec 2022 14:42:48 +0100 Subject: [PATCH] Add compatibility aliases for declarations moved from other packages 1539d7ef1a03d53524e0b66b8dec0174582ac9cd brought some package names in sync with the directory layout. However, this broke some third-party code that used classes from those packages. The new compatibility aliases allow that code to continue to compile. Deprecation warnings will be emitted, suggesting to replace the imported packages with new ones. --- .../serialization/metadata/Deprecated.kt | 36 +++++++++++ .../serialization/metadata/impl/Deprecated.kt | 32 ++++++++++ .../kotlin/descriptors/konan/Deprecated.kt | 63 +++++++++++++++++++ .../jetbrains/kotlin/konan/util/Deprecated.kt | 14 +++++ .../kotlin/library/resolver/Deprecated.kt | 39 ++++++++++++ .../library/resolver/impl/Deprecated.kt | 38 +++++++++++ .../kotlin/serialization/konan/Deprecated.kt | 20 ++++++ .../serialization/konan/impl/Deprecated.kt | 32 ++++++++++ 8 files changed, 274 insertions(+) create mode 100644 compiler/util-klib-metadata/src/org/jetbrains/kotlin/backend/common/serialization/metadata/Deprecated.kt create mode 100644 compiler/util-klib-metadata/src/org/jetbrains/kotlin/backend/common/serialization/metadata/impl/Deprecated.kt create mode 100644 compiler/util-klib-metadata/src/org/jetbrains/kotlin/descriptors/konan/Deprecated.kt create mode 100644 compiler/util-klib-metadata/src/org/jetbrains/kotlin/konan/util/Deprecated.kt create mode 100644 compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/resolver/Deprecated.kt create mode 100644 compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/resolver/impl/Deprecated.kt create mode 100644 compiler/util-klib-metadata/src/org/jetbrains/kotlin/serialization/konan/Deprecated.kt create mode 100644 compiler/util-klib-metadata/src/org/jetbrains/kotlin/serialization/konan/impl/Deprecated.kt diff --git a/compiler/util-klib-metadata/src/org/jetbrains/kotlin/backend/common/serialization/metadata/Deprecated.kt b/compiler/util-klib-metadata/src/org/jetbrains/kotlin/backend/common/serialization/metadata/Deprecated.kt new file mode 100644 index 00000000000..e39bac9ee78 --- /dev/null +++ b/compiler/util-klib-metadata/src/org/jetbrains/kotlin/backend/common/serialization/metadata/Deprecated.kt @@ -0,0 +1,36 @@ +/* + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +@file:Suppress("unused") // The declarations below may be used outside the Kotlin repo + +package org.jetbrains.kotlin.backend.common.serialization.metadata + +import org.jetbrains.kotlin.library.KotlinLibrary +import org.jetbrains.kotlin.library.metadata.metadataVersion + +@Deprecated( + "This interface has been moved from package org.jetbrains.kotlin.backend.common.serialization.metadata to package org.jetbrains.kotlin.library.metadata", + ReplaceWith("org.jetbrains.kotlin.library.metadata.KlibMetadataDeserializedPackageFragmentsFactory") +) +typealias KlibMetadataDeserializedPackageFragmentsFactory = org.jetbrains.kotlin.library.metadata.KlibMetadataDeserializedPackageFragmentsFactory + +@Deprecated( + "This class has been moved from package org.jetbrains.kotlin.backend.common.serialization.metadata to package org.jetbrains.kotlin.library.metadata", + ReplaceWith("org.jetbrains.kotlin.library.metadata.KlibMetadataVersion") +) +typealias KlibMetadataVersion = org.jetbrains.kotlin.library.metadata.KlibMetadataVersion + +@Deprecated( + "This property has been moved from package org.jetbrains.kotlin.backend.common.serialization.metadata to package org.jetbrains.kotlin.library.metadata", + ReplaceWith("metadataVersion", "org.jetbrains.kotlin.library.metadata.metadataVersion") +) +inline val KotlinLibrary.metadataVersion: org.jetbrains.kotlin.library.metadata.KlibMetadataVersion? + get() = metadataVersion + +@Deprecated( + "This interface has been moved from package org.jetbrains.kotlin.backend.common.serialization.metadata to package org.jetbrains.kotlin.library.metadata", + ReplaceWith("org.jetbrains.kotlin.library.metadata.KlibMetadataModuleDescriptorFactory") +) +typealias KlibMetadataModuleDescriptorFactory = org.jetbrains.kotlin.library.metadata.KlibMetadataModuleDescriptorFactory diff --git a/compiler/util-klib-metadata/src/org/jetbrains/kotlin/backend/common/serialization/metadata/impl/Deprecated.kt b/compiler/util-klib-metadata/src/org/jetbrains/kotlin/backend/common/serialization/metadata/impl/Deprecated.kt new file mode 100644 index 00000000000..e4670ac1ec5 --- /dev/null +++ b/compiler/util-klib-metadata/src/org/jetbrains/kotlin/backend/common/serialization/metadata/impl/Deprecated.kt @@ -0,0 +1,32 @@ +/* + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +@file:Suppress("unused") // The declarations below may be used outside the Kotlin repo + +package org.jetbrains.kotlin.backend.common.serialization.metadata.impl + +@Deprecated( + "This class has been moved from package org.jetbrains.kotlin.backend.common.serialization.metadata.impl to package org.jetbrains.kotlin.library.metadata.impl", + ReplaceWith("org.jetbrains.kotlin.library.metadata.impl.KlibMetadataDeserializedPackageFragmentsFactoryImpl") +) +typealias KlibMetadataDeserializedPackageFragmentsFactoryImpl = org.jetbrains.kotlin.library.metadata.impl.KlibMetadataDeserializedPackageFragmentsFactoryImpl + +@Deprecated( + "This class has been moved from package org.jetbrains.kotlin.backend.common.serialization.metadata.impl to package org.jetbrains.kotlin.library.metadata.impl", + ReplaceWith("org.jetbrains.kotlin.library.metadata.impl.ExportedForwardDeclarationsPackageFragmentDescriptor") +) +typealias ExportedForwardDeclarationsPackageFragmentDescriptor = org.jetbrains.kotlin.library.metadata.impl.ExportedForwardDeclarationsPackageFragmentDescriptor + +@Deprecated( + "This class has been moved from package org.jetbrains.kotlin.backend.common.serialization.metadata.impl to package org.jetbrains.kotlin.library.metadata.impl", + ReplaceWith("org.jetbrains.kotlin.library.metadata.impl.ClassifierAliasingPackageFragmentDescriptor") +) +typealias ClassifierAliasingPackageFragmentDescriptor = org.jetbrains.kotlin.library.metadata.impl.ClassifierAliasingPackageFragmentDescriptor + +@Deprecated( + "This enum class has been moved from package org.jetbrains.kotlin.backend.common.serialization.metadata.impl to package org.jetbrains.kotlin.library.metadata.impl", + ReplaceWith("org.jetbrains.kotlin.library.metadata.impl.ExportedForwardDeclarationChecker") +) +typealias ExportedForwardDeclarationChecker = org.jetbrains.kotlin.library.metadata.impl.ExportedForwardDeclarationChecker diff --git a/compiler/util-klib-metadata/src/org/jetbrains/kotlin/descriptors/konan/Deprecated.kt b/compiler/util-klib-metadata/src/org/jetbrains/kotlin/descriptors/konan/Deprecated.kt new file mode 100644 index 00000000000..4edf07d8dc1 --- /dev/null +++ b/compiler/util-klib-metadata/src/org/jetbrains/kotlin/descriptors/konan/Deprecated.kt @@ -0,0 +1,63 @@ +/* + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +@file:Suppress("unused") // The declarations below may be used outside the Kotlin repo + +package org.jetbrains.kotlin.descriptors.konan + +import org.jetbrains.kotlin.descriptors.ModuleDescriptor +import org.jetbrains.kotlin.library.KotlinLibrary +import org.jetbrains.kotlin.library.metadata.klibModuleOrigin +import org.jetbrains.kotlin.library.metadata.kotlinLibrary + +@Deprecated( + "This interface has been moved from package org.jetbrains.kotlin.descriptors.konan to package org.jetbrains.kotlin.library.metadata", + ReplaceWith("org.jetbrains.kotlin.library.metadata.KlibModuleDescriptorFactory") +) +typealias KlibModuleDescriptorFactory = org.jetbrains.kotlin.library.metadata.KlibModuleDescriptorFactory + +@Deprecated( + "This class has been moved from package org.jetbrains.kotlin.descriptors.konan to package org.jetbrains.kotlin.library.metadata", + ReplaceWith("org.jetbrains.kotlin.library.metadata.KlibModuleOrigin") +) +typealias KlibModuleOrigin = org.jetbrains.kotlin.library.metadata.KlibModuleOrigin + +@Deprecated( + "This class has been moved from package org.jetbrains.kotlin.descriptors.konan to package org.jetbrains.kotlin.library.metadata", + ReplaceWith("org.jetbrains.kotlin.library.metadata.CompiledKlibModuleOrigin") +) +typealias CompiledKlibModuleOrigin = org.jetbrains.kotlin.library.metadata.CompiledKlibModuleOrigin + +@Deprecated( + "This class has been moved from package org.jetbrains.kotlin.descriptors.konan to package org.jetbrains.kotlin.library.metadata", + ReplaceWith("org.jetbrains.kotlin.library.metadata.DeserializedKlibModuleOrigin") +) +typealias DeserializedKlibModuleOrigin = org.jetbrains.kotlin.library.metadata.DeserializedKlibModuleOrigin + +@Deprecated( + "This object has been moved from package org.jetbrains.kotlin.descriptors.konan to package org.jetbrains.kotlin.library.metadata", + ReplaceWith("org.jetbrains.kotlin.library.metadata.CurrentKlibModuleOrigin") +) +typealias CurrentKlibModuleOrigin = org.jetbrains.kotlin.library.metadata.CurrentKlibModuleOrigin + +@Deprecated( + "This object has been moved from package org.jetbrains.kotlin.descriptors.konan to package org.jetbrains.kotlin.library.metadata", + ReplaceWith("org.jetbrains.kotlin.library.metadata.SyntheticModulesOrigin") +) +typealias SyntheticModulesOrigin = org.jetbrains.kotlin.library.metadata.SyntheticModulesOrigin + +@Deprecated( + "This property has been moved from package org.jetbrains.kotlin.descriptors.konan to package org.jetbrains.kotlin.library.metadata", + ReplaceWith("klibModuleOrigin", "org.jetbrains.kotlin.library.metadata.klibModuleOrigin") +) +inline val ModuleDescriptor.klibModuleOrigin: org.jetbrains.kotlin.library.metadata.KlibModuleOrigin + get() = klibModuleOrigin + +@Deprecated( + "This property has been moved from package org.jetbrains.kotlin.descriptors.konan to package org.jetbrains.kotlin.library.metadata", + ReplaceWith("kotlinLibrary", "org.jetbrains.kotlin.library.metadata.kotlinLibrary") +) +inline val ModuleDescriptor.kotlinLibrary: KotlinLibrary + get() = kotlinLibrary diff --git a/compiler/util-klib-metadata/src/org/jetbrains/kotlin/konan/util/Deprecated.kt b/compiler/util-klib-metadata/src/org/jetbrains/kotlin/konan/util/Deprecated.kt new file mode 100644 index 00000000000..9d52b24dfee --- /dev/null +++ b/compiler/util-klib-metadata/src/org/jetbrains/kotlin/konan/util/Deprecated.kt @@ -0,0 +1,14 @@ +/* + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +@file:Suppress("unused") // The declarations below may be used outside the Kotlin repo + +package org.jetbrains.kotlin.konan.util + +@Deprecated( + "This class has been moved from package org.jetbrains.kotlin.konan.util to package org.jetbrains.kotlin.library.metadata", + ReplaceWith("org.jetbrains.kotlin.library.metadata.KlibMetadataFactories") +) +typealias KlibMetadataFactories = org.jetbrains.kotlin.library.metadata.KlibMetadataFactories diff --git a/compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/resolver/Deprecated.kt b/compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/resolver/Deprecated.kt new file mode 100644 index 00000000000..cd496586cfb --- /dev/null +++ b/compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/resolver/Deprecated.kt @@ -0,0 +1,39 @@ +/* + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +@file:Suppress("unused") // The declarations below may be used outside the Kotlin repo + +package org.jetbrains.kotlin.library.resolver + +@Deprecated( + "This interface has been moved from package org.jetbrains.kotlin.library.resolver to package org.jetbrains.kotlin.library.metadata.resolver", + ReplaceWith("org.jetbrains.kotlin.library.metadata.resolver.KotlinLibraryResolver") +) +typealias KotlinLibraryResolver = org.jetbrains.kotlin.library.metadata.resolver.KotlinLibraryResolver + +@Deprecated( + "This interface has been moved from package org.jetbrains.kotlin.library.resolver to package org.jetbrains.kotlin.library.metadata.resolver", + ReplaceWith("org.jetbrains.kotlin.library.metadata.resolver.KotlinLibraryResolveResult") +) +typealias KotlinLibraryResolveResult = org.jetbrains.kotlin.library.metadata.resolver.KotlinLibraryResolveResult + +@Deprecated( + "This type alias has been moved from package org.jetbrains.kotlin.library.resolver to package org.jetbrains.kotlin.library.metadata.resolver", + ReplaceWith("org.jetbrains.kotlin.library.metadata.resolver.LibraryOrder") +) +typealias LibraryOrder = org.jetbrains.kotlin.library.metadata.resolver.LibraryOrder + +@Deprecated( + "This property has been moved from package org.jetbrains.kotlin.library.resolver to package org.jetbrains.kotlin.library.metadata.resolver", + ReplaceWith("org.jetbrains.kotlin.library.metadata.resolver.TopologicalLibraryOrder") +) +inline val TopologicalLibraryOrder: org.jetbrains.kotlin.library.metadata.resolver.LibraryOrder + get() = org.jetbrains.kotlin.library.metadata.resolver.TopologicalLibraryOrder + +@Deprecated( + "This interface has been moved from package org.jetbrains.kotlin.library.resolver to package org.jetbrains.kotlin.library.metadata.resolver", + ReplaceWith("org.jetbrains.kotlin.library.metadata.resolver.KotlinResolvedLibrary") +) +typealias KotlinResolvedLibrary = org.jetbrains.kotlin.library.metadata.resolver.KotlinResolvedLibrary diff --git a/compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/resolver/impl/Deprecated.kt b/compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/resolver/impl/Deprecated.kt new file mode 100644 index 00000000000..f4a5fd5bf60 --- /dev/null +++ b/compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/resolver/impl/Deprecated.kt @@ -0,0 +1,38 @@ +/* + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +@file:Suppress("unused") // The declarations below may be used outside the Kotlin repo + +package org.jetbrains.kotlin.library.resolver.impl + +import org.jetbrains.kotlin.library.KotlinLibrary +import org.jetbrains.kotlin.library.SearchPathResolver +import org.jetbrains.kotlin.library.metadata.resolver.impl.libraryResolver + +@Suppress("NOTHING_TO_INLINE") +@Deprecated( + "This extension method has been moved from package org.jetbrains.kotlin.library.resolver.impl to package org.jetbrains.kotlin.library.metadata.resolver.impl", + ReplaceWith("libraryResolver", "org.jetbrains.kotlin.library.metadata.resolver.impl.libraryResolver") +) +inline fun SearchPathResolver.libraryResolver(resolveManifestDependenciesLenient: Boolean = false) = + libraryResolver(resolveManifestDependenciesLenient) + +@Deprecated( + "This class has been moved from package org.jetbrains.kotlin.library.resolver.impl to package org.jetbrains.kotlin.library.metadata.resolver.impl", + ReplaceWith("org.jetbrains.kotlin.library.metadata.resolver.impl.KotlinLibraryResolverImpl") +) +typealias KotlinLibraryResolverImpl = org.jetbrains.kotlin.library.metadata.resolver.impl.KotlinLibraryResolverImpl + +@Deprecated( + "This class has been moved from package org.jetbrains.kotlin.library.resolver.impl to package org.jetbrains.kotlin.library.metadata.resolver.impl", + ReplaceWith("org.jetbrains.kotlin.library.metadata.resolver.impl.KotlinLibraryResolverResultImpl") +) +typealias KotlinLibraryResolverResultImpl = org.jetbrains.kotlin.library.metadata.resolver.impl.KotlinLibraryResolverResultImpl + +@Deprecated( + "This class has been moved from package org.jetbrains.kotlin.library.resolver.impl to package org.jetbrains.kotlin.library.metadata.resolver.impl", + ReplaceWith("org.jetbrains.kotlin.library.metadata.resolver.impl.KotlinResolvedLibraryImpl") +) +typealias KotlinResolvedLibraryImpl = org.jetbrains.kotlin.library.metadata.resolver.impl.KotlinResolvedLibraryImpl diff --git a/compiler/util-klib-metadata/src/org/jetbrains/kotlin/serialization/konan/Deprecated.kt b/compiler/util-klib-metadata/src/org/jetbrains/kotlin/serialization/konan/Deprecated.kt new file mode 100644 index 00000000000..5f587eb17ae --- /dev/null +++ b/compiler/util-klib-metadata/src/org/jetbrains/kotlin/serialization/konan/Deprecated.kt @@ -0,0 +1,20 @@ +/* + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +@file:Suppress("unused") // The declarations below may be used outside the Kotlin repo + +package org.jetbrains.kotlin.serialization.konan + +@Deprecated( + "This interface has been moved from package org.jetbrains.kotlin.serialization.konan to package org.jetbrains.kotlin.library.metadata", + ReplaceWith("org.jetbrains.kotlin.library.metadata.KlibResolvedModuleDescriptorsFactory") +) +typealias KlibResolvedModuleDescriptorsFactory = org.jetbrains.kotlin.library.metadata.KlibResolvedModuleDescriptorsFactory + +@Deprecated( + "This class has been moved from package org.jetbrains.kotlin.serialization.konan to package org.jetbrains.kotlin.library.metadata", + ReplaceWith("org.jetbrains.kotlin.library.metadata.KotlinResolvedModuleDescriptors") +) +typealias KotlinResolvedModuleDescriptors = org.jetbrains.kotlin.library.metadata.KotlinResolvedModuleDescriptors diff --git a/compiler/util-klib-metadata/src/org/jetbrains/kotlin/serialization/konan/impl/Deprecated.kt b/compiler/util-klib-metadata/src/org/jetbrains/kotlin/serialization/konan/impl/Deprecated.kt new file mode 100644 index 00000000000..db72bc63be4 --- /dev/null +++ b/compiler/util-klib-metadata/src/org/jetbrains/kotlin/serialization/konan/impl/Deprecated.kt @@ -0,0 +1,32 @@ +/* + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +@file:Suppress("unused") // The declarations below may be used outside the Kotlin repo + +package org.jetbrains.kotlin.serialization.konan.impl + +@Deprecated( + "This class has been moved from package org.jetbrains.kotlin.serialization.konan.impl to package org.jetbrains.kotlin.library.metadata.impl", + ReplaceWith("org.jetbrains.kotlin.library.metadata.impl.KlibMetadataModuleDescriptorFactoryImpl") +) +typealias KlibMetadataModuleDescriptorFactoryImpl = org.jetbrains.kotlin.library.metadata.impl.KlibMetadataModuleDescriptorFactoryImpl + +@Deprecated( + "This class has been moved from package org.jetbrains.kotlin.serialization.konan.impl to package org.jetbrains.kotlin.library.metadata.impl", + ReplaceWith("org.jetbrains.kotlin.library.metadata.impl.KlibResolvedModuleDescriptorsFactoryImpl") +) +typealias KlibResolvedModuleDescriptorsFactoryImpl = org.jetbrains.kotlin.library.metadata.impl.KlibResolvedModuleDescriptorsFactoryImpl + +@Deprecated( + "This class has been moved from package org.jetbrains.kotlin.serialization.konan.impl to package org.jetbrains.kotlin.library.metadata.impl", + ReplaceWith("org.jetbrains.kotlin.library.metadata.impl.ForwardDeclarationsPackageFragmentDescriptor") +) +typealias ForwardDeclarationsPackageFragmentDescriptor = org.jetbrains.kotlin.library.metadata.impl.ForwardDeclarationsPackageFragmentDescriptor + +@Deprecated( + "This object has been moved from package org.jetbrains.kotlin.serialization.konan.impl to package org.jetbrains.kotlin.library.metadata.impl", + ReplaceWith("org.jetbrains.kotlin.library.metadata.impl.ForwardDeclarationsFqNames") +) +typealias ForwardDeclarationsFqNames = org.jetbrains.kotlin.library.metadata.impl.ForwardDeclarationsFqNames