From a13756cfe9ae75861e486a1b0217bc968dd14c9d Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Tue, 19 Mar 2024 09:57:36 +0100 Subject: [PATCH] [aa-klib-reader] Move aa-klib-reader to pkg 'o.j.k.native.analysis.api' To clearly distinguish this modules API from the Analysis API ^KT-66695 Fixed --- .../AbstractGetKlibSourceFileNameTest.kt | 4 ++-- .../reader => native/analysis/api}/KlibDeclarationAddress.kt | 2 +- .../analysis/api}/PackageFragmentReadingContext.kt | 2 +- .../reader => native/analysis/api}/getAllLibraryModules.kt | 2 +- .../api/klib/reader => native/analysis/api}/getSymbols.kt | 2 +- .../analysis/api}/readKlibDeclarationAddresses.kt | 2 +- .../kotlin/analysis/api/klib/reader/testUtils/render.kt | 2 +- .../kotlin/analysis/api/klib/reader/tests/GetSymbolsTest.kt | 2 +- .../reader/tests/ReadKlibDeclarationAddressesBlackBoxTest.kt | 2 +- .../src/org/jetbrains/kotlin/objcexport/KtObjCExportFile.kt | 2 +- .../org/jetbrains/kotlin/objcexport/translateToObjCHeader.kt | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) rename native/analysis-api-klib-reader/src/org/jetbrains/kotlin/{analysis/api/klib/reader => native/analysis/api}/KlibDeclarationAddress.kt (97%) rename native/analysis-api-klib-reader/src/org/jetbrains/kotlin/{analysis/api/klib/reader => native/analysis/api}/PackageFragmentReadingContext.kt (96%) rename native/analysis-api-klib-reader/src/org/jetbrains/kotlin/{analysis/api/klib/reader => native/analysis/api}/getAllLibraryModules.kt (97%) rename native/analysis-api-klib-reader/src/org/jetbrains/kotlin/{analysis/api/klib/reader => native/analysis/api}/getSymbols.kt (98%) rename native/analysis-api-klib-reader/src/org/jetbrains/kotlin/{analysis/api/klib/reader => native/analysis/api}/readKlibDeclarationAddresses.kt (99%) diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/klibSourceFileProvider/AbstractGetKlibSourceFileNameTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/klibSourceFileProvider/AbstractGetKlibSourceFileNameTest.kt index c3ad1ce5da1..3998cd7d48e 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/klibSourceFileProvider/AbstractGetKlibSourceFileNameTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/klibSourceFileProvider/AbstractGetKlibSourceFileNameTest.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.klibSourceFileProvider import org.jetbrains.kotlin.analysis.api.analyze -import org.jetbrains.kotlin.analysis.api.klib.reader.getSymbols -import org.jetbrains.kotlin.analysis.api.klib.reader.readKlibDeclarationAddresses +import org.jetbrains.kotlin.native.analysis.api.getSymbols +import org.jetbrains.kotlin.native.analysis.api.readKlibDeclarationAddresses import org.jetbrains.kotlin.analysis.api.symbols.KtCallableSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtClassOrObjectSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtDeclarationSymbol diff --git a/native/analysis-api-klib-reader/src/org/jetbrains/kotlin/analysis/api/klib/reader/KlibDeclarationAddress.kt b/native/analysis-api-klib-reader/src/org/jetbrains/kotlin/native/analysis/api/KlibDeclarationAddress.kt similarity index 97% rename from native/analysis-api-klib-reader/src/org/jetbrains/kotlin/analysis/api/klib/reader/KlibDeclarationAddress.kt rename to native/analysis-api-klib-reader/src/org/jetbrains/kotlin/native/analysis/api/KlibDeclarationAddress.kt index 2b009660d12..92d02590063 100644 --- a/native/analysis-api-klib-reader/src/org/jetbrains/kotlin/analysis/api/klib/reader/KlibDeclarationAddress.kt +++ b/native/analysis-api-klib-reader/src/org/jetbrains/kotlin/native/analysis/api/KlibDeclarationAddress.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.klib.reader +package org.jetbrains.kotlin.native.analysis.api import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName diff --git a/native/analysis-api-klib-reader/src/org/jetbrains/kotlin/analysis/api/klib/reader/PackageFragmentReadingContext.kt b/native/analysis-api-klib-reader/src/org/jetbrains/kotlin/native/analysis/api/PackageFragmentReadingContext.kt similarity index 96% rename from native/analysis-api-klib-reader/src/org/jetbrains/kotlin/analysis/api/klib/reader/PackageFragmentReadingContext.kt rename to native/analysis-api-klib-reader/src/org/jetbrains/kotlin/native/analysis/api/PackageFragmentReadingContext.kt index 15f9ad3d435..d55da675668 100644 --- a/native/analysis-api-klib-reader/src/org/jetbrains/kotlin/analysis/api/klib/reader/PackageFragmentReadingContext.kt +++ b/native/analysis-api-klib-reader/src/org/jetbrains/kotlin/native/analysis/api/PackageFragmentReadingContext.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.klib.reader +package org.jetbrains.kotlin.native.analysis.api import org.jetbrains.kotlin.library.KotlinLibrary import org.jetbrains.kotlin.library.metadata.KlibMetadataProtoBuf diff --git a/native/analysis-api-klib-reader/src/org/jetbrains/kotlin/analysis/api/klib/reader/getAllLibraryModules.kt b/native/analysis-api-klib-reader/src/org/jetbrains/kotlin/native/analysis/api/getAllLibraryModules.kt similarity index 97% rename from native/analysis-api-klib-reader/src/org/jetbrains/kotlin/analysis/api/klib/reader/getAllLibraryModules.kt rename to native/analysis-api-klib-reader/src/org/jetbrains/kotlin/native/analysis/api/getAllLibraryModules.kt index 8ecf82d414c..cc61055b801 100644 --- a/native/analysis-api-klib-reader/src/org/jetbrains/kotlin/analysis/api/klib/reader/getAllLibraryModules.kt +++ b/native/analysis-api-klib-reader/src/org/jetbrains/kotlin/native/analysis/api/getAllLibraryModules.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.klib.reader +package org.jetbrains.kotlin.native.analysis.api import org.jetbrains.kotlin.analysis.api.standalone.StandaloneAnalysisAPISession import org.jetbrains.kotlin.analysis.api.standalone.base.project.structure.KtStaticProjectStructureProvider diff --git a/native/analysis-api-klib-reader/src/org/jetbrains/kotlin/analysis/api/klib/reader/getSymbols.kt b/native/analysis-api-klib-reader/src/org/jetbrains/kotlin/native/analysis/api/getSymbols.kt similarity index 98% rename from native/analysis-api-klib-reader/src/org/jetbrains/kotlin/analysis/api/klib/reader/getSymbols.kt rename to native/analysis-api-klib-reader/src/org/jetbrains/kotlin/native/analysis/api/getSymbols.kt index a35de5f389b..8569cb40160 100644 --- a/native/analysis-api-klib-reader/src/org/jetbrains/kotlin/analysis/api/klib/reader/getSymbols.kt +++ b/native/analysis-api-klib-reader/src/org/jetbrains/kotlin/native/analysis/api/getSymbols.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.klib.reader +package org.jetbrains.kotlin.native.analysis.api import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.symbols.* diff --git a/native/analysis-api-klib-reader/src/org/jetbrains/kotlin/analysis/api/klib/reader/readKlibDeclarationAddresses.kt b/native/analysis-api-klib-reader/src/org/jetbrains/kotlin/native/analysis/api/readKlibDeclarationAddresses.kt similarity index 99% rename from native/analysis-api-klib-reader/src/org/jetbrains/kotlin/analysis/api/klib/reader/readKlibDeclarationAddresses.kt rename to native/analysis-api-klib-reader/src/org/jetbrains/kotlin/native/analysis/api/readKlibDeclarationAddresses.kt index b2c66954cb3..2c2d4e6f30e 100644 --- a/native/analysis-api-klib-reader/src/org/jetbrains/kotlin/analysis/api/klib/reader/readKlibDeclarationAddresses.kt +++ b/native/analysis-api-klib-reader/src/org/jetbrains/kotlin/native/analysis/api/readKlibDeclarationAddresses.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.analysis.api.klib.reader +package org.jetbrains.kotlin.native.analysis.api import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol import org.jetbrains.kotlin.analysis.project.structure.KtLibraryModule diff --git a/native/analysis-api-klib-reader/test/org/jetbrains/kotlin/analysis/api/klib/reader/testUtils/render.kt b/native/analysis-api-klib-reader/test/org/jetbrains/kotlin/analysis/api/klib/reader/testUtils/render.kt index 8d6add71a23..18ee8106dbb 100644 --- a/native/analysis-api-klib-reader/test/org/jetbrains/kotlin/analysis/api/klib/reader/testUtils/render.kt +++ b/native/analysis-api-klib-reader/test/org/jetbrains/kotlin/analysis/api/klib/reader/testUtils/render.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.analysis.api.klib.reader.testUtils -import org.jetbrains.kotlin.analysis.api.klib.reader.* +import org.jetbrains.kotlin.native.analysis.api.* fun Iterable.render() = joinToString(System.lineSeparator().repeat(2)) { it.render() } diff --git a/native/analysis-api-klib-reader/test/org/jetbrains/kotlin/analysis/api/klib/reader/tests/GetSymbolsTest.kt b/native/analysis-api-klib-reader/test/org/jetbrains/kotlin/analysis/api/klib/reader/tests/GetSymbolsTest.kt index 9445066f9b1..ef306176ae1 100644 --- a/native/analysis-api-klib-reader/test/org/jetbrains/kotlin/analysis/api/klib/reader/tests/GetSymbolsTest.kt +++ b/native/analysis-api-klib-reader/test/org/jetbrains/kotlin/analysis/api/klib/reader/tests/GetSymbolsTest.kt @@ -8,7 +8,6 @@ package org.jetbrains.kotlin.analysis.api.klib.reader.tests import org.jetbrains.kotlin.analysis.api.KtAnalysisApiInternals import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.analyze -import org.jetbrains.kotlin.analysis.api.klib.reader.* import org.jetbrains.kotlin.analysis.api.klib.reader.testUtils.providedTestProjectKlib import org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeTokenProvider import org.jetbrains.kotlin.analysis.api.standalone.KtAlwaysAccessibleLifetimeTokenProvider @@ -21,6 +20,7 @@ import org.jetbrains.kotlin.analysis.project.structure.builder.buildKtLibraryMod import org.jetbrains.kotlin.konan.target.HostManager import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.Name +import org.jetbrains.kotlin.native.analysis.api.* import org.jetbrains.kotlin.platform.konan.NativePlatforms import kotlin.io.path.nameWithoutExtension import kotlin.test.Test diff --git a/native/analysis-api-klib-reader/test/org/jetbrains/kotlin/analysis/api/klib/reader/tests/ReadKlibDeclarationAddressesBlackBoxTest.kt b/native/analysis-api-klib-reader/test/org/jetbrains/kotlin/analysis/api/klib/reader/tests/ReadKlibDeclarationAddressesBlackBoxTest.kt index 29fd78b789d..b85c0c1d25d 100644 --- a/native/analysis-api-klib-reader/test/org/jetbrains/kotlin/analysis/api/klib/reader/tests/ReadKlibDeclarationAddressesBlackBoxTest.kt +++ b/native/analysis-api-klib-reader/test/org/jetbrains/kotlin/analysis/api/klib/reader/tests/ReadKlibDeclarationAddressesBlackBoxTest.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.analysis.api.klib.reader.tests -import org.jetbrains.kotlin.analysis.api.klib.reader.readKlibDeclarationAddresses +import org.jetbrains.kotlin.native.analysis.api.readKlibDeclarationAddresses import org.jetbrains.kotlin.analysis.api.klib.reader.testUtils.providedTestProjectKlib import org.jetbrains.kotlin.analysis.api.klib.reader.testUtils.render import org.jetbrains.kotlin.analysis.api.klib.reader.testUtils.testDataDir diff --git a/native/objcexport-header-generator/impl/analysis-api/src/org/jetbrains/kotlin/objcexport/KtObjCExportFile.kt b/native/objcexport-header-generator/impl/analysis-api/src/org/jetbrains/kotlin/objcexport/KtObjCExportFile.kt index f775d2c1791..d4630795b2d 100644 --- a/native/objcexport-header-generator/impl/analysis-api/src/org/jetbrains/kotlin/objcexport/KtObjCExportFile.kt +++ b/native/objcexport-header-generator/impl/analysis-api/src/org/jetbrains/kotlin/objcexport/KtObjCExportFile.kt @@ -7,10 +7,10 @@ package org.jetbrains.kotlin.objcexport import com.intellij.openapi.util.io.FileUtil import org.jetbrains.kotlin.analysis.api.KtAnalysisSession -import org.jetbrains.kotlin.analysis.api.klib.reader.* import org.jetbrains.kotlin.analysis.api.symbols.KtCallableSymbol import org.jetbrains.kotlin.analysis.api.symbols.KtClassOrObjectSymbol import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.native.analysis.api.* import org.jetbrains.kotlin.objcexport.analysisApiUtils.getAllClassOrObjectSymbols import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.tooling.core.withClosure diff --git a/native/objcexport-header-generator/impl/analysis-api/src/org/jetbrains/kotlin/objcexport/translateToObjCHeader.kt b/native/objcexport-header-generator/impl/analysis-api/src/org/jetbrains/kotlin/objcexport/translateToObjCHeader.kt index 0fe83c4d577..ac99092afe6 100644 --- a/native/objcexport-header-generator/impl/analysis-api/src/org/jetbrains/kotlin/objcexport/translateToObjCHeader.kt +++ b/native/objcexport-header-generator/impl/analysis-api/src/org/jetbrains/kotlin/objcexport/translateToObjCHeader.kt @@ -6,12 +6,12 @@ package org.jetbrains.kotlin.objcexport import org.jetbrains.kotlin.analysis.api.KtAnalysisSession -import org.jetbrains.kotlin.analysis.api.klib.reader.readKlibDeclarationAddresses import org.jetbrains.kotlin.analysis.api.symbols.KtClassOrObjectSymbol import org.jetbrains.kotlin.analysis.project.structure.KtLibraryModule import org.jetbrains.kotlin.analysis.project.structure.allDirectDependencies import org.jetbrains.kotlin.backend.konan.objcexport.* import org.jetbrains.kotlin.name.ClassId +import org.jetbrains.kotlin.native.analysis.api.readKlibDeclarationAddresses import org.jetbrains.kotlin.objcexport.analysisApiUtils.* import org.jetbrains.kotlin.objcexport.extras.originClassId import org.jetbrains.kotlin.objcexport.extras.requiresForwardDeclaration