diff --git a/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt b/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt index 37a199b1f4e..6e3b69ca531 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt @@ -250,6 +250,7 @@ private fun Printer.generateDeclaration( println("package ${type.parent()}") println() } + println("@Suppress(\"DEPRECATION\")") print("$modifiers ${type.shortName()} ") afterType?.let { print("$afterType ") } println("{") diff --git a/libraries/examples/kotlin-gradle-subplugin-example/src/main/kotlin/example/CompilerPlugin.kt b/libraries/examples/kotlin-gradle-subplugin-example/src/main/kotlin/example/CompilerPlugin.kt index 5e8694b18c0..fc304ae77a1 100644 --- a/libraries/examples/kotlin-gradle-subplugin-example/src/main/kotlin/example/CompilerPlugin.kt +++ b/libraries/examples/kotlin-gradle-subplugin-example/src/main/kotlin/example/CompilerPlugin.kt @@ -16,16 +16,16 @@ package example +import com.intellij.mock.MockProject import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity import org.jetbrains.kotlin.cli.common.messages.MessageCollector -import org.jetbrains.kotlin.config.CompilerConfigurationKey -import org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor import org.jetbrains.kotlin.compiler.plugin.CliOption -import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.compiler.plugin.CliOptionProcessingException +import org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar -import com.intellij.mock.MockProject +import org.jetbrains.kotlin.config.CompilerConfiguration +import org.jetbrains.kotlin.config.CompilerConfigurationKey public object ExampleConfigurationKeys { public val EXAMPLE_KEY: CompilerConfigurationKey = CompilerConfigurationKey.create("example argument") @@ -46,7 +46,7 @@ public class ExampleCommandLineProcessor : CommandLineProcessor { when (option) { EXAMPLE_OPTION -> configuration.put(ExampleConfigurationKeys.EXAMPLE_KEY, value) EXAMPLE_LEGACY_OPTION -> configuration.put(ExampleConfigurationKeys.EXAMPLE_LEGACY_KEY, value) - else -> throw CliOptionProcessingException("Unknown option: ${option.name}") + else -> throw CliOptionProcessingException("Unknown option: ${option.optionName}") } } } diff --git a/libraries/examples/kotlin-gradle-subplugin-example/src/main/kotlin/example/ExampleLegacySubplugin.kt b/libraries/examples/kotlin-gradle-subplugin-example/src/main/kotlin/example/ExampleLegacySubplugin.kt index 568d7e19475..5206b9172f7 100644 --- a/libraries/examples/kotlin-gradle-subplugin-example/src/main/kotlin/example/ExampleLegacySubplugin.kt +++ b/libraries/examples/kotlin-gradle-subplugin-example/src/main/kotlin/example/ExampleLegacySubplugin.kt @@ -20,7 +20,7 @@ import org.gradle.api.Project import org.gradle.api.tasks.compile.AbstractCompile import org.jetbrains.kotlin.gradle.plugin.* -class ExampleLegacySubplugin : KotlinGradleSubplugin { +class ExampleLegacySubplugin : @Suppress("DEPRECATION") KotlinGradleSubplugin { override fun isApplicable(project: Project, task: AbstractCompile): Boolean { return true @@ -46,4 +46,4 @@ class ExampleLegacySubplugin : KotlinGradleSubplugin { override fun getPluginArtifact(): SubpluginArtifact = JetBrainsSubpluginArtifact("kotlin-gradle-subplugin-example") -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt index 20f902475fe..39149945017 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt @@ -2,6 +2,7 @@ // Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt package org.jetbrains.kotlin.gradle.dsl +@Suppress("DEPRECATION") interface KotlinCommonOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonToolOptions { /** diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonToolOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonToolOptions.kt index 168dc421879..36fecda12ef 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonToolOptions.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonToolOptions.kt @@ -2,6 +2,7 @@ // Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt package org.jetbrains.kotlin.gradle.dsl +@Suppress("DEPRECATION") interface KotlinCommonToolOptions { /** diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt index 7c93f8a431a..775f9769408 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt @@ -1,3 +1,8 @@ +/* + * Copyright 2010-2021 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. + */ + package org.jetbrains.kotlin.gradle import com.intellij.testFramework.TestDataFile @@ -464,11 +469,11 @@ abstract class BaseGradleIT { val errors = "(?m)^.*\\[ERROR] \\[\\S+] (.*)$".toRegex().findAll(output) val errorMessage = buildString { - appendln("Gradle build failed") - appendln() + appendLine("Gradle build failed") + appendLine() if (errors.any()) { - appendln("Possible errors:") - errors.forEach { match -> appendln(match.groupValues[1]) } + appendLine("Possible errors:") + errors.forEach { match -> appendLine(match.groupValues[1]) } } } fail(errorMessage) @@ -863,10 +868,10 @@ Finished executing task ':$taskName'| } val xmlString = buildString { - appendln("") - appendln("") + appendLine("") + appendLine("") files.forEach { file -> - appendln( + appendLine( file.readText() .trimTrailingWhitespaces() .replace(projectDir.absolutePath, "/\$PROJECT_DIR$") @@ -874,7 +879,7 @@ Finished executing task ':$taskName'| .replace("\n", "") ) } - appendln("") + appendLine("") } val doc = SAXBuilder().build(xmlString.reader()) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt index 5513f3810e4..14502759f10 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt @@ -75,7 +75,7 @@ class KotlinGradleIT : BaseGradleIT() { wd1.deleteRecursively() if (wd1.exists()) { val files = buildString { - wd1.walk().forEach { appendln(" " + it.relativeTo(wd1).path) } + wd1.walk().forEach { appendLine(" " + it.relativeTo(wd1).path) } } error("Some files in $wd1 were not removed:\n$files") } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MppHighlightingTestDataWithGradleIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MppHighlightingTestDataWithGradleIT.kt index 9dbbc0abc97..1af3ea69d10 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MppHighlightingTestDataWithGradleIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MppHighlightingTestDataWithGradleIT.kt @@ -55,11 +55,11 @@ class MppHighlightingTestDataWithGradleIT : BaseGradleIT() { // create Gradle Kotlin source sets for project roots: val scriptCustomization = buildString { - appendln() - appendln("kotlin {\n sourceSets {") + appendLine() + appendLine("kotlin {\n sourceSets {") sourceRoots.forEach { sourceRoot -> if (sourceRoot.kotlinSourceSetName != "commonMain") { - appendln( + appendLine( """ create("${sourceRoot.kotlinSourceSetName}") { | dependsOn(getByName("commonMain")) | listOf(${cliCompiler.targets.joinToString { "$it()" }}).forEach { @@ -70,7 +70,7 @@ class MppHighlightingTestDataWithGradleIT : BaseGradleIT() { """.trimMargin() ) } else { - appendln(" // commonMain source set used for common module") + appendLine(" // commonMain source set used for common module") } } @@ -79,11 +79,11 @@ class MppHighlightingTestDataWithGradleIT : BaseGradleIT() { sourceRoot.dependencies.forEach { dependency -> sourceRoots.find { it.qualifiedName == dependency }?.let { depSourceRoot -> val depSourceSet = depSourceRoot.kotlinSourceSetName - appendln(""" getByName("${sourceRoot.kotlinSourceSetName}").dependsOn(getByName("$depSourceSet"))""") + appendLine(""" getByName("${sourceRoot.kotlinSourceSetName}").dependsOn(getByName("$depSourceSet"))""") } } } - appendln(" }\n}") + appendLine(" }\n}") } gradleBuildScript().appendText("\n" + scriptCustomization) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/fileUtil.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/fileUtil.kt index 15889932883..363b2a36bcf 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/fileUtil.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/fileUtil.kt @@ -1,3 +1,8 @@ +/* + * Copyright 2010-2021 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. + */ + package org.jetbrains.kotlin.gradle.util import java.io.File @@ -70,7 +75,9 @@ fun normalizePath(path: String): String { } private fun normalizeTail(prefixEnd: Int, path: String, separator: Boolean): String { + @Suppress("NAME_SHADOWING") var separator = separator + val result = StringBuilder(path.length) result.append(path, 0, prefixEnd) var start = prefixEnd @@ -92,4 +99,4 @@ private fun normalizeTail(prefixEnd: Int, path: String, separator: Boolean): Str } return result.toString() -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/gradleRunningUtils.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/gradleRunningUtils.kt index 1cda8ae0506..7429166762b 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/gradleRunningUtils.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/gradleRunningUtils.kt @@ -1,6 +1,12 @@ +/* + * Copyright 2010-2021 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. + */ + package org.jetbrains.kotlin.gradle.util import org.jetbrains.kotlin.gradle.BaseGradleIT +import org.jetbrains.kotlin.gradle.SYSTEM_LINE_SEPARATOR import java.io.File class ProcessRunResult( @@ -39,7 +45,7 @@ fun runProcess( if (options?.forceOutputToStdout ?: false) { println(it) } - sb.appendln(it) + sb.append(it).append(SYSTEM_LINE_SEPARATOR) } val exitCode = process.waitFor() diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/CInteropCommonizerTaskTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/CInteropCommonizerTaskTest.kt index 0a8bcf2da5e..657a8eab420 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/CInteropCommonizerTaskTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/CInteropCommonizerTaskTest.kt @@ -406,8 +406,8 @@ class CInteropCommonizerTaskTest : MultiplatformExtensionTest() { iosX64.testCinteropIdentifier("iosX64TestHelper") ) - val mainGroup = groups.maxBy { it.targets.size }!! - val testGroup = groups.minBy { it.targets.size }!! + val mainGroup = groups.maxByOrNull { it.targets.size }!! + val testGroup = groups.minByOrNull { it.targets.size }!! assertEquals( expectedMainGroup, mainGroup, diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceOptions.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceOptions.kt index a7f5615d279..a7e89fda2af 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceOptions.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceOptions.kt @@ -2,6 +2,7 @@ // Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt package org.jetbrains.kotlin.gradle.dsl +@Suppress("DEPRECATION") interface KotlinJsDceOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonToolOptions { /** diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceOptionsBase.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceOptionsBase.kt index 78b0041c725..217a71895fb 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceOptionsBase.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceOptionsBase.kt @@ -2,6 +2,7 @@ // Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt package org.jetbrains.kotlin.gradle.dsl +@Suppress("DEPRECATION") internal abstract class KotlinJsDceOptionsBase : org.jetbrains.kotlin.gradle.dsl.KotlinJsDceOptions { private var allWarningsAsErrorsField: kotlin.Boolean? = null diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt index 6d5238012d5..c50a92bd0b5 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt @@ -2,6 +2,7 @@ // Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt package org.jetbrains.kotlin.gradle.dsl +@Suppress("DEPRECATION") interface KotlinJsOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions { /** diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsBase.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsBase.kt index 9c4be548f54..8197c78350f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsBase.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsBase.kt @@ -2,6 +2,7 @@ // Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt package org.jetbrains.kotlin.gradle.dsl +@Suppress("DEPRECATION") internal abstract class KotlinJsOptionsBase : org.jetbrains.kotlin.gradle.dsl.KotlinJsOptions { private var allWarningsAsErrorsField: kotlin.Boolean? = null diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt index c5c3fc3766d..261a5a1efc4 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt @@ -2,6 +2,7 @@ // Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt package org.jetbrains.kotlin.gradle.dsl +@Suppress("DEPRECATION") interface KotlinJvmOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions { /** diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsBase.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsBase.kt index 575e10c5955..1d524ff6c78 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsBase.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsBase.kt @@ -2,6 +2,7 @@ // Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt package org.jetbrains.kotlin.gradle.dsl +@Suppress("DEPRECATION") internal abstract class KotlinJvmOptionsBase : org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions { private var allWarningsAsErrorsField: kotlin.Boolean? = null diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonOptions.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonOptions.kt index 7fdab16d5db..e7f0b3e88be 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonOptions.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonOptions.kt @@ -2,5 +2,6 @@ // Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt package org.jetbrains.kotlin.gradle.dsl +@Suppress("DEPRECATION") interface KotlinMultiplatformCommonOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions { } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonOptionsBase.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonOptionsBase.kt index 5d034a4733e..f6847b31d4c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonOptionsBase.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinMultiplatformCommonOptionsBase.kt @@ -2,6 +2,7 @@ // Generated by org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt package org.jetbrains.kotlin.gradle.dsl +@Suppress("DEPRECATION") internal abstract class KotlinMultiplatformCommonOptionsBase : org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformCommonOptions { private var allWarningsAsErrorsField: kotlin.Boolean? = null diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/incremental/ClasspathChangesComputer.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/incremental/ClasspathChangesComputer.kt index 6a9328c437e..4f23d9a28ce 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/incremental/ClasspathChangesComputer.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/incremental/ClasspathChangesComputer.kt @@ -73,6 +73,7 @@ object ClasspathChangesComputer { return Success } + @Suppress("UNUSED_PARAMETER") private fun collectClassChanges( current: ClassSnapshot, previous: ClassSnapshot, diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/incremental/ClasspathSnapshotter.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/incremental/ClasspathSnapshotter.kt index 437b6686f68..c244f0cadc0 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/incremental/ClasspathSnapshotter.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/incremental/ClasspathSnapshotter.kt @@ -30,6 +30,7 @@ object ClasspathEntrySnapshotter { @Suppress("SpellCheckingInspection") object ClassSnapshotter { + @Suppress("UNUSED_PARAMETER") fun snapshot(invariantSeparatorsRelativePath: String, classContents: ByteArray): ClassSnapshot { // TODO WORK-IN-PROGRESS return ClassSnapshot() diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/CompilerArgumentsContributor.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/CompilerArgumentsContributor.kt index 9377ec63977..aa4af7a199c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/CompilerArgumentsContributor.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/CompilerArgumentsContributor.kt @@ -110,7 +110,10 @@ internal open class KotlinJvmCompilerArgumentsContributor( private fun warnJdkHomeNotUsed(kotlinOptions: List) { kotlinOptions - .firstOrNull { it.jdkHome != null } + .firstOrNull { + @Suppress("DEPRECATION") + it.jdkHome != null + } ?.run { logger.warn( """ diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/internal/KotlinCompilationsModuleGroups.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/internal/KotlinCompilationsModuleGroups.kt index 9630d131a24..fb61dc922f8 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/internal/KotlinCompilationsModuleGroups.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/internal/KotlinCompilationsModuleGroups.kt @@ -44,7 +44,7 @@ internal class KotlinCompilationsModuleGroups { val newLeader = singleOrNull { it.isMain() } ?: singleOrNull { it.name.contains("main", true) } ?: singleOrNull { !it.name.contains("test", true) } - ?: minBy { it.name }!! + ?: minByOrNull { it.name }!! forEach { moduleLeaderCompilationMap[it] = newLeader } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependencyExtension.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependencyExtension.kt index 4a511692aef..0956515d1c2 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependencyExtension.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependencyExtension.kt @@ -167,11 +167,11 @@ private abstract class NpmDependencyExtensionDelegate( return when (val arg = args[0]) { is String -> withName( name = arg, - args = *args + args = args ) is GString -> withName( name = arg.toString(), - args = *args + args = args ) else -> processNonStringFirstArgument(arg, *args) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/internal/testing/RecordingTestResultProcessor.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/internal/testing/RecordingTestResultProcessor.kt index 39358595831..051a1c1a9a4 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/internal/testing/RecordingTestResultProcessor.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/internal/testing/RecordingTestResultProcessor.kt @@ -1,3 +1,8 @@ +/* + * Copyright 2010-2021 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. + */ + package org.jetbrains.kotlin.gradle.internal.testing import org.gradle.api.internal.tasks.testing.* @@ -9,7 +14,7 @@ class RecordingTestResultProcessor : TestResultProcessor { fun line(line: String) { repeat(indent) { output.append(" ") } - output.appendln(line) + output.append(line).append("\n") } override fun started(test: TestDescriptorInternal, event: TestStartEvent) { @@ -37,4 +42,4 @@ class RecordingTestResultProcessor : TestResultProcessor { indent-- line("COMPLETED ${event.resultType} // $testId") } -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/SourceSetVisibilityInferenceTest.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/SourceSetVisibilityInferenceTest.kt index 0d7d1e67a97..da4e190b0f8 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/SourceSetVisibilityInferenceTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/SourceSetVisibilityInferenceTest.kt @@ -311,7 +311,7 @@ class MockKotlinCompilation( override val compileDependencyConfigurationName: String get() = throw UnsupportedOperationException() override var compileDependencyFiles: FileCollection get() = throw UnsupportedOperationException() - set(value) = throw UnsupportedOperationException() + set(_) = throw UnsupportedOperationException() override val output: KotlinCompilationOutput get() = throw UnsupportedOperationException() override val compileKotlinTaskName: String get() = throw UnsupportedOperationException() override val compileKotlinTask: KotlinCompile get() = throw UnsupportedOperationException() @@ -325,4 +325,4 @@ class MockKotlinCompilation( //endregion override fun toString(): String = "compilation '${name}'" -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/GradleNodeModuleBuilderTest.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/GradleNodeModuleBuilderTest.kt index 51c92101230..2e87f52e268 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/GradleNodeModuleBuilderTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/GradleNodeModuleBuilderTest.kt @@ -20,7 +20,7 @@ class GradleNodeModuleBuilderTest { ) assertNotNull(packageJson, "package.json should be deserialized") - with(packageJson!!) { + with(packageJson) { listOf( dependencies, devDependencies, @@ -32,4 +32,4 @@ class GradleNodeModuleBuilderTest { } } } -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-project-model/build.gradle.kts b/libraries/tools/kotlin-project-model/build.gradle.kts index bdb79989aef..8dccbeb9e12 100644 --- a/libraries/tools/kotlin-project-model/build.gradle.kts +++ b/libraries/tools/kotlin-project-model/build.gradle.kts @@ -20,7 +20,7 @@ pill { kotlin.target.compilations.all { kotlinOptions.languageVersion = "1.4" kotlinOptions.apiVersion = "1.4" - kotlinOptions.freeCompilerArgs += listOf("-Xskip-prerelease-check") + kotlinOptions.freeCompilerArgs += listOf("-Xskip-prerelease-check", "-Xsuppress-version-warnings") } tasks.named("jar") { diff --git a/libraries/tools/kotlin-tooling-metadata/src/test/kotlin/org/jetbrains/kotlin/tooling/DeserializeStringTest.kt b/libraries/tools/kotlin-tooling-metadata/src/test/kotlin/org/jetbrains/kotlin/tooling/DeserializeStringTest.kt index dbd26bcced2..6ee284950f5 100644 --- a/libraries/tools/kotlin-tooling-metadata/src/test/kotlin/org/jetbrains/kotlin/tooling/DeserializeStringTest.kt +++ b/libraries/tools/kotlin-tooling-metadata/src/test/kotlin/org/jetbrains/kotlin/tooling/DeserializeStringTest.kt @@ -5,21 +5,11 @@ package org.jetbrains.kotlin.tooling -import junit.framework.Assert.assertFalse -import junit.framework.Assert.assertTrue import org.intellij.lang.annotations.Language import org.junit.Test -import kotlin.test.assertEquals -import kotlin.test.assertNotNull -import kotlin.test.assertNull - -/* - * Copyright 2010-2021 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. - */ +import kotlin.test.* class DeserializeStringTest { - @Test fun `schemaVersion 1 0 0`() { @Language("JSON") val json = """ @@ -135,4 +125,3 @@ class DeserializeStringTest { assertNull(commonTarget.extras.native) } } -