From ebce1a1d2d68df7392cc69b66a328561b05a5f96 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Mon, 30 May 2022 11:47:54 +0200 Subject: [PATCH] Fix warnings in gradle70 variant This allowed to enable warning-as-errors for :k-g-p:gradle70 compilation ^KT-47047 In Progress --- buildSrc/src/main/kotlin/common-configuration.gradle.kts | 1 - .../kotlin/org/jetbrains/kotlin/gradle/plugin/PluginWrappers.kt | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/common-configuration.gradle.kts b/buildSrc/src/main/kotlin/common-configuration.gradle.kts index a345f5bacdd..62beccabd7c 100644 --- a/buildSrc/src/main/kotlin/common-configuration.gradle.kts +++ b/buildSrc/src/main/kotlin/common-configuration.gradle.kts @@ -153,7 +153,6 @@ fun Project.configureKotlinCompilationOptions() { // TODO: fix remaining warnings and remove this property. val tasksWithWarnings = listOf( ":kotlin-gradle-plugin:compileCommonKotlin", - ":kotlin-gradle-plugin:compileGradle70Kotlin" ) val projectsWithEnabledContextReceivers: List by rootProject.extra diff --git a/libraries/tools/kotlin-gradle-plugin/src/gradle70/kotlin/org/jetbrains/kotlin/gradle/plugin/PluginWrappers.kt b/libraries/tools/kotlin-gradle-plugin/src/gradle70/kotlin/org/jetbrains/kotlin/gradle/plugin/PluginWrappers.kt index 27478a93b67..dfddefdfc1b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/gradle70/kotlin/org/jetbrains/kotlin/gradle/plugin/PluginWrappers.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/gradle70/kotlin/org/jetbrains/kotlin/gradle/plugin/PluginWrappers.kt @@ -44,10 +44,12 @@ open class KotlinMultiplatformPluginWrapper : AbstractKotlinMultiplatformPluginW override val pluginVariant: String = PLUGIN_VARIANT_NAME } +@Suppress("unused") open class KotlinJsPluginWrapper : AbstractKotlinJsPluginWrapper() { override val pluginVariant: String = PLUGIN_VARIANT_NAME } +@Suppress("unused") open class KotlinPm20PluginWrapper @Inject constructor( objectFactory: ObjectFactory ) : AbstractKotlinPm20PluginWrapper(objectFactory) {