From 5dc4f1d9d9d19505836cbe0250f1b7752aae6851 Mon Sep 17 00:00:00 2001 From: Oleksandr Karpovich Date: Mon, 20 Sep 2021 16:41:35 +0200 Subject: [PATCH] Remove WarnAboutComposeWithSerialization.kt (#1167) Since kotlin 1.5.30, kotlinx.serialization plugin is forced to run its transformations before any other plugin. This made compose and kotlinx.serialization compatible, therefore no need to warn about their simultaneous usage. Co-authored-by: Oleksandr Karpovich --- .../org/jetbrains/compose/ComposePlugin.kt | 3 --- .../WarnAboutComposeWithSerialization.kt | 18 ------------------ 2 files changed, 21 deletions(-) delete mode 100644 gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/internal/WarnAboutComposeWithSerialization.kt diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt index 5630ddbce7..6c6ca656ff 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt @@ -16,7 +16,6 @@ import org.jetbrains.compose.desktop.DesktopExtension import org.jetbrains.compose.desktop.application.internal.configureApplicationImpl import org.jetbrains.compose.desktop.application.internal.currentTarget import org.jetbrains.compose.desktop.preview.internal.initializePreview -import org.jetbrains.compose.internal.checkAndWarnAboutComposeWithSerialization import org.jetbrains.compose.web.internal.initializeWeb import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler import org.jetbrains.kotlin.gradle.tasks.KotlinCompile @@ -107,8 +106,6 @@ class ComposePlugin : Plugin { useIR = true } } - - project.checkAndWarnAboutComposeWithSerialization() } object Dependencies { diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/internal/WarnAboutComposeWithSerialization.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/internal/WarnAboutComposeWithSerialization.kt deleted file mode 100644 index 8ca6c7f2e9..0000000000 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/internal/WarnAboutComposeWithSerialization.kt +++ /dev/null @@ -1,18 +0,0 @@ -package org.jetbrains.compose.internal - -import org.gradle.api.Project - -internal fun Project.checkAndWarnAboutComposeWithSerialization() { - project.plugins.withId("org.jetbrains.kotlin.plugin.serialization") { - val warningMessage = """ - - >>> COMPOSE WARNING - >>> Project `${project.name}` has `compose` and `kotlinx.serialization` plugins applied! - >>> Consider using these plugins in separate modules to avoid compilation errors - >>> Check more details here: https://github.com/JetBrains/compose-jb/issues/738 - - """.trimIndent() - - logger.warn(warningMessage) - } -}