[Gradle] Fix compilation warnings

^KT-62527 In Progress
This commit is contained in:
Anton Lakotka
2023-12-17 22:47:17 +01:00
committed by Space Team
parent 0264fc29b8
commit 63d615d220
6 changed files with 11 additions and 8 deletions
@@ -82,9 +82,9 @@ object KotlinToolingDiagnostics {
val cause = if (sourceSetNames.size == 1) { val cause = if (sourceSetNames.size == 1) {
"The Kotlin source set ${sourceSetNames.single()} was configured but not added to any Kotlin compilation.\n" "The Kotlin source set ${sourceSetNames.single()} was configured but not added to any Kotlin compilation.\n"
} else { } else {
val sourceSetNames = sourceSetNames.joinToString("\n") { " * $it" } val sourceSetNamesString = sourceSetNames.joinToString("\n") { " * $it" }
"The following Kotlin source sets were configured but not added to any Kotlin compilation:\n" + "The following Kotlin source sets were configured but not added to any Kotlin compilation:\n" +
sourceSetNames sourceSetNamesString
} }
val details = val details =
@@ -11,7 +11,6 @@ import org.jetbrains.kotlin.gradle.plugin.diagnostics.KotlinGradleProjectChecker
import org.jetbrains.kotlin.gradle.plugin.diagnostics.KotlinToolingDiagnostics.KotlinTargetAlreadyDeclared import org.jetbrains.kotlin.gradle.plugin.diagnostics.KotlinToolingDiagnostics.KotlinTargetAlreadyDeclared
import org.jetbrains.kotlin.gradle.plugin.diagnostics.KotlinToolingDiagnosticsCollector import org.jetbrains.kotlin.gradle.plugin.diagnostics.KotlinToolingDiagnosticsCollector
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinAndroidTargetPreset import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinAndroidTargetPreset
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsTargetPreset
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinMetadataTarget import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinMetadataTarget
import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTargetPreset import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTargetPreset
@@ -43,7 +42,7 @@ internal object KotlinTargetAlreadyDeclaredChecker : KotlinGradleProjectChecker
private val KotlinTarget.targetDslFunctionName private val KotlinTarget.targetDslFunctionName
get() = when (preset) { get() = when (preset) {
is KotlinJsIrTargetPreset -> "js" is KotlinJsIrTargetPreset -> "js"
is KotlinJsTargetPreset -> "js" is org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsTargetPreset -> "js"
is KotlinAndroidTargetPreset -> "androidTarget" is KotlinAndroidTargetPreset -> "androidTarget"
else -> preset?.name else -> preset?.name
} }
@@ -150,6 +150,7 @@ private class KotlinHierarchyBuilderImpl(
// Don't check for instance of [KotlinJsTargetDsl] or [KotlinWasmTargetDsl] because they are implemented by single target [KotlinJsIrTarget] // Don't check for instance of [KotlinJsTargetDsl] or [KotlinWasmTargetDsl] because they are implemented by single target [KotlinJsIrTarget]
override fun withJs() = withTargets { it.platformType == KotlinPlatformType.js } override fun withJs() = withTargets { it.platformType == KotlinPlatformType.js }
@Deprecated("Renamed to 'withWasmJs''", replaceWith = ReplaceWith("withWasmJs()"))
override fun withWasm() = withWasmJs() override fun withWasm() = withWasmJs()
override fun withWasmJs() = withTargets { override fun withWasmJs() = withTargets {
@@ -127,7 +127,10 @@ abstract class AbstractKotlinTarget(
): Set<DefaultKotlinUsageContext> { ): Set<DefaultKotlinUsageContext> {
return listOfNotNull( return listOfNotNull(
COMPILE to apiElementsConfigurationName, COMPILE to apiElementsConfigurationName,
(RUNTIME to runtimeElementsConfigurationName).takeIf { producingCompilation is KotlinCompilationToRunnableFiles } (RUNTIME to runtimeElementsConfigurationName).takeIf {
@Suppress("DEPRECATION")
producingCompilation is KotlinCompilationToRunnableFiles
}
).mapTo(mutableSetOf()) { (mavenScope, dependenciesConfigurationName) -> ).mapTo(mutableSetOf()) { (mavenScope, dependenciesConfigurationName) ->
DefaultKotlinUsageContext( DefaultKotlinUsageContext(
producingCompilation, producingCompilation,
@@ -18,7 +18,7 @@ import javax.inject.Inject
interface KotlinMetadataCompilation<T : KotlinCommonOptions> : KotlinCompilation<T> interface KotlinMetadataCompilation<T : KotlinCommonOptions> : KotlinCompilation<T>
open class KotlinCommonCompilation @Inject internal constructor(compilation: KotlinCompilationImpl) : open class KotlinCommonCompilation @Inject internal constructor(compilation: KotlinCompilationImpl) :
AbstractKotlinCompilation<KotlinCommonOptions>(compilation), @Suppress("DEPRECATION") AbstractKotlinCompilation<KotlinCommonOptions>(compilation),
KotlinMetadataCompilation<KotlinCommonOptions> { KotlinMetadataCompilation<KotlinCommonOptions> {
@Suppress("DEPRECATION") @Suppress("DEPRECATION")
@Deprecated("Accessing task instance directly is deprecated", replaceWith = ReplaceWith("compileTaskProvider")) @Deprecated("Accessing task instance directly is deprecated", replaceWith = ReplaceWith("compileTaskProvider"))
@@ -9,7 +9,6 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.KotlinCompilationImplFactory import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.KotlinCompilationImplFactory
import org.jetbrains.kotlin.gradle.plugin.sources.DefaultLanguageSettingsBuilder import org.jetbrains.kotlin.gradle.plugin.sources.DefaultLanguageSettingsBuilder
import org.jetbrains.kotlin.gradle.targets.js.KotlinJsTarget
/** /**
* Wires compilations compiler options into source sets [org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet.languageSettings]. * Wires compilations compiler options into source sets [org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet.languageSettings].
@@ -22,8 +21,9 @@ internal object KotlinCompilationLanguageSettingsConfigurator : KotlinCompilatio
) return ) return
// Ignoring jsLegacy as it shares a source set with jsIR // Ignoring jsLegacy as it shares a source set with jsIR
@Suppress("DEPRECATION")
if (compilation.platformType == KotlinPlatformType.js && if (compilation.platformType == KotlinPlatformType.js &&
compilation.target is KotlinJsTarget compilation.target is org.jetbrains.kotlin.gradle.targets.js.KotlinJsTarget
) return ) return
val languageSettingsBuilder = (compilation.defaultSourceSet.languageSettings as DefaultLanguageSettingsBuilder) val languageSettingsBuilder = (compilation.defaultSourceSet.languageSettings as DefaultLanguageSettingsBuilder)