From 2b0a63f3565f620f7212a822aee2575a46f44897 Mon Sep 17 00:00:00 2001 From: Vadim Mishenev Date: Wed, 1 Nov 2023 18:46:55 +0200 Subject: Update Kotlin compiler and KGP to 1.9.20-RC2 (#3262) * Update Kotlin compiler to 1.9.20-RC2 The current changes are related to https://github.com/JetBrains/kotlin/commit/d797505f06d640b666829bbfb4b7d7c67f812026 * Update KGP to 1.9.20-RC2 * Replace common stdlib in unit tests * Update Kotlin version in integration tests * Fix `Multiplatform0GradleIntegrationTest` * Turn WasmGradleIntegrationTest off for Kotlin 1.9.20-RC2 --- .../configuration/resolve/DokkaJsResolverForModuleFactory.kt | 1 - .../resolve/DokkaKlibMetadataCommonDependencyContainer.kt | 7 ++----- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'subprojects/analysis-kotlin-descriptors/compiler/src/main/kotlin') diff --git a/subprojects/analysis-kotlin-descriptors/compiler/src/main/kotlin/org/jetbrains/dokka/analysis/kotlin/descriptors/compiler/configuration/resolve/DokkaJsResolverForModuleFactory.kt b/subprojects/analysis-kotlin-descriptors/compiler/src/main/kotlin/org/jetbrains/dokka/analysis/kotlin/descriptors/compiler/configuration/resolve/DokkaJsResolverForModuleFactory.kt index 6957bcbf..98f9c64a 100644 --- a/subprojects/analysis-kotlin-descriptors/compiler/src/main/kotlin/org/jetbrains/dokka/analysis/kotlin/descriptors/compiler/configuration/resolve/DokkaJsResolverForModuleFactory.kt +++ b/subprojects/analysis-kotlin-descriptors/compiler/src/main/kotlin/org/jetbrains/dokka/analysis/kotlin/descriptors/compiler/configuration/resolve/DokkaJsResolverForModuleFactory.kt @@ -44,7 +44,6 @@ internal class DokkaJsResolverForModuleFactory( metadataFactories.DefaultDescriptorFactory, metadataFactories.DefaultPackageFragmentsFactory, metadataFactories.flexibleTypeDeserializer, - metadataFactories.platformDependentTypeTransformer ) } diff --git a/subprojects/analysis-kotlin-descriptors/compiler/src/main/kotlin/org/jetbrains/dokka/analysis/kotlin/descriptors/compiler/configuration/resolve/DokkaKlibMetadataCommonDependencyContainer.kt b/subprojects/analysis-kotlin-descriptors/compiler/src/main/kotlin/org/jetbrains/dokka/analysis/kotlin/descriptors/compiler/configuration/resolve/DokkaKlibMetadataCommonDependencyContainer.kt index 80166830..09f4e48a 100644 --- a/subprojects/analysis-kotlin-descriptors/compiler/src/main/kotlin/org/jetbrains/dokka/analysis/kotlin/descriptors/compiler/configuration/resolve/DokkaKlibMetadataCommonDependencyContainer.kt +++ b/subprojects/analysis-kotlin-descriptors/compiler/src/main/kotlin/org/jetbrains/dokka/analysis/kotlin/descriptors/compiler/configuration/resolve/DokkaKlibMetadataCommonDependencyContainer.kt @@ -16,7 +16,6 @@ import org.jetbrains.kotlin.library.metadata.DeserializedKlibModuleOrigin import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.library.metadata.KlibMetadataFactories import org.jetbrains.kotlin.library.KotlinLibrary -import org.jetbrains.kotlin.library.metadata.NativeTypeTransformer import org.jetbrains.kotlin.library.metadata.NullFlexibleTypeDeserializer import org.jetbrains.kotlin.library.metadata.parseModuleHeader import org.jetbrains.kotlin.name.Name @@ -107,8 +106,7 @@ internal class DokkaKlibMetadataCommonDependencyContainer( KlibMetadataModuleDescriptorFactoryImpl( MetadataFactories.DefaultDescriptorFactory, MetadataFactories.DefaultPackageFragmentsFactory, - MetadataFactories.flexibleTypeDeserializer, - MetadataFactories.platformDependentTypeTransformer + MetadataFactories.flexibleTypeDeserializer ) } @@ -138,6 +136,5 @@ internal class DokkaKlibMetadataCommonDependencyContainer( private val MetadataFactories = KlibMetadataFactories( { DefaultBuiltIns.Instance }, - NullFlexibleTypeDeserializer, - NativeTypeTransformer() + NullFlexibleTypeDeserializer ) -- cgit