From f92558d1c3081d06106eaa640dcd105bed1e6871 Mon Sep 17 00:00:00 2001 From: Pavel Kirpichenkov Date: Tue, 27 Dec 2022 18:54:46 +0200 Subject: [PATCH] Minor: code cleanup KT-55530 --- .../tcs/IdeSourceDependencyResolutionTest.kt | 1 - ...ansformedMetadataDependencyResolverTest.kt | 2 +- .../gradle/regression/CInteropTaskTest.kt | 2 ++ .../gradle/regression/CommonizerTaskTests.kt | 19 +++++++++---------- .../IdeImportPropertiesConsistencyTest.kt | 2 +- .../regression/KT31459JvmMainClassesTest.kt | 11 +++++++---- .../regression/KT55347JsProjectImport.kt | 4 +++- .../KotlinCompileTaskSourcesTest.kt | 3 +-- .../gradle/unit/CInteropCommonizerTaskTest.kt | 3 +-- .../unit/CompilationSpecificPluginPath.kt | 4 ++-- .../unit/CompositeMetadataArtifactTest.kt | 2 ++ ...isabledCInteropCommonizationWarningTest.kt | 10 +++++----- .../unit/KotlinAndroidDependsOnEdgesTest.kt | 4 ++-- .../unit/KotlinTargetHierarchyDslTest.kt | 2 +- .../kotlin/gradle/unit/MppPublicationTest.kt | 9 ++++----- .../unit/WhenEvaluatedAndroidOrderingTest.kt | 2 +- .../kpm/BuildKotlinToolingMetadataTest.kt | 2 ++ .../TransitiveRuntimeOnlyConfigurationTest.kt | 2 -- .../sources/InternalKotlinSourceSetTest.kt | 2 +- .../SourceSetVisibilityInferenceTest.kt | 2 +- .../SingleTargetAndroidSourceSetLayoutTest.kt | 2 +- .../android/TestDiagnosticsReporter.kt | 2 +- .../kotlin/gradle/util/assertions.kt | 8 +------- 23 files changed, 49 insertions(+), 51 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeSourceDependencyResolutionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeSourceDependencyResolutionTest.kt index 32a2bae348f..2231ef00700 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeSourceDependencyResolutionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeSourceDependencyResolutionTest.kt @@ -8,7 +8,6 @@ package org.jetbrains.kotlin.gradle.ide.tcs import org.gradle.api.Project -import org.jetbrains.kotlin.gradle.* import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinBinaryDependency import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinDependency diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeTransformedMetadataDependencyResolverTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeTransformedMetadataDependencyResolverTest.kt index 5b9e0f61b44..30284ebc0f4 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeTransformedMetadataDependencyResolverTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeTransformedMetadataDependencyResolverTest.kt @@ -3,7 +3,7 @@ * 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("FunctionName") +@file:Suppress("FunctionName", "DuplicatedCode") package org.jetbrains.kotlin.gradle.ide.tcs diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/CInteropTaskTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/CInteropTaskTest.kt index 0ac56eb7393..ca5bdc8b3dc 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/CInteropTaskTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/CInteropTaskTest.kt @@ -3,6 +3,8 @@ * 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("FunctionName") + package org.jetbrains.kotlin.gradle.regression import org.jetbrains.kotlin.gradle.MultiplatformExtensionTest diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/CommonizerTaskTests.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/CommonizerTaskTests.kt index e90a1ffdb71..873beaf8a7d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/CommonizerTaskTests.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/CommonizerTaskTests.kt @@ -9,7 +9,6 @@ package org.jetbrains.kotlin.gradle.regression import org.gradle.api.internal.project.ProjectInternal import org.gradle.testfixtures.ProjectBuilder -import org.jetbrains.kotlin.gradle.* import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeCompilation import org.jetbrains.kotlin.gradle.util.* import kotlin.test.Test @@ -25,16 +24,16 @@ class CommonizerTaskTests { const val JVM_ECOSYSTEM_PLUGIN_ID = "jvm-ecosystem" } - private val kotlin = subproject.applyMultiplatformPlugin().apply { - linuxX64() - linuxArm64() - - targets.flatMap { it.compilations } - .filterIsInstance() - .forEach { compilation -> compilation.cinterops.create("dummy") } - } - init { + subproject.applyMultiplatformPlugin().apply { + linuxX64() + linuxArm64() + + targets.flatMap { it.compilations } + .filterIsInstance() + .forEach { compilation -> compilation.cinterops.create("dummy") } + } + rootProject.enableCInteropCommonization() subproject.enableCInteropCommonization() diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/IdeImportPropertiesConsistencyTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/IdeImportPropertiesConsistencyTest.kt index a21d67e3a0f..66306e55bfb 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/IdeImportPropertiesConsistencyTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/IdeImportPropertiesConsistencyTest.kt @@ -83,7 +83,7 @@ class IdeImportPropertiesConsistencyTest { isHmppValueUsedInCli, isHmppValueUsedInIde, """ project.isKotlinGranularMetadataEnabled: $isHmppValueUsedInCli - GradleImportProperties.IS_HMPP_ENABLED: ${isHmppValueUsedInIde} + GradleImportProperties.IS_HMPP_ENABLED: $isHmppValueUsedInIde """.trimIndent() ) diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT31459JvmMainClassesTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT31459JvmMainClassesTest.kt index b30ce02745d..572b69dc278 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT31459JvmMainClassesTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT31459JvmMainClassesTest.kt @@ -3,6 +3,8 @@ * 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("FunctionName") + package org.jetbrains.kotlin.gradle.regression import org.gradle.api.Project @@ -83,8 +85,9 @@ class KT31459JvmMainClassesTest { /** * Returns names of all tasks that given task directly depends on */ - private val Task.directDependencies: Set get() = taskDependencies - .getDependencies(null) - .map { it.name } - .toSet() + private val Task.directDependencies: Set + get() = taskDependencies + .getDependencies(null) + .map { it.name } + .toSet() } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT55347JsProjectImport.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT55347JsProjectImport.kt index 0f0707fd0e3..ade718f3da4 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT55347JsProjectImport.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT55347JsProjectImport.kt @@ -3,6 +3,8 @@ * 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("FunctionName") + package org.jetbrains.kotlin.gradle.regression import org.jetbrains.kotlin.gradle.dsl.KotlinJsProjectExtension @@ -19,7 +21,7 @@ class KT55347JsProjectImport { private fun `GranularMetadataTransformation should be accessible in pure js projects`(jsCompiler: KotlinJsCompilerType) { val project = buildProject { plugins.apply("org.jetbrains.kotlin.js") } val kotlin = project.kotlinExtension as KotlinJsProjectExtension - with (kotlin) { + with(kotlin) { js(jsCompiler) { nodejs() } diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KotlinCompileTaskSourcesTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KotlinCompileTaskSourcesTest.kt index 3ff05c94a6b..e5a46487218 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KotlinCompileTaskSourcesTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KotlinCompileTaskSourcesTest.kt @@ -12,7 +12,6 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinCommonCompilation import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinSharedNativeCompilation import org.jetbrains.kotlin.gradle.tasks.KotlinCompileCommon import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile -import org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile import org.jetbrains.kotlin.gradle.util.buildProjectWithMPP import org.jetbrains.kotlin.gradle.util.relativeTo import kotlin.test.Test @@ -122,7 +121,7 @@ class KotlinCompileTaskSourcesTest { /* Check sources of linuxArm64 compile task */ val linuxArm64CompileTask = kotlin.linuxArm64().compilations.getByName("main") - .compileTaskProvider.get() as KotlinNativeCompile + .compileTaskProvider.get() assertEquals( setOf(commonMainSourceFile, jvmAndLinuxMainSourceFile, linuxArm64MainSourceFile).relativeTo(project), diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/CInteropCommonizerTaskTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/CInteropCommonizerTaskTest.kt index 4bbe1555994..1a36f835e5c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/CInteropCommonizerTaskTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/CInteropCommonizerTaskTest.kt @@ -3,8 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -/* Associate compilations are not yet supported by the IDE. KT-34102 */ -@file:Suppress("invisible_reference", "invisible_member", "FunctionName", "DuplicatedCode") +@file:Suppress("FunctionName", "DuplicatedCode") package org.jetbrains.kotlin.gradle.unit diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/CompilationSpecificPluginPath.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/CompilationSpecificPluginPath.kt index 30b15c0bd38..fc892d2bbca 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/CompilationSpecificPluginPath.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/CompilationSpecificPluginPath.kt @@ -2,7 +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("invisible_reference", "invisible_member", "FunctionName") +@file:Suppress("FunctionName", "DuplicatedCode") package org.jetbrains.kotlin.gradle.unit @@ -260,7 +260,7 @@ internal class CompilationSpecificPluginPath { override fun isApplicable(kotlinCompilation: KotlinCompilation<*>): Boolean = kotlinCompilation.isApplicablePredicate() override fun applyToCompilation(kotlinCompilation: KotlinCompilation<*>): Provider> = - kotlinCompilation.target.project.provider { emptyList() } + kotlinCompilation.target.project.provider { emptyList() } override fun getCompilerPluginId(): String = id diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/CompositeMetadataArtifactTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/CompositeMetadataArtifactTest.kt index 699c106a4ed..8f755878edf 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/CompositeMetadataArtifactTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/CompositeMetadataArtifactTest.kt @@ -3,6 +3,8 @@ * 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("FunctionName") + package org.jetbrains.kotlin.gradle.unit import org.gradle.kotlin.dsl.support.unzipTo diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/DisabledCInteropCommonizationWarningTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/DisabledCInteropCommonizationWarningTest.kt index faaa773a005..a4367ae4658 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/DisabledCInteropCommonizationWarningTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/DisabledCInteropCommonizationWarningTest.kt @@ -43,11 +43,11 @@ class DisabledCInteropCommonizationWarningTest { assertTrue( "[" + - "cinterop:compilation/compileKotlinLinuxArm64/dummy1, " + - "cinterop:compilation/compileKotlinLinuxArm64/dummy2, " + - "cinterop:compilation/compileKotlinLinuxX64/dummy1, " + - "cinterop:compilation/compileKotlinLinuxX64/dummy2" + - "]" in warningMessage, + "cinterop:compilation/compileKotlinLinuxArm64/dummy1, " + + "cinterop:compilation/compileKotlinLinuxArm64/dummy2, " + + "cinterop:compilation/compileKotlinLinuxX64/dummy1, " + + "cinterop:compilation/compileKotlinLinuxX64/dummy2" + + "]" in warningMessage, "Expected affected cinterops being mentioned in the warning message. Found\n\n$warningMessage" ) diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinAndroidDependsOnEdgesTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinAndroidDependsOnEdgesTest.kt index 2e381b5ef9b..364a44a6d99 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinAndroidDependsOnEdgesTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinAndroidDependsOnEdgesTest.kt @@ -3,8 +3,8 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -/* Associate compilations are not yet supported by the IDE. KT-34102 */ -@file:Suppress("invisible_reference", "invisible_member", "FunctionName") +@file:Suppress("FunctionName", "DuplicatedCode") + package org.jetbrains.kotlin.gradle.unit import com.android.build.gradle.LibraryExtension diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinTargetHierarchyDslTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinTargetHierarchyDslTest.kt index 4a1b090153b..da807c2ba93 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinTargetHierarchyDslTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinTargetHierarchyDslTest.kt @@ -3,7 +3,7 @@ * 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("FunctionName") +@file:Suppress("FunctionName", "DuplicatedCode") package org.jetbrains.kotlin.gradle.unit diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/MppPublicationTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/MppPublicationTest.kt index 2c40cea19ca..6f91994e555 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/MppPublicationTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/MppPublicationTest.kt @@ -90,10 +90,9 @@ class MppPublicationTest { val jvmComponent = kotlinComponent.variants.first { it.name == "jvm" } val jvmSourcesElementsAttributes = jvmComponent.attributesOfUsageContext("jvmSourcesElements-published") - val extraExpectedAttributes = mapOf( - "org.jetbrains.kotlin.platform.type" to "jvm", // target disambiguation attribute - "org.gradle.libraryelements" to "jar" // is set by default by kgp, when it sets usage as `java-runtime-jars` - // see [KotlinUsages.producerApiUsage] + val extraExpectedAttributes = mapOf( // target disambiguation attribute + "org.jetbrains.kotlin.platform.type" to "jvm", // is set by default by kgp, when it sets usage as `java-runtime-jars` + "org.gradle.libraryelements" to "jar" // see [KotlinUsages.producerApiUsage] ) val expectedAttributes = javaSourcesElementsAttributes.toMapOfStrings() + extraExpectedAttributes @@ -121,7 +120,7 @@ class MppPublicationTest { .attributesOfUsageContext("${targetName}SourcesElements-published") } - for ( (targetName, sourceElements) in sourcesElements) { + for ((targetName, sourceElements) in sourcesElements) { assertTrue( message = "Sources Elements of target $targetName doesn't have 'userAttribute'" ) { sourceElements.attributes.toMapOfStrings().containsKey("userAttribute") } diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/WhenEvaluatedAndroidOrderingTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/WhenEvaluatedAndroidOrderingTest.kt index 4c9fe2863a2..6a567988a7b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/WhenEvaluatedAndroidOrderingTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/WhenEvaluatedAndroidOrderingTest.kt @@ -3,7 +3,7 @@ * 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("DuplicatedCode") +@file:Suppress("FunctionName", "DuplicatedCode") package org.jetbrains.kotlin.gradle.unit diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/BuildKotlinToolingMetadataTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/BuildKotlinToolingMetadataTest.kt index 5f919707b2b..419c35fe701 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/BuildKotlinToolingMetadataTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/BuildKotlinToolingMetadataTest.kt @@ -3,6 +3,8 @@ * 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("FunctionName") + package org.jetbrains.kotlin.gradle.unit.kpm import org.gradle.api.Project diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/TransitiveRuntimeOnlyConfigurationTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/TransitiveRuntimeOnlyConfigurationTest.kt index 1e0106bc346..6f61d78ca10 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/TransitiveRuntimeOnlyConfigurationTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/TransitiveRuntimeOnlyConfigurationTest.kt @@ -7,8 +7,6 @@ package org.jetbrains.kotlin.gradle.unit.kpm -import org.gradle.kotlin.dsl.creating -import org.gradle.kotlin.dsl.provideDelegate import kotlin.test.Test import kotlin.test.assertEquals diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/InternalKotlinSourceSetTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/InternalKotlinSourceSetTest.kt index 591ccbfeb56..3ca4e51347a 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/InternalKotlinSourceSetTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/InternalKotlinSourceSetTest.kt @@ -117,7 +117,7 @@ class InternalKotlinSourceSetTest { } val kotlin = project.multiplatformExtension - + with(kotlin.sourceSets) { val commonMain = getByName("commonMain") val commonTest = getByName("commonTest") diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/SourceSetVisibilityInferenceTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/SourceSetVisibilityInferenceTest.kt index 84a69c26fdc..52718639fbb 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/SourceSetVisibilityInferenceTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/SourceSetVisibilityInferenceTest.kt @@ -40,7 +40,7 @@ class SourceSetVisibilityInferenceTest { } @Test - fun testFailureWithNoAssociation(): Unit { + fun testFailureWithNoAssociation() { val jvm = kotlin.jvm() val commonMain = kotlin.sourceSets.getByName("commonMain") val commonTest = kotlin.sourceSets.getByName("commonTest") diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/SingleTargetAndroidSourceSetLayoutTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/SingleTargetAndroidSourceSetLayoutTest.kt index 631772ce634..285dec2fb65 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/SingleTargetAndroidSourceSetLayoutTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/SingleTargetAndroidSourceSetLayoutTest.kt @@ -3,7 +3,7 @@ * 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("FunctionName") +@file:Suppress("FunctionName", "DuplicatedCode") package org.jetbrains.kotlin.gradle.unit.sources.android diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/TestDiagnosticsReporter.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/TestDiagnosticsReporter.kt index 7694e1ca396..7ae390a92fa 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/TestDiagnosticsReporter.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/TestDiagnosticsReporter.kt @@ -10,7 +10,7 @@ import kotlin.test.fail internal class TestDiagnosticsReporter : KotlinAndroidSourceSetLayoutChecker.DiagnosticReporter { - class ErrorDiagnosticException(val diagnostic: KotlinAndroidSourceSetLayoutChecker.Diagnostic) : + class ErrorDiagnosticException(diagnostic: KotlinAndroidSourceSetLayoutChecker.Diagnostic) : KotlinAndroidSourceSetLayoutChecker.ProjectMisconfiguredException(diagnostic.message) private val _errors = mutableListOf() diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/assertions.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/assertions.kt index e39009583aa..bcd2a91552c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/assertions.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/assertions.kt @@ -23,12 +23,6 @@ fun Task.assertDependsOn(other: Task) { } } -fun Task.assertNotDependsOn(other: Task) { - if (isDependsOn(other)) { - fail("Expected ${this.path} to *not* depend on ${other.path}") - } -} - fun Task.assertNoCircularTaskDependencies() { data class TaskAndDependants( val task: Task, @@ -38,7 +32,7 @@ fun Task.assertNoCircularTaskDependencies() { val visited = mutableSetOf() val queue = ArrayDeque(taskDependencies.getDependencies(this).map { TaskAndDependants(it, listOf(this)) }) - while(queue.isNotEmpty()) { + while (queue.isNotEmpty()) { val (task, dependants) = queue.removeFirst() if (task in visited) { val dependencyChain = dependants.joinToString(" -> ") { it.name }