From 328e906b574dc38c50bdd7eb3aeb20b2bf3666e1 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 7 Nov 2017 13:43:44 +0100 Subject: [PATCH] Rename source set "descriptor.loader.java" -> "descriptors.jvm" The new name is more convenient and precise because this module is no longer only about loading declarations from Java, it also contains implementation of loading Kotlin declarations from .class files, as well as type mapping abstractions, JVM ABI specifications, etc. --- .../jvm/DebugJvmPackageTable.java | 32 ++--- .../serialization/jvm/DebugJvmProtoBuf.java | 114 +++++++++--------- build.xml | 8 +- core/build.gradle.kts | 6 +- ...in.resolve.ExternalOverridabilityCondition | 0 .../src/jvm_descriptors.proto | 0 .../src/jvm_package_table.proto | 0 .../kotlin/builtins/CloneableClassScope.kt | 0 .../JvmBuiltInClassDescriptorFactory.kt | 0 .../JvmBuiltInsPackageFragmentProvider.kt | 0 .../java/AnnotationTypeQualifierResolver.kt | 0 .../java/BuiltinOverridabilityCondition.kt | 0 .../java/ErasedOverridabilityCondition.kt | 0 .../java/FakePureImplementationsProvider.kt | 0 .../load/java/FieldOverridabilityCondition.kt | 0 .../kotlin/load/java/JavaClassFinder.java | 0 ...mpatibilityRulesOverridabilityCondition.kt | 0 .../kotlin/load/java/JavaVisibilities.java | 0 .../jetbrains/kotlin/load/java/JvmAbi.java | 0 .../kotlin/load/java/JvmAnnotationNames.java | 0 .../kotlin/load/java/JvmAnnotationNames.kt | 0 .../load/java/JvmBytecodeBinaryVersion.kt | 0 .../components/DescriptorResolverUtils.java | 0 .../ExternalAnnotationResolver.java | 0 .../java/components/JavaAnnotationMapper.kt | 0 .../JavaPropertyInitializerEvaluator.kt | 0 .../java/components/JavaResolverCache.java | 0 .../java/components/SamConversionResolver.kt | 0 .../java/components/SignaturePropagator.java | 0 .../load/java/components/TypeUsage.java | 0 .../JavaCallableMemberDescriptor.java | 0 .../JavaClassConstructorDescriptor.java | 0 .../java/descriptors/JavaClassDescriptor.java | 0 .../descriptors/JavaMethodDescriptor.java | 0 .../descriptors/JavaPropertyDescriptor.java | 0 .../kotlin/load/java/descriptors/util.kt | 0 .../load/java/lazy/LazyJavaAnnotations.kt | 0 .../lazy/LazyJavaPackageFragmentProvider.kt | 0 .../load/java/lazy/ModuleClassResolver.kt | 0 .../load/java/lazy/PackageMappingProvider.kt | 0 .../kotlin/load/java/lazy/context.kt | 0 .../lazy/descriptors/DeclaredMemberIndex.kt | 0 .../lazy/descriptors/JavaDescriptorUtil.kt | 0 .../java/lazy/descriptors/JvmPackageScope.kt | 0 .../LazyJavaAnnotationDescriptor.kt | 0 .../descriptors/LazyJavaClassDescriptor.kt | 0 .../descriptors/LazyJavaClassMemberScope.kt | 0 .../descriptors/LazyJavaPackageFragment.kt | 0 .../lazy/descriptors/LazyJavaPackageScope.kt | 0 .../java/lazy/descriptors/LazyJavaScope.kt | 0 .../descriptors/LazyJavaStaticClassScope.kt | 0 .../lazy/descriptors/LazyJavaStaticScope.kt | 0 .../LazyJavaTypeParameterDescriptor.kt | 0 .../kotlin/load/java/lazy/resolvers.kt | 0 .../load/java/lazy/types/JavaTypeResolver.kt | 0 .../kotlin/load/java/lazy/types/RawType.kt | 0 .../load/java/propertiesConventionUtil.kt | 0 .../java/sources/JavaSourceElementFactory.kt | 0 .../kotlin/load/java/specialBuiltinMembers.kt | 0 .../java/structure/annotationArguments.kt | 0 .../load/java/structure/javaElements.kt | 0 .../kotlin/load/java/structure/javaTypes.kt | 0 .../predefinedEnhancementInfo.kt | 0 .../typeEnhancement/signatureEnhancement.kt | 0 .../java/typeEnhancement/typeEnhancement.kt | 0 .../java/typeEnhancement/typeQualifiers.kt | 0 .../org/jetbrains/kotlin/load/java/utils.kt | 0 ...tBinaryClassAnnotationAndConstantLoader.kt | 0 ...aryClassAnnotationAndConstantLoaderImpl.kt | 0 .../DeserializationComponentsForJava.kt | 0 .../kotlin/DeserializedDescriptorResolver.kt | 0 .../kotlin/load/kotlin/JavaClassDataFinder.kt | 0 .../kotlin/JavaFlexibleTypeDeserializer.kt | 0 .../kotlin/load/kotlin/JvmBuiltInsSettings.kt | 0 .../kotlin/load/kotlin/JvmMetadataVersion.kt | 0 .../kotlin/load/kotlin/JvmNameResolver.kt | 0 .../load/kotlin/JvmPackagePartSource.kt | 0 .../kotlin/load/kotlin/KotlinClassFinder.kt | 0 .../load/kotlin/KotlinJvmBinaryClass.kt | 0 .../KotlinJvmBinaryPackageSourceElement.kt | 0 .../kotlin/KotlinJvmBinarySourceElement.kt | 0 .../kotlin/load/kotlin/MemberSignature.kt | 0 .../kotlin/load/kotlin/ModuleMapping.kt | 0 .../kotlin/load/kotlin/TypeMappingMode.kt | 0 .../kotlin/UnsafeVarianceTypeSubstitution.kt | 0 .../load/kotlin/header/KotlinClassHeader.kt | 0 ...eadKotlinClassHeaderAnnotationVisitor.java | 0 .../load/kotlin/methodSignatureBuilding.kt | 0 .../load/kotlin/methodSignatureMapping.kt | 0 .../load/kotlin/typeSignatureMapping.kt | 0 .../kotlin/platform/JavaToKotlinClassMap.kt | 0 .../jetbrains/kotlin/platform/JvmBuiltIns.kt | 0 .../jetbrains/kotlin/platform/mappingUtil.kt | 0 .../resolve/jvm/JavaDescriptorResolver.kt | 0 .../kotlin/resolve/jvm/JvmClassName.java | 0 .../kotlin/resolve/jvm/JvmPrimitiveType.java | 0 .../kotlin/serialization/jvm/BitEncoding.java | 0 .../serialization/jvm/ClassMapperLite.kt | 0 .../serialization/jvm/JvmPackageTable.java | 2 +- .../kotlin/serialization/jvm/JvmProtoBuf.java | 2 +- .../serialization/jvm/JvmProtoBufUtil.kt | 0 .../kotlin/serialization/jvm/utfEncoding.kt | 0 .../generators/protobuf/GenerateProtoBuf.kt | 4 +- libraries/tools/kotlin-reflect/build.gradle | 4 +- 104 files changed, 86 insertions(+), 86 deletions(-) rename core/{descriptor.loader.java => descriptors.jvm}/src/META-INF/services/org.jetbrains.kotlin.resolve.ExternalOverridabilityCondition (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/jvm_descriptors.proto (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/jvm_package_table.proto (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/builtins/CloneableClassScope.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/builtins/JvmBuiltInClassDescriptorFactory.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/builtins/JvmBuiltInsPackageFragmentProvider.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/AnnotationTypeQualifierResolver.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/BuiltinOverridabilityCondition.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/ErasedOverridabilityCondition.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/FakePureImplementationsProvider.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/FieldOverridabilityCondition.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/JavaClassFinder.java (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/JavaIncompatibilityRulesOverridabilityCondition.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/JavaVisibilities.java (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/JvmAbi.java (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.java (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/JvmBytecodeBinaryVersion.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/components/DescriptorResolverUtils.java (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/components/ExternalAnnotationResolver.java (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/components/JavaAnnotationMapper.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/components/JavaPropertyInitializerEvaluator.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/components/JavaResolverCache.java (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/components/SamConversionResolver.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/components/SignaturePropagator.java (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/components/TypeUsage.java (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/descriptors/JavaCallableMemberDescriptor.java (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/descriptors/JavaClassConstructorDescriptor.java (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/descriptors/JavaClassDescriptor.java (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/descriptors/JavaMethodDescriptor.java (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/descriptors/JavaPropertyDescriptor.java (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/descriptors/util.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/lazy/LazyJavaAnnotations.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/lazy/LazyJavaPackageFragmentProvider.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/lazy/ModuleClassResolver.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/lazy/PackageMappingProvider.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/lazy/context.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/lazy/descriptors/DeclaredMemberIndex.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/lazy/descriptors/JavaDescriptorUtil.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/lazy/descriptors/JvmPackageScope.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageFragment.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageScope.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaStaticClassScope.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaStaticScope.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaTypeParameterDescriptor.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/lazy/resolvers.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/lazy/types/JavaTypeResolver.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/lazy/types/RawType.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/propertiesConventionUtil.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/sources/JavaSourceElementFactory.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/specialBuiltinMembers.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/structure/annotationArguments.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/structure/javaElements.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/structure/javaTypes.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/typeEnhancement/predefinedEnhancementInfo.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/typeEnhancement/signatureEnhancement.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/typeEnhancement/typeEnhancement.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/typeEnhancement/typeQualifiers.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/java/utils.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/kotlin/DeserializationComponentsForJava.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/kotlin/JavaClassDataFinder.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/kotlin/JavaFlexibleTypeDeserializer.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/kotlin/JvmBuiltInsSettings.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/kotlin/JvmMetadataVersion.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/kotlin/JvmNameResolver.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/kotlin/JvmPackagePartSource.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/kotlin/KotlinClassFinder.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinaryClass.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinaryPackageSourceElement.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinarySourceElement.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/kotlin/TypeMappingMode.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/kotlin/UnsafeVarianceTypeSubstitution.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/kotlin/header/KotlinClassHeader.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor.java (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/kotlin/methodSignatureBuilding.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/kotlin/methodSignatureMapping.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/load/kotlin/typeSignatureMapping.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMap.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/platform/JvmBuiltIns.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/platform/mappingUtil.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/resolve/jvm/JavaDescriptorResolver.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/resolve/jvm/JvmClassName.java (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/resolve/jvm/JvmPrimitiveType.java (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/serialization/jvm/BitEncoding.java (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/serialization/jvm/ClassMapperLite.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/serialization/jvm/JvmPackageTable.java (99%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java (99%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBufUtil.kt (100%) rename core/{descriptor.loader.java => descriptors.jvm}/src/org/jetbrains/kotlin/serialization/jvm/utfEncoding.kt (100%) diff --git a/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmPackageTable.java b/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmPackageTable.java index 27ca33c1153..655c1cf4ac9 100644 --- a/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmPackageTable.java +++ b/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmPackageTable.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: core/descriptor.loader.java/src/jvm_package_table.debug.proto +// source: core/descriptors.jvm/src/jvm_package_table.debug.proto package org.jetbrains.kotlin.serialization.jvm; @@ -3379,21 +3379,21 @@ public final class DebugJvmPackageTable { descriptor; static { java.lang.String[] descriptorData = { - "\n=core/descriptor.loader.java/src/jvm_pa" + - "ckage_table.debug.proto\022&org.jetbrains.k" + - "otlin.serialization.jvm\"\303\001\n\014PackageTable" + - "\022K\n\rpackage_parts\030\001 \003(\01324.org.jetbrains." + - "kotlin.serialization.jvm.PackageParts\022L\n" + - "\016metadata_parts\030\002 \003(\01324.org.jetbrains.ko" + - "tlin.serialization.jvm.PackageParts\022\030\n\020j" + - "vm_package_name\030\003 \003(\t\"\366\001\n\014PackageParts\022\027" + - "\n\017package_fq_name\030\001 \002(\t\022\030\n\020short_class_n" + - "ame\030\002 \003(\t\022*\n\036multifile_facade_short_name", - "_id\030\003 \003(\005B\002\020\001\022#\n\033multifile_facade_short_" + - "name\030\004 \003(\t\022.\n&class_with_jvm_package_nam" + - "e_short_name\030\005 \003(\t\0222\n&class_with_jvm_pac" + - "kage_name_package_id\030\006 \003(\005B\002\020\001B\026B\024DebugJ" + - "vmPackageTable" + "\n6core/descriptors.jvm/src/jvm_package_t" + + "able.debug.proto\022&org.jetbrains.kotlin.s" + + "erialization.jvm\"\303\001\n\014PackageTable\022K\n\rpac" + + "kage_parts\030\001 \003(\01324.org.jetbrains.kotlin." + + "serialization.jvm.PackageParts\022L\n\016metada" + + "ta_parts\030\002 \003(\01324.org.jetbrains.kotlin.se" + + "rialization.jvm.PackageParts\022\030\n\020jvm_pack" + + "age_name\030\003 \003(\t\"\366\001\n\014PackageParts\022\027\n\017packa" + + "ge_fq_name\030\001 \002(\t\022\030\n\020short_class_name\030\002 \003" + + "(\t\022*\n\036multifile_facade_short_name_id\030\003 \003", + "(\005B\002\020\001\022#\n\033multifile_facade_short_name\030\004 " + + "\003(\t\022.\n&class_with_jvm_package_name_short" + + "_name\030\005 \003(\t\0222\n&class_with_jvm_package_na" + + "me_package_id\030\006 \003(\005B\002\020\001B\026B\024DebugJvmPacka" + + "geTable" }; org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { diff --git a/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java b/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java index 9930388703b..ba6ba876282 100644 --- a/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java +++ b/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: core/descriptor.loader.java/src/jvm_descriptors.debug.proto +// source: core/descriptors.jvm/src/jvm_descriptors.debug.proto package org.jetbrains.kotlin.serialization.jvm; @@ -4655,62 +4655,62 @@ public final class DebugJvmProtoBuf { descriptor; static { java.lang.String[] descriptorData = { - "\n;core/descriptor.loader.java/src/jvm_de" + - "scriptors.debug.proto\022&org.jetbrains.kot" + - "lin.serialization.jvm\0320core/deserializat" + - "ion/src/ext_options.debug.proto\0320core/de" + - "serialization/src/descriptors.debug.prot" + - "o\"\244\003\n\020StringTableTypes\022O\n\006record\030\001 \003(\0132?" + - ".org.jetbrains.kotlin.serialization.jvm." + - "StringTableTypes.Record\022\026\n\nlocal_name\030\005 " + - "\003(\005B\002\020\001\032\246\002\n\006Record\022\020\n\005range\030\001 \001(\005:\0011\022\030\n\020" + - "predefined_index\030\002 \001(\005\022\016\n\006string\030\006 \001(\t\022b", - "\n\toperation\030\003 \001(\0162I.org.jetbrains.kotlin" + - ".serialization.jvm.StringTableTypes.Reco" + - "rd.Operation:\004NONE\022\033\n\017substring_index\030\004 " + - "\003(\005B\002\020\001\022\030\n\014replace_char\030\005 \003(\005B\002\020\001\"E\n\tOpe" + - "ration\022\010\n\004NONE\020\000\022\030\n\024INTERNAL_TO_CLASS_ID" + - "\020\001\022\024\n\020DESC_TO_CLASS_ID\020\002\"<\n\022JvmMethodSig" + - "nature\022\022\n\004name\030\001 \001(\005B\004\230\265\030\001\022\022\n\004desc\030\002 \001(\005" + - "B\004\230\265\030\001\";\n\021JvmFieldSignature\022\022\n\004name\030\001 \001(" + - "\005B\004\230\265\030\001\022\022\n\004desc\030\002 \001(\005B\004\230\265\030\001\"\316\002\n\024JvmPrope" + - "rtySignature\022H\n\005field\030\001 \001(\01329.org.jetbra", - "ins.kotlin.serialization.jvm.JvmFieldSig" + - "nature\022T\n\020synthetic_method\030\002 \001(\0132:.org.j" + - "etbrains.kotlin.serialization.jvm.JvmMet" + - "hodSignature\022J\n\006getter\030\003 \001(\0132:.org.jetbr" + - "ains.kotlin.serialization.jvm.JvmMethodS" + - "ignature\022J\n\006setter\030\004 \001(\0132:.org.jetbrains" + - ".kotlin.serialization.jvm.JvmMethodSigna" + - "ture:\212\001\n\025constructor_signature\022/.org.jet" + - "brains.kotlin.serialization.Constructor\030" + - "d \001(\0132:.org.jetbrains.kotlin.serializati", - "on.jvm.JvmMethodSignature:\202\001\n\020method_sig" + - "nature\022,.org.jetbrains.kotlin.serializat" + - "ion.Function\030d \001(\0132:.org.jetbrains.kotli" + - "n.serialization.jvm.JvmMethodSignature:\206" + - "\001\n\022property_signature\022,.org.jetbrains.ko" + - "tlin.serialization.Property\030d \001(\0132<.org." + - "jetbrains.kotlin.serialization.jvm.JvmPr" + - "opertySignature:q\n\017type_annotation\022(.org" + - ".jetbrains.kotlin.serialization.Type\030d \003" + - "(\0132..org.jetbrains.kotlin.serialization.", - "Annotation:8\n\006is_raw\022(.org.jetbrains.kot" + - "lin.serialization.Type\030e \001(\010:\204\001\n\031type_pa" + - "rameter_annotation\0221.org.jetbrains.kotli" + - "n.serialization.TypeParameter\030d \003(\0132..or" + - "g.jetbrains.kotlin.serialization.Annotat" + - "ion:J\n\021class_module_name\022).org.jetbrains" + - ".kotlin.serialization.Class\030e \001(\005B\004\230\265\030\001:" + - "u\n\024class_local_variable\022).org.jetbrains." + - "kotlin.serialization.Class\030f \003(\0132,.org.j" + - "etbrains.kotlin.serialization.Property:N", - "\n\023package_module_name\022+.org.jetbrains.ko" + - "tlin.serialization.Package\030e \001(\005B\004\230\265\030\001:y" + - "\n\026package_local_variable\022+.org.jetbrains" + - ".kotlin.serialization.Package\030f \003(\0132,.or" + - "g.jetbrains.kotlin.serialization.Propert" + - "yB\022B\020DebugJvmProtoBuf" + "\n4core/descriptors.jvm/src/jvm_descripto" + + "rs.debug.proto\022&org.jetbrains.kotlin.ser" + + "ialization.jvm\0320core/deserialization/src" + + "/ext_options.debug.proto\0320core/deseriali" + + "zation/src/descriptors.debug.proto\"\244\003\n\020S" + + "tringTableTypes\022O\n\006record\030\001 \003(\0132?.org.je" + + "tbrains.kotlin.serialization.jvm.StringT" + + "ableTypes.Record\022\026\n\nlocal_name\030\005 \003(\005B\002\020\001" + + "\032\246\002\n\006Record\022\020\n\005range\030\001 \001(\005:\0011\022\030\n\020predefi" + + "ned_index\030\002 \001(\005\022\016\n\006string\030\006 \001(\t\022b\n\topera", + "tion\030\003 \001(\0162I.org.jetbrains.kotlin.serial" + + "ization.jvm.StringTableTypes.Record.Oper" + + "ation:\004NONE\022\033\n\017substring_index\030\004 \003(\005B\002\020\001" + + "\022\030\n\014replace_char\030\005 \003(\005B\002\020\001\"E\n\tOperation\022" + + "\010\n\004NONE\020\000\022\030\n\024INTERNAL_TO_CLASS_ID\020\001\022\024\n\020D" + + "ESC_TO_CLASS_ID\020\002\"<\n\022JvmMethodSignature\022" + + "\022\n\004name\030\001 \001(\005B\004\230\265\030\001\022\022\n\004desc\030\002 \001(\005B\004\230\265\030\001\"" + + ";\n\021JvmFieldSignature\022\022\n\004name\030\001 \001(\005B\004\230\265\030\001" + + "\022\022\n\004desc\030\002 \001(\005B\004\230\265\030\001\"\316\002\n\024JvmPropertySign" + + "ature\022H\n\005field\030\001 \001(\01329.org.jetbrains.kot", + "lin.serialization.jvm.JvmFieldSignature\022" + + "T\n\020synthetic_method\030\002 \001(\0132:.org.jetbrain" + + "s.kotlin.serialization.jvm.JvmMethodSign" + + "ature\022J\n\006getter\030\003 \001(\0132:.org.jetbrains.ko" + + "tlin.serialization.jvm.JvmMethodSignatur" + + "e\022J\n\006setter\030\004 \001(\0132:.org.jetbrains.kotlin" + + ".serialization.jvm.JvmMethodSignature:\212\001" + + "\n\025constructor_signature\022/.org.jetbrains." + + "kotlin.serialization.Constructor\030d \001(\0132:" + + ".org.jetbrains.kotlin.serialization.jvm.", + "JvmMethodSignature:\202\001\n\020method_signature\022" + + ",.org.jetbrains.kotlin.serialization.Fun" + + "ction\030d \001(\0132:.org.jetbrains.kotlin.seria" + + "lization.jvm.JvmMethodSignature:\206\001\n\022prop" + + "erty_signature\022,.org.jetbrains.kotlin.se" + + "rialization.Property\030d \001(\0132<.org.jetbrai" + + "ns.kotlin.serialization.jvm.JvmPropertyS" + + "ignature:q\n\017type_annotation\022(.org.jetbra" + + "ins.kotlin.serialization.Type\030d \003(\0132..or" + + "g.jetbrains.kotlin.serialization.Annotat", + "ion:8\n\006is_raw\022(.org.jetbrains.kotlin.ser" + + "ialization.Type\030e \001(\010:\204\001\n\031type_parameter" + + "_annotation\0221.org.jetbrains.kotlin.seria" + + "lization.TypeParameter\030d \003(\0132..org.jetbr" + + "ains.kotlin.serialization.Annotation:J\n\021" + + "class_module_name\022).org.jetbrains.kotlin" + + ".serialization.Class\030e \001(\005B\004\230\265\030\001:u\n\024clas" + + "s_local_variable\022).org.jetbrains.kotlin." + + "serialization.Class\030f \003(\0132,.org.jetbrain" + + "s.kotlin.serialization.Property:N\n\023packa", + "ge_module_name\022+.org.jetbrains.kotlin.se" + + "rialization.Package\030e \001(\005B\004\230\265\030\001:y\n\026packa" + + "ge_local_variable\022+.org.jetbrains.kotlin" + + ".serialization.Package\030f \003(\0132,.org.jetbr" + + "ains.kotlin.serialization.PropertyB\022B\020De" + + "bugJvmProtoBuf" }; org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { diff --git a/build.xml b/build.xml index 585da896cb8..57e0f87d20a 100644 --- a/build.xml +++ b/build.xml @@ -79,8 +79,8 @@ - + @@ -125,7 +125,7 @@ - + @@ -246,8 +246,8 @@ - + @@ -372,7 +372,7 @@ - + diff --git a/core/build.gradle.kts b/core/build.gradle.kts index bd764d4fa4b..e37f53db0d9 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -16,11 +16,11 @@ dependencies { sourceSets { "main" { - java.srcDirs("descriptor.loader.java/src", - "descriptors/src", + java.srcDirs("descriptors/src", + "descriptors.jvm/src", "descriptors.runtime/src", "deserialization/src") - resources.srcDirs("descriptor.loader.java/src", "deserialization/src").apply { include("META-INF/**") } + resources.srcDirs("descriptors.jvm/src", "deserialization/src").apply { include("META-INF/**") } } "test" {} } diff --git a/core/descriptor.loader.java/src/META-INF/services/org.jetbrains.kotlin.resolve.ExternalOverridabilityCondition b/core/descriptors.jvm/src/META-INF/services/org.jetbrains.kotlin.resolve.ExternalOverridabilityCondition similarity index 100% rename from core/descriptor.loader.java/src/META-INF/services/org.jetbrains.kotlin.resolve.ExternalOverridabilityCondition rename to core/descriptors.jvm/src/META-INF/services/org.jetbrains.kotlin.resolve.ExternalOverridabilityCondition diff --git a/core/descriptor.loader.java/src/jvm_descriptors.proto b/core/descriptors.jvm/src/jvm_descriptors.proto similarity index 100% rename from core/descriptor.loader.java/src/jvm_descriptors.proto rename to core/descriptors.jvm/src/jvm_descriptors.proto diff --git a/core/descriptor.loader.java/src/jvm_package_table.proto b/core/descriptors.jvm/src/jvm_package_table.proto similarity index 100% rename from core/descriptor.loader.java/src/jvm_package_table.proto rename to core/descriptors.jvm/src/jvm_package_table.proto diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/builtins/CloneableClassScope.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/CloneableClassScope.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/builtins/CloneableClassScope.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/CloneableClassScope.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/builtins/JvmBuiltInClassDescriptorFactory.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/JvmBuiltInClassDescriptorFactory.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/builtins/JvmBuiltInClassDescriptorFactory.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/JvmBuiltInClassDescriptorFactory.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/builtins/JvmBuiltInsPackageFragmentProvider.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/JvmBuiltInsPackageFragmentProvider.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/builtins/JvmBuiltInsPackageFragmentProvider.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/builtins/JvmBuiltInsPackageFragmentProvider.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/AnnotationTypeQualifierResolver.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/AnnotationTypeQualifierResolver.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/AnnotationTypeQualifierResolver.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/AnnotationTypeQualifierResolver.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/BuiltinOverridabilityCondition.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/BuiltinOverridabilityCondition.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/BuiltinOverridabilityCondition.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/BuiltinOverridabilityCondition.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/ErasedOverridabilityCondition.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/ErasedOverridabilityCondition.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/ErasedOverridabilityCondition.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/ErasedOverridabilityCondition.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/FakePureImplementationsProvider.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/FakePureImplementationsProvider.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/FakePureImplementationsProvider.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/FakePureImplementationsProvider.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/FieldOverridabilityCondition.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/FieldOverridabilityCondition.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/FieldOverridabilityCondition.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/FieldOverridabilityCondition.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JavaClassFinder.java b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JavaClassFinder.java similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JavaClassFinder.java rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JavaClassFinder.java diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JavaIncompatibilityRulesOverridabilityCondition.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JavaIncompatibilityRulesOverridabilityCondition.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JavaIncompatibilityRulesOverridabilityCondition.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JavaIncompatibilityRulesOverridabilityCondition.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JavaVisibilities.java b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JavaVisibilities.java similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JavaVisibilities.java rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JavaVisibilities.java diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.java b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JvmAbi.java similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.java rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JvmAbi.java diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.java b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.java similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.java rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.java diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmBytecodeBinaryVersion.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JvmBytecodeBinaryVersion.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmBytecodeBinaryVersion.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JvmBytecodeBinaryVersion.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/DescriptorResolverUtils.java b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/components/DescriptorResolverUtils.java similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/DescriptorResolverUtils.java rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/components/DescriptorResolverUtils.java diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/ExternalAnnotationResolver.java b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/components/ExternalAnnotationResolver.java similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/ExternalAnnotationResolver.java rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/components/ExternalAnnotationResolver.java diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/JavaAnnotationMapper.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/components/JavaAnnotationMapper.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/JavaAnnotationMapper.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/components/JavaAnnotationMapper.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/JavaPropertyInitializerEvaluator.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/components/JavaPropertyInitializerEvaluator.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/JavaPropertyInitializerEvaluator.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/components/JavaPropertyInitializerEvaluator.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/JavaResolverCache.java b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/components/JavaResolverCache.java similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/JavaResolverCache.java rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/components/JavaResolverCache.java diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/SamConversionResolver.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/components/SamConversionResolver.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/SamConversionResolver.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/components/SamConversionResolver.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/SignaturePropagator.java b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/components/SignaturePropagator.java similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/SignaturePropagator.java rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/components/SignaturePropagator.java diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/TypeUsage.java b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/components/TypeUsage.java similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/TypeUsage.java rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/components/TypeUsage.java diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/JavaCallableMemberDescriptor.java b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/descriptors/JavaCallableMemberDescriptor.java similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/JavaCallableMemberDescriptor.java rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/descriptors/JavaCallableMemberDescriptor.java diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/JavaClassConstructorDescriptor.java b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/descriptors/JavaClassConstructorDescriptor.java similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/JavaClassConstructorDescriptor.java rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/descriptors/JavaClassConstructorDescriptor.java diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/JavaClassDescriptor.java b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/descriptors/JavaClassDescriptor.java similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/JavaClassDescriptor.java rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/descriptors/JavaClassDescriptor.java diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/JavaMethodDescriptor.java b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/descriptors/JavaMethodDescriptor.java similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/JavaMethodDescriptor.java rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/descriptors/JavaMethodDescriptor.java diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/JavaPropertyDescriptor.java b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/descriptors/JavaPropertyDescriptor.java similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/JavaPropertyDescriptor.java rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/descriptors/JavaPropertyDescriptor.java diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/util.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/descriptors/util.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/util.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/descriptors/util.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/LazyJavaAnnotations.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/LazyJavaAnnotations.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/LazyJavaAnnotations.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/LazyJavaAnnotations.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/LazyJavaPackageFragmentProvider.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/LazyJavaPackageFragmentProvider.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/LazyJavaPackageFragmentProvider.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/LazyJavaPackageFragmentProvider.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/ModuleClassResolver.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/ModuleClassResolver.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/ModuleClassResolver.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/ModuleClassResolver.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/PackageMappingProvider.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/PackageMappingProvider.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/PackageMappingProvider.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/PackageMappingProvider.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/context.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/context.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/context.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/context.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/DeclaredMemberIndex.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/DeclaredMemberIndex.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/DeclaredMemberIndex.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/DeclaredMemberIndex.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/JavaDescriptorUtil.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/JavaDescriptorUtil.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/JavaDescriptorUtil.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/JavaDescriptorUtil.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/JvmPackageScope.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/JvmPackageScope.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/JvmPackageScope.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/JvmPackageScope.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageFragment.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageFragment.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageFragment.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageFragment.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageScope.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageScope.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageScope.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageScope.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaScope.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaStaticClassScope.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaStaticClassScope.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaStaticClassScope.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaStaticClassScope.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaStaticScope.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaStaticScope.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaStaticScope.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaStaticScope.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaTypeParameterDescriptor.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaTypeParameterDescriptor.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaTypeParameterDescriptor.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaTypeParameterDescriptor.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/resolvers.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/resolvers.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/resolvers.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/resolvers.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/JavaTypeResolver.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/types/JavaTypeResolver.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/JavaTypeResolver.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/types/JavaTypeResolver.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/RawType.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/types/RawType.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/RawType.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/lazy/types/RawType.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/propertiesConventionUtil.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/propertiesConventionUtil.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/propertiesConventionUtil.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/propertiesConventionUtil.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/sources/JavaSourceElementFactory.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/sources/JavaSourceElementFactory.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/sources/JavaSourceElementFactory.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/sources/JavaSourceElementFactory.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/specialBuiltinMembers.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/specialBuiltinMembers.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/specialBuiltinMembers.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/specialBuiltinMembers.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/annotationArguments.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/structure/annotationArguments.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/annotationArguments.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/structure/annotationArguments.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/javaElements.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/structure/javaElements.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/javaElements.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/structure/javaElements.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/javaTypes.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/structure/javaTypes.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/javaTypes.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/structure/javaTypes.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/predefinedEnhancementInfo.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/typeEnhancement/predefinedEnhancementInfo.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/predefinedEnhancementInfo.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/typeEnhancement/predefinedEnhancementInfo.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/signatureEnhancement.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/typeEnhancement/signatureEnhancement.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/signatureEnhancement.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/typeEnhancement/signatureEnhancement.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/typeEnhancement.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/typeEnhancement/typeEnhancement.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/typeEnhancement.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/typeEnhancement/typeEnhancement.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/typeQualifiers.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/typeEnhancement/typeQualifiers.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/typeEnhancement/typeQualifiers.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/typeEnhancement/typeQualifiers.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/utils.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/utils.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/utils.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/utils.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializationComponentsForJava.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/DeserializationComponentsForJava.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializationComponentsForJava.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/DeserializationComponentsForJava.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JavaClassDataFinder.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/JavaClassDataFinder.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JavaClassDataFinder.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/JavaClassDataFinder.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JavaFlexibleTypeDeserializer.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/JavaFlexibleTypeDeserializer.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JavaFlexibleTypeDeserializer.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/JavaFlexibleTypeDeserializer.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JvmBuiltInsSettings.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/JvmBuiltInsSettings.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JvmBuiltInsSettings.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/JvmBuiltInsSettings.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JvmMetadataVersion.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/JvmMetadataVersion.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JvmMetadataVersion.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/JvmMetadataVersion.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JvmNameResolver.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/JvmNameResolver.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JvmNameResolver.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/JvmNameResolver.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JvmPackagePartSource.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/JvmPackagePartSource.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JvmPackagePartSource.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/JvmPackagePartSource.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/KotlinClassFinder.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinClassFinder.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/KotlinClassFinder.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinClassFinder.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinaryClass.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinaryClass.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinaryClass.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinaryClass.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinaryPackageSourceElement.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinaryPackageSourceElement.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinaryPackageSourceElement.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinaryPackageSourceElement.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinarySourceElement.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinarySourceElement.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinarySourceElement.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinarySourceElement.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/TypeMappingMode.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/TypeMappingMode.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/TypeMappingMode.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/TypeMappingMode.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/UnsafeVarianceTypeSubstitution.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/UnsafeVarianceTypeSubstitution.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/UnsafeVarianceTypeSubstitution.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/UnsafeVarianceTypeSubstitution.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/header/KotlinClassHeader.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/header/KotlinClassHeader.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/header/KotlinClassHeader.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/header/KotlinClassHeader.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor.java b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor.java similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor.java rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor.java diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/methodSignatureBuilding.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/methodSignatureBuilding.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/methodSignatureBuilding.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/methodSignatureBuilding.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/methodSignatureMapping.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/methodSignatureMapping.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/methodSignatureMapping.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/methodSignatureMapping.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/typeSignatureMapping.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/typeSignatureMapping.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/typeSignatureMapping.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/typeSignatureMapping.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMap.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMap.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMap.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMap.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JvmBuiltIns.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/platform/JvmBuiltIns.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JvmBuiltIns.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/platform/JvmBuiltIns.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/mappingUtil.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/platform/mappingUtil.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/mappingUtil.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/platform/mappingUtil.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/resolve/jvm/JavaDescriptorResolver.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/resolve/jvm/JavaDescriptorResolver.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/resolve/jvm/JavaDescriptorResolver.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/resolve/jvm/JavaDescriptorResolver.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/resolve/jvm/JvmClassName.java b/core/descriptors.jvm/src/org/jetbrains/kotlin/resolve/jvm/JvmClassName.java similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/resolve/jvm/JvmClassName.java rename to core/descriptors.jvm/src/org/jetbrains/kotlin/resolve/jvm/JvmClassName.java diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/resolve/jvm/JvmPrimitiveType.java b/core/descriptors.jvm/src/org/jetbrains/kotlin/resolve/jvm/JvmPrimitiveType.java similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/resolve/jvm/JvmPrimitiveType.java rename to core/descriptors.jvm/src/org/jetbrains/kotlin/resolve/jvm/JvmPrimitiveType.java diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/BitEncoding.java b/core/descriptors.jvm/src/org/jetbrains/kotlin/serialization/jvm/BitEncoding.java similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/BitEncoding.java rename to core/descriptors.jvm/src/org/jetbrains/kotlin/serialization/jvm/BitEncoding.java diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/ClassMapperLite.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/serialization/jvm/ClassMapperLite.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/ClassMapperLite.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/serialization/jvm/ClassMapperLite.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmPackageTable.java b/core/descriptors.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmPackageTable.java similarity index 99% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmPackageTable.java rename to core/descriptors.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmPackageTable.java index 5c7a1e9cef0..a60db9db991 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmPackageTable.java +++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmPackageTable.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: core/descriptor.loader.java/src/jvm_package_table.proto +// source: core/descriptors.jvm/src/jvm_package_table.proto package org.jetbrains.kotlin.serialization.jvm; diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java b/core/descriptors.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java similarity index 99% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java rename to core/descriptors.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java index 0a5021d0978..854d3d8fb63 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java +++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: core/descriptor.loader.java/src/jvm_descriptors.proto +// source: core/descriptors.jvm/src/jvm_descriptors.proto package org.jetbrains.kotlin.serialization.jvm; diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBufUtil.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBufUtil.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBufUtil.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBufUtil.kt diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/utfEncoding.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/serialization/jvm/utfEncoding.kt similarity index 100% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/utfEncoding.kt rename to core/descriptors.jvm/src/org/jetbrains/kotlin/serialization/jvm/utfEncoding.kt diff --git a/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt b/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt index f9845c26815..2a70f607244 100644 --- a/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt +++ b/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt @@ -54,8 +54,8 @@ val PROTO_PATHS: List = listOf( ProtoPath("core/deserialization/src/builtins.proto"), ProtoPath("js/js.serializer/src/js.proto"), ProtoPath("js/js.serializer/src/js-ast.proto"), - ProtoPath("core/descriptor.loader.java/src/jvm_descriptors.proto"), - ProtoPath("core/descriptor.loader.java/src/jvm_package_table.proto") + ProtoPath("core/descriptors.jvm/src/jvm_descriptors.proto"), + ProtoPath("core/descriptors.jvm/src/jvm_package_table.proto") ) private val EXT_OPTIONS_PROTO_PATH = ProtoPath("core/deserialization/src/ext_options.proto") diff --git a/libraries/tools/kotlin-reflect/build.gradle b/libraries/tools/kotlin-reflect/build.gradle index f61ec1d144b..1400eb182f3 100644 --- a/libraries/tools/kotlin-reflect/build.gradle +++ b/libraries/tools/kotlin-reflect/build.gradle @@ -87,7 +87,7 @@ task reflectShadowJar(type: ShadowJar) { manifestAttributes(manifest, project, 'Main') from (sourceSets.main.output) - from ("${core}/descriptor.loader.java/src") { + from ("${core}/descriptors.jvm/src") { include 'META-INF/services/**' } from ("${core}/deserialization/src") { @@ -141,8 +141,8 @@ task relocateCoreSources(type: Copy) { delete(relocatedCoreSrc) } - from "${core}/descriptor.loader.java/src/${commonPackage}" from "${core}/descriptors/src/${commonPackage}" + from "${core}/descriptors.jvm/src/${commonPackage}" from "${core}/descriptors.runtime/src/${commonPackage}" from "${core}/deserialization/src/${commonPackage}" from "${core}/util.runtime/src/${commonPackage}"