From 1be8480aed3d31e6263bce554d345db84324520a Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Mon, 30 May 2022 11:31:22 +0200 Subject: [PATCH] Suppress deprecations for MavenPluginConfiguratorG6 This allowed to enable warning-as-errors for :k-g-p:main compilation ^KT-47047 In Progress --- buildSrc/src/main/kotlin/common-configuration.gradle.kts | 1 - .../kotlin/gradle/plugin/internal/MavenPluginConfiguratorG6.kt | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/common-configuration.gradle.kts b/buildSrc/src/main/kotlin/common-configuration.gradle.kts index 0d8605b0204..a345f5bacdd 100644 --- a/buildSrc/src/main/kotlin/common-configuration.gradle.kts +++ b/buildSrc/src/main/kotlin/common-configuration.gradle.kts @@ -152,7 +152,6 @@ fun Project.configureKotlinCompilationOptions() { // TODO: fix remaining warnings and remove this property. val tasksWithWarnings = listOf( - ":kotlin-gradle-plugin:compileKotlin", ":kotlin-gradle-plugin:compileCommonKotlin", ":kotlin-gradle-plugin:compileGradle70Kotlin" ) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/internal/MavenPluginConfiguratorG6.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/internal/MavenPluginConfiguratorG6.kt index 624fd4f256d..c74f398dfd7 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/internal/MavenPluginConfiguratorG6.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/internal/MavenPluginConfiguratorG6.kt @@ -2,6 +2,7 @@ * 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. */ +@file:Suppress("DEPRECATION") package org.jetbrains.kotlin.gradle.plugin.internal @@ -15,7 +16,6 @@ import org.gradle.api.tasks.Upload import org.jetbrains.kotlin.gradle.plugin.mpp.AbstractKotlinTarget import org.jetbrains.kotlin.gradle.plugin.mpp.PomDependenciesRewriter -@Suppress("DEPRECATION") class MavenPluginConfiguratorG6 : MavenPluginConfigurator { override fun applyConfiguration( project: Project,