From 689a5cbdf52e2de509938efd5dd1059761870eec Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Tue, 10 Sep 2019 16:10:17 +0200 Subject: [PATCH] Add descriptors.runtime to the compiler... move it into appropriate package and ensure that it gets relocated properly in kotlin-reflect.jar This change is needed to use the functionality that provides descriptors from classloaders for scripts compilation. --- build.gradle.kts | 1 + .../internal/structure/ReflectJavaField.kt | 31 ------------------- .../components/PackagePartScopeCache.kt | 2 +- .../components/ReflectAnnotationSource.kt | 2 +- .../components/ReflectJavaClassFinder.kt | 6 ++-- .../runtime}/components/ReflectKotlinClass.kt | 8 ++--- .../components/ReflectKotlinClassFinder.kt | 2 +- .../components/RuntimeErrorReporter.kt | 2 +- .../runtime}/components/RuntimeModuleData.kt | 2 +- .../components/RuntimeSourceElementFactory.kt | 7 +++-- .../structure/ReflectJavaAnnotation.kt | 2 +- .../ReflectJavaAnnotationArguments.kt | 2 +- .../structure/ReflectJavaAnnotationOwner.kt | 2 +- .../structure/ReflectJavaArrayType.kt | 2 +- .../runtime}/structure/ReflectJavaClass.kt | 2 +- .../structure/ReflectJavaClassifierType.kt | 2 +- .../structure/ReflectJavaConstructor.kt | 2 +- .../runtime}/structure/ReflectJavaElement.kt | 2 +- .../runtime/structure/ReflectJavaField.kt | 31 +++++++++++++++++++ .../runtime}/structure/ReflectJavaMember.kt | 2 +- .../runtime}/structure/ReflectJavaMethod.kt | 2 +- .../structure/ReflectJavaModifierListOwner.kt | 2 +- .../runtime}/structure/ReflectJavaPackage.kt | 2 +- .../structure/ReflectJavaPrimitiveType.kt | 2 +- .../runtime}/structure/ReflectJavaType.kt | 2 +- .../structure/ReflectJavaTypeParameter.kt | 2 +- .../structure/ReflectJavaValueParameter.kt | 2 +- .../structure/ReflectJavaWildcardType.kt | 2 +- .../runtime}/structure/reflectClassUtil.kt | 2 +- .../AbstractJvmRuntimeDescriptorLoaderTest.kt | 6 ++-- .../kotlin/reflect/jvm/ReflectJvmMapping.kt | 2 +- .../kotlin/reflect/jvm/internal/KClassImpl.kt | 6 ++-- .../jvm/internal/KDeclarationContainerImpl.kt | 10 +++--- .../reflect/jvm/internal/KPackageImpl.kt | 4 +-- .../kotlin/reflect/jvm/internal/KTypeImpl.kt | 6 ++-- .../reflect/jvm/internal/RuntimeTypeMapper.kt | 2 +- .../calls/AnnotationConstructorCaller.kt | 2 +- .../jvm/internal/moduleByClassLoader.kt | 4 +-- .../src/kotlin/reflect/jvm/internal/util.kt | 14 ++++----- 39 files changed, 94 insertions(+), 92 deletions(-) delete mode 100644 core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaField.kt rename core/descriptors.runtime/src/{kotlin/reflect/jvm/internal => org/jetbrains/kotlin/descriptors/runtime}/components/PackagePartScopeCache.kt (96%) rename core/descriptors.runtime/src/{kotlin/reflect/jvm/internal => org/jetbrains/kotlin/descriptors/runtime}/components/ReflectAnnotationSource.kt (93%) rename core/descriptors.runtime/src/{kotlin/reflect/jvm/internal => org/jetbrains/kotlin/descriptors/runtime}/components/ReflectJavaClassFinder.kt (90%) rename core/descriptors.runtime/src/{kotlin/reflect/jvm/internal => org/jetbrains/kotlin/descriptors/runtime}/components/ReflectKotlinClass.kt (97%) rename core/descriptors.runtime/src/{kotlin/reflect/jvm/internal => org/jetbrains/kotlin/descriptors/runtime}/components/ReflectKotlinClassFinder.kt (97%) rename core/descriptors.runtime/src/{kotlin/reflect/jvm/internal => org/jetbrains/kotlin/descriptors/runtime}/components/RuntimeErrorReporter.kt (95%) rename core/descriptors.runtime/src/{kotlin/reflect/jvm/internal => org/jetbrains/kotlin/descriptors/runtime}/components/RuntimeModuleData.kt (99%) rename core/descriptors.runtime/src/{kotlin/reflect/jvm/internal => org/jetbrains/kotlin/descriptors/runtime}/components/RuntimeSourceElementFactory.kt (85%) rename core/descriptors.runtime/src/{kotlin/reflect/jvm/internal => org/jetbrains/kotlin/descriptors/runtime}/structure/ReflectJavaAnnotation.kt (96%) rename core/descriptors.runtime/src/{kotlin/reflect/jvm/internal => org/jetbrains/kotlin/descriptors/runtime}/structure/ReflectJavaAnnotationArguments.kt (97%) rename core/descriptors.runtime/src/{kotlin/reflect/jvm/internal => org/jetbrains/kotlin/descriptors/runtime}/structure/ReflectJavaAnnotationOwner.kt (96%) rename core/descriptors.runtime/src/{kotlin/reflect/jvm/internal => org/jetbrains/kotlin/descriptors/runtime}/structure/ReflectJavaArrayType.kt (95%) rename core/descriptors.runtime/src/{kotlin/reflect/jvm/internal => org/jetbrains/kotlin/descriptors/runtime}/structure/ReflectJavaClass.kt (98%) rename core/descriptors.runtime/src/{kotlin/reflect/jvm/internal => org/jetbrains/kotlin/descriptors/runtime}/structure/ReflectJavaClassifierType.kt (97%) rename core/descriptors.runtime/src/{kotlin/reflect/jvm/internal => org/jetbrains/kotlin/descriptors/runtime}/structure/ReflectJavaConstructor.kt (97%) rename core/descriptors.runtime/src/{kotlin/reflect/jvm/internal => org/jetbrains/kotlin/descriptors/runtime}/structure/ReflectJavaElement.kt (92%) create mode 100644 core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaField.kt rename core/descriptors.runtime/src/{kotlin/reflect/jvm/internal => org/jetbrains/kotlin/descriptors/runtime}/structure/ReflectJavaMember.kt (98%) rename core/descriptors.runtime/src/{kotlin/reflect/jvm/internal => org/jetbrains/kotlin/descriptors/runtime}/structure/ReflectJavaMethod.kt (96%) rename core/descriptors.runtime/src/{kotlin/reflect/jvm/internal => org/jetbrains/kotlin/descriptors/runtime}/structure/ReflectJavaModifierListOwner.kt (96%) rename core/descriptors.runtime/src/{kotlin/reflect/jvm/internal => org/jetbrains/kotlin/descriptors/runtime}/structure/ReflectJavaPackage.kt (96%) rename core/descriptors.runtime/src/{kotlin/reflect/jvm/internal => org/jetbrains/kotlin/descriptors/runtime}/structure/ReflectJavaPrimitiveType.kt (94%) rename core/descriptors.runtime/src/{kotlin/reflect/jvm/internal => org/jetbrains/kotlin/descriptors/runtime}/structure/ReflectJavaType.kt (96%) rename core/descriptors.runtime/src/{kotlin/reflect/jvm/internal => org/jetbrains/kotlin/descriptors/runtime}/structure/ReflectJavaTypeParameter.kt (96%) rename core/descriptors.runtime/src/{kotlin/reflect/jvm/internal => org/jetbrains/kotlin/descriptors/runtime}/structure/ReflectJavaValueParameter.kt (96%) rename core/descriptors.runtime/src/{kotlin/reflect/jvm/internal => org/jetbrains/kotlin/descriptors/runtime}/structure/ReflectJavaWildcardType.kt (96%) rename core/descriptors.runtime/src/{kotlin/reflect/jvm/internal => org/jetbrains/kotlin/descriptors/runtime}/structure/reflectClassUtil.kt (98%) diff --git a/build.gradle.kts b/build.gradle.kts index 8e4c3300dbc..abd9eb5a2d2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -234,6 +234,7 @@ extra["compilerModules"] = arrayOf( ":core:metadata.jvm", ":core:descriptors", ":core:descriptors.jvm", + ":core:descriptors.runtime", ":core:deserialization", ":core:util.runtime", ":core:type-system", diff --git a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaField.kt b/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaField.kt deleted file mode 100644 index 0f98496a685..00000000000 --- a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaField.kt +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package kotlin.reflect.jvm.internal.structure - -import org.jetbrains.kotlin.load.java.structure.JavaField -import java.lang.reflect.Field - -class ReflectJavaField(override val member: Field) : ReflectJavaMember(), JavaField { - override val isEnumEntry: Boolean - get() = member.isEnumConstant - - override val type: ReflectJavaType - get() = ReflectJavaType.create(member.genericType) - - override val initializerValue: Any? get() = null - override val hasConstantNotNullInitializer get() = false -} diff --git a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/PackagePartScopeCache.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/components/PackagePartScopeCache.kt similarity index 96% rename from core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/PackagePartScopeCache.kt rename to core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/components/PackagePartScopeCache.kt index eea1c1991fb..4c3d7f4412b 100644 --- a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/PackagePartScopeCache.kt +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/components/PackagePartScopeCache.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 kotlin.reflect.jvm.internal.components +package org.jetbrains.kotlin.descriptors.runtime.components import org.jetbrains.kotlin.descriptors.impl.EmptyPackageFragmentDescriptor import org.jetbrains.kotlin.load.kotlin.DeserializedDescriptorResolver diff --git a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/ReflectAnnotationSource.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/components/ReflectAnnotationSource.kt similarity index 93% rename from core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/ReflectAnnotationSource.kt rename to core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/components/ReflectAnnotationSource.kt index 11e940aff06..8d3e5928373 100644 --- a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/ReflectAnnotationSource.kt +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/components/ReflectAnnotationSource.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package kotlin.reflect.jvm.internal.components +package org.jetbrains.kotlin.descriptors.runtime.components import org.jetbrains.kotlin.descriptors.SourceElement import org.jetbrains.kotlin.descriptors.SourceFile diff --git a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/ReflectJavaClassFinder.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/components/ReflectJavaClassFinder.kt similarity index 90% rename from core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/ReflectJavaClassFinder.kt rename to core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/components/ReflectJavaClassFinder.kt index 92f98c34478..885305783e2 100644 --- a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/ReflectJavaClassFinder.kt +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/components/ReflectJavaClassFinder.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package kotlin.reflect.jvm.internal.components +package org.jetbrains.kotlin.descriptors.runtime.components import org.jetbrains.kotlin.load.java.JavaClassFinder import org.jetbrains.kotlin.load.java.structure.JavaClass import org.jetbrains.kotlin.load.java.structure.JavaPackage import org.jetbrains.kotlin.name.FqName -import kotlin.reflect.jvm.internal.structure.ReflectJavaClass -import kotlin.reflect.jvm.internal.structure.ReflectJavaPackage +import org.jetbrains.kotlin.descriptors.runtime.structure.ReflectJavaClass +import org.jetbrains.kotlin.descriptors.runtime.structure.ReflectJavaPackage class ReflectJavaClassFinder(private val classLoader: ClassLoader) : JavaClassFinder { override fun findClass(request: JavaClassFinder.Request): JavaClass? { diff --git a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/ReflectKotlinClass.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/components/ReflectKotlinClass.kt similarity index 97% rename from core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/ReflectKotlinClass.kt rename to core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/components/ReflectKotlinClass.kt index 201543115d0..2172685d039 100644 --- a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/ReflectKotlinClass.kt +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/components/ReflectKotlinClass.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package kotlin.reflect.jvm.internal.components +package org.jetbrains.kotlin.descriptors.runtime.components import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap @@ -28,9 +28,9 @@ import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType import java.lang.reflect.Constructor import java.lang.reflect.Field import java.lang.reflect.Method -import kotlin.reflect.jvm.internal.structure.classId -import kotlin.reflect.jvm.internal.structure.desc -import kotlin.reflect.jvm.internal.structure.isEnumClassOrSpecializedEnumEntryClass +import org.jetbrains.kotlin.descriptors.runtime.structure.classId +import org.jetbrains.kotlin.descriptors.runtime.structure.desc +import org.jetbrains.kotlin.descriptors.runtime.structure.isEnumClassOrSpecializedEnumEntryClass @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN") private val TYPES_ELIGIBLE_FOR_SIMPLE_VISIT = setOf>( diff --git a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/ReflectKotlinClassFinder.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/components/ReflectKotlinClassFinder.kt similarity index 97% rename from core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/ReflectKotlinClassFinder.kt rename to core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/components/ReflectKotlinClassFinder.kt index daf3ed8c36e..7e7e1c54afd 100644 --- a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/ReflectKotlinClassFinder.kt +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/components/ReflectKotlinClassFinder.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package kotlin.reflect.jvm.internal.components +package org.jetbrains.kotlin.descriptors.runtime.components import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.load.java.structure.JavaClass diff --git a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/RuntimeErrorReporter.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/components/RuntimeErrorReporter.kt similarity index 95% rename from core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/RuntimeErrorReporter.kt rename to core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/components/RuntimeErrorReporter.kt index 9bba28e825e..21741f49687 100644 --- a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/RuntimeErrorReporter.kt +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/components/RuntimeErrorReporter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package kotlin.reflect.jvm.internal.components +package org.jetbrains.kotlin.descriptors.runtime.components import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor diff --git a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/RuntimeModuleData.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/components/RuntimeModuleData.kt similarity index 99% rename from core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/RuntimeModuleData.kt rename to core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/components/RuntimeModuleData.kt index b1d9e2a361a..b567928ed2c 100644 --- a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/RuntimeModuleData.kt +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/components/RuntimeModuleData.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package kotlin.reflect.jvm.internal.components +package org.jetbrains.kotlin.descriptors.runtime.components import org.jetbrains.kotlin.builtins.ReflectionTypes import org.jetbrains.kotlin.builtins.jvm.JvmBuiltIns diff --git a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/RuntimeSourceElementFactory.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/components/RuntimeSourceElementFactory.kt similarity index 85% rename from core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/RuntimeSourceElementFactory.kt rename to core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/components/RuntimeSourceElementFactory.kt index fde02b9f1b2..5377dc79db0 100644 --- a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/components/RuntimeSourceElementFactory.kt +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/components/RuntimeSourceElementFactory.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package kotlin.reflect.jvm.internal.components +package org.jetbrains.kotlin.descriptors.runtime.components import org.jetbrains.kotlin.descriptors.SourceFile import org.jetbrains.kotlin.load.java.sources.JavaSourceElement import org.jetbrains.kotlin.load.java.sources.JavaSourceElementFactory import org.jetbrains.kotlin.load.java.structure.JavaElement -import kotlin.reflect.jvm.internal.structure.ReflectJavaElement +import org.jetbrains.kotlin.descriptors.runtime.structure.ReflectJavaElement object RuntimeSourceElementFactory : JavaSourceElementFactory { class RuntimeSourceElement(override val javaElement: ReflectJavaElement) : JavaSourceElement { @@ -28,5 +28,6 @@ object RuntimeSourceElementFactory : JavaSourceElementFactory { override fun getContainingFile(): SourceFile = SourceFile.NO_SOURCE_FILE } - override fun source(javaElement: JavaElement): JavaSourceElement = RuntimeSourceElement(javaElement as ReflectJavaElement) + override fun source(javaElement: JavaElement): JavaSourceElement = + RuntimeSourceElement(javaElement as ReflectJavaElement) } diff --git a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaAnnotation.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaAnnotation.kt similarity index 96% rename from core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaAnnotation.kt rename to core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaAnnotation.kt index c3152c381e7..dcf47afb90a 100644 --- a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaAnnotation.kt +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaAnnotation.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package kotlin.reflect.jvm.internal.structure +package org.jetbrains.kotlin.descriptors.runtime.structure import org.jetbrains.kotlin.load.java.structure.JavaAnnotation import org.jetbrains.kotlin.load.java.structure.JavaAnnotationArgument diff --git a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaAnnotationArguments.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaAnnotationArguments.kt similarity index 97% rename from core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaAnnotationArguments.kt rename to core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaAnnotationArguments.kt index 579e6fb635b..b683a7059f9 100644 --- a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaAnnotationArguments.kt +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaAnnotationArguments.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package kotlin.reflect.jvm.internal.structure +package org.jetbrains.kotlin.descriptors.runtime.structure import org.jetbrains.kotlin.load.java.structure.* import org.jetbrains.kotlin.name.ClassId diff --git a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaAnnotationOwner.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaAnnotationOwner.kt similarity index 96% rename from core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaAnnotationOwner.kt rename to core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaAnnotationOwner.kt index 62a7a2e8ba2..24bf2c994fe 100644 --- a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaAnnotationOwner.kt +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaAnnotationOwner.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package kotlin.reflect.jvm.internal.structure +package org.jetbrains.kotlin.descriptors.runtime.structure import org.jetbrains.kotlin.load.java.structure.JavaAnnotationOwner import org.jetbrains.kotlin.name.FqName diff --git a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaArrayType.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaArrayType.kt similarity index 95% rename from core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaArrayType.kt rename to core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaArrayType.kt index 19f8c5dffe1..e4c3463e2a5 100644 --- a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaArrayType.kt +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaArrayType.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package kotlin.reflect.jvm.internal.structure +package org.jetbrains.kotlin.descriptors.runtime.structure import org.jetbrains.kotlin.load.java.structure.JavaArrayType import java.lang.reflect.GenericArrayType diff --git a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaClass.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaClass.kt similarity index 98% rename from core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaClass.kt rename to core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaClass.kt index c06cfe0b178..f4a88670b86 100644 --- a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaClass.kt +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaClass.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package kotlin.reflect.jvm.internal.structure +package org.jetbrains.kotlin.descriptors.runtime.structure import org.jetbrains.kotlin.load.java.structure.JavaClass import org.jetbrains.kotlin.load.java.structure.JavaClassifierType diff --git a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaClassifierType.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaClassifierType.kt similarity index 97% rename from core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaClassifierType.kt rename to core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaClassifierType.kt index 142a23baf17..77c3d65b8a8 100644 --- a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaClassifierType.kt +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaClassifierType.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package kotlin.reflect.jvm.internal.structure +package org.jetbrains.kotlin.descriptors.runtime.structure import org.jetbrains.kotlin.load.java.structure.JavaAnnotation import org.jetbrains.kotlin.load.java.structure.JavaClassifier diff --git a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaConstructor.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaConstructor.kt similarity index 97% rename from core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaConstructor.kt rename to core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaConstructor.kt index 744d5756148..158529d5010 100644 --- a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaConstructor.kt +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaConstructor.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package kotlin.reflect.jvm.internal.structure +package org.jetbrains.kotlin.descriptors.runtime.structure import org.jetbrains.kotlin.load.java.structure.JavaConstructor import org.jetbrains.kotlin.load.java.structure.JavaValueParameter diff --git a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaElement.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaElement.kt similarity index 92% rename from core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaElement.kt rename to core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaElement.kt index fbe173de71e..28c81c3322a 100644 --- a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaElement.kt +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaElement.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package kotlin.reflect.jvm.internal.structure +package org.jetbrains.kotlin.descriptors.runtime.structure import org.jetbrains.kotlin.load.java.structure.JavaElement diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaField.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaField.kt new file mode 100644 index 00000000000..bc45da18347 --- /dev/null +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaField.kt @@ -0,0 +1,31 @@ +/* +* Copyright 2010-2017 JetBrains s.r.o. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +package org.jetbrains.kotlin.descriptors.runtime.structure + +import org.jetbrains.kotlin.load.java.structure.JavaField +import java.lang.reflect.Field + +class ReflectJavaField(override val member: Field) : ReflectJavaMember(), JavaField { + override val isEnumEntry: Boolean + get() = member.isEnumConstant + + override val type: ReflectJavaType + get() = ReflectJavaType.create(member.genericType) + + override val initializerValue: Any? get() = null + override val hasConstantNotNullInitializer get() = false +} diff --git a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaMember.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaMember.kt similarity index 98% rename from core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaMember.kt rename to core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaMember.kt index 69a18c9b4e7..03a5b03cc08 100644 --- a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaMember.kt +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaMember.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package kotlin.reflect.jvm.internal.structure +package org.jetbrains.kotlin.descriptors.runtime.structure import org.jetbrains.kotlin.load.java.structure.JavaMember import org.jetbrains.kotlin.load.java.structure.JavaValueParameter diff --git a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaMethod.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaMethod.kt similarity index 96% rename from core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaMethod.kt rename to core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaMethod.kt index 893de4b6242..c47f4660268 100644 --- a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaMethod.kt +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaMethod.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package kotlin.reflect.jvm.internal.structure +package org.jetbrains.kotlin.descriptors.runtime.structure import org.jetbrains.kotlin.load.java.structure.JavaAnnotationArgument import org.jetbrains.kotlin.load.java.structure.JavaMethod diff --git a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaModifierListOwner.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaModifierListOwner.kt similarity index 96% rename from core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaModifierListOwner.kt rename to core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaModifierListOwner.kt index 09cb689463f..c54a56c74be 100644 --- a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaModifierListOwner.kt +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaModifierListOwner.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package kotlin.reflect.jvm.internal.structure +package org.jetbrains.kotlin.descriptors.runtime.structure import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.descriptors.Visibility diff --git a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaPackage.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaPackage.kt similarity index 96% rename from core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaPackage.kt rename to core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaPackage.kt index 59aa32e8287..64f17a21c61 100644 --- a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaPackage.kt +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaPackage.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package kotlin.reflect.jvm.internal.structure +package org.jetbrains.kotlin.descriptors.runtime.structure import org.jetbrains.kotlin.load.java.structure.JavaAnnotation import org.jetbrains.kotlin.load.java.structure.JavaClass diff --git a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaPrimitiveType.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaPrimitiveType.kt similarity index 94% rename from core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaPrimitiveType.kt rename to core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaPrimitiveType.kt index 3479bac81b4..87cd7139058 100644 --- a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaPrimitiveType.kt +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaPrimitiveType.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package kotlin.reflect.jvm.internal.structure +package org.jetbrains.kotlin.descriptors.runtime.structure import org.jetbrains.kotlin.builtins.PrimitiveType import org.jetbrains.kotlin.load.java.structure.JavaPrimitiveType diff --git a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaType.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaType.kt similarity index 96% rename from core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaType.kt rename to core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaType.kt index 781d8508018..b51c0c283e3 100644 --- a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaType.kt +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaType.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package kotlin.reflect.jvm.internal.structure +package org.jetbrains.kotlin.descriptors.runtime.structure import org.jetbrains.kotlin.load.java.structure.JavaType import java.lang.reflect.GenericArrayType diff --git a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaTypeParameter.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaTypeParameter.kt similarity index 96% rename from core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaTypeParameter.kt rename to core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaTypeParameter.kt index 14e432a8b93..56a9b9cb4d7 100644 --- a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaTypeParameter.kt +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaTypeParameter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package kotlin.reflect.jvm.internal.structure +package org.jetbrains.kotlin.descriptors.runtime.structure import org.jetbrains.kotlin.load.java.structure.JavaTypeParameter import org.jetbrains.kotlin.name.Name diff --git a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaValueParameter.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaValueParameter.kt similarity index 96% rename from core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaValueParameter.kt rename to core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaValueParameter.kt index 5bfcae0faae..ab86031e83e 100644 --- a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaValueParameter.kt +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaValueParameter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package kotlin.reflect.jvm.internal.structure +package org.jetbrains.kotlin.descriptors.runtime.structure import org.jetbrains.kotlin.load.java.structure.JavaValueParameter import org.jetbrains.kotlin.name.FqName diff --git a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaWildcardType.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaWildcardType.kt similarity index 96% rename from core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaWildcardType.kt rename to core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaWildcardType.kt index f97f21ecd47..54f35496650 100644 --- a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaWildcardType.kt +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/ReflectJavaWildcardType.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package kotlin.reflect.jvm.internal.structure +package org.jetbrains.kotlin.descriptors.runtime.structure import org.jetbrains.kotlin.load.java.structure.JavaWildcardType import java.lang.reflect.WildcardType diff --git a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/reflectClassUtil.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/reflectClassUtil.kt similarity index 98% rename from core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/reflectClassUtil.kt rename to core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/reflectClassUtil.kt index f047ee3e41c..fba5e29b020 100644 --- a/core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/reflectClassUtil.kt +++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/reflectClassUtil.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package kotlin.reflect.jvm.internal.structure +package org.jetbrains.kotlin.descriptors.runtime.structure import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName diff --git a/core/descriptors.runtime/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt b/core/descriptors.runtime/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt index 2e77450612c..d4b0c3b809a 100644 --- a/core/descriptors.runtime/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt +++ b/core/descriptors.runtime/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt @@ -38,9 +38,9 @@ import java.io.File import java.net.URLClassLoader import java.util.* import java.util.regex.Pattern -import kotlin.reflect.jvm.internal.components.ReflectKotlinClass -import kotlin.reflect.jvm.internal.components.RuntimeModuleData -import kotlin.reflect.jvm.internal.structure.classId +import org.jetbrains.kotlin.descriptors.runtime.components.ReflectKotlinClass +import org.jetbrains.kotlin.descriptors.runtime.components.RuntimeModuleData +import org.jetbrains.kotlin.descriptors.runtime.structure.classId abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdir() { companion object { diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/ReflectJvmMapping.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/ReflectJvmMapping.kt index 9df594bb17e..2fc177d8d1d 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/ReflectJvmMapping.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/ReflectJvmMapping.kt @@ -28,7 +28,7 @@ import kotlin.reflect.jvm.internal.KPackageImpl import kotlin.reflect.jvm.internal.KTypeImpl import kotlin.reflect.jvm.internal.asKCallableImpl import kotlin.reflect.jvm.internal.asKPropertyImpl -import kotlin.reflect.jvm.internal.components.ReflectKotlinClass +import org.jetbrains.kotlin.descriptors.runtime.components.ReflectKotlinClass // Kotlin reflection -> Java reflection diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt index 1c5e104fc78..f0cc00577b3 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt @@ -36,9 +36,9 @@ import kotlin.jvm.internal.TypeIntrinsics import kotlin.reflect.* import kotlin.reflect.jvm.internal.KDeclarationContainerImpl.MemberBelonginess.DECLARED import kotlin.reflect.jvm.internal.KDeclarationContainerImpl.MemberBelonginess.INHERITED -import kotlin.reflect.jvm.internal.components.ReflectKotlinClass -import kotlin.reflect.jvm.internal.structure.functionClassArity -import kotlin.reflect.jvm.internal.structure.wrapperByPrimitive +import org.jetbrains.kotlin.descriptors.runtime.components.ReflectKotlinClass +import org.jetbrains.kotlin.descriptors.runtime.structure.functionClassArity +import org.jetbrains.kotlin.descriptors.runtime.structure.wrapperByPrimitive internal class KClassImpl(override val jClass: Class) : KDeclarationContainerImpl(), KClass, KClassifierImpl { inner class Data : KDeclarationContainerImpl.Data() { diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KDeclarationContainerImpl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KDeclarationContainerImpl.kt index c52c0ede770..75d6322beac 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KDeclarationContainerImpl.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KDeclarationContainerImpl.kt @@ -25,11 +25,11 @@ import org.jetbrains.kotlin.resolve.scopes.MemberScope import java.lang.reflect.Constructor import java.lang.reflect.Method import kotlin.jvm.internal.ClassBasedDeclarationContainer -import kotlin.reflect.jvm.internal.components.RuntimeModuleData -import kotlin.reflect.jvm.internal.components.tryLoadClass -import kotlin.reflect.jvm.internal.structure.createArrayType -import kotlin.reflect.jvm.internal.structure.safeClassLoader -import kotlin.reflect.jvm.internal.structure.wrapperByPrimitive +import org.jetbrains.kotlin.descriptors.runtime.components.RuntimeModuleData +import org.jetbrains.kotlin.descriptors.runtime.components.tryLoadClass +import org.jetbrains.kotlin.descriptors.runtime.structure.createArrayType +import org.jetbrains.kotlin.descriptors.runtime.structure.safeClassLoader +import org.jetbrains.kotlin.descriptors.runtime.structure.wrapperByPrimitive internal abstract class KDeclarationContainerImpl : ClassBasedDeclarationContainer { abstract inner class Data { diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPackageImpl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPackageImpl.kt index 07dca1343a5..124c23a45a7 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPackageImpl.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPackageImpl.kt @@ -32,8 +32,8 @@ import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.serialization.deserialization.MemberDeserializer import kotlin.reflect.KCallable import kotlin.reflect.jvm.internal.KDeclarationContainerImpl.MemberBelonginess.DECLARED -import kotlin.reflect.jvm.internal.components.ReflectKotlinClass -import kotlin.reflect.jvm.internal.structure.classId +import org.jetbrains.kotlin.descriptors.runtime.components.ReflectKotlinClass +import org.jetbrains.kotlin.descriptors.runtime.structure.classId internal class KPackageImpl( override val jClass: Class<*>, diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KTypeImpl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KTypeImpl.kt index 20aa90806b8..c680419231f 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KTypeImpl.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KTypeImpl.kt @@ -30,9 +30,9 @@ import kotlin.LazyThreadSafetyMode.PUBLICATION import kotlin.reflect.KClassifier import kotlin.reflect.KType import kotlin.reflect.KTypeProjection -import kotlin.reflect.jvm.internal.structure.createArrayType -import kotlin.reflect.jvm.internal.structure.parameterizedTypeArguments -import kotlin.reflect.jvm.internal.structure.primitiveByWrapper +import org.jetbrains.kotlin.descriptors.runtime.structure.createArrayType +import org.jetbrains.kotlin.descriptors.runtime.structure.parameterizedTypeArguments +import org.jetbrains.kotlin.descriptors.runtime.structure.primitiveByWrapper import kotlin.reflect.jvm.jvmErasure internal class KTypeImpl( diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt index d6610ff6462..141d2f78e09 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt @@ -21,6 +21,7 @@ import org.jetbrains.kotlin.builtins.PrimitiveType import org.jetbrains.kotlin.builtins.jvm.CloneableClassScope import org.jetbrains.kotlin.builtins.jvm.JavaToKotlinClassMap import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.descriptors.runtime.structure.* import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.load.java.descriptors.JavaClassConstructorDescriptor import org.jetbrains.kotlin.load.java.descriptors.JavaMethodDescriptor @@ -50,7 +51,6 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ import java.lang.reflect.Constructor import java.lang.reflect.Field import java.lang.reflect.Method -import kotlin.reflect.jvm.internal.structure.* internal sealed class JvmFunctionSignature { abstract fun asString(): String diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/calls/AnnotationConstructorCaller.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/calls/AnnotationConstructorCaller.kt index 821f5e472ea..ee45eb5b4e5 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/calls/AnnotationConstructorCaller.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/calls/AnnotationConstructorCaller.kt @@ -10,7 +10,7 @@ import java.lang.reflect.Type import java.util.* import kotlin.reflect.KClass import kotlin.reflect.jvm.internal.KotlinReflectionInternalError -import kotlin.reflect.jvm.internal.structure.wrapperByPrimitive +import org.jetbrains.kotlin.descriptors.runtime.structure.wrapperByPrimitive import java.lang.reflect.Method as ReflectMethod internal class AnnotationConstructorCaller( diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/moduleByClassLoader.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/moduleByClassLoader.kt index 3f457471aa2..68815954188 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/moduleByClassLoader.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/moduleByClassLoader.kt @@ -19,8 +19,8 @@ package kotlin.reflect.jvm.internal import java.lang.ref.WeakReference import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.ConcurrentMap -import kotlin.reflect.jvm.internal.components.RuntimeModuleData -import kotlin.reflect.jvm.internal.structure.safeClassLoader +import org.jetbrains.kotlin.descriptors.runtime.components.RuntimeModuleData +import org.jetbrains.kotlin.descriptors.runtime.structure.safeClassLoader // TODO: collect nulls periodically private val moduleByClassLoader: ConcurrentMap> = ConcurrentHashMap() diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/util.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/util.kt index 12c599c52c8..b3a4d25a770 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/util.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/util.kt @@ -39,13 +39,13 @@ import kotlin.jvm.internal.PropertyReference import kotlin.reflect.KVisibility import kotlin.reflect.full.IllegalCallableAccessException import kotlin.reflect.jvm.internal.calls.createAnnotationInstance -import kotlin.reflect.jvm.internal.components.ReflectAnnotationSource -import kotlin.reflect.jvm.internal.components.ReflectKotlinClass -import kotlin.reflect.jvm.internal.components.RuntimeSourceElementFactory -import kotlin.reflect.jvm.internal.components.tryLoadClass -import kotlin.reflect.jvm.internal.structure.ReflectJavaAnnotation -import kotlin.reflect.jvm.internal.structure.ReflectJavaClass -import kotlin.reflect.jvm.internal.structure.safeClassLoader +import org.jetbrains.kotlin.descriptors.runtime.components.ReflectAnnotationSource +import org.jetbrains.kotlin.descriptors.runtime.components.ReflectKotlinClass +import org.jetbrains.kotlin.descriptors.runtime.components.RuntimeSourceElementFactory +import org.jetbrains.kotlin.descriptors.runtime.components.tryLoadClass +import org.jetbrains.kotlin.descriptors.runtime.structure.ReflectJavaAnnotation +import org.jetbrains.kotlin.descriptors.runtime.structure.ReflectJavaClass +import org.jetbrains.kotlin.descriptors.runtime.structure.safeClassLoader internal val JVM_STATIC = FqName("kotlin.jvm.JvmStatic")