[Gradle] Fix compilation warnings
^KT-62527 In Progress
This commit is contained in:
committed by
Space Team
parent
0264fc29b8
commit
63d615d220
+2
-2
@@ -82,9 +82,9 @@ object KotlinToolingDiagnostics {
|
||||
val cause = if (sourceSetNames.size == 1) {
|
||||
"The Kotlin source set ${sourceSetNames.single()} was configured but not added to any Kotlin compilation.\n"
|
||||
} 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" +
|
||||
sourceSetNames
|
||||
sourceSetNamesString
|
||||
}
|
||||
|
||||
val details =
|
||||
|
||||
+1
-2
@@ -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.KotlinToolingDiagnosticsCollector
|
||||
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.targets.js.ir.KotlinJsIrTargetPreset
|
||||
|
||||
@@ -43,7 +42,7 @@ internal object KotlinTargetAlreadyDeclaredChecker : KotlinGradleProjectChecker
|
||||
private val KotlinTarget.targetDslFunctionName
|
||||
get() = when (preset) {
|
||||
is KotlinJsIrTargetPreset -> "js"
|
||||
is KotlinJsTargetPreset -> "js"
|
||||
is org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsTargetPreset -> "js"
|
||||
is KotlinAndroidTargetPreset -> "androidTarget"
|
||||
else -> preset?.name
|
||||
}
|
||||
|
||||
+1
@@ -150,6 +150,7 @@ private class KotlinHierarchyBuilderImpl(
|
||||
// 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 }
|
||||
|
||||
@Deprecated("Renamed to 'withWasmJs''", replaceWith = ReplaceWith("withWasmJs()"))
|
||||
override fun withWasm() = withWasmJs()
|
||||
|
||||
override fun withWasmJs() = withTargets {
|
||||
|
||||
+4
-1
@@ -127,7 +127,10 @@ abstract class AbstractKotlinTarget(
|
||||
): Set<DefaultKotlinUsageContext> {
|
||||
return listOfNotNull(
|
||||
COMPILE to apiElementsConfigurationName,
|
||||
(RUNTIME to runtimeElementsConfigurationName).takeIf { producingCompilation is KotlinCompilationToRunnableFiles }
|
||||
(RUNTIME to runtimeElementsConfigurationName).takeIf {
|
||||
@Suppress("DEPRECATION")
|
||||
producingCompilation is KotlinCompilationToRunnableFiles
|
||||
}
|
||||
).mapTo(mutableSetOf()) { (mavenScope, dependenciesConfigurationName) ->
|
||||
DefaultKotlinUsageContext(
|
||||
producingCompilation,
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@ import javax.inject.Inject
|
||||
interface KotlinMetadataCompilation<T : KotlinCommonOptions> : KotlinCompilation<T>
|
||||
|
||||
open class KotlinCommonCompilation @Inject internal constructor(compilation: KotlinCompilationImpl) :
|
||||
AbstractKotlinCompilation<KotlinCommonOptions>(compilation),
|
||||
@Suppress("DEPRECATION") AbstractKotlinCompilation<KotlinCommonOptions>(compilation),
|
||||
KotlinMetadataCompilation<KotlinCommonOptions> {
|
||||
@Suppress("DEPRECATION")
|
||||
@Deprecated("Accessing task instance directly is deprecated", replaceWith = ReplaceWith("compileTaskProvider"))
|
||||
|
||||
+2
-2
@@ -9,7 +9,6 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
|
||||
import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
|
||||
import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.factory.KotlinCompilationImplFactory
|
||||
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].
|
||||
@@ -22,8 +21,9 @@ internal object KotlinCompilationLanguageSettingsConfigurator : KotlinCompilatio
|
||||
) return
|
||||
|
||||
// Ignoring jsLegacy as it shares a source set with jsIR
|
||||
@Suppress("DEPRECATION")
|
||||
if (compilation.platformType == KotlinPlatformType.js &&
|
||||
compilation.target is KotlinJsTarget
|
||||
compilation.target is org.jetbrains.kotlin.gradle.targets.js.KotlinJsTarget
|
||||
) return
|
||||
|
||||
val languageSettingsBuilder = (compilation.defaultSourceSet.languageSettings as DefaultLanguageSettingsBuilder)
|
||||
|
||||
Reference in New Issue
Block a user