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

@@ -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",

core/descriptors.runtime/src/kotlin/reflect/jvm/internal/structure/ReflectJavaField.kt

@@ -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
-}

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

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

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? {

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<Class<*>>(

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

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

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

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)
 }

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

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

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

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

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

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

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

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
 

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
+}

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

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

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

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

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

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

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

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

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

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

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 {

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
 

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<T : Any>(override val jClass: Class<T>) : KDeclarationContainerImpl(), KClass<T>, KClassifierImpl {
     inner class Data : KDeclarationContainerImpl.Data() {

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 {

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<*>,

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(

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

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(

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<WeakClassLoaderBox, WeakReference<RuntimeModuleData>> = ConcurrentHashMap()

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")