[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
JetBrains · Mar 19, 2024 · a13756c · a13756c
1 parent 069c920
commit a13756c
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 12 deletions.
diff --git a/...pl/base/test/cases/components/klibSourceFileProvider/AbstractGetKlibSourceFileNameTest.kt b/...pl/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/...api/klib/reader/KlibDeclarationAddress.kt → ...ve/analysis/api/KlibDeclarationAddress.kt b/...api/klib/reader/KlibDeclarationAddress.kt → ...ve/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/...b/reader/PackageFragmentReadingContext.kt → ...ysis/api/PackageFragmentReadingContext.kt b/...b/reader/PackageFragmentReadingContext.kt → ...ysis/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/...s/api/klib/reader/getAllLibraryModules.kt → ...tive/analysis/api/getAllLibraryModules.kt b/...s/api/klib/reader/getAllLibraryModules.kt → ...tive/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/...in/analysis/api/klib/reader/getSymbols.kt → .../kotlin/native/analysis/api/getSymbols.kt b/...in/analysis/api/klib/reader/getSymbols.kt → .../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/...ib/reader/readKlibDeclarationAddresses.kt → ...lysis/api/readKlibDeclarationAddresses.kt b/...ib/reader/readKlibDeclarationAddresses.kt → ...lysis/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/...is-api-klib-reader/test/org/jetbrains/kotlin/analysis/api/klib/reader/testUtils/render.kt b/...is-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<KlibDeclarationAddress>.render() = joinToString(System.lineSeparator().repeat(2)) { it.render() }
 

diff --git a/...pi-klib-reader/test/org/jetbrains/kotlin/analysis/api/klib/reader/tests/GetSymbolsTest.kt b/...pi-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/...tbrains/kotlin/analysis/api/klib/reader/tests/ReadKlibDeclarationAddressesBlackBoxTest.kt b/...tbrains/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/...eader-generator/impl/analysis-api/src/org/jetbrains/kotlin/objcexport/KtObjCExportFile.kt b/...eader-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/...-generator/impl/analysis-api/src/org/jetbrains/kotlin/objcexport/translateToObjCHeader.kt b/...-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