From f3998d523d5a3fc61a692e8f7f81ce9465fdb746 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Tue, 8 Nov 2022 11:16:27 +0100 Subject: [PATCH] [Gradle] Move IdeDependency into kgp-idea module and share serializer logic KT-54825 --- .../kotlin-gradle-plugin-idea-proto.txt | 10 ++-- .../kotlin-gradle-plugin-idea.txt | 6 +- .../kpm/idea/proto/binaryCoordinates.kt | 4 +- .../kpm/idea/proto/compilationOutput.kt | 4 +- .../kotlin/kpm/idea/proto/container.kt | 21 +++---- .../kotlin/kpm/idea/proto/contentRoot.kt | 14 ++--- .../kotlin/kpm/idea/proto/dependency.kt | 10 +++- .../jetbrains/kotlin/kpm/idea/proto/extras.kt | 10 ++-- .../kotlin/kpm/idea/proto/fragment.kt | 14 ++--- .../kpm/idea/proto/fragmentCoordinates.kt | 4 +- .../kpm/idea/proto/fragmentDependency.kt | 14 ++--- .../kotlin/kpm/idea/proto/languageSettings.kt | 4 +- .../jetbrains/kotlin/kpm/idea/proto/module.kt | 16 +++--- .../kpm/idea/proto/moduleCoordinates.kt | 4 +- .../kotlin/kpm/idea/proto/platform.kt | 48 ++++++++-------- .../kotlin/kpm/idea/proto/project.kt | 10 ++-- .../idea/proto/resolvedBinaryDependency.kt | 14 ++--- .../idea/proto/unresolvedBinaryDependency.kt | 14 ++--- .../kotlin/kpm/idea/proto/variant.kt | 14 ++--- .../idea/proto/AbstractSerializationTest.kt | 8 +-- .../kpm/idea/proto/BinaryCoordinatesTest.kt | 4 +- .../kpm/idea/proto/CompilationOutputTest.kt | 4 +- .../kotlin/kpm/idea/proto/ContainerTest.kt | 8 +-- .../kpm/idea/proto/FragmentCoordinatesTest.kt | 6 +- .../kpm/idea/proto/FragmentDependencyTest.kt | 10 ++-- .../kotlin/kpm/idea/proto/FragmentTest.kt | 2 +- .../kpm/idea/proto/LanguageSettingsTest.kt | 4 +- .../kpm/idea/proto/ModuleCoordinatesTest.kt | 4 +- .../kotlin/kpm/idea/proto/ModuleTest.kt | 2 +- .../kotlin/kpm/idea/proto/PlatformTest.kt | 2 +- .../kotlin/kpm/idea/proto/ProjectTest.kt | 2 +- .../proto/ResolvedBinaryDependencyTest.kt | 8 +-- .../kpm/idea/proto/SourceDirectoryTest.kt | 4 +- .../proto/UnresolvedBinaryDependencyTest.kt | 8 +-- .../kotlin/kpm/idea/proto/VariantTest.kt | 2 +- .../kpm}/IdeaKpmBinaryCoordinates.kt | 2 +- .../kpm}/IdeaKpmCompilationOutput.kt | 2 +- .../idea => idea/kpm}/IdeaKpmContentRoot.kt | 6 +- .../idea => idea/kpm}/IdeaKpmDependency.kt | 8 +-- .../kpm}/IdeaKpmDependencyCoordinates.kt | 2 +- .../{kpm/idea => idea/kpm}/IdeaKpmFragment.kt | 2 +- .../kpm}/IdeaKpmFragmentCoordinates.kt | 2 +- .../kpm}/IdeaKpmLanguageSettings.kt | 2 +- .../{kpm/idea => idea/kpm}/IdeaKpmModule.kt | 2 +- .../kpm}/IdeaKpmModuleCoordinates.kt | 2 +- .../{kpm/idea => idea/kpm}/IdeaKpmPlatform.kt | 2 +- .../{kpm/idea => idea/kpm}/IdeaKpmProject.kt | 2 +- .../kpm}/IdeaKpmProjectContainer.kt | 2 +- .../{kpm/idea => idea/kpm}/IdeaKpmVariant.kt | 2 +- .../idea => idea/kpm}/WriteReplacedModel.kt | 2 +- .../IdeaExtrasSerializationExtension.kt | 46 ++++++++++++++++ .../idea/serialize/IdeaExtrasSerializer.kt | 27 +++++++++ ...IdeaJavaIoSerializableExtrasSerializer.kt} | 10 ++-- .../serialize/IdeaSerializationContext.kt} | 8 +-- .../serialize/IdeaSerializationLogger.kt} | 6 +- .../idea/tcs/IdeaKotlinBinaryDependency.kt | 26 +++++++++ .../gradle/idea/tcs/IdeaKotlinDependency.kt | 19 +++++++ .../tcs/IdeaKotlinDependencyCoordinates.kt} | 16 ++---- .../idea/tcs/IdeaKotlinSourceDependency.kt | 19 +++++++ .../IdeaKpmExtrasSerializationExtension.kt | 46 ---------------- .../idea/serialize/IdeaKpmExtrasSerializer.kt | 28 ---------- ...eaKpmJavaIoSerializableExtrasSerializer.kt | 43 --------------- .../serialize/IdeaKpmSerializationContext.kt | 11 ---- .../serialize/IdeaKpmSerializationLogger.kt | 21 ------- ...ckwardsCompatibilityDeserializationTest.kt | 8 +-- ...ckwardsCompatibilityDeserializationTest.kt | 4 +- .../kpm}/IdeaKpmProjectContainerTest.kt | 2 +- .../kpm}/IdeaKpmProjectObjectGraphTest.kt | 2 +- ...JavaIoSerializableExtrasSerializerTest.kt} | 26 ++++----- .../idea/testUtils/CompatibilityTestUtil.kt | 8 +-- .../{kpm => }/idea/testUtils/gradleUtils.kt | 8 +-- .../ideDependencyResolutionAssertions.kt | 29 ++++------ ...izer.kt => TestIdeaIntExtrasSerializer.kt} | 10 ++-- .../TestIdeaKpmBinaryDependencyMatcher.kt | 6 +- ...TestIdeaKpmClassLoaderProjectSerializer.kt | 10 ++-- .../TestIdeaKpmDependencyMatcher.kt | 2 +- ...TestIdeaKpmExtrasSerializationExtension.kt | 16 +++--- .../TestIdeaKpmFragmentDependencyMatcher.kt | 2 +- .../idea/testFixtures/TestIdeaKpmInstances.kt | 2 +- .../TestIdeaKpmSerializationContext.kt | 6 +- .../TestIdeaKpmStringExtrasSerializer.kt | 16 ------ ...gger.kt => TestIdeaSerializationLogger.kt} | 7 +-- .../TestIdeaStringExtrasSerializer.kt | 14 +++++ .../kpm/idea/testFixtures/assertions.kt | 1 + .../kpm/idea/testFixtures/modelUtils.kt | 8 +-- .../gradle/android/AndroidTargetExtension.kt | 4 +- .../android/IdeaDependencyResolution.kt | 4 +- ...lVariantPlatformDependencyResolutionDsl.kt | 1 + .../kpm/idea/IdeaKpmDependencyEffect.kt | 1 + .../kpm/idea/IdeaKpmDependencyLogger.kt | 1 + .../kpm/idea/IdeaKpmDependencyResolver.kt | 1 + .../kpm/idea/IdeaKpmDependencyTransformer.kt | 1 + ...eaKpmGranularFragmentDependencyResolver.kt | 1 + ...IdeaKpmMetadataBinaryDependencyResolver.kt | 3 + .../IdeaKpmMissingFileDependencyLogger.kt | 2 + ...IdeaKpmNativePlatformDependencyResolver.kt | 4 ++ .../IdeaKpmNativeStdlibDependencyResolver.kt | 3 + ...eaKpmOriginalMetadataDependencyResolver.kt | 3 + .../idea/IdeaKpmPlatformDependencyResolver.kt | 1 + .../kpm/idea/IdeaKpmProjectModelBuilder.kt | 18 +++--- .../idea/IdeaKpmProjectModelBuilderImpl.kt | 14 +++-- .../idea/IdeaKpmRefinesDependencyResolver.kt | 3 + .../idea/IdeaKpmSerializationContextImpl.kt | 38 ++++++------- ...IdeaKpmSinglePlatformStdlibCommonFilter.kt | 2 + .../IdeaKpmSourcesAndDocumentationResolver.kt | 3 + ...aKpmUnusedSourcesAndDocumentationFilter.kt | 1 + .../idea/ideaKpmCompilationOutputBuilder.kt | 2 + .../gradle/kpm/idea/ideaKpmFragmentBuilder.kt | 1 + .../idea/ideaKpmFragmentCoordinatesBuilder.kt | 2 + .../idea/ideaKpmLanguageSettingsBuilder.kt | 2 + .../gradle/kpm/idea/ideaKpmModuleBuilder.kt | 2 + .../idea/ideaKpmModuleCoordinatesBuilder.kt | 2 + .../gradle/kpm/idea/ideaKpmPlatformBuilder.kt | 1 + .../idea/ideaKpmProjectModelBuilderFactory.kt | 4 +- .../kotlin/gradle/plugin/ide/IdeDependency.kt | 55 ------------------- .../gradle/plugin/ide/IdeDependencyEffect.kt | 3 +- .../plugin/ide/IdeDependencyResolver.kt | 7 ++- .../plugin/ide/IdeDependencyTransformer.kt | 7 ++- .../ide/IdeExtrasSerializationExtension.kt | 46 ---------------- .../gradle/plugin/ide/IdeExtrasSerializer.kt | 27 --------- .../plugin/ide/IdeMultiplatformImport.kt | 11 ++-- .../ide/IdeMultiplatformImportFactory.kt | 3 +- .../plugin/ide/IdeMultiplatformImportImpl.kt | 8 ++- .../IdeDependsOnDependencyResolver.kt | 14 ++--- ...latformResolveDependsOnDependenciesTest.kt | 11 ++-- .../jetbrains/kotlin/gradle/ide/assertions.kt | 12 ++++ .../gradle/kpm/AbstractKpmExtensionTest.kt | 2 +- .../IdeaKpmProjectModelSerializableTest.kt | 1 + .../MviKotlinIdeaDependencyResolutionTest.kt | 2 +- ...rojectToProjectDependencyResolutionTest.kt | 1 + ...tdlibKotlinIdeaDependencyResolutionTest.kt | 2 +- 131 files changed, 561 insertions(+), 642 deletions(-) rename libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/{kpm/idea => idea/kpm}/IdeaKpmBinaryCoordinates.kt (96%) rename libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/{kpm/idea => idea/kpm}/IdeaKpmCompilationOutput.kt (94%) rename libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/{kpm/idea => idea/kpm}/IdeaKpmContentRoot.kt (87%) rename libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/{kpm/idea => idea/kpm}/IdeaKpmDependency.kt (93%) rename libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/{kpm/idea => idea/kpm}/IdeaKpmDependencyCoordinates.kt (86%) rename libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/{kpm/idea => idea/kpm}/IdeaKpmFragment.kt (96%) rename libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/{kpm/idea => idea/kpm}/IdeaKpmFragmentCoordinates.kt (95%) rename libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/{kpm/idea => idea/kpm}/IdeaKpmLanguageSettings.kt (96%) rename libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/{kpm/idea => idea/kpm}/IdeaKpmModule.kt (95%) rename libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/{kpm/idea => idea/kpm}/IdeaKpmModuleCoordinates.kt (95%) rename libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/{kpm/idea => idea/kpm}/IdeaKpmPlatform.kt (98%) rename libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/{kpm/idea => idea/kpm}/IdeaKpmProject.kt (95%) rename libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/{kpm/idea => idea/kpm}/IdeaKpmProjectContainer.kt (98%) rename libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/{kpm/idea => idea/kpm}/IdeaKpmVariant.kt (95%) rename libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/{kpm/idea => idea/kpm}/WriteReplacedModel.kt (87%) create mode 100644 libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/serialize/IdeaExtrasSerializationExtension.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/serialize/IdeaExtrasSerializer.kt rename libraries/tools/{kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeJavaIoSerializableExtrasSerializer.kt => kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/serialize/IdeaJavaIoSerializableExtrasSerializer.kt} (80%) rename libraries/tools/{kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeSerializationContext.kt => kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/serialize/IdeaSerializationContext.kt} (51%) rename libraries/tools/{kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeSerializationLogger.kt => kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/serialize/IdeaSerializationLogger.kt} (83%) create mode 100644 libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinBinaryDependency.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinDependency.kt rename libraries/tools/{kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyCoordinates.kt => kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinDependencyCoordinates.kt} (53%) create mode 100644 libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinSourceDependency.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaKpmExtrasSerializationExtension.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaKpmExtrasSerializer.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaKpmJavaIoSerializableExtrasSerializer.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaKpmSerializationContext.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaKpmSerializationLogger.kt rename libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/{kpm/idea => idea/kpm}/GradleProjectBackwardsCompatibilityDeserializationTest.kt (94%) rename libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/{kpm/idea => idea/kpm}/IdeaKpmProjectBackwardsCompatibilityDeserializationTest.kt (89%) rename libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/{kpm/idea => idea/kpm}/IdeaKpmProjectContainerTest.kt (98%) rename libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/{kpm/idea => idea/kpm}/IdeaKpmProjectObjectGraphTest.kt (99%) rename libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/{kpm/idea/IdeaKpmJavaIoSerializableExtrasSerializerTest.kt => idea/serialize/IdeaJavaIoSerializableExtrasSerializerTest.kt} (69%) rename libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/{kpm => }/idea/testUtils/CompatibilityTestUtil.kt (88%) rename libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/{kpm => }/idea/testUtils/gradleUtils.kt (88%) rename libraries/tools/{kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide => kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/ide/testFixtures}/ideDependencyResolutionAssertions.kt (73%) rename libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/{TestIdeaKpmIntExtrasSerializer.kt => TestIdeaIntExtrasSerializer.kt} (50%) delete mode 100644 libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmStringExtrasSerializer.kt rename libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/{TestIdeaKpmSerializationLogger.kt => TestIdeaSerializationLogger.kt} (73%) create mode 100644 libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaStringExtrasSerializer.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependency.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeExtrasSerializationExtension.kt delete mode 100644 libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeExtrasSerializer.kt create mode 100644 libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/assertions.kt diff --git a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-gradle-plugin-idea-proto.txt b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-gradle-plugin-idea-proto.txt index 32a9cd3f904..08d1cff35b6 100644 --- a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-gradle-plugin-idea-proto.txt +++ b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-gradle-plugin-idea-proto.txt @@ -1,8 +1,8 @@ public final class org/jetbrains/kotlin/kpm/idea/proto/KpmIdeaProto { - public static final fun IdeaKpmProject (Lorg/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaKpmSerializationContext;Ljava/io/InputStream;)Lorg/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProject; - public static final fun IdeaKpmProject (Lorg/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaKpmSerializationContext;Ljava/nio/ByteBuffer;)Lorg/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProject; - public static final fun IdeaKpmProject (Lorg/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaKpmSerializationContext;[B)Lorg/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProject; - public static final fun toByteArray (Lorg/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProject;Lorg/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaKpmSerializationContext;)[B - public static final fun writeTo (Lorg/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProject;Ljava/io/OutputStream;Lorg/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaKpmSerializationContext;)V + public static final fun IdeaKpmProject (Lorg/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaSerializationContext;Ljava/io/InputStream;)Lorg/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProject; + public static final fun IdeaKpmProject (Lorg/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaSerializationContext;Ljava/nio/ByteBuffer;)Lorg/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProject; + public static final fun IdeaKpmProject (Lorg/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaSerializationContext;[B)Lorg/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProject; + public static final fun toByteArray (Lorg/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProject;Lorg/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaSerializationContext;)[B + public static final fun writeTo (Lorg/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProject;Ljava/io/OutputStream;Lorg/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaSerializationContext;)V } diff --git a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-gradle-plugin-idea.txt b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-gradle-plugin-idea.txt index 212d8bbc957..93c7cded4a4 100644 --- a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-gradle-plugin-idea.txt +++ b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-gradle-plugin-idea.txt @@ -233,15 +233,15 @@ public final class org/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaKpmExtrasS public abstract interface class org/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaKpmExtrasSerializer { public static final field Companion Lorg/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaKpmExtrasSerializer$Companion; - public abstract fun deserialize (Lorg/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaKpmSerializationContext;[B)Ljava/lang/Object; - public abstract fun serialize (Lorg/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaKpmSerializationContext;Ljava/lang/Object;)[B + public abstract fun deserialize (Lorg/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaSerializationContext;[B)Ljava/lang/Object; + public abstract fun serialize (Lorg/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaSerializationContext;Ljava/lang/Object;)[B } public final class org/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaKpmExtrasSerializer$Companion { public final fun javaIoSerializable (Lkotlin/reflect/KClass;)Lorg/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaKpmExtrasSerializer; } -public abstract interface class org/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaKpmSerializationContext { +public abstract interface class org/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaSerializationContext { public abstract fun getExtrasSerializationExtension ()Lorg/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaKpmExtrasSerializationExtension; public abstract fun getLogger ()Lorg/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaKpmSerializationLogger; } diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/binaryCoordinates.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/binaryCoordinates.kt index 0378df9b078..8d4a006085d 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/binaryCoordinates.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/binaryCoordinates.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.kpm.idea.proto -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmBinaryCoordinates -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmBinaryCoordinatesImpl +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmBinaryCoordinates +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmBinaryCoordinatesImpl internal fun IdeaKpmBinaryCoordinatesProto(coordinates: IdeaKpmBinaryCoordinates): IdeaKpmBinaryCoordinatesProto { return ideaKpmBinaryCoordinatesProto { diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/compilationOutput.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/compilationOutput.kt index b87731390e5..7d50147ffd4 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/compilationOutput.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/compilationOutput.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.kpm.idea.proto -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmCompilationOutput -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmCompilationOutputImpl +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmCompilationOutput +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmCompilationOutputImpl import java.io.File internal fun IdeaKpmCompilationOutputProto(output: IdeaKpmCompilationOutput): IdeaKpmCompilationOutputProto { diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/container.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/container.kt index f80f74eeded..0e3bf6911ec 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/container.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/container.kt @@ -9,25 +9,26 @@ package org.jetbrains.kotlin.kpm.idea.proto import com.google.protobuf.InvalidProtocolBufferException -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmProject -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmSerializationContext +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmProject +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext import java.io.InputStream import java.io.OutputStream import java.nio.ByteBuffer -fun IdeaKpmSerializationContext.IdeaKpmProject(data: ByteArray): IdeaKpmProject? { + +fun IdeaSerializationContext.IdeaKpmProject(data: ByteArray): IdeaKpmProject? { return IdeaKpmProject(data) { IdeaKpmContainerProto.parseFrom(data) } } -fun IdeaKpmSerializationContext.IdeaKpmProject(data: ByteBuffer): IdeaKpmProject? { +fun IdeaSerializationContext.IdeaKpmProject(data: ByteBuffer): IdeaKpmProject? { return IdeaKpmProject(data) { IdeaKpmContainerProto.parseFrom(data) } } -fun IdeaKpmSerializationContext.IdeaKpmProject(stream: InputStream): IdeaKpmProject? { +fun IdeaSerializationContext.IdeaKpmProject(stream: InputStream): IdeaKpmProject? { return IdeaKpmProject(stream) { IdeaKpmContainerProto.parseFrom(stream) } } -internal fun IdeaKpmSerializationContext.IdeaKpmProject(data: T, proto: (T) -> IdeaKpmContainerProto): IdeaKpmProject? { +internal fun IdeaSerializationContext.IdeaKpmProject(data: T, proto: (T) -> IdeaKpmContainerProto): IdeaKpmProject? { val container = try { proto(data) } catch (e: InvalidProtocolBufferException) { @@ -38,15 +39,15 @@ internal fun IdeaKpmSerializationContext.IdeaKpmProject(data: T, proto: (T) return IdeaKpmProject(container) } -fun IdeaKpmProject.toByteArray(context: IdeaKpmSerializationContext): ByteArray { +fun IdeaKpmProject.toByteArray(context: IdeaSerializationContext): ByteArray { return context.IdeaKpmContainerProto(this).toByteArray() } -fun IdeaKpmProject.writeTo(output: OutputStream, context: IdeaKpmSerializationContext) { +fun IdeaKpmProject.writeTo(output: OutputStream, context: IdeaSerializationContext) { context.IdeaKpmContainerProto(this).writeDelimitedTo(output) } -internal fun IdeaKpmSerializationContext.IdeaKpmContainerProto(project: IdeaKpmProject): IdeaKpmContainerProto { +internal fun IdeaSerializationContext.IdeaKpmContainerProto(project: IdeaKpmProject): IdeaKpmContainerProto { return ideaKpmContainerProto { schemaVersionMajor = IdeaKpmProtoSchema.versionMajor schemaVersionMinor = IdeaKpmProtoSchema.versionMinor @@ -56,7 +57,7 @@ internal fun IdeaKpmSerializationContext.IdeaKpmContainerProto(project: IdeaKpmP } } -internal fun IdeaKpmSerializationContext.IdeaKpmProject(proto: IdeaKpmContainerProto): IdeaKpmProject? { +internal fun IdeaSerializationContext.IdeaKpmProject(proto: IdeaKpmContainerProto): IdeaKpmProject? { if (!proto.hasSchemaVersionMajor()) { logger.error("Missing 'schema_version_major'", Throwable()) return null diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/contentRoot.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/contentRoot.kt index 9951e51af82..d3082bdf06d 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/contentRoot.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/contentRoot.kt @@ -5,12 +5,12 @@ package org.jetbrains.kotlin.kpm.idea.proto -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmContentRoot -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmContentRootImpl -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmSerializationContext +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmContentRoot +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmContentRootImpl +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext import java.io.File -internal fun IdeaKpmSerializationContext.IdeaKpmContentRootProto(sourceDirectory: IdeaKpmContentRoot): IdeaKpmContentRootProto { +internal fun IdeaSerializationContext.IdeaKpmContentRootProto(sourceDirectory: IdeaKpmContentRoot): IdeaKpmContentRootProto { return ideaKpmContentRootProto { absolutePath = sourceDirectory.file.absolutePath type = sourceDirectory.type @@ -18,7 +18,7 @@ internal fun IdeaKpmSerializationContext.IdeaKpmContentRootProto(sourceDirectory } } -internal fun IdeaKpmSerializationContext.IdeaKpmContentRoot(proto: IdeaKpmContentRootProto): IdeaKpmContentRoot { +internal fun IdeaSerializationContext.IdeaKpmContentRoot(proto: IdeaKpmContentRootProto): IdeaKpmContentRoot { return IdeaKpmContentRootImpl( file = File(proto.absolutePath), type = proto.type, @@ -26,10 +26,10 @@ internal fun IdeaKpmSerializationContext.IdeaKpmContentRoot(proto: IdeaKpmConten ) } -internal fun IdeaKpmSerializationContext.IdeaKpmContentRoot(data: ByteArray): IdeaKpmContentRoot { +internal fun IdeaSerializationContext.IdeaKpmContentRoot(data: ByteArray): IdeaKpmContentRoot { return IdeaKpmContentRoot(IdeaKpmContentRootProto.parseFrom(data)) } -internal fun IdeaKpmContentRoot.toByteArray(context: IdeaKpmSerializationContext): ByteArray { +internal fun IdeaKpmContentRoot.toByteArray(context: IdeaSerializationContext): ByteArray { return context.IdeaKpmContentRootProto(this).toByteArray() } diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/dependency.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/dependency.kt index 3aa20482b8c..2846cb79f0d 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/dependency.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/dependency.kt @@ -7,11 +7,15 @@ package org.jetbrains.kotlin.kpm.idea.proto +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmDependency +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmFragmentDependency +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmResolvedBinaryDependency +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmUnresolvedBinaryDependency +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext import org.jetbrains.kotlin.gradle.kpm.idea.* -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmSerializationContext import org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmDependencyProto.DependencyCase -internal fun IdeaKpmSerializationContext.IdeaKpmDependencyProto(dependency: IdeaKpmDependency): IdeaKpmDependencyProto { +internal fun IdeaSerializationContext.IdeaKpmDependencyProto(dependency: IdeaKpmDependency): IdeaKpmDependencyProto { return ideaKpmDependencyProto { when (dependency) { is IdeaKpmResolvedBinaryDependency -> resolvedBinaryDependency = IdeaKpmResolvedBinaryDependencyProto(dependency) @@ -21,7 +25,7 @@ internal fun IdeaKpmSerializationContext.IdeaKpmDependencyProto(dependency: Idea } } -internal fun IdeaKpmSerializationContext.IdeaKpmDependency(proto: IdeaKpmDependencyProto): IdeaKpmDependency? { +internal fun IdeaSerializationContext.IdeaKpmDependency(proto: IdeaKpmDependencyProto): IdeaKpmDependency? { return when (proto.dependencyCase) { DependencyCase.UNRESOLVED_BINARY_DEPENDENCY -> IdeaKpmUnresolvedBinaryDependency(proto.unresolvedBinaryDependency) DependencyCase.RESOLVED_BINARY_DEPENDENCY -> IdeaKpmResolvedBinaryDependency(proto.resolvedBinaryDependency) diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/extras.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/extras.kt index 666018a0452..7a63c2bd62e 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/extras.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/extras.kt @@ -6,19 +6,19 @@ package org.jetbrains.kotlin.kpm.idea.proto import com.google.protobuf.ByteString -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmSerializationContext -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmExtrasSerializer +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaExtrasSerializer +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext import org.jetbrains.kotlin.tooling.core.Extras import org.jetbrains.kotlin.tooling.core.toExtras import org.jetbrains.kotlin.tooling.core.withValue @Suppress("unchecked_cast") -internal fun IdeaKpmSerializationContext.IdeaKpmExtrasProto(extras: Extras): IdeaKpmExtrasProto { +internal fun IdeaSerializationContext.IdeaKpmExtrasProto(extras: Extras): IdeaKpmExtrasProto { val context = this return ideaKpmExtrasProto { extras.entries.forEach { (key, value) -> val serializer = context.extrasSerializationExtension.serializer(key) ?: return@forEach - serializer as IdeaKpmExtrasSerializer + serializer as IdeaExtrasSerializer val serialized = runCatching { serializer.serialize(context, value) ?: return@forEach }.getOrElse { exception -> logger.error("Failed to serialize $key, using ${serializer.javaClass.simpleName}", exception) return@forEach @@ -30,7 +30,7 @@ internal fun IdeaKpmSerializationContext.IdeaKpmExtrasProto(extras: Extras): Ide } @Suppress("unchecked_cast") -internal fun IdeaKpmSerializationContext.Extras(proto: IdeaKpmExtrasProto): Extras { +internal fun IdeaSerializationContext.Extras(proto: IdeaKpmExtrasProto): Extras { return proto.valuesMap.entries.mapNotNull { (keyString, value) -> val key = Extras.Key.fromString(keyString) as Extras.Key val serializer = extrasSerializationExtension.serializer(key) ?: return@mapNotNull null diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/fragment.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/fragment.kt index 769af941a7c..f62e26bc0b5 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/fragment.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/fragment.kt @@ -5,11 +5,11 @@ package org.jetbrains.kotlin.kpm.idea.proto -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmFragment -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmFragmentImpl -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmSerializationContext +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmFragment +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmFragmentImpl +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext -internal fun IdeaKpmSerializationContext.IdeaKpmFragmentProto(fragment: IdeaKpmFragment): IdeaKpmFragmentProto { +internal fun IdeaSerializationContext.IdeaKpmFragmentProto(fragment: IdeaKpmFragment): IdeaKpmFragmentProto { return ideaKpmFragmentProto { coordinates = IdeaKpmFragmentCoordinatesProto(fragment.coordinates) platforms.addAll(fragment.platforms.map { IdeaKpmPlatformProto(it) }) @@ -20,7 +20,7 @@ internal fun IdeaKpmSerializationContext.IdeaKpmFragmentProto(fragment: IdeaKpmF } } -internal fun IdeaKpmSerializationContext.IdeaKpmFragment(proto: IdeaKpmFragmentProto): IdeaKpmFragment { +internal fun IdeaSerializationContext.IdeaKpmFragment(proto: IdeaKpmFragmentProto): IdeaKpmFragment { return IdeaKpmFragmentImpl( coordinates = IdeaKpmFragmentCoordinates(proto.coordinates), platforms = proto.platformsList.map { IdeaKpmPlatform(it) }.toSet(), @@ -31,10 +31,10 @@ internal fun IdeaKpmSerializationContext.IdeaKpmFragment(proto: IdeaKpmFragmentP ) } -internal fun IdeaKpmSerializationContext.IdeaKpmFragment(data: ByteArray): IdeaKpmFragment { +internal fun IdeaSerializationContext.IdeaKpmFragment(data: ByteArray): IdeaKpmFragment { return IdeaKpmFragment(IdeaKpmFragmentProto.parseFrom(data)) } -internal fun IdeaKpmFragment.toByteArray(context: IdeaKpmSerializationContext): ByteArray { +internal fun IdeaKpmFragment.toByteArray(context: IdeaSerializationContext): ByteArray { return context.IdeaKpmFragmentProto(this).toByteArray() } diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/fragmentCoordinates.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/fragmentCoordinates.kt index 8822c7f53ed..26bdbd53841 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/fragmentCoordinates.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/fragmentCoordinates.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.kpm.idea.proto -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmFragmentCoordinates -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmFragmentCoordinatesImpl +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmFragmentCoordinates +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmFragmentCoordinatesImpl internal fun IdeaKpmFragmentCoordinatesProto(coordinates: IdeaKpmFragmentCoordinates): IdeaKpmFragmentCoordinatesProto { return ideaKpmFragmentCoordinatesProto { diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/fragmentDependency.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/fragmentDependency.kt index fda12f9881e..a3f8943dbfc 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/fragmentDependency.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/fragmentDependency.kt @@ -5,11 +5,11 @@ package org.jetbrains.kotlin.kpm.idea.proto -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmFragmentDependency -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmFragmentDependencyImpl -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmSerializationContext +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmFragmentDependency +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmFragmentDependencyImpl +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext -internal fun IdeaKpmSerializationContext.IdeaKpmFragmentDependencyProto(dependency: IdeaKpmFragmentDependency): IdeaKpmFragmentDependencyProto { +internal fun IdeaSerializationContext.IdeaKpmFragmentDependencyProto(dependency: IdeaKpmFragmentDependency): IdeaKpmFragmentDependencyProto { return ideaKpmFragmentDependencyProto { type = when (dependency.type) { IdeaKpmFragmentDependency.Type.Regular -> IdeaKpmFragmentDependencyProto.Type.REGULAR @@ -22,7 +22,7 @@ internal fun IdeaKpmSerializationContext.IdeaKpmFragmentDependencyProto(dependen } } -internal fun IdeaKpmSerializationContext.IdeaKpmFragmentDependency(proto: IdeaKpmFragmentDependencyProto): IdeaKpmFragmentDependency { +internal fun IdeaSerializationContext.IdeaKpmFragmentDependency(proto: IdeaKpmFragmentDependencyProto): IdeaKpmFragmentDependency { return IdeaKpmFragmentDependencyImpl( type = when (proto.type) { IdeaKpmFragmentDependencyProto.Type.REGULAR -> IdeaKpmFragmentDependency.Type.Regular @@ -35,10 +35,10 @@ internal fun IdeaKpmSerializationContext.IdeaKpmFragmentDependency(proto: IdeaKp ) } -internal fun IdeaKpmSerializationContext.IdeaKpmFragmentDependency(data: ByteArray): IdeaKpmFragmentDependency { +internal fun IdeaSerializationContext.IdeaKpmFragmentDependency(data: ByteArray): IdeaKpmFragmentDependency { return IdeaKpmFragmentDependency(IdeaKpmFragmentDependencyProto.parseFrom(data)) } -internal fun IdeaKpmFragmentDependency.toByteArray(context: IdeaKpmSerializationContext): ByteArray { +internal fun IdeaKpmFragmentDependency.toByteArray(context: IdeaSerializationContext): ByteArray { return context.IdeaKpmFragmentDependencyProto(this).toByteArray() } diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/languageSettings.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/languageSettings.kt index 5a674868b64..9c9c5700751 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/languageSettings.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/languageSettings.kt @@ -8,8 +8,8 @@ package org.jetbrains.kotlin.kpm.idea.proto import org.jetbrains.kotlin.gradle.InternalKotlinGradlePluginApi -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmLanguageSettings -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmLanguageSettingsImpl +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmLanguageSettings +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmLanguageSettingsImpl import java.io.File internal fun IdeaKpmLanguageSettingsProto(languageSettings: IdeaKpmLanguageSettings): IdeaKpmLanguageSettingsProto { diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/module.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/module.kt index 46297a3101c..498f1bf7b9d 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/module.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/module.kt @@ -5,12 +5,12 @@ package org.jetbrains.kotlin.kpm.idea.proto -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmModule -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmModuleImpl -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmVariant -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmSerializationContext +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmModule +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmModuleImpl +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmVariant +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext -internal fun IdeaKpmSerializationContext.IdeaKpmModuleProto(module: IdeaKpmModule): IdeaKpmModuleProto { +internal fun IdeaSerializationContext.IdeaKpmModuleProto(module: IdeaKpmModule): IdeaKpmModuleProto { return ideaKpmModuleProto { coordinates = IdeaKpmModuleCoordinatesProto(module.coordinates) fragments.addAll(module.fragments.filter { it !is IdeaKpmVariant }.map { IdeaKpmFragmentProto(it) }) @@ -18,17 +18,17 @@ internal fun IdeaKpmSerializationContext.IdeaKpmModuleProto(module: IdeaKpmModul } } -internal fun IdeaKpmSerializationContext.IdeaKpmModule(proto: IdeaKpmModuleProto): IdeaKpmModule { +internal fun IdeaSerializationContext.IdeaKpmModule(proto: IdeaKpmModuleProto): IdeaKpmModule { return IdeaKpmModuleImpl( coordinates = IdeaKpmModuleCoordinates(proto.coordinates), fragments = proto.fragmentsList.map { IdeaKpmFragment(it) } + proto.variantsList.map { IdeaKpmVariant(it) } ) } -internal fun IdeaKpmSerializationContext.IdeaKpmModule(data: ByteArray): IdeaKpmModule { +internal fun IdeaSerializationContext.IdeaKpmModule(data: ByteArray): IdeaKpmModule { return IdeaKpmModule(IdeaKpmModuleProto.parseFrom(data)) } -internal fun IdeaKpmModule.toByteArray(context: IdeaKpmSerializationContext): ByteArray { +internal fun IdeaKpmModule.toByteArray(context: IdeaSerializationContext): ByteArray { return context.IdeaKpmModuleProto(this).toByteArray() } diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/moduleCoordinates.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/moduleCoordinates.kt index 9bcff90d648..514d86d25de 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/moduleCoordinates.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/moduleCoordinates.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.kpm.idea.proto -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmModuleCoordinates -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmModuleCoordinatesImpl +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmModuleCoordinates +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmModuleCoordinatesImpl internal fun IdeaKpmModuleCoordinatesProto(coordinates: IdeaKpmModuleCoordinates): IdeaKpmModuleCoordinatesProto { return ideaKpmModuleCoordinatesProto { diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/platform.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/platform.kt index 7e7815e8083..8e7d3e66823 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/platform.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/platform.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.kpm.idea.proto -import org.jetbrains.kotlin.gradle.kpm.idea.* -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmSerializationContext +import org.jetbrains.kotlin.gradle.idea.kpm.* +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext -internal fun IdeaKpmSerializationContext.IdeaKpmPlatformProto(platform: IdeaKpmPlatform): IdeaKpmPlatformProto { +internal fun IdeaSerializationContext.IdeaKpmPlatformProto(platform: IdeaKpmPlatform): IdeaKpmPlatformProto { return ideaKpmPlatformProto { when (platform) { is IdeaKpmJsPlatformImpl -> js = IdeaKpmJsPlatformProto(platform) @@ -20,7 +20,7 @@ internal fun IdeaKpmSerializationContext.IdeaKpmPlatformProto(platform: IdeaKpmP } } -internal fun IdeaKpmSerializationContext.IdeaKpmPlatform(proto: IdeaKpmPlatformProto): IdeaKpmPlatform { +internal fun IdeaSerializationContext.IdeaKpmPlatform(proto: IdeaKpmPlatformProto): IdeaKpmPlatform { return when (proto.platformCase) { IdeaKpmPlatformProto.PlatformCase.JVM -> IdeaKpmJvmPlatform(proto.jvm) IdeaKpmPlatformProto.PlatformCase.NATIVE -> IdeaKpmNativePlatform(proto.native) @@ -33,116 +33,116 @@ internal fun IdeaKpmSerializationContext.IdeaKpmPlatform(proto: IdeaKpmPlatformP /* Jvm */ -internal fun IdeaKpmSerializationContext.IdeaKpmJvmPlatformProto(platform: IdeaKpmJvmPlatform): IdeaKpmJvmPlatformProto { +internal fun IdeaSerializationContext.IdeaKpmJvmPlatformProto(platform: IdeaKpmJvmPlatform): IdeaKpmJvmPlatformProto { return ideaKpmJvmPlatformProto { if (platform.extras.isNotEmpty()) extras = IdeaKpmExtrasProto(platform.extras) jvmTarget = platform.jvmTarget } } -internal fun IdeaKpmSerializationContext.IdeaKpmJvmPlatform(proto: IdeaKpmJvmPlatformProto): IdeaKpmJvmPlatform { +internal fun IdeaSerializationContext.IdeaKpmJvmPlatform(proto: IdeaKpmJvmPlatformProto): IdeaKpmJvmPlatform { return IdeaKpmJvmPlatformImpl( jvmTarget = proto.jvmTarget, extras = Extras(proto.extras) ) } -internal fun IdeaKpmSerializationContext.IdeaKpmJvmPlatform(data: ByteArray): IdeaKpmJvmPlatform { +internal fun IdeaSerializationContext.IdeaKpmJvmPlatform(data: ByteArray): IdeaKpmJvmPlatform { return IdeaKpmJvmPlatform(IdeaKpmJvmPlatformProto.parseFrom(data)) } -internal fun IdeaKpmJvmPlatform.toByteArray(context: IdeaKpmSerializationContext): ByteArray { +internal fun IdeaKpmJvmPlatform.toByteArray(context: IdeaSerializationContext): ByteArray { return context.IdeaKpmJvmPlatformProto(this).toByteArray() } /* Native */ -internal fun IdeaKpmSerializationContext.IdeaKpmNativePlatformProto(platform: IdeaKpmNativePlatform): IdeaKpmNativePlatformProto { +internal fun IdeaSerializationContext.IdeaKpmNativePlatformProto(platform: IdeaKpmNativePlatform): IdeaKpmNativePlatformProto { return ideaKpmNativePlatformProto { if (platform.extras.isNotEmpty()) extras = IdeaKpmExtrasProto(platform.extras) konanTarget = platform.konanTarget } } -internal fun IdeaKpmSerializationContext.IdeaKpmNativePlatform(proto: IdeaKpmNativePlatformProto): IdeaKpmNativePlatform { +internal fun IdeaSerializationContext.IdeaKpmNativePlatform(proto: IdeaKpmNativePlatformProto): IdeaKpmNativePlatform { return IdeaKpmNativePlatformImpl( konanTarget = proto.konanTarget, extras = Extras(proto.extras) ) } -internal fun IdeaKpmSerializationContext.IdeaKpmNativePlatform(data: ByteArray): IdeaKpmNativePlatform { +internal fun IdeaSerializationContext.IdeaKpmNativePlatform(data: ByteArray): IdeaKpmNativePlatform { return IdeaKpmNativePlatform(IdeaKpmNativePlatformProto.parseFrom(data)) } -internal fun IdeaKpmNativePlatform.toByteArray(context: IdeaKpmSerializationContext): ByteArray { +internal fun IdeaKpmNativePlatform.toByteArray(context: IdeaSerializationContext): ByteArray { return context.IdeaKpmNativePlatformProto(this).toByteArray() } /* Js */ -internal fun IdeaKpmSerializationContext.IdeaKpmJsPlatformProto(platform: IdeaKpmJsPlatform): IdeaKpmJsPlatformProto { +internal fun IdeaSerializationContext.IdeaKpmJsPlatformProto(platform: IdeaKpmJsPlatform): IdeaKpmJsPlatformProto { return ideaKpmJsPlatformProto { if (platform.extras.isNotEmpty()) extras = IdeaKpmExtrasProto(platform.extras) isIr = platform.isIr } } -internal fun IdeaKpmSerializationContext.IdeaKpmJsPlatform(proto: IdeaKpmJsPlatformProto): IdeaKpmJsPlatform { +internal fun IdeaSerializationContext.IdeaKpmJsPlatform(proto: IdeaKpmJsPlatformProto): IdeaKpmJsPlatform { return IdeaKpmJsPlatformImpl( isIr = proto.isIr, extras = Extras(proto.extras) ) } -internal fun IdeaKpmSerializationContext.IdeaKpmJsPlatform(data: ByteArray): IdeaKpmJsPlatform { +internal fun IdeaSerializationContext.IdeaKpmJsPlatform(data: ByteArray): IdeaKpmJsPlatform { return IdeaKpmJsPlatform(IdeaKpmJsPlatformProto.parseFrom(data)) } -internal fun IdeaKpmJsPlatform.toByteArray(context: IdeaKpmSerializationContext): ByteArray { +internal fun IdeaKpmJsPlatform.toByteArray(context: IdeaSerializationContext): ByteArray { return context.IdeaKpmJsPlatformProto(this).toByteArray() } /* Wasm */ -internal fun IdeaKpmSerializationContext.IdeaKpmWasmPlatformProto(platform: IdeaKpmWasmPlatform): IdeaKpmWasmPlatformProto { +internal fun IdeaSerializationContext.IdeaKpmWasmPlatformProto(platform: IdeaKpmWasmPlatform): IdeaKpmWasmPlatformProto { return ideaKpmWasmPlatformProto { if (platform.extras.isNotEmpty()) extras = IdeaKpmExtrasProto(platform.extras) } } -internal fun IdeaKpmSerializationContext.IdeaKpmWasmPlatform(proto: IdeaKpmWasmPlatformProto): IdeaKpmWasmPlatform { +internal fun IdeaSerializationContext.IdeaKpmWasmPlatform(proto: IdeaKpmWasmPlatformProto): IdeaKpmWasmPlatform { return IdeaKpmWasmPlatformImpl( extras = Extras(proto.extras) ) } -internal fun IdeaKpmSerializationContext.IdeaKpmWasmPlatform(data: ByteArray): IdeaKpmWasmPlatform { +internal fun IdeaSerializationContext.IdeaKpmWasmPlatform(data: ByteArray): IdeaKpmWasmPlatform { return IdeaKpmWasmPlatform(IdeaKpmWasmPlatformProto.parseFrom(data)) } -internal fun IdeaKpmWasmPlatform.toByteArray(context: IdeaKpmSerializationContext): ByteArray { +internal fun IdeaKpmWasmPlatform.toByteArray(context: IdeaSerializationContext): ByteArray { return context.IdeaKpmWasmPlatformProto(this).toByteArray() } /* Unknown */ -internal fun IdeaKpmSerializationContext.IdeaKpmUnknownPlatformProto(platform: IdeaKpmUnknownPlatform): IdeaKpmUnknownPlatformProto { +internal fun IdeaSerializationContext.IdeaKpmUnknownPlatformProto(platform: IdeaKpmUnknownPlatform): IdeaKpmUnknownPlatformProto { return ideaKpmUnknownPlatformProto { if (platform.extras.isNotEmpty()) extras = IdeaKpmExtrasProto(platform.extras) } } -internal fun IdeaKpmSerializationContext.IdeaKpmUnknownPlatform(proto: IdeaKpmUnknownPlatformProto): IdeaKpmUnknownPlatform { +internal fun IdeaSerializationContext.IdeaKpmUnknownPlatform(proto: IdeaKpmUnknownPlatformProto): IdeaKpmUnknownPlatform { return IdeaKpmUnknownPlatformImpl( extras = Extras(proto.extras) ) } -internal fun IdeaKpmSerializationContext.IdeaKpmUnknownPlatform(data: ByteArray): IdeaKpmUnknownPlatform { +internal fun IdeaSerializationContext.IdeaKpmUnknownPlatform(data: ByteArray): IdeaKpmUnknownPlatform { return IdeaKpmUnknownPlatform(IdeaKpmUnknownPlatformProto.parseFrom(data)) } -internal fun IdeaKpmUnknownPlatform.toByteArray(context: IdeaKpmSerializationContext): ByteArray { +internal fun IdeaKpmUnknownPlatform.toByteArray(context: IdeaSerializationContext): ByteArray { return context.IdeaKpmUnknownPlatformProto(this).toByteArray() } diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/project.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/project.kt index f973d3cbdda..bf1bb0cfc7c 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/project.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/project.kt @@ -5,12 +5,12 @@ package org.jetbrains.kotlin.kpm.idea.proto -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmProject -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmProjectImpl -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmSerializationContext +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmProject +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmProjectImpl +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext import java.io.File -internal fun IdeaKpmSerializationContext.IdeaKpmProjectProto(project: IdeaKpmProject): IdeaKpmProjectProto { +internal fun IdeaSerializationContext.IdeaKpmProjectProto(project: IdeaKpmProject): IdeaKpmProjectProto { return ideaKpmProjectProto { gradlePluginVersion = project.gradlePluginVersion coreLibrariesVersion = project.coreLibrariesVersion @@ -20,7 +20,7 @@ internal fun IdeaKpmSerializationContext.IdeaKpmProjectProto(project: IdeaKpmPro } } -internal fun IdeaKpmSerializationContext.IdeaKpmProject(proto: IdeaKpmProjectProto): IdeaKpmProject { +internal fun IdeaSerializationContext.IdeaKpmProject(proto: IdeaKpmProjectProto): IdeaKpmProject { return IdeaKpmProjectImpl( gradlePluginVersion = proto.gradlePluginVersion, coreLibrariesVersion = proto.coreLibrariesVersion, diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/resolvedBinaryDependency.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/resolvedBinaryDependency.kt index d9a997eda17..b266dc4aa95 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/resolvedBinaryDependency.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/resolvedBinaryDependency.kt @@ -5,12 +5,12 @@ package org.jetbrains.kotlin.kpm.idea.proto -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmResolvedBinaryDependency -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmResolvedBinaryDependencyImpl -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmSerializationContext +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmResolvedBinaryDependency +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmResolvedBinaryDependencyImpl +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext import java.io.File -internal fun IdeaKpmSerializationContext.IdeaKpmResolvedBinaryDependencyProto( +internal fun IdeaSerializationContext.IdeaKpmResolvedBinaryDependencyProto( dependency: IdeaKpmResolvedBinaryDependency ): IdeaKpmResolvedBinaryDependencyProto { return ideaKpmResolvedBinaryDependencyProto { @@ -21,7 +21,7 @@ internal fun IdeaKpmSerializationContext.IdeaKpmResolvedBinaryDependencyProto( } } -internal fun IdeaKpmSerializationContext.IdeaKpmResolvedBinaryDependency( +internal fun IdeaSerializationContext.IdeaKpmResolvedBinaryDependency( proto: IdeaKpmResolvedBinaryDependencyProto ): IdeaKpmResolvedBinaryDependency { return IdeaKpmResolvedBinaryDependencyImpl( @@ -32,10 +32,10 @@ internal fun IdeaKpmSerializationContext.IdeaKpmResolvedBinaryDependency( ) } -internal fun IdeaKpmSerializationContext.IdeaKpmResolvedBinaryDependency(data: ByteArray): IdeaKpmResolvedBinaryDependency { +internal fun IdeaSerializationContext.IdeaKpmResolvedBinaryDependency(data: ByteArray): IdeaKpmResolvedBinaryDependency { return IdeaKpmResolvedBinaryDependency(IdeaKpmResolvedBinaryDependencyProto.parseFrom(data)) } -internal fun IdeaKpmResolvedBinaryDependency.toByteArray(context: IdeaKpmSerializationContext): ByteArray { +internal fun IdeaKpmResolvedBinaryDependency.toByteArray(context: IdeaSerializationContext): ByteArray { return context.IdeaKpmResolvedBinaryDependencyProto(this).toByteArray() } diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/unresolvedBinaryDependency.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/unresolvedBinaryDependency.kt index 66ad372cbc8..7d34693a7c7 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/unresolvedBinaryDependency.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/unresolvedBinaryDependency.kt @@ -5,11 +5,11 @@ package org.jetbrains.kotlin.kpm.idea.proto -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmUnresolvedBinaryDependency -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmUnresolvedBinaryDependencyImpl -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmSerializationContext +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmUnresolvedBinaryDependency +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmUnresolvedBinaryDependencyImpl +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext -internal fun IdeaKpmSerializationContext.IdeaKpmUnresolvedBinaryDependencyProto( +internal fun IdeaSerializationContext.IdeaKpmUnresolvedBinaryDependencyProto( dependency: IdeaKpmUnresolvedBinaryDependency ): IdeaKpmUnresolvedBinaryDependencyProto { return ideaKpmUnresolvedBinaryDependencyProto { @@ -19,7 +19,7 @@ internal fun IdeaKpmSerializationContext.IdeaKpmUnresolvedBinaryDependencyProto( } } -internal fun IdeaKpmSerializationContext.IdeaKpmUnresolvedBinaryDependency(proto: IdeaKpmUnresolvedBinaryDependencyProto): IdeaKpmUnresolvedBinaryDependency { +internal fun IdeaSerializationContext.IdeaKpmUnresolvedBinaryDependency(proto: IdeaKpmUnresolvedBinaryDependencyProto): IdeaKpmUnresolvedBinaryDependency { return IdeaKpmUnresolvedBinaryDependencyImpl( cause = if (proto.hasCause()) proto.cause else null, coordinates = if (proto.hasCoordinates()) IdeaKpmBinaryCoordinates(proto.coordinates) else null, @@ -27,10 +27,10 @@ internal fun IdeaKpmSerializationContext.IdeaKpmUnresolvedBinaryDependency(proto ) } -internal fun IdeaKpmSerializationContext.IdeaKpmUnresolvedBinaryDependency(data: ByteArray): IdeaKpmUnresolvedBinaryDependency { +internal fun IdeaSerializationContext.IdeaKpmUnresolvedBinaryDependency(data: ByteArray): IdeaKpmUnresolvedBinaryDependency { return IdeaKpmUnresolvedBinaryDependency(IdeaKpmUnresolvedBinaryDependencyProto.parseFrom(data)) } -internal fun IdeaKpmUnresolvedBinaryDependency.toByteArray(context: IdeaKpmSerializationContext): ByteArray { +internal fun IdeaKpmUnresolvedBinaryDependency.toByteArray(context: IdeaSerializationContext): ByteArray { return context.IdeaKpmUnresolvedBinaryDependencyProto(this).toByteArray() } diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/variant.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/variant.kt index d05dc5e742d..055c452e24a 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/variant.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/variant.kt @@ -5,12 +5,12 @@ package org.jetbrains.kotlin.kpm.idea.proto -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmVariant -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmVariantImpl -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmSerializationContext +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmVariant +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmVariantImpl +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext -internal fun IdeaKpmSerializationContext.IdeaKpmVariantProto(variant: IdeaKpmVariant): IdeaKpmVariantProto { +internal fun IdeaSerializationContext.IdeaKpmVariantProto(variant: IdeaKpmVariant): IdeaKpmVariantProto { return ideaKpmVariantProto { fragment = IdeaKpmFragmentProto(variant) variantAttributes.putAll(variant.variantAttributes) @@ -19,7 +19,7 @@ internal fun IdeaKpmSerializationContext.IdeaKpmVariantProto(variant: IdeaKpmVar } } -internal fun IdeaKpmSerializationContext.IdeaKpmVariant(proto: IdeaKpmVariantProto): IdeaKpmVariant { +internal fun IdeaSerializationContext.IdeaKpmVariant(proto: IdeaKpmVariantProto): IdeaKpmVariant { return IdeaKpmVariantImpl( fragment = IdeaKpmFragment(proto.fragment), platform = IdeaKpmPlatform(proto.platform), @@ -28,10 +28,10 @@ internal fun IdeaKpmSerializationContext.IdeaKpmVariant(proto: IdeaKpmVariantPro ) } -internal fun IdeaKpmSerializationContext.IdeaKpmVariant(data: ByteArray): IdeaKpmVariant { +internal fun IdeaSerializationContext.IdeaKpmVariant(data: ByteArray): IdeaKpmVariant { return IdeaKpmVariant(IdeaKpmVariantProto.parseFrom(data)) } -internal fun IdeaKpmVariant.toByteArray(context: IdeaKpmSerializationContext): ByteArray { +internal fun IdeaKpmVariant.toByteArray(context: IdeaSerializationContext): ByteArray { return context.IdeaKpmVariantProto(this).toByteArray() } diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/AbstractSerializationTest.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/AbstractSerializationTest.kt index 953aa1b21f0..45abb0b5675 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/AbstractSerializationTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/AbstractSerializationTest.kt @@ -5,14 +5,14 @@ package org.jetbrains.kotlin.kpm.idea.proto -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmSerializationContext +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext import org.jetbrains.kotlin.gradle.kpm.idea.testFixtures.TestIdeaKpmExtrasSerializationExtension -import org.jetbrains.kotlin.gradle.kpm.idea.testFixtures.TestIdeaKpmSerializationLogger +import org.jetbrains.kotlin.gradle.kpm.idea.testFixtures.TestIdeaSerializationLogger import kotlin.test.assertEquals -abstract class AbstractSerializationTest : IdeaKpmSerializationContext { +abstract class AbstractSerializationTest : IdeaSerializationContext { - final override val logger = TestIdeaKpmSerializationLogger() + final override val logger = TestIdeaSerializationLogger() final override val extrasSerializationExtension = TestIdeaKpmExtrasSerializationExtension abstract fun serialize(value: T): ByteArray diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/BinaryCoordinatesTest.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/BinaryCoordinatesTest.kt index ea6665609f8..aa0fdb58d7e 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/BinaryCoordinatesTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/BinaryCoordinatesTest.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.kpm.idea.proto -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmBinaryCoordinates -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmBinaryCoordinatesImpl +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmBinaryCoordinates +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmBinaryCoordinatesImpl import org.junit.Test class BinaryCoordinatesTest : AbstractSerializationTest() { diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/CompilationOutputTest.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/CompilationOutputTest.kt index 882439c5ced..a64215fc987 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/CompilationOutputTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/CompilationOutputTest.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.kpm.idea.proto -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmCompilationOutput -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmCompilationOutputImpl +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmCompilationOutput +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmCompilationOutputImpl import org.jetbrains.kotlin.gradle.kpm.idea.testFixtures.TestIdeaKpmInstances import kotlin.test.Test diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/ContainerTest.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/ContainerTest.kt index a2305706985..673ada80d9c 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/ContainerTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/ContainerTest.kt @@ -5,17 +5,17 @@ package org.jetbrains.kotlin.kpm.idea.proto -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmSerializationContext +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext import org.jetbrains.kotlin.gradle.kpm.idea.testFixtures.TestIdeaKpmExtrasSerializationExtension import org.jetbrains.kotlin.gradle.kpm.idea.testFixtures.TestIdeaKpmInstances -import org.jetbrains.kotlin.gradle.kpm.idea.testFixtures.TestIdeaKpmSerializationLogger +import org.jetbrains.kotlin.gradle.kpm.idea.testFixtures.TestIdeaSerializationLogger import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNull import kotlin.test.assertTrue -class ContainerTest : IdeaKpmSerializationContext { - override val logger = TestIdeaKpmSerializationLogger() +class ContainerTest : IdeaSerializationContext { + override val logger = TestIdeaSerializationLogger() override val extrasSerializationExtension = TestIdeaKpmExtrasSerializationExtension @Test diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/FragmentCoordinatesTest.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/FragmentCoordinatesTest.kt index f8e6843a08e..8e8f47e2956 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/FragmentCoordinatesTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/FragmentCoordinatesTest.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.kpm.idea.proto -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmFragmentCoordinates -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmFragmentCoordinatesImpl -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmModuleCoordinatesImpl +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmFragmentCoordinates +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmFragmentCoordinatesImpl +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmModuleCoordinatesImpl import org.junit.Test class FragmentCoordinatesTest : AbstractSerializationTest() { diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/FragmentDependencyTest.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/FragmentDependencyTest.kt index 5c7d9814fe1..affb6eee9ba 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/FragmentDependencyTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/FragmentDependencyTest.kt @@ -5,16 +5,14 @@ package org.jetbrains.kotlin.kpm.idea.proto -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmFragmentCoordinatesImpl -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmFragmentDependency -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmFragmentDependencyImpl -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmModuleCoordinatesImpl -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmSerializationContext +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmFragmentCoordinatesImpl +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmFragmentDependency +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmFragmentDependencyImpl +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmModuleCoordinatesImpl import org.jetbrains.kotlin.tooling.core.extrasKeyOf import org.jetbrains.kotlin.tooling.core.extrasOf import org.jetbrains.kotlin.tooling.core.withValue import kotlin.test.Test -import kotlin.test.assertEquals class FragmentDependencyTest : AbstractSerializationTest() { diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/FragmentTest.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/FragmentTest.kt index 1e35d57762c..5df390fe479 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/FragmentTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/FragmentTest.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.kpm.idea.proto -import org.jetbrains.kotlin.gradle.kpm.idea.* +import org.jetbrains.kotlin.gradle.idea.kpm.* import org.jetbrains.kotlin.gradle.kpm.idea.testFixtures.TestIdeaKpmInstances import kotlin.test.Test import kotlin.test.assertEquals diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/LanguageSettingsTest.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/LanguageSettingsTest.kt index 55529782a85..beef503fbdb 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/LanguageSettingsTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/LanguageSettingsTest.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.kpm.idea.proto -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmLanguageSettings -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmLanguageSettingsImpl +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmLanguageSettings +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmLanguageSettingsImpl import java.io.File import kotlin.test.Test diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/ModuleCoordinatesTest.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/ModuleCoordinatesTest.kt index fefb8e2b846..a9e45279ebf 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/ModuleCoordinatesTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/ModuleCoordinatesTest.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.kpm.idea.proto -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmModuleCoordinates -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmModuleCoordinatesImpl +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmModuleCoordinates +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmModuleCoordinatesImpl import org.jetbrains.kotlin.gradle.kpm.idea.testFixtures.TestIdeaKpmInstances import kotlin.test.Test diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/ModuleTest.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/ModuleTest.kt index f6a8788fec2..90fb882c4bc 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/ModuleTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/ModuleTest.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.kpm.idea.proto -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmModule +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmModule import org.jetbrains.kotlin.gradle.kpm.idea.testFixtures.TestIdeaKpmInstances import kotlin.test.Test diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/PlatformTest.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/PlatformTest.kt index 4d976e7b936..4d8102cf214 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/PlatformTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/PlatformTest.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.kpm.idea.proto -import org.jetbrains.kotlin.gradle.kpm.idea.* +import org.jetbrains.kotlin.gradle.idea.kpm.* import kotlin.test.Test import kotlin.test.assertEquals diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/ProjectTest.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/ProjectTest.kt index 584f5d981f6..0b3a4976490 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/ProjectTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/ProjectTest.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.kpm.idea.proto -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmProject +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmProject import org.jetbrains.kotlin.gradle.kpm.idea.testFixtures.TestIdeaKpmInstances import kotlin.test.Test diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/ResolvedBinaryDependencyTest.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/ResolvedBinaryDependencyTest.kt index d7ee330f8c4..f178b3477b2 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/ResolvedBinaryDependencyTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/ResolvedBinaryDependencyTest.kt @@ -5,17 +5,15 @@ package org.jetbrains.kotlin.kpm.idea.proto -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmBinaryCoordinatesImpl -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmResolvedBinaryDependency -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmResolvedBinaryDependencyImpl -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmSerializationContext +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmBinaryCoordinatesImpl +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmResolvedBinaryDependency +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmResolvedBinaryDependencyImpl import org.jetbrains.kotlin.tooling.core.emptyExtras import org.jetbrains.kotlin.tooling.core.extrasKeyOf import org.jetbrains.kotlin.tooling.core.extrasOf import org.jetbrains.kotlin.tooling.core.withValue import java.io.File import kotlin.test.Test -import kotlin.test.assertEquals class ResolvedBinaryDependencyTest : AbstractSerializationTest() { diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/SourceDirectoryTest.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/SourceDirectoryTest.kt index 29d83535bd8..453c2e41d63 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/SourceDirectoryTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/SourceDirectoryTest.kt @@ -5,8 +5,8 @@ package org.jetbrains.kotlin.kpm.idea.proto -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmContentRoot -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmContentRootImpl +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmContentRoot +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmContentRootImpl import org.jetbrains.kotlin.tooling.core.emptyExtras import org.jetbrains.kotlin.tooling.core.extrasKeyOf import org.jetbrains.kotlin.tooling.core.extrasOf diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/UnresolvedBinaryDependencyTest.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/UnresolvedBinaryDependencyTest.kt index b244435b825..ae325e8d6ac 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/UnresolvedBinaryDependencyTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/UnresolvedBinaryDependencyTest.kt @@ -5,16 +5,14 @@ package org.jetbrains.kotlin.kpm.idea.proto -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmBinaryCoordinatesImpl -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmUnresolvedBinaryDependency -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmUnresolvedBinaryDependencyImpl -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmSerializationContext +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmBinaryCoordinatesImpl +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmUnresolvedBinaryDependency +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmUnresolvedBinaryDependencyImpl import org.jetbrains.kotlin.tooling.core.emptyExtras import org.jetbrains.kotlin.tooling.core.extrasKeyOf import org.jetbrains.kotlin.tooling.core.extrasOf import org.jetbrains.kotlin.tooling.core.withValue import kotlin.test.Test -import kotlin.test.assertEquals class UnresolvedBinaryTest : AbstractSerializationTest() { diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/VariantTest.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/VariantTest.kt index 5952c0a7e14..a90c8fe9d69 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/VariantTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/VariantTest.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.kpm.idea.proto -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmVariant +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmVariant import org.jetbrains.kotlin.gradle.kpm.idea.testFixtures.TestIdeaKpmInstances import kotlin.test.Test diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmBinaryCoordinates.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmBinaryCoordinates.kt similarity index 96% rename from libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmBinaryCoordinates.kt rename to libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmBinaryCoordinates.kt index 3ae95ec1e8b..c60d1fa2400 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmBinaryCoordinates.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmBinaryCoordinates.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.gradle.kpm.idea +package org.jetbrains.kotlin.gradle.idea.kpm import org.jetbrains.kotlin.gradle.InternalKotlinGradlePluginApi diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmCompilationOutput.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmCompilationOutput.kt similarity index 94% rename from libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmCompilationOutput.kt rename to libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmCompilationOutput.kt index e98368310d8..90d770f403f 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmCompilationOutput.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmCompilationOutput.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.gradle.kpm.idea +package org.jetbrains.kotlin.gradle.idea.kpm import org.jetbrains.kotlin.gradle.InternalKotlinGradlePluginApi import java.io.File diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmContentRoot.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmContentRoot.kt similarity index 87% rename from libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmContentRoot.kt rename to libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmContentRoot.kt index d6187168099..6829ce47df8 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmContentRoot.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmContentRoot.kt @@ -5,11 +5,11 @@ @file:Suppress("unused") -package org.jetbrains.kotlin.gradle.kpm.idea +package org.jetbrains.kotlin.gradle.idea.kpm import org.jetbrains.kotlin.gradle.InternalKotlinGradlePluginApi -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmContentRoot.Companion.RESOURCES_TYPE -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmContentRoot.Companion.SOURCES_TYPE +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmContentRoot.Companion.RESOURCES_TYPE +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmContentRoot.Companion.SOURCES_TYPE import org.jetbrains.kotlin.tooling.core.Extras import org.jetbrains.kotlin.tooling.core.emptyExtras import java.io.File diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmDependency.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmDependency.kt similarity index 93% rename from libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmDependency.kt rename to libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmDependency.kt index faf8fb27fc2..0006b96d7b3 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmDependency.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmDependency.kt @@ -5,12 +5,12 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.kpm.idea +package org.jetbrains.kotlin.gradle.idea.kpm import org.jetbrains.kotlin.gradle.InternalKotlinGradlePluginApi -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmDependency.Companion.CLASSPATH_BINARY_TYPE -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmDependency.Companion.DOCUMENTATION_BINARY_TYPE -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmDependency.Companion.SOURCES_BINARY_TYPE +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmDependency.Companion.CLASSPATH_BINARY_TYPE +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmDependency.Companion.DOCUMENTATION_BINARY_TYPE +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmDependency.Companion.SOURCES_BINARY_TYPE import org.jetbrains.kotlin.tooling.core.Extras import org.jetbrains.kotlin.tooling.core.emptyExtras import java.io.File diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmDependencyCoordinates.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmDependencyCoordinates.kt similarity index 86% rename from libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmDependencyCoordinates.kt rename to libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmDependencyCoordinates.kt index 71df823827f..e2a5228fe17 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmDependencyCoordinates.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmDependencyCoordinates.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.gradle.kpm.idea +package org.jetbrains.kotlin.gradle.idea.kpm import java.io.Serializable diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmFragment.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmFragment.kt similarity index 96% rename from libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmFragment.kt rename to libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmFragment.kt index 03f5a9ece9b..cb6b5587c92 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmFragment.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmFragment.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.gradle.kpm.idea +package org.jetbrains.kotlin.gradle.idea.kpm import org.jetbrains.kotlin.gradle.InternalKotlinGradlePluginApi import org.jetbrains.kotlin.tooling.core.Extras diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmFragmentCoordinates.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmFragmentCoordinates.kt similarity index 95% rename from libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmFragmentCoordinates.kt rename to libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmFragmentCoordinates.kt index 900b61a2940..b8c3f60d60b 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmFragmentCoordinates.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmFragmentCoordinates.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.gradle.kpm.idea +package org.jetbrains.kotlin.gradle.idea.kpm import org.jetbrains.kotlin.gradle.InternalKotlinGradlePluginApi import java.io.Serializable diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmLanguageSettings.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmLanguageSettings.kt similarity index 96% rename from libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmLanguageSettings.kt rename to libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmLanguageSettings.kt index 71ad18939a4..55159394141 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmLanguageSettings.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmLanguageSettings.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.gradle.kpm.idea +package org.jetbrains.kotlin.gradle.idea.kpm import org.jetbrains.kotlin.gradle.InternalKotlinGradlePluginApi import java.io.File diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmModule.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmModule.kt similarity index 95% rename from libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmModule.kt rename to libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmModule.kt index 252456e0ea1..cfe654ca02c 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmModule.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmModule.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.gradle.kpm.idea +package org.jetbrains.kotlin.gradle.idea.kpm import org.jetbrains.kotlin.gradle.InternalKotlinGradlePluginApi import java.io.Serializable diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmModuleCoordinates.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmModuleCoordinates.kt similarity index 95% rename from libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmModuleCoordinates.kt rename to libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmModuleCoordinates.kt index 54449e148b7..f936bfc1186 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmModuleCoordinates.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmModuleCoordinates.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.gradle.kpm.idea +package org.jetbrains.kotlin.gradle.idea.kpm import org.jetbrains.kotlin.gradle.InternalKotlinGradlePluginApi import java.io.Serializable diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmPlatform.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmPlatform.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmPlatform.kt rename to libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmPlatform.kt index c1eb7825df7..f65e1a5eff7 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmPlatform.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmPlatform.kt @@ -5,7 +5,7 @@ @file:Suppress("unused") -package org.jetbrains.kotlin.gradle.kpm.idea +package org.jetbrains.kotlin.gradle.idea.kpm import org.jetbrains.kotlin.gradle.InternalKotlinGradlePluginApi import org.jetbrains.kotlin.tooling.core.Extras diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProject.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProject.kt similarity index 95% rename from libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProject.kt rename to libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProject.kt index a630236a87f..f182f07d543 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProject.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProject.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.gradle.kpm.idea +package org.jetbrains.kotlin.gradle.idea.kpm import org.jetbrains.kotlin.gradle.InternalKotlinGradlePluginApi import java.io.File diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProjectContainer.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProjectContainer.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProjectContainer.kt rename to libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProjectContainer.kt index 9384a48c740..1e32b8fd8b9 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProjectContainer.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProjectContainer.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.kpm.idea +package org.jetbrains.kotlin.gradle.idea.kpm import java.io.Serializable diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmVariant.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmVariant.kt similarity index 95% rename from libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmVariant.kt rename to libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmVariant.kt index f720e00d556..6a44bd3e929 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmVariant.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmVariant.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.gradle.kpm.idea +package org.jetbrains.kotlin.gradle.idea.kpm import org.jetbrains.kotlin.gradle.InternalKotlinGradlePluginApi import java.io.Serializable diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/WriteReplacedModel.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/WriteReplacedModel.kt similarity index 87% rename from libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/WriteReplacedModel.kt rename to libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/WriteReplacedModel.kt index 0b19c83bdb8..05a848c0d1b 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/WriteReplacedModel.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/WriteReplacedModel.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.gradle.kpm.idea +package org.jetbrains.kotlin.gradle.idea.kpm import kotlin.reflect.KClass diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/serialize/IdeaExtrasSerializationExtension.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/serialize/IdeaExtrasSerializationExtension.kt new file mode 100644 index 00000000000..d2ea76478b9 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/serialize/IdeaExtrasSerializationExtension.kt @@ -0,0 +1,46 @@ +/* + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.gradle.idea.serialize + +import org.jetbrains.kotlin.tooling.core.Extras + +interface IdeaExtrasSerializationExtension { + fun serializer(key: Extras.Key): IdeaExtrasSerializer? + + object Empty : IdeaExtrasSerializationExtension { + override fun serializer(key: Extras.Key): IdeaExtrasSerializer? = null + } +} + +interface IdeaExtrasSerializationExtensionBuilder { + fun register(key: Extras.Key, serializer: IdeaExtrasSerializer) +} + +fun IdeaExtrasSerializationExtension( + builder: IdeaExtrasSerializationExtensionBuilder.() -> Unit +): IdeaExtrasSerializationExtension { + return IdeaExtrasSerializationExtensionImpl( + IdeaExtrasSerializationExtensionBuilderImpl().apply(builder).serializers + ) +} + +private class IdeaExtrasSerializationExtensionBuilderImpl : IdeaExtrasSerializationExtensionBuilder { + val serializers = mutableMapOf, IdeaExtrasSerializer<*>>() + + override fun register(key: Extras.Key, serializer: IdeaExtrasSerializer) { + serializers[key] = serializer + } +} + + +private class IdeaExtrasSerializationExtensionImpl( + private val map: Map, IdeaExtrasSerializer<*>> +) : IdeaExtrasSerializationExtension { + override fun serializer(key: Extras.Key): IdeaExtrasSerializer? { + @Suppress("unchecked_cast") + return map[key] as? IdeaExtrasSerializer + } +} diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/serialize/IdeaExtrasSerializer.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/serialize/IdeaExtrasSerializer.kt new file mode 100644 index 00000000000..f7b6f81ac17 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/serialize/IdeaExtrasSerializer.kt @@ -0,0 +1,27 @@ +/* + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.gradle.idea.serialize + +import kotlin.reflect.KClass + + +interface IdeaExtrasSerializer { + fun serialize(context: IdeaSerializationContext, value: T): ByteArray? + fun deserialize(context: IdeaSerializationContext, data: ByteArray): T? + + companion object { + /** + * Returns a [IdeaExtrasSerializer] based upon [java.io.Serializable] + */ + fun javaIoSerializable(clazz: KClass): IdeaExtrasSerializer { + return IdeaJavaIoSerializableExtrasSerializer(clazz) + } + + inline fun javaIoSerializable(): IdeaExtrasSerializer { + return javaIoSerializable(T::class) + } + } +} diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeJavaIoSerializableExtrasSerializer.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/serialize/IdeaJavaIoSerializableExtrasSerializer.kt similarity index 80% rename from libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeJavaIoSerializableExtrasSerializer.kt rename to libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/serialize/IdeaJavaIoSerializableExtrasSerializer.kt index acf654d580a..df58967efba 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeJavaIoSerializableExtrasSerializer.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/serialize/IdeaJavaIoSerializableExtrasSerializer.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.gradle.plugin.ide +package org.jetbrains.kotlin.gradle.idea.serialize import java.io.ByteArrayInputStream import java.io.ByteArrayOutputStream @@ -11,11 +11,11 @@ import java.io.ObjectInputStream import java.io.ObjectOutputStream import kotlin.reflect.KClass -internal class IdeJavaIoSerializableExtrasSerializer( +internal class IdeaJavaIoSerializableExtrasSerializer( private val clazz: KClass -) : IdeExtrasSerializer { +) : IdeaExtrasSerializer { - override fun serialize(context: IdeSerializationContext, value: T): ByteArray? { + override fun serialize(context: IdeaSerializationContext, value: T): ByteArray? { return try { ByteArrayOutputStream().use { byteArrayOutputStream -> ObjectOutputStream(byteArrayOutputStream).use { oos -> oos.writeObject(value) } @@ -27,7 +27,7 @@ internal class IdeJavaIoSerializableExtrasSerializer( } } - override fun deserialize(context: IdeSerializationContext, data: ByteArray): T? { + override fun deserialize(context: IdeaSerializationContext, data: ByteArray): T? { return try { ObjectInputStream(ByteArrayInputStream(data)).use { stream -> clazz.java.cast(stream.readObject()) } } catch (t: Throwable) { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeSerializationContext.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/serialize/IdeaSerializationContext.kt similarity index 51% rename from libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeSerializationContext.kt rename to libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/serialize/IdeaSerializationContext.kt index 2e1681f0c7f..972c5196268 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeSerializationContext.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/serialize/IdeaSerializationContext.kt @@ -3,9 +3,9 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.gradle.plugin.ide +package org.jetbrains.kotlin.gradle.idea.serialize -interface IdeSerializationContext { - val logger: IdeSerializationLogger - val extrasSerializationExtension: IdeExtrasSerializationExtension +interface IdeaSerializationContext { + val logger: IdeaSerializationLogger + val extrasSerializationExtension: IdeaExtrasSerializationExtension } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeSerializationLogger.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/serialize/IdeaSerializationLogger.kt similarity index 83% rename from libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeSerializationLogger.kt rename to libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/serialize/IdeaSerializationLogger.kt index 7f6e8b88fd0..ae1aef88d7b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeSerializationLogger.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/serialize/IdeaSerializationLogger.kt @@ -3,9 +3,9 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.gradle.plugin.ide +package org.jetbrains.kotlin.gradle.idea.serialize -interface IdeSerializationLogger { +interface IdeaSerializationLogger { enum class Severity { WARNING, ERROR, @@ -15,7 +15,7 @@ interface IdeSerializationLogger { fun warn(message: String, cause: Throwable? = null) = report(Severity.WARNING, message, cause) fun error(message: String, cause: Throwable? = null) = report(Severity.ERROR, message, cause) - object None : IdeSerializationLogger { + object None : IdeaSerializationLogger { override fun report(severity: Severity, message: String, cause: Throwable?) = Unit } } diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinBinaryDependency.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinBinaryDependency.kt new file mode 100644 index 00000000000..c38f06bdbf8 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinBinaryDependency.kt @@ -0,0 +1,26 @@ +/* + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.gradle.idea.tcs + +import org.jetbrains.kotlin.tooling.core.Extras +import java.io.File + +sealed class IdeaKotlinBinaryDependency : IdeaKotlinDependency { + abstract override val coordinates: IdeaKotlinBinaryCoordinates? +} + +data class IdeaKotlinResolvedBinaryDependency( + val binaryType: String, + val binaryFile: File, + override val extras: Extras, + override val coordinates: IdeaKotlinBinaryCoordinates? +) : IdeaKotlinBinaryDependency() + +data class IdeaKotlinUnresolvedBinaryDependency( + val cause: String?, + override val coordinates: IdeaKotlinBinaryCoordinates?, + override val extras: Extras +) : IdeaKotlinBinaryDependency() \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinDependency.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinDependency.kt new file mode 100644 index 00000000000..11cea523363 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinDependency.kt @@ -0,0 +1,19 @@ +/* + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.gradle.idea.tcs + +import org.jetbrains.kotlin.tooling.core.Extras + +sealed interface IdeaKotlinDependency { + val coordinates: IdeaKotlinDependencyCoordinates? + val extras: Extras + + companion object { + const val CLASSPATH_BINARY_TYPE = "org.jetbrains.kotlin.gradle.idea.tcs.IdeDependency.classpathBinaryType" + const val SOURCES_BINARY_TYPE = "org.jetbrains.kotlin.gradle.idea.tcs.IdeDependency.sourcesBinaryType" + const val DOCUMENTATION_BINARY_TYPE = "org.jetbrains.kotlin.gradle.idea.tcs.IdeDependency.documentationBinaryType" + } +} diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyCoordinates.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinDependencyCoordinates.kt similarity index 53% rename from libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyCoordinates.kt rename to libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinDependencyCoordinates.kt index d4c2b598b34..cf4fd64f362 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyCoordinates.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinDependencyCoordinates.kt @@ -3,24 +3,20 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.gradle.plugin.ide +package org.jetbrains.kotlin.gradle.idea.tcs -sealed class IdeDependencyCoordinates { - /* Reflection helpers */ - val isBinaryCoordinates get() = this is IdeBinaryCoordinates - val isSourceCoordinates get() = this is IdeSourceCoordinates -} +sealed interface IdeaKotlinDependencyCoordinates -data class IdeBinaryCoordinates( +data class IdeaKotlinBinaryCoordinates( val group: String, val module: String, val version: String?, val sourceSetName: String? -) : IdeDependencyCoordinates() +) : IdeaKotlinDependencyCoordinates -data class IdeSourceCoordinates( +data class IdeaKotlinSourceCoordinates( val buildId: String, val projectPath: String, val projectName: String, val sourceSetName: String -) : IdeDependencyCoordinates() \ No newline at end of file +) : IdeaKotlinDependencyCoordinates \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinSourceDependency.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinSourceDependency.kt new file mode 100644 index 00000000000..12ccb664b34 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinSourceDependency.kt @@ -0,0 +1,19 @@ +/* + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.gradle.idea.tcs + +import org.jetbrains.kotlin.tooling.core.Extras +import java.io.Serializable + +data class IdeaKotlinSourceDependency( + val type: Type, + override val coordinates: IdeaKotlinSourceCoordinates, + override val extras: Extras +) : IdeaKotlinDependency { + enum class Type : Serializable { + Regular, Friend, DependsOn + } +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaKpmExtrasSerializationExtension.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaKpmExtrasSerializationExtension.kt deleted file mode 100644 index b1f04638cd1..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaKpmExtrasSerializationExtension.kt +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.gradle.kpm.idea.serialize - -import org.jetbrains.kotlin.tooling.core.Extras - -interface IdeaKpmExtrasSerializationExtension { - fun serializer(key: Extras.Key): IdeaKpmExtrasSerializer? - - object Empty : IdeaKpmExtrasSerializationExtension { - override fun serializer(key: Extras.Key): IdeaKpmExtrasSerializer? = null - } -} - -interface IdeaKpmExtrasSerializationExtensionBuilder { - fun register(key: Extras.Key, serializer: IdeaKpmExtrasSerializer) -} - -fun IdeaKpmExtrasSerializationExtension( - builder: IdeaKpmExtrasSerializationExtensionBuilder.() -> Unit -): IdeaKpmExtrasSerializationExtension { - return IdeaKpmExtrasSerializationExtensionImpl( - IdeaKpmExtrasSerializationExtensionBuilderImpl().apply(builder).serializers - ) -} - -private class IdeaKpmExtrasSerializationExtensionBuilderImpl : IdeaKpmExtrasSerializationExtensionBuilder { - val serializers = mutableMapOf, IdeaKpmExtrasSerializer<*>>() - - override fun register(key: Extras.Key, serializer: IdeaKpmExtrasSerializer) { - serializers[key] = serializer - } -} - - -private class IdeaKpmExtrasSerializationExtensionImpl( - private val map: Map, IdeaKpmExtrasSerializer<*>> -) : IdeaKpmExtrasSerializationExtension { - override fun serializer(key: Extras.Key): IdeaKpmExtrasSerializer? { - @Suppress("unchecked_cast") - return map[key] as? IdeaKpmExtrasSerializer - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaKpmExtrasSerializer.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaKpmExtrasSerializer.kt deleted file mode 100644 index a3e09752d1b..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaKpmExtrasSerializer.kt +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.gradle.kpm.idea.serialize - -import kotlin.reflect.KClass - -interface IdeaKpmExtrasSerializer { - fun serialize(context: IdeaKpmSerializationContext, value: T): ByteArray? - fun deserialize(context: IdeaKpmSerializationContext, data: ByteArray): T? - - companion object { - /** - * Returns a [IdeaKpmExtrasSerializer] based upon [java.io.Serializable] - */ - fun javaIoSerializable(clazz: KClass): IdeaKpmExtrasSerializer { - return IdeaKpmJavaIoSerializableExtrasSerializer(clazz) - } - - inline fun javaIoSerializable(): IdeaKpmExtrasSerializer { - return javaIoSerializable(T::class) - } - } -} - - diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaKpmJavaIoSerializableExtrasSerializer.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaKpmJavaIoSerializableExtrasSerializer.kt deleted file mode 100644 index 1c7436b17c3..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaKpmJavaIoSerializableExtrasSerializer.kt +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.gradle.kpm.idea.serialize - -import java.io.ByteArrayInputStream -import java.io.ByteArrayOutputStream -import java.io.ObjectInputStream -import java.io.ObjectOutputStream -import kotlin.reflect.KClass - -internal class IdeaKpmJavaIoSerializableExtrasSerializer( - private val clazz: KClass -) : IdeaKpmExtrasSerializer { - - override fun serialize(context: IdeaKpmSerializationContext, value: T): ByteArray? { - return try { - ByteArrayOutputStream().use { byteArrayOutputStream -> - ObjectOutputStream(byteArrayOutputStream).use { oos -> oos.writeObject(value) } - byteArrayOutputStream.toByteArray() - } - } catch (t: Throwable) { - context.logger.error("${ErrorMessages.SERIALIZATION_FAILURE} $value", t) - null - } - } - - override fun deserialize(context: IdeaKpmSerializationContext, data: ByteArray): T? { - return try { - ObjectInputStream(ByteArrayInputStream(data)).use { stream -> clazz.java.cast(stream.readObject()) } - } catch (t: Throwable) { - context.logger.error("${ErrorMessages.DESERIALIZATION_FAILURE} ${clazz.java}", t) - null - } - } - - object ErrorMessages { - const val SERIALIZATION_FAILURE = "Failed to serialize" - const val DESERIALIZATION_FAILURE = "Failed to deserialize" - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaKpmSerializationContext.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaKpmSerializationContext.kt deleted file mode 100644 index 32b10ce83ff..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaKpmSerializationContext.kt +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.gradle.kpm.idea.serialize - -interface IdeaKpmSerializationContext { - val extrasSerializationExtension: IdeaKpmExtrasSerializationExtension - val logger: IdeaKpmSerializationLogger -} diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaKpmSerializationLogger.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaKpmSerializationLogger.kt deleted file mode 100644 index 67ee68c184e..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/serialize/IdeaKpmSerializationLogger.kt +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.gradle.kpm.idea.serialize - -interface IdeaKpmSerializationLogger { - enum class Severity { - WARNING, - ERROR, - } - - fun report(severity: Severity, message: String, cause: Throwable? = null) - fun warn(message: String, cause: Throwable? = null) = report(Severity.WARNING, message, cause) - fun error(message: String, cause: Throwable? = null) = report(Severity.ERROR, message, cause) - - object None : IdeaKpmSerializationLogger { - override fun report(severity: Severity, message: String, cause: Throwable?) = Unit - } -} diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/GradleProjectBackwardsCompatibilityDeserializationTest.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/GradleProjectBackwardsCompatibilityDeserializationTest.kt similarity index 94% rename from libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/GradleProjectBackwardsCompatibilityDeserializationTest.kt rename to libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/GradleProjectBackwardsCompatibilityDeserializationTest.kt index b5bcf2795bc..bfc4d77447d 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/GradleProjectBackwardsCompatibilityDeserializationTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/GradleProjectBackwardsCompatibilityDeserializationTest.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.gradle.kpm.idea +package org.jetbrains.kotlin.gradle.idea.kpm import org.gradle.api.internal.project.ProjectInternal import org.gradle.kotlin.dsl.create @@ -13,9 +13,9 @@ import org.jetbrains.kotlin.gradle.kpm.idea.testFixtures.TestIdeaKpmExtrasSerial import org.jetbrains.kotlin.gradle.kpm.idea.testFixtures.copy import org.jetbrains.kotlin.gradle.kpm.idea.testFixtures.createProxyInstance import org.jetbrains.kotlin.gradle.kpm.idea.testFixtures.unwrapProxyInstance -import org.jetbrains.kotlin.gradle.kpm.idea.testUtils.buildIdeaKpmProject -import org.jetbrains.kotlin.gradle.kpm.idea.testUtils.createKpmProject -import org.jetbrains.kotlin.gradle.kpm.idea.testUtils.deserializeIdeaKpmProjectWithBackwardsCompatibleClasses +import org.jetbrains.kotlin.gradle.idea.testUtils.buildIdeaKpmProject +import org.jetbrains.kotlin.gradle.idea.testUtils.createKpmProject +import org.jetbrains.kotlin.gradle.idea.testUtils.deserializeIdeaKpmProjectWithBackwardsCompatibleClasses import org.jetbrains.kotlin.gradle.plugin.KotlinPm20PluginWrapper import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmIosX64Variant import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmLinuxX64Variant diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProjectBackwardsCompatibilityDeserializationTest.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProjectBackwardsCompatibilityDeserializationTest.kt similarity index 89% rename from libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProjectBackwardsCompatibilityDeserializationTest.kt rename to libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProjectBackwardsCompatibilityDeserializationTest.kt index efb35c7882f..afb737e2320 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProjectBackwardsCompatibilityDeserializationTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProjectBackwardsCompatibilityDeserializationTest.kt @@ -3,10 +3,10 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.gradle.kpm.idea +package org.jetbrains.kotlin.gradle.idea.kpm import org.jetbrains.kotlin.gradle.kpm.idea.testFixtures.* -import org.jetbrains.kotlin.gradle.kpm.idea.testUtils.deserializeIdeaKpmProjectWithBackwardsCompatibleClasses +import org.jetbrains.kotlin.gradle.idea.testUtils.deserializeIdeaKpmProjectWithBackwardsCompatibleClasses import org.junit.Test import kotlin.test.assertEquals diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProjectContainerTest.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProjectContainerTest.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProjectContainerTest.kt rename to libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProjectContainerTest.kt index b65173cbf38..ecf2848247d 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProjectContainerTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProjectContainerTest.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.gradle.kpm.idea +package org.jetbrains.kotlin.gradle.idea.kpm import org.jetbrains.kotlin.gradle.kpm.idea.testFixtures.TestIdeaKpmInstances import kotlin.test.* diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProjectObjectGraphTest.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProjectObjectGraphTest.kt similarity index 99% rename from libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProjectObjectGraphTest.kt rename to libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProjectObjectGraphTest.kt index 64e94026636..c2cb789d59c 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProjectObjectGraphTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProjectObjectGraphTest.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.gradle.kpm.idea +package org.jetbrains.kotlin.gradle.idea.kpm import org.jetbrains.kotlin.tooling.core.AbstractExtras import org.jetbrains.kotlin.tooling.core.Extras diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmJavaIoSerializableExtrasSerializerTest.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/serialize/IdeaJavaIoSerializableExtrasSerializerTest.kt similarity index 69% rename from libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmJavaIoSerializableExtrasSerializerTest.kt rename to libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/serialize/IdeaJavaIoSerializableExtrasSerializerTest.kt index 39a789f0192..c8177799cfc 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmJavaIoSerializableExtrasSerializerTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/serialize/IdeaJavaIoSerializableExtrasSerializerTest.kt @@ -3,11 +3,9 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.gradle.kpm.idea +package org.jetbrains.kotlin.gradle.idea.serialize -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmExtrasSerializer -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmJavaIoSerializableExtrasSerializer -import org.jetbrains.kotlin.gradle.kpm.idea.testFixtures.TestIdeaKpmSerializationContext +import org.jetbrains.kotlin.gradle.kpm.idea.testFixtures.TestIdeaSerializationContext import org.jetbrains.kotlin.tooling.core.withLinearClosure import org.junit.Test import java.io.Serializable @@ -16,12 +14,12 @@ import kotlin.test.assertNotNull import kotlin.test.assertNull import kotlin.test.assertTrue -class IdeaKpmJavaIoSerializableExtrasSerializerTest { +class IdeaJavaIoSerializableExtrasSerializerTest { @Test fun `serialize - deserialize - String`() { - val context = TestIdeaKpmSerializationContext() - val serializer = IdeaKpmExtrasSerializer.javaIoSerializable() + val context = TestIdeaSerializationContext() + val serializer = IdeaExtrasSerializer.javaIoSerializable() val binary = assertNotNull( serializer.serialize(context, "Sunny Cash"), "Failed to serialize: ${context.logger.reports}" @@ -36,12 +34,12 @@ class IdeaKpmJavaIoSerializableExtrasSerializerTest { fun `serialize - deserialize - non serializable object`() { class ThisIsNotSerializable - val context = TestIdeaKpmSerializationContext() - val serializer = IdeaKpmExtrasSerializer.javaIoSerializable() + val context = TestIdeaSerializationContext() + val serializer = IdeaExtrasSerializer.javaIoSerializable() assertNull(serializer.serialize(context, ThisIsNotSerializable()), "Expected null return value for non serializable object") val serializationFailureReportsCount = context.logger.reports.count { report -> - report.message.startsWith(IdeaKpmJavaIoSerializableExtrasSerializer.ErrorMessages.SERIALIZATION_FAILURE) + report.message.startsWith(IdeaJavaIoSerializableExtrasSerializer.ErrorMessages.SERIALIZATION_FAILURE) } assertEquals( @@ -60,8 +58,8 @@ class IdeaKpmJavaIoSerializableExtrasSerializerTest { fun readResolve(): Any = throw exception } - val context = TestIdeaKpmSerializationContext() - val serializer = IdeaKpmExtrasSerializer.javaIoSerializable() + val context = TestIdeaSerializationContext() + val serializer = IdeaExtrasSerializer.javaIoSerializable() val binary = assertNotNull(serializer.serialize(context, NotDeserializable())) assertNull(serializer.deserialize(context, binary)) @@ -74,8 +72,8 @@ class IdeaKpmJavaIoSerializableExtrasSerializerTest { val reportMessage = assertNotNull(report.message, "Expected message in issue report") assertTrue( - reportMessage.startsWith(IdeaKpmJavaIoSerializableExtrasSerializer.ErrorMessages.DESERIALIZATION_FAILURE), - "Expected issue report to start with ${IdeaKpmJavaIoSerializableExtrasSerializer.ErrorMessages.DESERIALIZATION_FAILURE}" + reportMessage.startsWith(IdeaJavaIoSerializableExtrasSerializer.ErrorMessages.DESERIALIZATION_FAILURE), + "Expected issue report to start with ${IdeaJavaIoSerializableExtrasSerializer.ErrorMessages.DESERIALIZATION_FAILURE}" ) diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testUtils/CompatibilityTestUtil.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/testUtils/CompatibilityTestUtil.kt similarity index 88% rename from libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testUtils/CompatibilityTestUtil.kt rename to libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/testUtils/CompatibilityTestUtil.kt index 69c5db6b7ca..a38d834dd1e 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testUtils/CompatibilityTestUtil.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/testUtils/CompatibilityTestUtil.kt @@ -3,10 +3,10 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.gradle.kpm.idea.testUtils +package org.jetbrains.kotlin.gradle.idea.testUtils -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmProject -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmSerializationLogger +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmProject +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationLogger import org.jetbrains.kotlin.gradle.kpm.idea.testFixtures.TestIdeaKpmClassLoaderProjectSerializer import java.io.File import java.net.URLClassLoader @@ -49,7 +49,7 @@ fun deserializeIdeaKpmProjectWithBackwardsCompatibleClasses(project: ByteArray): ) assertEquals( - 0, serializer.reports.count { it.severity > IdeaKpmSerializationLogger.Severity.WARNING }, + 0, serializer.reports.count { it.severity > IdeaSerializationLogger.Severity.WARNING }, "Expected no severe deserialization reports. Found ${serializer.reports}" ) diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testUtils/gradleUtils.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/testUtils/gradleUtils.kt similarity index 88% rename from libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testUtils/gradleUtils.kt rename to libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/testUtils/gradleUtils.kt index 65b32ff4af9..cc0592be217 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testUtils/gradleUtils.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/testUtils/gradleUtils.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.gradle.kpm.idea.testUtils +package org.jetbrains.kotlin.gradle.idea.testUtils import org.gradle.api.Project import org.gradle.api.artifacts.verification.DependencyVerificationMode @@ -11,9 +11,9 @@ import org.gradle.api.internal.project.ProjectInternal import org.gradle.configurationcache.extensions.serviceOf import org.gradle.testfixtures.ProjectBuilder import org.gradle.tooling.provider.model.ToolingModelBuilderRegistry -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmProject -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmProjectBinaryContainer -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmProjectContainer +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmProject +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmProjectBinaryContainer +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmProjectContainer import org.jetbrains.kotlin.gradle.plugin.KotlinPm20PluginWrapper import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinPm20ProjectExtension diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/ideDependencyResolutionAssertions.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/ide/testFixtures/ideDependencyResolutionAssertions.kt similarity index 73% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/ideDependencyResolutionAssertions.kt rename to libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/ide/testFixtures/ideDependencyResolutionAssertions.kt index 5aa4b148bab..49b71e9a719 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/ideDependencyResolutionAssertions.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/ide/testFixtures/ideDependencyResolutionAssertions.kt @@ -3,14 +3,12 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.gradle.ide +package org.jetbrains.kotlin.gradle.ide.testFixtures import org.gradle.api.Project -import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet -import org.jetbrains.kotlin.gradle.plugin.ide.IdeDependency -import org.jetbrains.kotlin.gradle.plugin.ide.IdeSourceDependency -import org.jetbrains.kotlin.gradle.plugin.sources.internal -import org.junit.jupiter.api.fail +import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinSourceDependency +import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinDependency +import kotlin.test.fail fun buildIdeDependencyMatchers(notation: Any?): List { return when (notation) { @@ -21,38 +19,35 @@ fun buildIdeDependencyMatchers(notation: Any?): List { } } -fun ideSourceDependency(type: IdeSourceDependency.Type, project: Project, sourceSetName: String): IdeDependencyMatcher { +fun ideSourceDependency(type: IdeaKotlinSourceDependency.Type, project: Project, sourceSetName: String): IdeDependencyMatcher { return IdeSourceDependencyMatcher(type, project.path, sourceSetName) } fun dependsOnDependency(project: Project, sourceSetName: String) = - ideSourceDependency(IdeSourceDependency.Type.DependsOn, project, sourceSetName) - -fun dependsOnDependency(sourceSet: KotlinSourceSet) = - dependsOnDependency(sourceSet.internal.project, sourceSet.name) + ideSourceDependency(IdeaKotlinSourceDependency.Type.DependsOn, project, sourceSetName) interface IdeDependencyMatcher { val description: String - fun matches(dependency: IdeDependency): Boolean + fun matches(dependency: IdeaKotlinDependency): Boolean } private class IdeSourceDependencyMatcher( - val type: IdeSourceDependency.Type, + val type: IdeaKotlinSourceDependency.Type, val projectPath: String, val sourceSetName: String ) : IdeDependencyMatcher { override val description: String = "source($type)::$projectPath/$sourceSetName" - override fun matches(dependency: IdeDependency): Boolean { - if (dependency !is IdeSourceDependency) return false + override fun matches(dependency: IdeaKotlinDependency): Boolean { + if (dependency !is IdeaKotlinSourceDependency) return false return dependency.type == type && dependency.coordinates.projectPath == projectPath && dependency.coordinates.sourceSetName == sourceSetName } } -fun Iterable.assertMatches(vararg notation: Any?) { +fun Iterable.assertMatches(vararg notation: Any?) { val thisList = toList() val matchers = notation.flatMap { buildIdeDependencyMatchers(it) } @@ -88,4 +83,4 @@ fun Iterable.assertMatches(vararg notation: Any?) { } } ) -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmIntExtrasSerializer.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaIntExtrasSerializer.kt similarity index 50% rename from libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmIntExtrasSerializer.kt rename to libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaIntExtrasSerializer.kt index c55b4a07d7b..951a0d72788 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmIntExtrasSerializer.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaIntExtrasSerializer.kt @@ -5,16 +5,16 @@ package org.jetbrains.kotlin.gradle.kpm.idea.testFixtures -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmExtrasSerializer -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmSerializationContext +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaExtrasSerializer +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext import java.nio.ByteBuffer -object TestIdeaKpmIntExtrasSerializer : IdeaKpmExtrasSerializer { - override fun serialize(context: IdeaKpmSerializationContext, value: Int): ByteArray { +object TestIdeaIntExtrasSerializer : IdeaExtrasSerializer { + override fun serialize(context: IdeaSerializationContext, value: Int): ByteArray { return ByteBuffer.allocate(Int.SIZE_BYTES).putInt(value).array() } - override fun deserialize(context: IdeaKpmSerializationContext, data: ByteArray): Int { + override fun deserialize(context: IdeaSerializationContext, data: ByteArray): Int { return ByteBuffer.wrap(data).int } } diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmBinaryDependencyMatcher.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmBinaryDependencyMatcher.kt index b03e43ff76e..8a54e429c8a 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmBinaryDependencyMatcher.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmBinaryDependencyMatcher.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.gradle.kpm.idea.testFixtures -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmBinaryCoordinates -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmBinaryDependency -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmResolvedBinaryDependency +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmBinaryCoordinates +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmBinaryDependency +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmResolvedBinaryDependency import java.io.File fun buildIdeaKpmBinaryDependencyMatchers(notation: Any?): List { diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmClassLoaderProjectSerializer.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmClassLoaderProjectSerializer.kt index fa13d59150f..3bad712ea26 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmClassLoaderProjectSerializer.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmClassLoaderProjectSerializer.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.gradle.kpm.idea.testFixtures -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmProject +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmProject import org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmProject import org.jetbrains.kotlin.kpm.idea.proto.toByteArray import org.jetbrains.kotlin.tooling.core.UnsafeApi @@ -41,12 +41,12 @@ fun TestIdeaKpmClassLoaderProjectSerializer(classLoader: ClassLoader): TestIdeaK /** * Test Util to serialize / deserialize [IdeaKpmProject] within a dedicated ClassLoader. - * The serialization context used will be [TestIdeaKpmSerializationContext]. Note, that this context + * The serialization context used will be [TestIdeaSerializationContext]. Note, that this context * might also depend on the version shipped by the specified [ClassLoader]. */ interface TestIdeaKpmClassLoaderProjectSerializer { val classLoader: ClassLoader - val reports: List + val reports: List fun serialize(project: Any): ByteArray fun deserialize(data: ByteArray): Any? } @@ -55,9 +55,9 @@ interface TestIdeaKpmClassLoaderProjectSerializer { internal class TestIdeaKpmProtoClassLoaderProjectSerializer( override val classLoader: ClassLoader ) : TestIdeaKpmClassLoaderProjectSerializer { - private val context = TestIdeaKpmSerializationContext() + private val context = TestIdeaSerializationContext() - override val reports: List + override val reports: List get() = context.logger.reports override fun serialize(project: Any): ByteArray { diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmDependencyMatcher.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmDependencyMatcher.kt index af04fb9df78..55938b144b0 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmDependencyMatcher.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmDependencyMatcher.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.gradle.kpm.idea.testFixtures -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmDependency +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmDependency interface TestIdeaKpmDependencyMatcher { val description: String diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmExtrasSerializationExtension.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmExtrasSerializationExtension.kt index 8f7c4caa2a6..990fa72710b 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmExtrasSerializationExtension.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmExtrasSerializationExtension.kt @@ -5,23 +5,23 @@ package org.jetbrains.kotlin.gradle.kpm.idea.testFixtures -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmExtrasSerializationExtension -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmExtrasSerializer +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaExtrasSerializationExtension +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaExtrasSerializer import org.jetbrains.kotlin.tooling.core.Extras import org.jetbrains.kotlin.tooling.core.extrasKeyOf import org.jetbrains.kotlin.tooling.core.extrasTypeOf @Suppress("UNCHECKED_CAST") -object TestIdeaKpmExtrasSerializationExtension : IdeaKpmExtrasSerializationExtension { +object TestIdeaKpmExtrasSerializationExtension : IdeaExtrasSerializationExtension { val ignoredStringKey = extrasKeyOf("ignored") val anySerializableKey = extrasKeyOf("serializable") - override fun serializer(key: Extras.Key): IdeaKpmExtrasSerializer? = when { + override fun serializer(key: Extras.Key): IdeaExtrasSerializer? = when { key == ignoredStringKey -> null - key == anySerializableKey -> IdeaKpmExtrasSerializer.javaIoSerializable() - key.type == extrasTypeOf() -> TestIdeaKpmStringExtrasSerializer - key.type == extrasTypeOf() -> TestIdeaKpmIntExtrasSerializer + key == anySerializableKey -> IdeaExtrasSerializer.javaIoSerializable() + key.type == extrasTypeOf() -> TestIdeaStringExtrasSerializer + key.type == extrasTypeOf() -> TestIdeaIntExtrasSerializer else -> null - } as? IdeaKpmExtrasSerializer + } as? IdeaExtrasSerializer } diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmFragmentDependencyMatcher.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmFragmentDependencyMatcher.kt index 7f61f6a5b14..93765e60dcd 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmFragmentDependencyMatcher.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmFragmentDependencyMatcher.kt @@ -1,6 +1,6 @@ package org.jetbrains.kotlin.gradle.kpm.idea.testFixtures -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmFragmentDependency +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmFragmentDependency fun buildIdeaKpmFragmentDependencyMatchers(notation: Any?): List { return when (notation) { diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmInstances.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmInstances.kt index 895a18a5aeb..4d32791df9c 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmInstances.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmInstances.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.gradle.kpm.idea.testFixtures -import org.jetbrains.kotlin.gradle.kpm.idea.* +import org.jetbrains.kotlin.gradle.idea.kpm.* import org.jetbrains.kotlin.tooling.core.emptyExtras import org.jetbrains.kotlin.tooling.core.extrasKeyOf import org.jetbrains.kotlin.tooling.core.extrasOf diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmSerializationContext.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmSerializationContext.kt index 98fa88cd79b..46044066acd 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmSerializationContext.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmSerializationContext.kt @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.gradle.kpm.idea.testFixtures -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmSerializationContext +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext -class TestIdeaKpmSerializationContext : IdeaKpmSerializationContext { - override val logger = TestIdeaKpmSerializationLogger() +class TestIdeaSerializationContext : IdeaSerializationContext { + override val logger = TestIdeaSerializationLogger() override val extrasSerializationExtension = TestIdeaKpmExtrasSerializationExtension } diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmStringExtrasSerializer.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmStringExtrasSerializer.kt deleted file mode 100644 index 2cfd361d335..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmStringExtrasSerializer.kt +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.gradle.kpm.idea.testFixtures - -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmExtrasSerializer -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmSerializationContext -import kotlin.text.decodeToString -import kotlin.text.encodeToByteArray - -object TestIdeaKpmStringExtrasSerializer : IdeaKpmExtrasSerializer { - override fun serialize(context: IdeaKpmSerializationContext, value: String): ByteArray = value.encodeToByteArray() - override fun deserialize(context: IdeaKpmSerializationContext, data: ByteArray) = data.decodeToString() -} diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmSerializationLogger.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaSerializationLogger.kt similarity index 73% rename from libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmSerializationLogger.kt rename to libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaSerializationLogger.kt index 407c8ecbb65..bfba66dcc31 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmSerializationLogger.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaSerializationLogger.kt @@ -5,12 +5,11 @@ package org.jetbrains.kotlin.gradle.kpm.idea.testFixtures -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmSerializationLogger -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmSerializationLogger.Severity +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationLogger +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationLogger.Severity import java.io.Serializable -import kotlin.collections.toList -class TestIdeaKpmSerializationLogger : IdeaKpmSerializationLogger { +class TestIdeaSerializationLogger : IdeaSerializationLogger { data class Report( val severity: Severity, val message: String, diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaStringExtrasSerializer.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaStringExtrasSerializer.kt new file mode 100644 index 00000000000..5a7202a1ad2 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaStringExtrasSerializer.kt @@ -0,0 +1,14 @@ +/* + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.gradle.kpm.idea.testFixtures + +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaExtrasSerializer +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext + +object TestIdeaStringExtrasSerializer : IdeaExtrasSerializer { + override fun serialize(context: IdeaSerializationContext, value: String): ByteArray = value.encodeToByteArray() + override fun deserialize(context: IdeaSerializationContext, data: ByteArray) = data.decodeToString() +} diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/assertions.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/assertions.kt index 0d9093747e2..34d95bdb046 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/assertions.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/assertions.kt @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.gradle.kpm.idea.testFixtures +import org.jetbrains.kotlin.gradle.idea.kpm.* import org.jetbrains.kotlin.gradle.kpm.idea.* import kotlin.test.fail diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/modelUtils.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/modelUtils.kt index 932573451bf..741af345a77 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/modelUtils.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/modelUtils.kt @@ -5,10 +5,10 @@ package org.jetbrains.kotlin.gradle.kpm.idea.testFixtures -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmBinaryCoordinates -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmBinaryCoordinatesImpl -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmBinaryDependency -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmFragment +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmBinaryCoordinates +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmBinaryCoordinatesImpl +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmBinaryDependency +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmFragment fun parseIdeaKpmBinaryCoordinates(coordinates: String): IdeaKpmBinaryCoordinates { val parts = coordinates.split(":") diff --git a/libraries/tools/kotlin-gradle-plugin-kpm-android/src/main/kotlin/org/jetbrains/kotlin/gradle/android/AndroidTargetExtension.kt b/libraries/tools/kotlin-gradle-plugin-kpm-android/src/main/kotlin/org/jetbrains/kotlin/gradle/android/AndroidTargetExtension.kt index 5b8c1a8a99e..975390720a2 100644 --- a/libraries/tools/kotlin-gradle-plugin-kpm-android/src/main/kotlin/org/jetbrains/kotlin/gradle/android/AndroidTargetExtension.kt +++ b/libraries/tools/kotlin-gradle-plugin-kpm-android/src/main/kotlin/org/jetbrains/kotlin/gradle/android/AndroidTargetExtension.kt @@ -11,11 +11,11 @@ package org.jetbrains.kotlin.gradle.android import com.android.build.gradle.AppExtension import com.android.build.gradle.LibraryExtension import org.gradle.kotlin.dsl.findByType +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaExtrasSerializer import org.jetbrains.kotlin.gradle.kpm.external.ExternalVariantApi import org.jetbrains.kotlin.gradle.kpm.external.ideaKpmProjectModelBuilder import org.jetbrains.kotlin.gradle.kpm.external.project import org.jetbrains.kotlin.gradle.kpm.idea.registerExtrasSerializationExtension -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmExtrasSerializer import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinPm20ProjectExtension fun KotlinPm20ProjectExtension.androidPrototype() { @@ -34,6 +34,6 @@ fun KotlinPm20ProjectExtension.androidPrototype() { setupIdeaKpmFragmentDependencyResolver() ideaKpmProjectModelBuilder.registerExtrasSerializationExtension { - register(androidDslKey, IdeaKpmExtrasSerializer.javaIoSerializable()) + register(androidDslKey, IdeaExtrasSerializer.javaIoSerializable()) } } diff --git a/libraries/tools/kotlin-gradle-plugin-kpm-android/src/main/kotlin/org/jetbrains/kotlin/gradle/android/IdeaDependencyResolution.kt b/libraries/tools/kotlin-gradle-plugin-kpm-android/src/main/kotlin/org/jetbrains/kotlin/gradle/android/IdeaDependencyResolution.kt index 8cc8141ecc5..8bf90d2f132 100644 --- a/libraries/tools/kotlin-gradle-plugin-kpm-android/src/main/kotlin/org/jetbrains/kotlin/gradle/android/IdeaDependencyResolution.kt +++ b/libraries/tools/kotlin-gradle-plugin-kpm-android/src/main/kotlin/org/jetbrains/kotlin/gradle/android/IdeaDependencyResolution.kt @@ -10,9 +10,9 @@ import org.gradle.api.attributes.Usage import org.jetbrains.kotlin.gradle.InternalKotlinGradlePluginApi import org.jetbrains.kotlin.gradle.kpm.external.ExternalVariantApi import org.jetbrains.kotlin.gradle.kpm.external.project -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmDependency.Companion.CLASSPATH_BINARY_TYPE +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmDependency.Companion.CLASSPATH_BINARY_TYPE import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmProjectModelBuilder.FragmentConstraint -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmResolvedBinaryDependencyImpl +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmResolvedBinaryDependencyImpl import org.jetbrains.kotlin.gradle.kpm.idea.configureIdeaKpmSpecialPlatformDependencyResolution import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinPm20ProjectExtension diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ExternalVariantPlatformDependencyResolutionDsl.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ExternalVariantPlatformDependencyResolutionDsl.kt index 526fa7f9c9c..dfa11a41766 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ExternalVariantPlatformDependencyResolutionDsl.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ExternalVariantPlatformDependencyResolutionDsl.kt @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.gradle.kpm.idea +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmDependency import org.jetbrains.kotlin.gradle.kpm.external.ExternalVariantApi import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmPlatformDependencyResolver.ArtifactResolution import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmProjectModelBuilder.* diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmDependencyEffect.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmDependencyEffect.kt index 2e35186b6fb..5afac9ed232 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmDependencyEffect.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmDependencyEffect.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.gradle.kpm.idea +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmDependency import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmFragment /** diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmDependencyLogger.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmDependencyLogger.kt index 09ae3845f41..5c27afd4865 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmDependencyLogger.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmDependencyLogger.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.gradle.kpm.idea +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmDependency import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmFragment import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.path diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmDependencyResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmDependencyResolver.kt index 71d70ea0902..afc264d8d4c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmDependencyResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmDependencyResolver.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.gradle.kpm.idea +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmDependency import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmFragment fun interface IdeaKpmDependencyResolver { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmDependencyTransformer.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmDependencyTransformer.kt index cc1dcde7921..cfcfef5bde7 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmDependencyTransformer.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmDependencyTransformer.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.gradle.kpm.idea +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmDependency import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmFragment /** diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmGranularFragmentDependencyResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmGranularFragmentDependencyResolver.kt index 3ecbc7eedc9..214628f45ba 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmGranularFragmentDependencyResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmGranularFragmentDependencyResolver.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.gradle.kpm.idea import org.gradle.api.artifacts.component.ProjectComponentIdentifier +import org.jetbrains.kotlin.gradle.idea.kpm.* import org.jetbrains.kotlin.gradle.plugin.mpp.MetadataDependencyResolution.ChooseVisibleSourceSets import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmFragmentGranularMetadataResolverFactory import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmFragment diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmMetadataBinaryDependencyResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmMetadataBinaryDependencyResolver.kt index b9380ff5f2a..fb4ed3bd5ed 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmMetadataBinaryDependencyResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmMetadataBinaryDependencyResolver.kt @@ -6,6 +6,9 @@ package org.jetbrains.kotlin.gradle.kpm.idea import org.gradle.api.artifacts.component.ModuleComponentIdentifier +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmBinaryCoordinatesImpl +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmDependency +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmResolvedBinaryDependencyImpl import org.jetbrains.kotlin.gradle.plugin.mpp.MetadataDependencyResolution.ChooseVisibleSourceSets import org.jetbrains.kotlin.gradle.plugin.mpp.MetadataDependencyResolution.ChooseVisibleSourceSets.MetadataProvider.ArtifactMetadataProvider import org.jetbrains.kotlin.gradle.plugin.mpp.MetadataDependencyResolution.ChooseVisibleSourceSets.MetadataProvider.ProjectMetadataProvider diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmMissingFileDependencyLogger.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmMissingFileDependencyLogger.kt index 6d46b157b8b..b21a0cb076b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmMissingFileDependencyLogger.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmMissingFileDependencyLogger.kt @@ -5,6 +5,8 @@ package org.jetbrains.kotlin.gradle.kpm.idea +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmDependency +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmResolvedBinaryDependency import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmFragment import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.path import org.jetbrains.kotlin.utils.addToStdlib.ifNotEmpty diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmNativePlatformDependencyResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmNativePlatformDependencyResolver.kt index 924f7b57841..0c1f8099e68 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmNativePlatformDependencyResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmNativePlatformDependencyResolver.kt @@ -9,6 +9,10 @@ import org.gradle.api.Project import org.jetbrains.kotlin.commonizer.KonanDistribution import org.jetbrains.kotlin.commonizer.platformLibsDir import org.jetbrains.kotlin.compilerRunner.konanHome +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmBinaryCoordinatesImpl +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmDependency +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmResolvedBinaryDependency +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmResolvedBinaryDependencyImpl import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmFragment import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmNativeVariantInternal diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmNativeStdlibDependencyResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmNativeStdlibDependencyResolver.kt index 08c60e0f09f..a751160980e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmNativeStdlibDependencyResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmNativeStdlibDependencyResolver.kt @@ -8,6 +8,9 @@ package org.jetbrains.kotlin.gradle.kpm.idea import org.jetbrains.kotlin.commonizer.KonanDistribution import org.jetbrains.kotlin.commonizer.stdlib import org.jetbrains.kotlin.compilerRunner.konanHome +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmBinaryCoordinatesImpl +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmDependency +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmResolvedBinaryDependencyImpl import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmFragment diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmOriginalMetadataDependencyResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmOriginalMetadataDependencyResolver.kt index a9939d2cca6..492dfbf81e7 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmOriginalMetadataDependencyResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmOriginalMetadataDependencyResolver.kt @@ -6,6 +6,9 @@ package org.jetbrains.kotlin.gradle.kpm.idea import org.gradle.api.artifacts.component.ModuleComponentIdentifier +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmBinaryCoordinatesImpl +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmDependency +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmResolvedBinaryDependencyImpl import org.jetbrains.kotlin.gradle.plugin.mpp.MetadataDependencyResolution.KeepOriginalDependency import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmFragmentGranularMetadataResolverFactory import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmFragment diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmPlatformDependencyResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmPlatformDependencyResolver.kt index 78743218a34..e6610dcd3fc 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmPlatformDependencyResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmPlatformDependencyResolver.kt @@ -12,6 +12,7 @@ import org.gradle.api.artifacts.component.ModuleComponentIdentifier import org.gradle.api.artifacts.component.ModuleComponentSelector import org.gradle.api.artifacts.component.ProjectComponentIdentifier import org.gradle.internal.resolve.ModuleVersionResolveException +import org.jetbrains.kotlin.gradle.idea.kpm.* import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmPlatformDependencyResolver.* import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.* import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmConfigurationAttributesSetup diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProjectModelBuilder.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProjectModelBuilder.kt index 0c7e625212a..40d177c98f1 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProjectModelBuilder.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProjectModelBuilder.kt @@ -3,11 +3,15 @@ package org.jetbrains.kotlin.gradle.kpm.idea import org.jetbrains.kotlin.compilerRunner.konanHome +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmProject +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmProjectImpl +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaExtrasSerializationExtension +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaExtrasSerializationExtensionBuilder +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext import org.jetbrains.kotlin.gradle.kpm.external.ExternalVariantApi +import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmProjectModelBuilder.DependencyResolutionLevel.Default +import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmProjectModelBuilder.DependencyResolutionLevel.Overwrite import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmProjectModelBuilder.FragmentConstraint -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmExtrasSerializationExtension -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmExtrasSerializationExtensionBuilder -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmSerializationContext import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType.native import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmFragment @@ -129,10 +133,10 @@ interface IdeaKpmProjectModelBuilder { @ExternalVariantApi fun registerExtrasSerializationExtension( - extension: IdeaKpmExtrasSerializationExtension + extension: IdeaExtrasSerializationExtension ) - fun buildSerializationContext(): IdeaKpmSerializationContext + fun buildSerializationContext(): IdeaSerializationContext fun buildIdeaKpmProject(): IdeaKpmProject @@ -167,7 +171,7 @@ operator fun FragmentConstraint.not() = FragmentConstraint { fragment -> @ExternalVariantApi fun IdeaKpmProjectModelBuilder.registerExtrasSerializationExtension( - builder: IdeaKpmExtrasSerializationExtensionBuilder.() -> Unit + builder: IdeaExtrasSerializationExtensionBuilder.() -> Unit ) { - registerExtrasSerializationExtension(IdeaKpmExtrasSerializationExtension(builder)) + registerExtrasSerializationExtension(IdeaExtrasSerializationExtension(builder)) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProjectModelBuilderImpl.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProjectModelBuilderImpl.kt index 455bba25a2e..48b2cf20f19 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProjectModelBuilderImpl.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProjectModelBuilderImpl.kt @@ -9,10 +9,12 @@ package org.jetbrains.kotlin.gradle.kpm.idea import org.gradle.api.Project import org.gradle.tooling.provider.model.ToolingModelBuilder +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmProject +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmProjectContainer +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaExtrasSerializationExtension +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext import org.jetbrains.kotlin.gradle.kpm.external.ExternalVariantApi import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmProjectModelBuilder.* -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmExtrasSerializationExtension -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmSerializationContext import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinPm20ProjectExtension import org.jetbrains.kotlin.kpm.idea.proto.toByteArray import org.jetbrains.kotlin.tooling.core.UnsafeApi @@ -46,7 +48,7 @@ internal class IdeaKpmProjectModelBuilderImpl @UnsafeApi("Use factory methods in private val registeredDependencyResolvers = mutableListOf() private val registeredDependencyTransformers = mutableListOf() private val registeredDependencyEffects = mutableListOf() - private val registeredExtrasSerializationExtensions = mutableListOf() + private val registeredExtrasSerializationExtensions = mutableListOf() override fun registerDependencyResolver( resolver: IdeaKpmDependencyResolver, @@ -79,13 +81,13 @@ internal class IdeaKpmProjectModelBuilderImpl @UnsafeApi("Use factory methods in } override fun registerExtrasSerializationExtension( - extension: IdeaKpmExtrasSerializationExtension + extension: IdeaExtrasSerializationExtension ) { registeredExtrasSerializationExtensions.add(extension) } - override fun buildSerializationContext(): IdeaKpmSerializationContext { - return IdeaKpmSerializationContext( + override fun buildSerializationContext(): IdeaSerializationContext { + return IdeaSerializationContext( logger = extension.project.logger, extrasSerializationExtensions = registeredExtrasSerializationExtensions.toList() ) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmRefinesDependencyResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmRefinesDependencyResolver.kt index 600950218e5..35e3ddff769 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmRefinesDependencyResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmRefinesDependencyResolver.kt @@ -5,6 +5,9 @@ package org.jetbrains.kotlin.gradle.kpm.idea +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmDependency +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmFragmentDependency +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmFragmentDependencyImpl import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmFragment internal object IdeaKpmRefinesDependencyResolver : IdeaKpmDependencyResolver { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmSerializationContextImpl.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmSerializationContextImpl.kt index 5306ac2f9ab..cdcb3a4501d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmSerializationContextImpl.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmSerializationContextImpl.kt @@ -6,32 +6,32 @@ package org.jetbrains.kotlin.gradle.kpm.idea import org.gradle.api.logging.Logger -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmExtrasSerializationExtension -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmExtrasSerializer -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmSerializationContext -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmSerializationLogger +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaExtrasSerializationExtension +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaExtrasSerializer +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationContext +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaSerializationLogger import org.jetbrains.kotlin.tooling.core.Extras -internal fun IdeaKpmSerializationContext( - logger: Logger, extrasSerializationExtensions: List -): IdeaKpmSerializationContext { - return IdeaKpmSerializationContextImpl( +internal fun IdeaSerializationContext( + logger: Logger, extrasSerializationExtensions: List +): IdeaSerializationContext { + return IdeaSerializationContextImpl( extrasSerializationExtension = IdeaKpmCompositeExtrasSerializationExtension(logger, extrasSerializationExtensions), logger = IdeaKpmSerializationLoggerImpl(logger) ) } -private class IdeaKpmSerializationContextImpl( - override val extrasSerializationExtension: IdeaKpmExtrasSerializationExtension, - override val logger: IdeaKpmSerializationLogger -) : IdeaKpmSerializationContext +private class IdeaSerializationContextImpl( + override val extrasSerializationExtension: IdeaExtrasSerializationExtension, + override val logger: IdeaSerializationLogger +) : IdeaSerializationContext /* Simple composite implementation, reporting conflicting extensions */ private class IdeaKpmCompositeExtrasSerializationExtension( private val logger: Logger, - private val extensions: List -) : IdeaKpmExtrasSerializationExtension { - override fun serializer(key: Extras.Key): IdeaKpmExtrasSerializer? { + private val extensions: List +) : IdeaExtrasSerializationExtension { + override fun serializer(key: Extras.Key): IdeaExtrasSerializer? { val serializers = extensions.mapNotNull { it.serializer(key) } if (serializers.size == 1) { @@ -50,12 +50,12 @@ private class IdeaKpmCompositeExtrasSerializationExtension( /* Simple Gradle logger based implementation */ private class IdeaKpmSerializationLoggerImpl( private val logger: Logger, -) : IdeaKpmSerializationLogger { - override fun report(severity: IdeaKpmSerializationLogger.Severity, message: String, cause: Throwable?) { +) : IdeaSerializationLogger { + override fun report(severity: IdeaSerializationLogger.Severity, message: String, cause: Throwable?) { val text = "[KPM] Serialization: $message" when (severity) { - IdeaKpmSerializationLogger.Severity.WARNING -> logger.warn(text, cause) - IdeaKpmSerializationLogger.Severity.ERROR -> logger.error(text, cause) + IdeaSerializationLogger.Severity.WARNING -> logger.warn(text, cause) + IdeaSerializationLogger.Severity.ERROR -> logger.error(text, cause) } } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmSinglePlatformStdlibCommonFilter.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmSinglePlatformStdlibCommonFilter.kt index a4c356ea904..16c267eb16b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmSinglePlatformStdlibCommonFilter.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmSinglePlatformStdlibCommonFilter.kt @@ -5,6 +5,8 @@ package org.jetbrains.kotlin.gradle.kpm.idea +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmBinaryDependency +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmDependency import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmFragment import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.containingVariants diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmSourcesAndDocumentationResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmSourcesAndDocumentationResolver.kt index d1c74d393a4..875c22c0e7e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmSourcesAndDocumentationResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmSourcesAndDocumentationResolver.kt @@ -14,6 +14,9 @@ import org.gradle.api.component.Artifact import org.gradle.jvm.JvmLibrary import org.gradle.language.base.artifact.SourcesArtifact import org.gradle.language.java.artifact.JavadocArtifact +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmBinaryCoordinatesImpl +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmDependency +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmResolvedBinaryDependencyImpl import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmFragment import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmVariant import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.resolvableMetadataConfigurationName diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmUnusedSourcesAndDocumentationFilter.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmUnusedSourcesAndDocumentationFilter.kt index 75e476d6091..895d23a05c2 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmUnusedSourcesAndDocumentationFilter.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmUnusedSourcesAndDocumentationFilter.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.gradle.kpm.idea +import org.jetbrains.kotlin.gradle.idea.kpm.* import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmFragment internal object IdeaKpmUnusedSourcesAndDocumentationFilter : IdeaKpmDependencyTransformer { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmCompilationOutputBuilder.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmCompilationOutputBuilder.kt index b9d02beb4e9..b384504a7de 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmCompilationOutputBuilder.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmCompilationOutputBuilder.kt @@ -5,6 +5,8 @@ package org.jetbrains.kotlin.gradle.kpm.idea +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmCompilationOutput +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmCompilationOutputImpl import org.jetbrains.kotlin.gradle.plugin.KotlinCompilationOutput internal fun IdeaKpmCompilationOutput(compilation: KotlinCompilationOutput): IdeaKpmCompilationOutput { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmFragmentBuilder.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmFragmentBuilder.kt index 238d3103564..5b4a54527c5 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmFragmentBuilder.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmFragmentBuilder.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.gradle.kpm.idea +import org.jetbrains.kotlin.gradle.idea.kpm.* import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.* internal fun IdeaKpmProjectBuildingContext.IdeaKpmFragment(fragment: GradleKpmFragment): IdeaKpmFragment { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmFragmentCoordinatesBuilder.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmFragmentCoordinatesBuilder.kt index a9225d2b8bf..a558eb5bc79 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmFragmentCoordinatesBuilder.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmFragmentCoordinatesBuilder.kt @@ -5,6 +5,8 @@ package org.jetbrains.kotlin.gradle.kpm.idea +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmFragmentCoordinates +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmFragmentCoordinatesImpl import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmFragment internal fun IdeaKpmFragmentCoordinates(fragment: GradleKpmFragment): IdeaKpmFragmentCoordinates { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmLanguageSettingsBuilder.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmLanguageSettingsBuilder.kt index 0dfd11eaf91..27a501b6c92 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmLanguageSettingsBuilder.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmLanguageSettingsBuilder.kt @@ -5,6 +5,8 @@ package org.jetbrains.kotlin.gradle.kpm.idea +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmLanguageSettings +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmLanguageSettingsImpl import org.jetbrains.kotlin.gradle.plugin.sources.DefaultLanguageSettingsBuilder import org.jetbrains.kotlin.project.model.LanguageSettings diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmModuleBuilder.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmModuleBuilder.kt index 0fca688ebcc..3dcbdf602be 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmModuleBuilder.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmModuleBuilder.kt @@ -5,6 +5,8 @@ package org.jetbrains.kotlin.gradle.kpm.idea +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmModule +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmModuleImpl import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmModule internal fun IdeaKpmProjectBuildingContext.IdeaKpmModule(module: GradleKpmModule): IdeaKpmModule { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmModuleCoordinatesBuilder.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmModuleCoordinatesBuilder.kt index 8e874e4bc14..e4baddc05bf 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmModuleCoordinatesBuilder.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmModuleCoordinatesBuilder.kt @@ -5,6 +5,8 @@ package org.jetbrains.kotlin.gradle.kpm.idea +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmModuleCoordinates +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmModuleCoordinatesImpl import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmModule import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.currentBuildId diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmPlatformBuilder.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmPlatformBuilder.kt index 9222d583b56..78be4348617 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmPlatformBuilder.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmPlatformBuilder.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.gradle.kpm.idea import org.jetbrains.kotlin.config.JvmTarget +import org.jetbrains.kotlin.gradle.idea.kpm.* import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType import org.jetbrains.kotlin.gradle.plugin.mpp.* import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.* diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmProjectModelBuilderFactory.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmProjectModelBuilderFactory.kt index cd81e086a52..6d8167807c4 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmProjectModelBuilderFactory.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmProjectModelBuilderFactory.kt @@ -7,8 +7,8 @@ package org.jetbrains.kotlin.gradle.kpm.idea +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaExtrasSerializer import org.jetbrains.kotlin.gradle.kpm.external.ExternalVariantApi -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmExtrasSerializer import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmFragmentGranularMetadataResolverFactory import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinPm20ProjectExtension import org.jetbrains.kotlin.tooling.core.UnsafeApi @@ -99,6 +99,6 @@ internal fun IdeaKpmProjectModelBuilder.Companion.default( registerExtrasSerializationExtension { /* For transporting debugging breadcrumbs into the ide */ - register(kotlinDebugKey, IdeaKpmExtrasSerializer.javaIoSerializable()) + register(kotlinDebugKey, IdeaExtrasSerializer.javaIoSerializable()) } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependency.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependency.kt deleted file mode 100644 index 117287c3332..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependency.kt +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.gradle.plugin.ide - -import org.jetbrains.kotlin.tooling.core.Extras -import java.io.File -import java.io.Serializable - -sealed class IdeDependency { - abstract val coordinates: IdeDependencyCoordinates? - abstract val extras: Extras - - /* Reflection helper */ - - val isSourceDependency: Boolean get() = this is IdeSourceDependency - val isBinaryDependency: Boolean get() = this is IdeBinaryDependency - val isResolvedBinaryDependency: Boolean get() = this is IdeResolvedBinaryDependency - val isUnresolvedBinaryDependency: Boolean get() = this is IdeUnresolvedBinaryDependency - - companion object { - const val CLASSPATH_BINARY_TYPE = "org.jetbrains.kotlin.gradle.plugin.ide.IdeDependency.classpathBinaryType" - const val SOURCES_BINARY_TYPE = "org.jetbrains.kotlin.gradle.plugin.ide.IdeDependency.sourcesBinaryType" - const val DOCUMENTATION_BINARY_TYPE = "org.jetbrains.kotlin.gradle.plugin.ide.IdeDependency.documentationBinaryType" - } -} - -data class IdeSourceDependency( - val type: Type, - override val coordinates: IdeSourceCoordinates, - override val extras: Extras -) : IdeDependency() { - enum class Type : Serializable { - Regular, Friend, DependsOn - } -} - -sealed class IdeBinaryDependency : IdeDependency() { - abstract override val coordinates: IdeBinaryCoordinates? -} - -data class IdeUnresolvedBinaryDependency( - val cause: String?, - override val coordinates: IdeBinaryCoordinates?, - override val extras: Extras -) : IdeBinaryDependency() - -data class IdeResolvedBinaryDependency( - val binaryType: String, - val binaryFile: File, - override val extras: Extras, - override val coordinates: IdeBinaryCoordinates? -) : IdeBinaryDependency() \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyEffect.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyEffect.kt index 4f3f1e8d200..ddeb52232da 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyEffect.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyEffect.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.gradle.plugin.ide +import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinDependency import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet /** @@ -13,7 +14,7 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet * that the dependency resolution result is final. */ fun interface IdeDependencyEffect { - operator fun invoke(sourceSet: KotlinSourceSet, dependencies: Set) + operator fun invoke(sourceSet: KotlinSourceSet, dependencies: Set) } fun IdeDependencyResolver.withEffect(effect: IdeDependencyEffect) = IdeDependencyResolver { sourceSet -> diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyResolver.kt index ba1739b2b9c..0228d61123b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyResolver.kt @@ -5,13 +5,14 @@ package org.jetbrains.kotlin.gradle.plugin.ide +import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinDependency import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet fun interface IdeDependencyResolver { - fun resolve(sourceSet: KotlinSourceSet): Set + fun resolve(sourceSet: KotlinSourceSet): Set object Empty : IdeDependencyResolver { - override fun resolve(sourceSet: KotlinSourceSet): Set = emptySet() + override fun resolve(sourceSet: KotlinSourceSet): Set = emptySet() } } @@ -45,7 +46,7 @@ operator fun IdeDependencyResolver.plus(other: IdeDependencyResolver): IdeDepend private class IdeCompositeDependencyResolver( val children: List ) : IdeDependencyResolver { - override fun resolve(sourceSet: KotlinSourceSet): Set { + override fun resolve(sourceSet: KotlinSourceSet): Set { return children.flatMap { child -> child.resolve(sourceSet) }.toSet() } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyTransformer.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyTransformer.kt index b621c6a844a..2016a9a865a 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyTransformer.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeDependencyTransformer.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.gradle.plugin.ide +import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinDependency import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet /** @@ -16,7 +17,7 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet * Transformations can be scheduled in different phases see: [IdeMultiplatformImport.DependencyTransformationPhase] */ fun interface IdeDependencyTransformer { - fun transform(sourceSet: KotlinSourceSet, dependencies: Set): Set + fun transform(sourceSet: KotlinSourceSet, dependencies: Set): Set } fun IdeDependencyResolver.withTransformer(transformer: IdeDependencyTransformer) = IdeDependencyResolver { sourceSet -> @@ -52,8 +53,8 @@ private class IdeCompositeDependencyTransformer( val transformers: List ) : IdeDependencyTransformer { override fun transform( - sourceSet: KotlinSourceSet, dependencies: Set - ): Set { + sourceSet: KotlinSourceSet, dependencies: Set + ): Set { return transformers.fold(dependencies) { currentDependencies, transformer -> transformer.transform(sourceSet, currentDependencies) } } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeExtrasSerializationExtension.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeExtrasSerializationExtension.kt deleted file mode 100644 index d0b0df03d99..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeExtrasSerializationExtension.kt +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.gradle.plugin.ide - -import org.jetbrains.kotlin.tooling.core.Extras - -interface IdeExtrasSerializationExtension { - fun serializer(key: Extras.Key): IdeExtrasSerializer? - - object Empty : IdeExtrasSerializationExtension { - override fun serializer(key: Extras.Key): IdeExtrasSerializer? = null - } -} - -interface IdeExtrasSerializationExtensionBuilder { - fun register(key: Extras.Key, serializer: IdeExtrasSerializer) -} - -fun IdeExtrasSerializationExtension( - builder: IdeExtrasSerializationExtensionBuilder.() -> Unit -): IdeExtrasSerializationExtension { - return IdeaKpmExtrasSerializationExtensionImpl( - IdeaExtrasSerializationExtensionBuilderImpl().apply(builder).serializers - ) -} - -private class IdeaExtrasSerializationExtensionBuilderImpl : IdeExtrasSerializationExtensionBuilder { - val serializers = mutableMapOf, IdeExtrasSerializer<*>>() - - override fun register(key: Extras.Key, serializer: IdeExtrasSerializer) { - serializers[key] = serializer - } -} - - -private class IdeaKpmExtrasSerializationExtensionImpl( - private val map: Map, IdeExtrasSerializer<*>> -) : IdeExtrasSerializationExtension { - override fun serializer(key: Extras.Key): IdeExtrasSerializer? { - @Suppress("unchecked_cast") - return map[key] as? IdeExtrasSerializer - } -} diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeExtrasSerializer.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeExtrasSerializer.kt deleted file mode 100644 index 44a247fe98d..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeExtrasSerializer.kt +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.gradle.plugin.ide - -import kotlin.reflect.KClass - - -interface IdeExtrasSerializer { - fun serialize(context: IdeSerializationContext, value: T): ByteArray? - fun deserialize(context: IdeSerializationContext, data: ByteArray): T? - - companion object { - /** - * Returns a [IdeExtrasSerializer] based upon [java.io.Serializable] - */ - fun javaIoSerializable(clazz: KClass): IdeExtrasSerializer { - return IdeJavaIoSerializableExtrasSerializer(clazz) - } - - inline fun javaIoSerializable(): IdeExtrasSerializer { - return javaIoSerializable(T::class) - } - } -} diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImport.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImport.kt index f4738affbc0..7fb1abce0c1 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImport.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImport.kt @@ -9,6 +9,9 @@ package org.jetbrains.kotlin.gradle.plugin.ide import org.gradle.api.Project import org.jetbrains.kotlin.gradle.ExternalKotlinTargetApi import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension +import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinDependency +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaExtrasSerializationExtension +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaExtrasSerializationExtensionBuilder import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.extraProperties import org.jetbrains.kotlin.gradle.plugin.ide.IdeMultiplatformImport.DependencyResolutionLevel.Default @@ -20,7 +23,7 @@ import org.jetbrains.kotlin.tooling.core.Extras interface IdeMultiplatformImport { - fun resolveDependencies(sourceSet: KotlinSourceSet): Set + fun resolveDependencies(sourceSet: KotlinSourceSet): Set fun serialize(key: Extras.Key, value: T): ByteArray? @@ -47,7 +50,7 @@ interface IdeMultiplatformImport { @ExternalKotlinTargetApi fun registerExtrasSerializationExtension( - extension: IdeExtrasSerializationExtension + extension: IdeaExtrasSerializationExtension ) /** @@ -144,7 +147,7 @@ internal val Project.kotlinIdeMultiplatformImport: IdeMultiplatformImport get() @ExternalKotlinTargetApi fun IdeMultiplatformImport.registerExtrasSerializationExtension( - builder: IdeExtrasSerializationExtensionBuilder.() -> Unit + builder: IdeaExtrasSerializationExtensionBuilder.() -> Unit ) { - registerExtrasSerializationExtension(IdeExtrasSerializationExtension(builder)) + registerExtrasSerializationExtension(IdeaExtrasSerializationExtension(builder)) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImportFactory.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImportFactory.kt index 5819b839c0f..3399d4b60b2 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImportFactory.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImportFactory.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.gradle.plugin.ide import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaExtrasSerializer import org.jetbrains.kotlin.gradle.kpm.idea.kotlinDebugKey import org.jetbrains.kotlin.gradle.plugin.ide.dependencyResolvers.IdeDependsOnDependencyResolver @@ -20,7 +21,7 @@ fun IdeMultiplatformImport(extension: KotlinMultiplatformExtension): IdeMultipla ) registerExtrasSerializationExtension { - register(kotlinDebugKey, IdeExtrasSerializer.javaIoSerializable()) + register(kotlinDebugKey, IdeaExtrasSerializer.javaIoSerializable()) } } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImportImpl.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImportImpl.kt index edafed96cbc..d50138595f9 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImportImpl.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImportImpl.kt @@ -7,6 +7,8 @@ package org.jetbrains.kotlin.gradle.plugin.ide import org.jetbrains.kotlin.gradle.ExternalKotlinTargetApi import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension +import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinDependency +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaExtrasSerializationExtension import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.ide.IdeMultiplatformImport.* import org.jetbrains.kotlin.tooling.core.Extras @@ -16,7 +18,7 @@ internal class IdeMultiplatformImportImpl( private val extension: KotlinMultiplatformExtension ) : IdeMultiplatformImport { - override fun resolveDependencies(sourceSet: KotlinSourceSet): Set { + override fun resolveDependencies(sourceSet: KotlinSourceSet): Set { return createDependencyResolver().resolve(sourceSet) } @@ -45,7 +47,7 @@ internal class IdeMultiplatformImportImpl( private val registeredDependencyResolvers = mutableListOf() private val registeredDependencyTransformers = mutableListOf() private val registeredDependencyEffects = mutableListOf() - private val registeredExtrasSerializationExtensions = mutableListOf() + private val registeredExtrasSerializationExtensions = mutableListOf() @ExternalKotlinTargetApi override fun registerDependencyResolver( @@ -78,7 +80,7 @@ internal class IdeMultiplatformImportImpl( } @ExternalKotlinTargetApi - override fun registerExtrasSerializationExtension(extension: IdeExtrasSerializationExtension) { + override fun registerExtrasSerializationExtension(extension: IdeaExtrasSerializationExtension) { registeredExtrasSerializationExtensions.add(extension) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeDependsOnDependencyResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeDependsOnDependencyResolver.kt index 2913aea55fe..dc0e08023d4 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeDependsOnDependencyResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeDependsOnDependencyResolver.kt @@ -6,20 +6,20 @@ package org.jetbrains.kotlin.gradle.plugin.ide.dependencyResolvers import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet -import org.jetbrains.kotlin.gradle.plugin.ide.IdeDependency +import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinDependency import org.jetbrains.kotlin.gradle.plugin.ide.IdeDependencyResolver -import org.jetbrains.kotlin.gradle.plugin.ide.IdeSourceCoordinates -import org.jetbrains.kotlin.gradle.plugin.ide.IdeSourceDependency +import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinSourceCoordinates +import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinSourceDependency import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.currentBuildId import org.jetbrains.kotlin.gradle.plugin.sources.internal import org.jetbrains.kotlin.tooling.core.emptyExtras internal object IdeDependsOnDependencyResolver : IdeDependencyResolver { - override fun resolve(sourceSet: KotlinSourceSet): Set { + override fun resolve(sourceSet: KotlinSourceSet): Set { return sourceSet.internal.dependsOnClosure.map { dependsOnSourceSet -> - IdeSourceDependency( - type = IdeSourceDependency.Type.DependsOn, - coordinates = IdeSourceCoordinates( + IdeaKotlinSourceDependency( + type = IdeaKotlinSourceDependency.Type.DependsOn, + coordinates = IdeaKotlinSourceCoordinates( buildId = dependsOnSourceSet.internal.project.currentBuildId().name, projectPath = dependsOnSourceSet.internal.project.path, projectName = dependsOnSourceSet.internal.project.name, diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeMultiplatformResolveDependsOnDependenciesTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeMultiplatformResolveDependsOnDependenciesTest.kt index 2be72ca5764..7bc1885fa86 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeMultiplatformResolveDependsOnDependenciesTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeMultiplatformResolveDependsOnDependenciesTest.kt @@ -9,7 +9,8 @@ package org.jetbrains.kotlin.gradle.ide import org.jetbrains.kotlin.gradle.buildProjectWithMPP import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension -import org.jetbrains.kotlin.gradle.plugin.ide.IdeSourceDependency +import org.jetbrains.kotlin.gradle.ide.testFixtures.assertMatches +import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinSourceDependency import org.jetbrains.kotlin.gradle.plugin.ide.kotlinIdeMultiplatformImport import kotlin.test.Test @@ -28,12 +29,12 @@ class IdeMultiplatformResolveDependsOnDependenciesTest { project.kotlinIdeMultiplatformImport.resolveDependencies(jvmMain) - .filterIsInstance() + .filterIsInstance() .assertMatches(dependsOnDependency(commonMain)) project.kotlinIdeMultiplatformImport.resolveDependencies(jvmTest) - .filterIsInstance() + .filterIsInstance() .assertMatches(dependsOnDependency(commonTest)) } @@ -50,14 +51,14 @@ class IdeMultiplatformResolveDependsOnDependenciesTest { customMain.dependsOn(commonMain) project.kotlinIdeMultiplatformImport.resolveDependencies(jvmMain) - .filterIsInstance() + .filterIsInstance() .assertMatches( dependsOnDependency(commonMain), dependsOnDependency(customMain) ) project.kotlinIdeMultiplatformImport.resolveDependencies(customMain) - .filterIsInstance() + .filterIsInstance() .assertMatches(dependsOnDependency(commonMain)) } } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/assertions.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/assertions.kt new file mode 100644 index 00000000000..ea27935a792 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/assertions.kt @@ -0,0 +1,12 @@ +/* + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.gradle.ide + +import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet +import org.jetbrains.kotlin.gradle.plugin.sources.internal + +fun dependsOnDependency(sourceSet: KotlinSourceSet) = + org.jetbrains.kotlin.gradle.ide.testFixtures.dependsOnDependency(sourceSet.internal.project, sourceSet.name) \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/AbstractKpmExtensionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/AbstractKpmExtensionTest.kt index 7939ca243c4..e59b9c4feef 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/AbstractKpmExtensionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/AbstractKpmExtensionTest.kt @@ -10,7 +10,7 @@ import org.gradle.api.artifacts.verification.DependencyVerificationMode import org.gradle.api.internal.project.ProjectInternal import org.gradle.testfixtures.ProjectBuilder import org.jetbrains.kotlin.gradle.addBuildEventsListenerRegistryMock -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmProject +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmProject import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinPm20ProjectExtension abstract class AbstractKpmExtensionTest { diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProjectModelSerializableTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProjectModelSerializableTest.kt index 307e46c8e69..acd7c933530 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProjectModelSerializableTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProjectModelSerializableTest.kt @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.gradle.kpm.idea import org.gradle.kotlin.dsl.create +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmProject import org.jetbrains.kotlin.gradle.kpm.AbstractKpmExtensionTest import org.jetbrains.kotlin.gradle.kpm.buildIdeaKpmProjectModel import org.jetbrains.kotlin.gradle.kpm.idea.testFixtures.deserialize diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/MviKotlinIdeaDependencyResolutionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/MviKotlinIdeaDependencyResolutionTest.kt index c93c53034c4..e501fb0707c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/MviKotlinIdeaDependencyResolutionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/MviKotlinIdeaDependencyResolutionTest.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.gradle.android.androidPrototype import org.jetbrains.kotlin.gradle.assumeAndroidSdkAvailable import org.jetbrains.kotlin.gradle.kpm.applyKpmPlugin import org.jetbrains.kotlin.gradle.kpm.buildIdeaKpmProjectModel -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmDependency.Companion.CLASSPATH_BINARY_TYPE +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmDependency.Companion.CLASSPATH_BINARY_TYPE import org.jetbrains.kotlin.gradle.kpm.idea.testFixtures.assertContainsFragment import org.jetbrains.kotlin.gradle.kpm.idea.testFixtures.assertContainsModule import org.jetbrains.kotlin.gradle.kpm.idea.testFixtures.assertIsNotEmpty diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/SimpleProjectToProjectDependencyResolutionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/SimpleProjectToProjectDependencyResolutionTest.kt index b8d26072d07..fa1d781c0f9 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/SimpleProjectToProjectDependencyResolutionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/SimpleProjectToProjectDependencyResolutionTest.kt @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.gradle.kpm.idea +import org.jetbrains.kotlin.gradle.idea.kpm.name import org.jetbrains.kotlin.gradle.kpm.applyKpmPlugin import org.jetbrains.kotlin.gradle.kpm.buildIdeaKpmProjectModel import org.jetbrains.kotlin.gradle.kpm.idea.testFixtures.assertContainsFragment diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/StdlibKotlinIdeaDependencyResolutionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/StdlibKotlinIdeaDependencyResolutionTest.kt index b427188285f..060ed94431a 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/StdlibKotlinIdeaDependencyResolutionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/StdlibKotlinIdeaDependencyResolutionTest.kt @@ -10,7 +10,7 @@ package org.jetbrains.kotlin.gradle.kpm.idea import org.jetbrains.kotlin.gradle.enableDefaultStdlibDependency import org.jetbrains.kotlin.gradle.kpm.applyKpmPlugin import org.jetbrains.kotlin.gradle.kpm.buildIdeaKpmProjectModel -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmDependency.Companion.CLASSPATH_BINARY_TYPE +import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmDependency.Companion.CLASSPATH_BINARY_TYPE import org.jetbrains.kotlin.gradle.kpm.idea.testFixtures.TestIdeaKpmBinaryDependencyMatcher import org.jetbrains.kotlin.gradle.kpm.idea.testFixtures.assertContainsFragment import org.jetbrains.kotlin.gradle.kpm.idea.testFixtures.assertIsNotEmpty