diff --git a/.idea/runConfigurations/Test__Kotlin_Gradle_Plugin___functionalTest___dependency_resolution_tests.xml b/.idea/runConfigurations/Test__Kotlin_Gradle_Plugin___functionalTest___dependency_resolution_tests.xml new file mode 100644 index 00000000000..0df55c44baa --- /dev/null +++ b/.idea/runConfigurations/Test__Kotlin_Gradle_Plugin___functionalTest___dependency_resolution_tests.xml @@ -0,0 +1,25 @@ + + + + + + + true + true + false + + + \ No newline at end of file diff --git a/.idea/runConfigurations/Test__Kotlin_Gradle_Plugin___functionalTest___regression.xml b/.idea/runConfigurations/Test__Kotlin_Gradle_Plugin___functionalTest___regression.xml new file mode 100644 index 00000000000..1c1a1ff9a15 --- /dev/null +++ b/.idea/runConfigurations/Test__Kotlin_Gradle_Plugin___functionalTest___regression.xml @@ -0,0 +1,25 @@ + + + + + + + true + true + false + + + \ No newline at end of file diff --git a/.idea/runConfigurations/Test__Kotlin_Gradle_Plugin___functionalTest___unit.xml b/.idea/runConfigurations/Test__Kotlin_Gradle_Plugin___functionalTest___unit.xml new file mode 100644 index 00000000000..00a09244fa6 --- /dev/null +++ b/.idea/runConfigurations/Test__Kotlin_Gradle_Plugin___functionalTest___unit.xml @@ -0,0 +1,25 @@ + + + + + + + true + true + false + + + \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/MultiplatformExtensionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/MultiplatformExtensionTest.kt index b7c914c010e..bf3d1f55450 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/MultiplatformExtensionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/MultiplatformExtensionTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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. */ @@ -8,23 +8,17 @@ package org.jetbrains.kotlin.gradle -import org.gradle.api.Project -import org.gradle.api.artifacts.verification.DependencyVerificationMode import org.gradle.api.internal.project.ProjectInternal -import org.gradle.api.plugins.ExtraPropertiesExtension import org.gradle.testfixtures.ProjectBuilder import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet -import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider.PropertyNames.KOTLIN_MPP_ANDROID_SOURCE_SET_LAYOUT_VERSION -import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider.PropertyNames.KOTLIN_MPP_ENABLE_CINTEROP_COMMONIZATION -import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider.PropertyNames.KOTLIN_MPP_HIERARCHICAL_STRUCTURE_BY_DEFAULT -import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider.PropertyNames.KOTLIN_STDLIB_DEFAULT_DEPENDENCY import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinSharedNativeCompilation import org.jetbrains.kotlin.gradle.targets.native.internal.CInteropCommonizerDependent import org.jetbrains.kotlin.gradle.targets.native.internal.CInteropIdentifier import org.jetbrains.kotlin.gradle.targets.native.internal.from +import org.jetbrains.kotlin.gradle.util.* import kotlin.test.BeforeTest import kotlin.test.assertNotNull @@ -83,38 +77,3 @@ abstract class MultiplatformExtensionTest { return CInteropIdentifier(CInteropIdentifier.Scope.create(this), name) } } - -fun Project.applyMultiplatformPlugin(): KotlinMultiplatformExtension { - addBuildEventsListenerRegistryMock(this) - disableLegacyWarning(project) - plugins.apply("kotlin-multiplatform") - return extensions.getByName("kotlin") as KotlinMultiplatformExtension -} - -val Project.propertiesExtension: ExtraPropertiesExtension - get() = extensions.getByType(ExtraPropertiesExtension::class.java) - -fun Project.enableGranularSourceSetsMetadata() { - propertiesExtension.set("kotlin.mpp.enableGranularSourceSetsMetadata", "true") -} - -fun Project.enableCInteropCommonization(enabled: Boolean = true) { - propertiesExtension.set(KOTLIN_MPP_ENABLE_CINTEROP_COMMONIZATION, enabled.toString()) -} - -fun Project.enableHierarchicalStructureByDefault(enabled: Boolean = true) { - propertiesExtension.set(KOTLIN_MPP_HIERARCHICAL_STRUCTURE_BY_DEFAULT, enabled.toString()) -} - -fun Project.enableDefaultStdlibDependency(enabled: Boolean = true) { - project.propertiesExtension.set(KOTLIN_STDLIB_DEFAULT_DEPENDENCY, enabled.toString()) -} - -fun Project.setMultiplatformAndroidSourceSetLayoutVersion(version: Int) { - project.propertiesExtension.set(KOTLIN_MPP_ANDROID_SOURCE_SET_LAYOUT_VERSION, version.toString()) -} - -fun Project.enableDependencyVerification(enabled: Boolean = true) { - gradle.startParameter.dependencyVerificationMode = if (enabled) DependencyVerificationMode.STRICT - else DependencyVerificationMode.OFF -} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/AbstractLightweightIdeaDependencyResolutionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/kpm/AbstractLightweightIdeaDependencyResolutionTest.kt similarity index 92% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/AbstractLightweightIdeaDependencyResolutionTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/kpm/AbstractLightweightIdeaDependencyResolutionTest.kt index 2720437f885..5d5cab7f65d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/AbstractLightweightIdeaDependencyResolutionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/kpm/AbstractLightweightIdeaDependencyResolutionTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.kpm.idea +package org.jetbrains.kotlin.gradle.ide.kpm import org.gradle.api.Project import org.gradle.api.artifacts.dsl.RepositoryHandler @@ -15,10 +15,10 @@ import org.gradle.testfixtures.ProjectBuilder import org.jetbrains.kotlin.commonizer.KonanDistribution import org.jetbrains.kotlin.commonizer.platformLibsDir import org.jetbrains.kotlin.compilerRunner.konanHome -import org.jetbrains.kotlin.gradle.enableDefaultStdlibDependency -import org.jetbrains.kotlin.gradle.enableDependencyVerification import org.jetbrains.kotlin.gradle.idea.testFixtures.kpm.TestIdeaKpmBinaryDependencyMatcher import org.jetbrains.kotlin.gradle.plugin.mpp.enabledOnCurrentHost +import org.jetbrains.kotlin.gradle.util.enableDefaultStdlibDependency +import org.jetbrains.kotlin.gradle.util.enableDependencyVerification import org.jetbrains.kotlin.konan.target.KonanTarget /** diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProjectModelSerializableTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/kpm/IdeaKpmProjectModelSerializableTest.kt similarity index 92% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProjectModelSerializableTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/kpm/IdeaKpmProjectModelSerializableTest.kt index 07b8e001a87..b731ff047b1 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmProjectModelSerializableTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/kpm/IdeaKpmProjectModelSerializableTest.kt @@ -5,12 +5,12 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.kpm.idea +package org.jetbrains.kotlin.gradle.ide.kpm import org.gradle.kotlin.dsl.create import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmProject -import org.jetbrains.kotlin.gradle.kpm.AbstractKpmExtensionTest -import org.jetbrains.kotlin.gradle.kpm.buildIdeaKpmProjectModel +import org.jetbrains.kotlin.gradle.unit.kpm.AbstractKpmExtensionTest +import org.jetbrains.kotlin.gradle.unit.kpm.buildIdeaKpmProjectModel import org.jetbrains.kotlin.gradle.idea.testFixtures.utils.deserialize import org.jetbrains.kotlin.gradle.idea.testFixtures.utils.serialize import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmIosX64Variant diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/MviKotlinIdeaDependencyResolutionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/kpm/MviKotlinIdeaDependencyResolutionTest.kt similarity index 97% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/MviKotlinIdeaDependencyResolutionTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/kpm/MviKotlinIdeaDependencyResolutionTest.kt index 22fa30bb119..fde1078bc36 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/MviKotlinIdeaDependencyResolutionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/kpm/MviKotlinIdeaDependencyResolutionTest.kt @@ -5,22 +5,22 @@ @file:Suppress("FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle.kpm.idea +package org.jetbrains.kotlin.gradle.ide.kpm import com.android.build.gradle.LibraryExtension import com.android.build.gradle.LibraryPlugin import org.jetbrains.kotlin.commonizer.stdlib -import org.jetbrains.kotlin.gradle.addBuildEventsListenerRegistryMock import org.jetbrains.kotlin.gradle.android.androidPrototype -import org.jetbrains.kotlin.gradle.assumeAndroidSdkAvailable import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmDependency.Companion.CLASSPATH_BINARY_TYPE import org.jetbrains.kotlin.gradle.idea.testFixtures.kpm.assertContainsFragment import org.jetbrains.kotlin.gradle.idea.testFixtures.kpm.assertContainsModule import org.jetbrains.kotlin.gradle.idea.testFixtures.kpm.assertIsNotEmpty import org.jetbrains.kotlin.gradle.idea.testFixtures.kpm.assertResolvedBinaryDependencies -import org.jetbrains.kotlin.gradle.kpm.applyKpmPlugin -import org.jetbrains.kotlin.gradle.kpm.buildIdeaKpmProjectModel import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.* +import org.jetbrains.kotlin.gradle.unit.kpm.applyKpmPlugin +import org.jetbrains.kotlin.gradle.unit.kpm.buildIdeaKpmProjectModel +import org.jetbrains.kotlin.gradle.util.addBuildEventsListenerRegistryMock +import org.jetbrains.kotlin.gradle.util.assumeAndroidSdkAvailable import org.jetbrains.kotlin.konan.target.KonanTarget.* import org.junit.Test diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/SimpleProjectToProjectDependencyResolutionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/kpm/SimpleProjectToProjectDependencyResolutionTest.kt similarity index 97% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/SimpleProjectToProjectDependencyResolutionTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/kpm/SimpleProjectToProjectDependencyResolutionTest.kt index aae01a67385..63c7cd02df4 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/SimpleProjectToProjectDependencyResolutionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/kpm/SimpleProjectToProjectDependencyResolutionTest.kt @@ -5,11 +5,11 @@ @file:Suppress("FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle.kpm.idea +package org.jetbrains.kotlin.gradle.ide.kpm import org.jetbrains.kotlin.gradle.idea.kpm.name -import org.jetbrains.kotlin.gradle.kpm.applyKpmPlugin -import org.jetbrains.kotlin.gradle.kpm.buildIdeaKpmProjectModel +import org.jetbrains.kotlin.gradle.unit.kpm.applyKpmPlugin +import org.jetbrains.kotlin.gradle.unit.kpm.buildIdeaKpmProjectModel import org.jetbrains.kotlin.gradle.idea.testFixtures.kpm.assertContainsFragment import org.jetbrains.kotlin.gradle.idea.testFixtures.kpm.assertIsNotEmpty import org.jetbrains.kotlin.gradle.idea.testFixtures.kpm.assertFragmentDependencies diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/StdlibKotlinIdeaDependencyResolutionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/kpm/StdlibKotlinIdeaDependencyResolutionTest.kt similarity index 96% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/StdlibKotlinIdeaDependencyResolutionTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/kpm/StdlibKotlinIdeaDependencyResolutionTest.kt index 3329041adc4..74ddd7142bb 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/StdlibKotlinIdeaDependencyResolutionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/kpm/StdlibKotlinIdeaDependencyResolutionTest.kt @@ -5,11 +5,8 @@ @file:Suppress("FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle.kpm.idea +package org.jetbrains.kotlin.gradle.ide.kpm -import org.jetbrains.kotlin.gradle.enableDefaultStdlibDependency -import org.jetbrains.kotlin.gradle.kpm.applyKpmPlugin -import org.jetbrains.kotlin.gradle.kpm.buildIdeaKpmProjectModel import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmDependency.Companion.CLASSPATH_BINARY_TYPE import org.jetbrains.kotlin.gradle.idea.testFixtures.kpm.TestIdeaKpmBinaryDependencyMatcher import org.jetbrains.kotlin.gradle.idea.testFixtures.kpm.assertContainsFragment @@ -19,6 +16,9 @@ import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmIosArm64Variant import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmIosX64Variant import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmJvmVariant +import org.jetbrains.kotlin.gradle.unit.kpm.applyKpmPlugin +import org.jetbrains.kotlin.gradle.unit.kpm.buildIdeaKpmProjectModel +import org.jetbrains.kotlin.gradle.util.enableDefaultStdlibDependency import org.junit.Test class StdlibKotlinIdeaDependencyResolutionTest : AbstractLightweightIdeaDependencyResolutionTest() { diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeDependsOnDependencyResolverTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeDependsOnDependencyResolverTest.kt similarity index 95% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeDependsOnDependencyResolverTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeDependsOnDependencyResolverTest.kt index 4836275f565..acc50070917 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeDependsOnDependencyResolverTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeDependsOnDependencyResolverTest.kt @@ -5,13 +5,13 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.ide +package org.jetbrains.kotlin.gradle.ide.tcs -import org.jetbrains.kotlin.gradle.buildProjectWithMPP import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinSourceDependency import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.assertMatches import org.jetbrains.kotlin.gradle.plugin.ide.dependencyResolvers.IdeDependsOnDependencyResolver +import org.jetbrains.kotlin.gradle.util.buildProjectWithMPP import kotlin.test.Test class IdeDependsOnDependencyResolverTest { diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeJvmAndAndroidDependencyResolutionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeJvmAndAndroidDependencyResolutionTest.kt similarity index 96% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeJvmAndAndroidDependencyResolutionTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeJvmAndAndroidDependencyResolutionTest.kt index a7135ac2eef..e8dfcd3f9f5 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeJvmAndAndroidDependencyResolutionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeJvmAndAndroidDependencyResolutionTest.kt @@ -5,15 +5,16 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.ide +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.testFixtures.tcs.* -import org.jetbrains.kotlin.gradle.kpm.idea.mavenCentralCacheRedirector +import org.jetbrains.kotlin.gradle.ide.kpm.mavenCentralCacheRedirector import org.jetbrains.kotlin.gradle.plugin.ide.dependencyResolvers.IdeJvmAndAndroidPlatformBinaryDependencyResolver import org.jetbrains.kotlin.gradle.plugin.ide.kotlinIdeMultiplatformImport +import org.jetbrains.kotlin.gradle.util.* import org.jetbrains.kotlin.gradle.utils.androidExtension import kotlin.test.BeforeTest import kotlin.test.Test diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeNativePlatformDependencyResolverTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeNativePlatformDependencyResolverTest.kt similarity index 97% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeNativePlatformDependencyResolverTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeNativePlatformDependencyResolverTest.kt index f916c2780ef..6057f9c0e8d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeNativePlatformDependencyResolverTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeNativePlatformDependencyResolverTest.kt @@ -5,14 +5,14 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.ide +package org.jetbrains.kotlin.gradle.ide.tcs import org.jetbrains.kotlin.compilerRunner.konanVersion -import org.jetbrains.kotlin.gradle.buildProjectWithMPP import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.assertMatches import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.binaryCoordinates import org.jetbrains.kotlin.gradle.plugin.ide.dependencyResolvers.IdeNativePlatformDependencyResolver +import org.jetbrains.kotlin.gradle.util.buildProjectWithMPP import org.jetbrains.kotlin.konan.target.HostManager import org.jetbrains.kotlin.konan.target.KonanTarget.LINUX_X64 import org.jetbrains.kotlin.konan.target.KonanTarget.MACOS_ARM64 diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeNativeStdlibResolverTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeNativeStdlibResolverTest.kt similarity index 97% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeNativeStdlibResolverTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeNativeStdlibResolverTest.kt index 57b6f7e8a95..8e3bd01b249 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeNativeStdlibResolverTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeNativeStdlibResolverTest.kt @@ -5,14 +5,14 @@ @file:Suppress("FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle.ide +package org.jetbrains.kotlin.gradle.ide.tcs import org.jetbrains.kotlin.compilerRunner.konanVersion -import org.jetbrains.kotlin.gradle.buildProjectWithMPP import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.assertMatches import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.binaryCoordinates import org.jetbrains.kotlin.gradle.plugin.ide.dependencyResolvers.IdeNativeStdlibDependencyResolver +import org.jetbrains.kotlin.gradle.util.buildProjectWithMPP import org.junit.Test class IdeNativeStdlibResolverTest { diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeOriginalMetadataDependencyResolverTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeOriginalMetadataDependencyResolverTest.kt similarity index 88% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeOriginalMetadataDependencyResolverTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeOriginalMetadataDependencyResolverTest.kt index 8ec68bac34f..fa950723d90 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeOriginalMetadataDependencyResolverTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeOriginalMetadataDependencyResolverTest.kt @@ -5,17 +5,17 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.ide +package org.jetbrains.kotlin.gradle.ide.tcs -import org.jetbrains.kotlin.gradle.applyMultiplatformPlugin -import org.jetbrains.kotlin.gradle.buildProject import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension -import org.jetbrains.kotlin.gradle.enableDefaultStdlibDependency -import org.jetbrains.kotlin.gradle.enableDependencyVerification +import org.jetbrains.kotlin.gradle.ide.kpm.mavenCentralCacheRedirector import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.assertMatches import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.binaryCoordinates -import org.jetbrains.kotlin.gradle.kpm.idea.mavenCentralCacheRedirector import org.jetbrains.kotlin.gradle.plugin.ide.dependencyResolvers.IdeOriginalMetadataDependencyResolver +import org.jetbrains.kotlin.gradle.util.applyMultiplatformPlugin +import org.jetbrains.kotlin.gradle.util.buildProject +import org.jetbrains.kotlin.gradle.util.enableDefaultStdlibDependency +import org.jetbrains.kotlin.gradle.util.enableDependencyVerification import org.junit.Test class IdeOriginalMetadataDependencyResolverTest { diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdePlatformDependencyResolverTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdePlatformDependencyResolverTest.kt similarity index 90% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdePlatformDependencyResolverTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdePlatformDependencyResolverTest.kt index 7001910e9b8..da50c70d386 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdePlatformDependencyResolverTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdePlatformDependencyResolverTest.kt @@ -5,17 +5,17 @@ @file:Suppress("FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle.ide +package org.jetbrains.kotlin.gradle.ide.tcs -import org.jetbrains.kotlin.gradle.applyMultiplatformPlugin -import org.jetbrains.kotlin.gradle.buildProject import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension -import org.jetbrains.kotlin.gradle.enableDefaultStdlibDependency -import org.jetbrains.kotlin.gradle.enableDependencyVerification +import org.jetbrains.kotlin.gradle.ide.kpm.mavenCentralCacheRedirector import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.assertMatches import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.binaryCoordinates -import org.jetbrains.kotlin.gradle.kpm.idea.mavenCentralCacheRedirector import org.jetbrains.kotlin.gradle.plugin.ide.dependencyResolvers.IdeBinaryDependencyResolver +import org.jetbrains.kotlin.gradle.util.applyMultiplatformPlugin +import org.jetbrains.kotlin.gradle.util.buildProject +import org.jetbrains.kotlin.gradle.util.enableDefaultStdlibDependency +import org.jetbrains.kotlin.gradle.util.enableDependencyVerification import kotlin.test.Test class IdeBinaryDependencyResolverTest { diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeSourceDependencyResolutionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeSourceDependencyResolutionTest.kt similarity index 99% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeSourceDependencyResolutionTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeSourceDependencyResolutionTest.kt index 058747a6ecc..32a2bae348f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeSourceDependencyResolutionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeSourceDependencyResolutionTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle.ide +package org.jetbrains.kotlin.gradle.ide.tcs import org.gradle.api.Project import org.jetbrains.kotlin.gradle.* @@ -15,6 +15,7 @@ import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinDependency import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinSourceDependency.Type.Regular import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.* import org.jetbrains.kotlin.gradle.plugin.ide.kotlinIdeMultiplatformImport +import org.jetbrains.kotlin.gradle.util.* import kotlin.test.Test class IdeSourceDependencyResolutionTest { diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeSourceSetConstraintTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeSourceSetConstraintTest.kt similarity index 99% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeSourceSetConstraintTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeSourceSetConstraintTest.kt index 82c7b88f706..961ba58e2ea 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeSourceSetConstraintTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeSourceSetConstraintTest.kt @@ -5,13 +5,13 @@ @file:Suppress("FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle.ide +package org.jetbrains.kotlin.gradle.ide.tcs -import org.jetbrains.kotlin.gradle.applyMultiplatformPlugin -import org.jetbrains.kotlin.gradle.buildProject +import org.jetbrains.kotlin.gradle.util.applyMultiplatformPlugin +import org.jetbrains.kotlin.gradle.util.buildProject import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension -import org.jetbrains.kotlin.gradle.enableDependencyVerification -import org.jetbrains.kotlin.gradle.kpm.idea.mavenCentralCacheRedirector +import org.jetbrains.kotlin.gradle.util.enableDependencyVerification +import org.jetbrains.kotlin.gradle.ide.kpm.mavenCentralCacheRedirector import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.ide.IdeMultiplatformImport diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeSourcesAndDocumentationResolutionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeSourcesAndDocumentationResolutionTest.kt similarity index 94% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeSourcesAndDocumentationResolutionTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeSourcesAndDocumentationResolutionTest.kt index 5e9c927bc93..4806a385912 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeSourcesAndDocumentationResolutionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeSourcesAndDocumentationResolutionTest.kt @@ -5,23 +5,23 @@ @file:Suppress("FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle.ide +package org.jetbrains.kotlin.gradle.ide.tcs -import org.jetbrains.kotlin.gradle.applyMultiplatformPlugin -import org.jetbrains.kotlin.gradle.buildProject import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension -import org.jetbrains.kotlin.gradle.enableDefaultStdlibDependency -import org.jetbrains.kotlin.gradle.enableDependencyVerification +import org.jetbrains.kotlin.gradle.ide.kpm.mavenCentralCacheRedirector import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinResolvedBinaryDependency import org.jetbrains.kotlin.gradle.idea.tcs.extras.documentationClasspathKey import org.jetbrains.kotlin.gradle.idea.tcs.extras.sourcesClasspath import org.jetbrains.kotlin.gradle.idea.tcs.extras.sourcesClasspathKey import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.assertMatches import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.binaryCoordinates -import org.jetbrains.kotlin.gradle.kpm.idea.mavenCentralCacheRedirector import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.ide.dependencyResolvers.IdeNativeStdlibDependencyResolver import org.jetbrains.kotlin.gradle.plugin.ide.kotlinIdeMultiplatformImport +import org.jetbrains.kotlin.gradle.util.applyMultiplatformPlugin +import org.jetbrains.kotlin.gradle.util.buildProject +import org.jetbrains.kotlin.gradle.util.enableDefaultStdlibDependency +import org.jetbrains.kotlin.gradle.util.enableDependencyVerification import kotlin.test.Test import kotlin.test.fail import kotlin.text.Regex.Companion.escape diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeStdlibResolutionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeStdlibResolutionTest.kt similarity index 96% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeStdlibResolutionTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeStdlibResolutionTest.kt index 0e58e14d67d..6175484ffa7 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeStdlibResolutionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeStdlibResolutionTest.kt @@ -5,20 +5,23 @@ @file:Suppress("FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle.ide +package org.jetbrains.kotlin.gradle.ide.tcs import org.gradle.api.Project import org.jetbrains.kotlin.compilerRunner.konanVersion -import org.jetbrains.kotlin.gradle.* import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension +import org.jetbrains.kotlin.gradle.ide.kpm.mavenCentralCacheRedirector import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinResolvedBinaryDependency import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.assertMatches import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.binaryCoordinates -import org.jetbrains.kotlin.gradle.kpm.idea.mavenCentralCacheRedirector import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.ide.kotlinIdeMultiplatformImport +import org.jetbrains.kotlin.gradle.util.applyMultiplatformPlugin +import org.jetbrains.kotlin.gradle.util.buildProject +import org.jetbrains.kotlin.gradle.util.enableDefaultStdlibDependency +import org.jetbrains.kotlin.gradle.util.enableDependencyVerification import org.jetbrains.kotlin.gradle.utils.androidExtension import org.junit.Test diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeTransformedMetadataDependencyResolverTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeTransformedMetadataDependencyResolverTest.kt similarity index 87% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeTransformedMetadataDependencyResolverTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeTransformedMetadataDependencyResolverTest.kt index 5580a20fd75..5b9e0f61b44 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeTransformedMetadataDependencyResolverTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeTransformedMetadataDependencyResolverTest.kt @@ -5,14 +5,18 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.ide +package org.jetbrains.kotlin.gradle.ide.tcs import org.jetbrains.kotlin.gradle.* import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.assertMatches import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.binaryCoordinates -import org.jetbrains.kotlin.gradle.kpm.idea.mavenCentralCacheRedirector +import org.jetbrains.kotlin.gradle.ide.kpm.mavenCentralCacheRedirector import org.jetbrains.kotlin.gradle.plugin.ide.dependencyResolvers.IdeTransformedMetadataDependencyResolver +import org.jetbrains.kotlin.gradle.util.buildProject +import org.jetbrains.kotlin.gradle.util.enableDefaultStdlibDependency +import org.jetbrains.kotlin.gradle.util.enableDependencyVerification +import org.jetbrains.kotlin.gradle.util.applyMultiplatformPlugin import org.junit.Test class IdeTransformedMetadataDependencyResolverTest { diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/PrepareKotlinIdeaImportTaskTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/PrepareKotlinIdeaImportTaskTest.kt similarity index 90% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/PrepareKotlinIdeaImportTaskTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/PrepareKotlinIdeaImportTaskTest.kt index 827bb2ac153..ed9923acc0f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/PrepareKotlinIdeaImportTaskTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/PrepareKotlinIdeaImportTaskTest.kt @@ -6,17 +6,17 @@ @file:Suppress("FunctionName") @file:OptIn(Idea222Api::class) -package org.jetbrains.kotlin.gradle.ide +package org.jetbrains.kotlin.gradle.ide.tcs import org.gradle.api.internal.project.ProjectInternal import org.gradle.testfixtures.ProjectBuilder -import org.jetbrains.kotlin.gradle.applyMultiplatformPlugin -import org.jetbrains.kotlin.gradle.assertDependsOn -import org.jetbrains.kotlin.gradle.assertTaskDependenciesEquals -import org.jetbrains.kotlin.gradle.enableCInteropCommonization import org.jetbrains.kotlin.gradle.plugin.ide.Idea222Api import org.jetbrains.kotlin.gradle.plugin.ide.ideaImportDependsOn import org.jetbrains.kotlin.gradle.plugin.ide.prepareKotlinIdeaImportTask +import org.jetbrains.kotlin.gradle.util.applyMultiplatformPlugin +import org.jetbrains.kotlin.gradle.util.assertDependsOn +import org.jetbrains.kotlin.gradle.util.assertTaskDependenciesEquals +import org.jetbrains.kotlin.gradle.util.enableCInteropCommonization import org.jetbrains.kotlin.tooling.core.UnsafeApi import kotlin.test.Test import kotlin.test.assertNotNull diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/externalTargetApi/ExternalAndroidTargetPrototypeSmokeTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/externalTargetApi/ExternalAndroidTargetPrototypeSmokeTest.kt similarity index 95% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/externalTargetApi/ExternalAndroidTargetPrototypeSmokeTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/externalTargetApi/ExternalAndroidTargetPrototypeSmokeTest.kt index 3efd46d82b6..ed26568b26b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/externalTargetApi/ExternalAndroidTargetPrototypeSmokeTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/externalTargetApi/ExternalAndroidTargetPrototypeSmokeTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.externalTargetApi +package org.jetbrains.kotlin.gradle.ide.tcs.externalTargetApi import org.gradle.api.publish.PublishingExtension import org.gradle.api.publish.maven.MavenPublication @@ -16,8 +16,9 @@ import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.anyDependency import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.assertMatches import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.binaryCoordinates -import org.jetbrains.kotlin.gradle.kpm.idea.mavenCentralCacheRedirector +import org.jetbrains.kotlin.gradle.ide.kpm.mavenCentralCacheRedirector import org.jetbrains.kotlin.gradle.plugin.ide.kotlinIdeMultiplatformImport +import org.jetbrains.kotlin.gradle.util.* import org.jetbrains.kotlin.gradle.utils.getByType import org.junit.Test import kotlin.test.BeforeTest diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/ideaKotlinDependencyMatcherBuilders.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/ideaKotlinDependencyMatcherBuilders.kt similarity index 91% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/ideaKotlinDependencyMatcherBuilders.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/ideaKotlinDependencyMatcherBuilders.kt index 0bcf66386d9..5b794670fd5 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/ideaKotlinDependencyMatcherBuilders.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/ideaKotlinDependencyMatcherBuilders.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. */ -package org.jetbrains.kotlin.gradle.ide +package org.jetbrains.kotlin.gradle.ide.tcs import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.sources.internal diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ArchiveReproducibilityTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/ArchiveReproducibilityTest.kt similarity index 92% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ArchiveReproducibilityTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/ArchiveReproducibilityTest.kt index c8c9c203b64..cf8d5d52583 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ArchiveReproducibilityTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/ArchiveReproducibilityTest.kt @@ -5,10 +5,12 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.regression import org.gradle.api.Project import org.gradle.api.tasks.bundling.AbstractArchiveTask +import org.jetbrains.kotlin.gradle.util.buildProjectWithMPP +import org.jetbrains.kotlin.gradle.util.kotlin import org.junit.Test import kotlin.test.assertFalse import kotlin.test.assertTrue diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/CInteropTaskTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/CInteropTaskTest.kt similarity index 95% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/CInteropTaskTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/CInteropTaskTest.kt index cc7fd142b9f..0ac56eb7393 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/CInteropTaskTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/CInteropTaskTest.kt @@ -3,11 +3,11 @@ * 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 +package org.jetbrains.kotlin.gradle.regression +import org.jetbrains.kotlin.gradle.MultiplatformExtensionTest import org.jetbrains.kotlin.gradle.plugin.mpp.DefaultCInteropSettings import org.jetbrains.kotlin.gradle.tasks.CInteropProcess -import kotlin.test.BeforeTest import kotlin.test.Test import kotlin.test.assertEquals diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/CommonizerTaskTests.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/CommonizerTaskTests.kt similarity index 97% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/CommonizerTaskTests.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/CommonizerTaskTests.kt index 330be577af0..e90a1ffdb71 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/CommonizerTaskTests.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/CommonizerTaskTests.kt @@ -5,11 +5,13 @@ @file:Suppress("FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle +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 import kotlin.test.assertNotNull import kotlin.test.assertNull diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ConfigurationsTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/ConfigurationsTest.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ConfigurationsTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/ConfigurationsTest.kt index a43a7f32123..a4f05c662b1 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ConfigurationsTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/ConfigurationsTest.kt @@ -1,16 +1,17 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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("FunctionName") -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.regression import org.gradle.api.attributes.AttributeContainer import org.gradle.api.attributes.Category import org.gradle.api.attributes.Usage import org.gradle.kotlin.dsl.withType +import org.jetbrains.kotlin.gradle.* import org.jetbrains.kotlin.gradle.dsl.kotlinExtension import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType @@ -20,6 +21,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.targets import org.jetbrains.kotlin.gradle.targets.js.KotlinJsCompilerAttribute import org.jetbrains.kotlin.gradle.targets.js.KotlinJsTarget import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl +import org.jetbrains.kotlin.gradle.util.* import java.util.* import kotlin.test.Test import kotlin.test.assertEquals diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/IdeImportPropertiesConsistencyTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/IdeImportPropertiesConsistencyTest.kt similarity index 94% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/IdeImportPropertiesConsistencyTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/IdeImportPropertiesConsistencyTest.kt index 517a9fb47d8..a21d67e3a0f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/IdeImportPropertiesConsistencyTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/IdeImportPropertiesConsistencyTest.kt @@ -1,16 +1,18 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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. */ /* Associate compilations are not yet supported by the IDE. KT-34102 */ @file:Suppress("invisible_reference", "invisible_member", "FunctionName") -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.regression import org.gradle.api.Project import org.gradle.testfixtures.ProjectBuilder import org.jetbrains.kotlin.gradle.targets.metadata.isKotlinGranularMetadataEnabled import org.jetbrains.kotlin.gradle.targets.native.internal.isNativeDependencyPropagationEnabled +import org.jetbrains.kotlin.gradle.util.applyMultiplatformPlugin +import org.jetbrains.kotlin.gradle.util.enableHierarchicalStructureByDefault import kotlin.test.Test import kotlin.test.assertEquals diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/JvmAndAndroidIntermediateSourceSetTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/JvmAndAndroidIntermediateSourceSetTest.kt similarity index 96% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/JvmAndAndroidIntermediateSourceSetTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/JvmAndAndroidIntermediateSourceSetTest.kt index 253e7dc2346..f558a30747b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/JvmAndAndroidIntermediateSourceSetTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/JvmAndAndroidIntermediateSourceSetTest.kt @@ -1,11 +1,11 @@ /* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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("FunctionName") -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.regression import com.android.build.gradle.LibraryExtension import org.gradle.api.internal.project.ProjectInternal @@ -17,6 +17,7 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinAndroidTarget import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinMetadataCompilation import org.jetbrains.kotlin.gradle.plugin.mpp.kotlinProjectStructureMetadata +import org.jetbrains.kotlin.gradle.util.addBuildEventsListenerRegistryMock import org.jetbrains.kotlin.util.capitalizeDecapitalize.toLowerCaseAsciiOnly import kotlin.test.* diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KT31459JvmMainClassesTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT31459JvmMainClassesTest.kt similarity index 92% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KT31459JvmMainClassesTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT31459JvmMainClassesTest.kt index 1d1c48c5a4e..b30ce02745d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KT31459JvmMainClassesTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT31459JvmMainClassesTest.kt @@ -3,16 +3,18 @@ * 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 +package org.jetbrains.kotlin.gradle.regression import org.gradle.api.Project import org.gradle.api.Task import org.gradle.api.file.FileCollection import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation import org.jetbrains.kotlin.gradle.plugin.KotlinTarget +import org.jetbrains.kotlin.gradle.util.assertNoCircularTaskDependencies +import org.jetbrains.kotlin.gradle.util.buildProjectWithMPP +import org.jetbrains.kotlin.gradle.util.kotlin import kotlin.test.Test import kotlin.test.assertEquals -import kotlin.test.fail class KT31459JvmMainClassesTest { diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KT41641AbsentAndroidTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT41641AbsentAndroidTarget.kt similarity index 93% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KT41641AbsentAndroidTarget.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT41641AbsentAndroidTarget.kt index c571cad54c7..fe0ef5ffdad 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KT41641AbsentAndroidTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT41641AbsentAndroidTarget.kt @@ -1,15 +1,17 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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("FunctionName") -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.regression import com.android.build.gradle.LibraryExtension +import org.jetbrains.kotlin.gradle.MultiplatformExtensionTest import org.jetbrains.kotlin.gradle.plugin.runMissingAndroidTargetProjectConfigurationHealthCheck import org.jetbrains.kotlin.gradle.targets.android.findAndroidTarget +import org.jetbrains.kotlin.gradle.util.propertiesExtension import org.junit.Test import kotlin.test.* diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KT46273JvmTargetAndOrphanTestSourceSetTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT46273JvmTargetAndOrphanTestSourceSetTest.kt similarity index 88% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KT46273JvmTargetAndOrphanTestSourceSetTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT46273JvmTargetAndOrphanTestSourceSetTest.kt index 4ccc08313bc..c84913c3d17 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KT46273JvmTargetAndOrphanTestSourceSetTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT46273JvmTargetAndOrphanTestSourceSetTest.kt @@ -1,14 +1,14 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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("FunctionName") -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.regression +import org.jetbrains.kotlin.gradle.MultiplatformExtensionTest import org.jetbrains.kotlin.gradle.plugin.sources.DefaultKotlinSourceSet -import org.jetbrains.kotlin.gradle.plugin.sources.KotlinDependencyScope import kotlin.test.Test class KT46273JvmTargetAndOrphanTestSourceSetTest : MultiplatformExtensionTest() { diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KT54783JvmWithJavaCompilationFactoryTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT54783JvmWithJavaCompilationFactoryTest.kt similarity index 91% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KT54783JvmWithJavaCompilationFactoryTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT54783JvmWithJavaCompilationFactoryTest.kt index 2076fb26ad0..21480ecd117 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KT54783JvmWithJavaCompilationFactoryTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT54783JvmWithJavaCompilationFactoryTest.kt @@ -5,11 +5,12 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.regression import org.gradle.kotlin.dsl.getByType import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinWithJavaCompilation +import org.jetbrains.kotlin.gradle.util.buildProjectWithJvm import kotlin.test.Test import kotlin.test.assertSame diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KT54867KotlinWithJavaCompilationClasspathTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT54867KotlinWithJavaCompilationClasspathTest.kt similarity index 90% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KT54867KotlinWithJavaCompilationClasspathTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT54867KotlinWithJavaCompilationClasspathTest.kt index e005da25a01..b767fa09fac 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KT54867KotlinWithJavaCompilationClasspathTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT54867KotlinWithJavaCompilationClasspathTest.kt @@ -5,10 +5,12 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.regression import org.jetbrains.kotlin.gradle.dsl.kotlinJvmExtension import org.jetbrains.kotlin.gradle.plugin.mpp.javaSourceSets +import org.jetbrains.kotlin.gradle.util.buildProjectWithJvm +import org.jetbrains.kotlin.gradle.util.enableDefaultStdlibDependency import org.junit.Test import kotlin.test.assertEquals import kotlin.test.assertSame diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KT55347JsProjectImport.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT55347JsProjectImport.kt similarity index 86% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KT55347JsProjectImport.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT55347JsProjectImport.kt index bfa08727f8f..0f0707fd0e3 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KT55347JsProjectImport.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT55347JsProjectImport.kt @@ -3,13 +3,15 @@ * 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 +package org.jetbrains.kotlin.gradle.regression import org.jetbrains.kotlin.gradle.dsl.KotlinJsProjectExtension import org.jetbrains.kotlin.gradle.dsl.kotlinExtension import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType -import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType.* +import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType.BOTH +import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType.IR import org.jetbrains.kotlin.gradle.plugin.sources.DefaultKotlinSourceSet +import org.jetbrains.kotlin.gradle.util.buildProject import org.junit.Test import kotlin.test.assertTrue diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinCompileTaskSourcesTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KotlinCompileTaskSourcesTest.kt similarity index 96% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinCompileTaskSourcesTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KotlinCompileTaskSourcesTest.kt index 55c06b01242..3ff05c94a6b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinCompileTaskSourcesTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KotlinCompileTaskSourcesTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.regression import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinCommonCompilation @@ -13,6 +13,8 @@ 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 import kotlin.test.assertEquals diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinJvmFunctionalTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KotlinJvmFunctionalTest.kt similarity index 92% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinJvmFunctionalTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KotlinJvmFunctionalTest.kt index 576c5cc1e01..f1729236572 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinJvmFunctionalTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KotlinJvmFunctionalTest.kt @@ -5,10 +5,11 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.regression import org.jetbrains.kotlin.gradle.dsl.kotlinExtension import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.targets +import org.jetbrains.kotlin.gradle.util.buildProjectWithJvm import kotlin.test.Test class KotlinJvmFunctionalTest { diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinNativeCompileRefinesPathsTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KotlinNativeCompileRefinesPathsTest.kt similarity index 91% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinNativeCompileRefinesPathsTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KotlinNativeCompileRefinesPathsTest.kt index 30e1e7f1166..267dbd557a4 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinNativeCompileRefinesPathsTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KotlinNativeCompileRefinesPathsTest.kt @@ -5,11 +5,14 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.regression import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinSharedNativeCompilation import org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile +import org.jetbrains.kotlin.gradle.util.buildProjectWithMPP +import org.jetbrains.kotlin.gradle.util.main +import org.jetbrains.kotlin.gradle.util.relativeTo import kotlin.test.Test import kotlin.test.assertEquals diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/AndroidGradlePluginVersionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/AndroidGradlePluginVersionTest.kt similarity index 97% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/AndroidGradlePluginVersionTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/AndroidGradlePluginVersionTest.kt index e58a0619855..d47e943f912 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/AndroidGradlePluginVersionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/AndroidGradlePluginVersionTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.unit import org.jetbrains.kotlin.gradle.plugin.AndroidGradlePluginVersion import org.jetbrains.kotlin.gradle.plugin.AndroidGradlePluginVersionOrNull diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/BuildKotlinToolingMetadataTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/BuildKotlinToolingMetadataTest.kt similarity index 97% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/BuildKotlinToolingMetadataTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/BuildKotlinToolingMetadataTest.kt index 4b643b9023e..0742605f46f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/BuildKotlinToolingMetadataTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/BuildKotlinToolingMetadataTest.kt @@ -1,12 +1,12 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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. */ /* Associate compilations are not yet supported by the IDE. KT-34102 */ @file:Suppress("invisible_reference", "invisible_member", "FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.unit import com.android.build.gradle.BaseExtension import org.gradle.api.JavaVersion @@ -30,6 +30,8 @@ import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTarget import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget import org.jetbrains.kotlin.gradle.tooling.BuildKotlinToolingMetadataTask import org.jetbrains.kotlin.gradle.tooling.buildKotlinToolingMetadataTask +import org.jetbrains.kotlin.gradle.util.addBuildEventsListenerRegistryMock +import org.jetbrains.kotlin.gradle.util.disableLegacyWarning import org.jetbrains.kotlin.konan.target.KonanTarget import org.jetbrains.kotlin.library.KotlinAbiVersion import org.jetbrains.kotlin.tooling.KotlinToolingMetadata 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/unit/CInteropCommonizerTaskTest.kt similarity index 99% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/CInteropCommonizerTaskTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/CInteropCommonizerTaskTest.kt index 657a8eab420..4bbe1555994 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/unit/CInteropCommonizerTaskTest.kt @@ -1,15 +1,16 @@ /* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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. */ /* Associate compilations are not yet supported by the IDE. KT-34102 */ @file:Suppress("invisible_reference", "invisible_member", "FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.unit import org.jetbrains.kotlin.commonizer.CommonizerTarget import org.jetbrains.kotlin.commonizer.SharedCommonizerTarget +import org.jetbrains.kotlin.gradle.MultiplatformExtensionTest import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.targets.native.internal.CInteropCommonizerTask diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/CInteropMetadataDependencyTransformationTaskTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/CInteropMetadataDependencyTransformationTaskTest.kt similarity index 95% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/CInteropMetadataDependencyTransformationTaskTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/CInteropMetadataDependencyTransformationTaskTest.kt index b078985c46a..ec923141bea 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/CInteropMetadataDependencyTransformationTaskTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/CInteropMetadataDependencyTransformationTaskTest.kt @@ -1,13 +1,15 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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("FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.unit import org.gradle.api.internal.TaskInternal +import org.jetbrains.kotlin.gradle.MultiplatformExtensionTest +import org.jetbrains.kotlin.gradle.util.enableCInteropCommonization import org.jetbrains.kotlin.gradle.plugin.sources.DefaultKotlinSourceSet import org.jetbrains.kotlin.gradle.targets.native.internal.locateOrRegisterCInteropMetadataDependencyTransformationTask import org.jetbrains.kotlin.gradle.targets.native.internal.locateOrRegisterCInteropMetadataDependencyTransformationTaskForIde diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/mpp/CompilationSpecificPluginPath.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/CompilationSpecificPluginPath.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/mpp/CompilationSpecificPluginPath.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/CompilationSpecificPluginPath.kt index 298470ace81..30b15c0bd38 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/mpp/CompilationSpecificPluginPath.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/CompilationSpecificPluginPath.kt @@ -1,22 +1,20 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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") -package org.jetbrains.kotlin.gradle.mpp +package org.jetbrains.kotlin.gradle.unit import org.gradle.api.Project import org.gradle.api.artifacts.Configuration import org.gradle.api.plugins.ExtraPropertiesExtension import org.gradle.api.provider.Provider -import org.jetbrains.kotlin.gradle.buildProject -import org.jetbrains.kotlin.gradle.buildProjectWithMPP -import org.jetbrains.kotlin.gradle.kotlin import org.jetbrains.kotlin.gradle.plugin.* import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinNativeCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile +import org.jetbrains.kotlin.gradle.util.* import kotlin.test.* internal class CompilationSpecificPluginPath { diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/CompositeMetadataArtifactTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/CompositeMetadataArtifactTest.kt similarity index 96% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/CompositeMetadataArtifactTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/CompositeMetadataArtifactTest.kt index 6fb575a0ab9..699c106a4ed 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/CompositeMetadataArtifactTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/CompositeMetadataArtifactTest.kt @@ -1,17 +1,13 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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("FunctionName") - -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.unit import org.gradle.kotlin.dsl.support.unzipTo import org.gradle.kotlin.dsl.support.zipTo import org.jetbrains.kotlin.gradle.plugin.mpp.* -import org.jetbrains.kotlin.gradle.plugin.mpp.SourceSetMetadataLayout.KLIB -import org.jetbrains.kotlin.gradle.plugin.mpp.SourceSetMetadataLayout.METADATA import org.junit.Rule import org.junit.rules.TemporaryFolder import java.io.File @@ -34,7 +30,7 @@ class CompositeMetadataArtifactTest { moduleDependencyVersion = "1.0.0", kotlinProjectStructureMetadata = createProjectStructureMetadata( sourceSetNames = mutableSetOf("testSourceSetName"), - sourceSetBinaryLayout = mapOf("testSourceSetName" to KLIB), + sourceSetBinaryLayout = mapOf("testSourceSetName" to SourceSetMetadataLayout.KLIB), sourceSetCInteropMetadataDirectory = mapOf("testSourceSetName" to "cinterop/testSourceSetName") ), primaryArtifactFile = primaryArtifactFile, @@ -73,7 +69,7 @@ class CompositeMetadataArtifactTest { moduleDependencyIdentifier = ModuleDependencyIdentifier("test-group", "test-module"), moduleDependencyVersion = "1.0.0", kotlinProjectStructureMetadata = createProjectStructureMetadata( - sourceSetBinaryLayout = mapOf(testSourceSetName to KLIB), + sourceSetBinaryLayout = mapOf(testSourceSetName to SourceSetMetadataLayout.KLIB), sourceSetCInteropMetadataDirectory = emptyMap(), ), primaryArtifactFile = primaryArtifactFile, @@ -154,7 +150,10 @@ class CompositeMetadataArtifactTest { moduleDependencyIdentifier = ModuleDependencyIdentifier("test-group", "test-module"), moduleDependencyVersion = "1.0.0", kotlinProjectStructureMetadata = createProjectStructureMetadata( - sourceSetBinaryLayout = mapOf("sourceSetA" to KLIB, "sourceSetB" to METADATA) + sourceSetBinaryLayout = mapOf( + "sourceSetA" to SourceSetMetadataLayout.KLIB, + "sourceSetB" to SourceSetMetadataLayout.METADATA + ) ), primaryArtifactFile = primaryArtifactFile, hostSpecificArtifactFilesBySourceSetName = emptyMap() @@ -169,7 +168,7 @@ class CompositeMetadataArtifactTest { assertNotNull(sourceSetA.metadataBinary).copyTo(sourceSetAMetadataFile) assertTrue(sourceSetAMetadataFile.isFile, "Expected sourceSetAMetadataFile.isFile") assertEquals( - KLIB.archiveExtension, sourceSetAMetadataFile.extension, + SourceSetMetadataLayout.KLIB.archiveExtension, sourceSetAMetadataFile.extension, "Expected correct archiveExtension for extracted sourceSetA" ) assertZipContentEquals( @@ -185,7 +184,7 @@ class CompositeMetadataArtifactTest { assertNotNull(sourceSetB.metadataBinary).copyTo(sourceSetBMetadataFile) assertTrue(sourceSetBMetadataFile.isFile, "Expected sourceSetBMetadataFile.isFile") assertEquals( - METADATA.archiveExtension, sourceSetBMetadataFile.extension, + SourceSetMetadataLayout.METADATA.archiveExtension, sourceSetBMetadataFile.extension, "Expected correct archiveExtension for extracted sourceSetB" ) assertZipContentEquals( @@ -317,4 +316,4 @@ private fun createProjectStructureMetadata( ) } -private fun File.withParentDirectoriesCreated(): File = apply { parentFile.mkdirs() } +private fun File.withParentDirectoriesCreated(): File = apply { parentFile.mkdirs() } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/DisabledCInteropCommonizationWarningTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/DisabledCInteropCommonizationWarningTest.kt similarity index 94% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/DisabledCInteropCommonizationWarningTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/DisabledCInteropCommonizationWarningTest.kt index aed45fbaa56..faaa773a005 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/DisabledCInteropCommonizationWarningTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/DisabledCInteropCommonizationWarningTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.unit import org.gradle.api.Project import org.gradle.api.internal.project.ProjectInternal @@ -13,6 +13,10 @@ import org.gradle.testfixtures.ProjectBuilder import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider.PropertyNames.KOTLIN_MPP_ENABLE_CINTEROP_COMMONIZATION import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget import org.jetbrains.kotlin.gradle.plugin.runDisabledCInteropCommonizationOnHmppProjectConfigurationHealthCheck +import org.jetbrains.kotlin.gradle.util.applyMultiplatformPlugin +import org.jetbrains.kotlin.gradle.util.enableCInteropCommonization +import org.jetbrains.kotlin.gradle.util.enableHierarchicalStructureByDefault +import org.jetbrains.kotlin.gradle.util.propertiesExtension import kotlin.test.Test import kotlin.test.assertNotNull import kotlin.test.assertNull diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/mpp/InternalKotlinCompilationTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/InternalKotlinCompilationTest.kt similarity index 84% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/mpp/InternalKotlinCompilationTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/InternalKotlinCompilationTest.kt index 48abf1f4aa1..2494a3eba3b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/mpp/InternalKotlinCompilationTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/InternalKotlinCompilationTest.kt @@ -5,11 +5,11 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.mpp +package org.jetbrains.kotlin.gradle.unit -import org.jetbrains.kotlin.gradle.assertAllImplementationsAlsoImplement import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation import org.jetbrains.kotlin.gradle.plugin.mpp.InternalKotlinCompilation +import org.jetbrains.kotlin.gradle.util.assertAllImplementationsAlsoImplement import org.junit.Test class InternalKotlinSourceSetTest { diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/InternalKotlinTargetTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/InternalKotlinTargetTest.kt similarity index 84% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/InternalKotlinTargetTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/InternalKotlinTargetTest.kt index 0125cbec221..8b84207e0dd 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/InternalKotlinTargetTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/InternalKotlinTargetTest.kt @@ -5,10 +5,11 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.unit import org.jetbrains.kotlin.gradle.plugin.KotlinTarget import org.jetbrains.kotlin.gradle.plugin.mpp.InternalKotlinTarget +import org.jetbrains.kotlin.gradle.util.assertAllImplementationsAlsoImplement import kotlin.test.Test class InternalKotlinTargetTest { diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/InvokeWhenCreatedTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/InvokeWhenCreatedTest.kt similarity index 95% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/InvokeWhenCreatedTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/InvokeWhenCreatedTest.kt index 0e8162d1f47..3dc96d4c26d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/InvokeWhenCreatedTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/InvokeWhenCreatedTest.kt @@ -5,11 +5,12 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.unit import org.gradle.api.Named import org.gradle.api.UnknownDomainObjectException import org.jetbrains.kotlin.gradle.dsl.kotlinExtension +import org.jetbrains.kotlin.gradle.util.buildProjectWithJvm import org.jetbrains.kotlin.tooling.core.withLinearClosure import org.junit.Test import kotlin.test.assertEquals diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KaptApiTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KaptApiTest.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KaptApiTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KaptApiTest.kt index 488fc781c23..88d23b3fdb3 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KaptApiTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KaptApiTest.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. */ -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.unit import org.gradle.api.internal.project.ProjectInternal import org.jetbrains.kotlin.gradle.internal.Kapt3GradleSubplugin @@ -11,6 +11,7 @@ import org.jetbrains.kotlin.gradle.internal.KaptWithoutKotlincTask import org.jetbrains.kotlin.gradle.plugin.KotlinBaseApiPlugin import org.jetbrains.kotlin.gradle.plugin.KotlinJvmFactory import org.jetbrains.kotlin.gradle.tasks.Kapt +import org.jetbrains.kotlin.gradle.util.buildProject import org.junit.Before import org.junit.Rule import org.junit.Test diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinAndroidDependsOnEdgesTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinAndroidDependsOnEdgesTest.kt similarity index 95% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinAndroidDependsOnEdgesTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinAndroidDependsOnEdgesTest.kt index 6ae92793d52..2e381b5ef9b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinAndroidDependsOnEdgesTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinAndroidDependsOnEdgesTest.kt @@ -1,11 +1,11 @@ /* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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. */ /* Associate compilations are not yet supported by the IDE. KT-34102 */ @file:Suppress("invisible_reference", "invisible_member", "FunctionName") -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.unit import com.android.build.gradle.LibraryExtension import org.gradle.api.internal.project.ProjectInternal @@ -13,6 +13,7 @@ import org.gradle.testfixtures.ProjectBuilder import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jetbrains.kotlin.gradle.dsl.kotlinExtension import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet +import org.jetbrains.kotlin.gradle.util.addBuildEventsListenerRegistryMock import kotlin.test.Test import kotlin.test.assertEquals diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinCompileApiTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinCompileApiTest.kt similarity index 97% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinCompileApiTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinCompileApiTest.kt index 0c4d29cb8d5..ad76ccafc3f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinCompileApiTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinCompileApiTest.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. */ -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.unit import org.gradle.api.internal.project.ProjectInternal import org.jetbrains.kotlin.gradle.dsl.ExplicitApiMode @@ -11,6 +11,7 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinBaseApiPlugin import org.jetbrains.kotlin.gradle.plugin.KotlinJvmFactory import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile +import org.jetbrains.kotlin.gradle.util.buildProject import org.junit.Before import org.junit.Rule import org.junit.Test diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinMultiplatformAndroidGradlePluginCompatibilityHealthCheckTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinMultiplatformAndroidGradlePluginCompatibilityHealthCheckTest.kt similarity index 99% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinMultiplatformAndroidGradlePluginCompatibilityHealthCheckTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinMultiplatformAndroidGradlePluginCompatibilityHealthCheckTest.kt index 6543ebe7008..ec0ae4b9f36 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinMultiplatformAndroidGradlePluginCompatibilityHealthCheckTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinMultiplatformAndroidGradlePluginCompatibilityHealthCheckTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.unit import com.android.build.gradle.LibraryPlugin import org.gradle.testfixtures.ProjectBuilder @@ -18,6 +18,7 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinMultiplatformAndroidGradlePlugin import org.jetbrains.kotlin.gradle.plugin.KotlinMultiplatformAndroidGradlePluginCompatibilityHealthCheck.runMultiplatformAndroidGradlePluginCompatibilityHealthCheck import org.jetbrains.kotlin.gradle.plugin.KotlinMultiplatformAndroidGradlePluginCompatibilityHealthCheck.runMultiplatformAndroidGradlePluginCompatibilityHealthCheckWhenAndroidIsApplied import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider +import org.jetbrains.kotlin.gradle.util.* import org.jetbrains.kotlin.gradle.utils.getOrPutRootProjectProperty import org.junit.Test import kotlin.test.assertEquals diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinProjectStructureMetadataSerializationTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinProjectStructureMetadataSerializationTest.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinProjectStructureMetadataSerializationTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinProjectStructureMetadataSerializationTest.kt index a241b09daa8..9a73fe665f0 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinProjectStructureMetadataSerializationTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinProjectStructureMetadataSerializationTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.unit import org.jetbrains.kotlin.gradle.plugin.mpp.* import org.jetbrains.kotlin.gradle.plugin.mpp.SourceSetMetadataLayout.KLIB diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinTargetHierarchyBuilderTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinTargetHierarchyBuilderTest.kt similarity index 94% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinTargetHierarchyBuilderTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinTargetHierarchyBuilderTest.kt index 0f9c1882566..485cc72b308 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinTargetHierarchyBuilderTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinTargetHierarchyBuilderTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.unit import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension import org.jetbrains.kotlin.gradle.plugin.KotlinTargetHierarchyBuilder @@ -13,6 +13,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsTargetPreset import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJvmWithJavaTargetPreset import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTargetPreset import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinWasmTargetPreset +import org.jetbrains.kotlin.gradle.util.buildProjectWithMPP import org.jetbrains.kotlin.util.capitalizeDecapitalize.capitalizeAsciiOnly import org.junit.Test import kotlin.test.fail diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinTargetHierarchyDescriptorTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinTargetHierarchyDescriptorTest.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinTargetHierarchyDescriptorTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinTargetHierarchyDescriptorTest.kt index c758d4342d6..b40fcc306b2 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinTargetHierarchyDescriptorTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinTargetHierarchyDescriptorTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.unit import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension import org.jetbrains.kotlin.gradle.plugin.KotlinTargetHierarchyDescriptor @@ -13,6 +13,8 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.targetHierarchy.CyclicKotlinTarget import org.jetbrains.kotlin.gradle.plugin.mpp.targetHierarchy.KotlinTargetHierarchy import org.jetbrains.kotlin.gradle.plugin.mpp.targetHierarchy.KotlinTargetHierarchy.Node import org.jetbrains.kotlin.gradle.plugin.mpp.targetHierarchy.buildKotlinTargetHierarchy +import org.jetbrains.kotlin.gradle.util.buildProjectWithMPP +import org.jetbrains.kotlin.gradle.util.main import org.junit.Test import kotlin.test.* diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinTargetHierarchyDslTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinTargetHierarchyDslTest.kt similarity index 99% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinTargetHierarchyDslTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinTargetHierarchyDslTest.kt index 5543adcc401..4a1b090153b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinTargetHierarchyDslTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinTargetHierarchyDslTest.kt @@ -5,14 +5,16 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.unit +import org.jetbrains.kotlin.gradle.* import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.KotlinTargetHierarchyDescriptor import org.jetbrains.kotlin.gradle.plugin.mpp.targetHierarchy.buildKotlinTargetHierarchy import org.jetbrains.kotlin.gradle.plugin.mpp.targetHierarchy.naturalKotlinTargetHierarchy +import org.jetbrains.kotlin.gradle.util.* import kotlin.test.* class KotlinTargetHierarchyDslTest { diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinToolingVersionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinToolingVersionTest.kt similarity index 96% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinToolingVersionTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinToolingVersionTest.kt index 92e2c7e159f..e74461750d1 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/KotlinToolingVersionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinToolingVersionTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.unit import org.gradle.testfixtures.ProjectBuilder import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/MppPublicationTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/MppPublicationTest.kt similarity index 96% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/MppPublicationTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/MppPublicationTest.kt index 338cc56cab7..2c40cea19ca 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/MppPublicationTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/MppPublicationTest.kt @@ -1,11 +1,11 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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("FunctionName") -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.unit import org.gradle.api.attributes.Attribute import org.gradle.api.attributes.AttributeContainer @@ -18,6 +18,8 @@ import org.gradle.api.publish.PublishingExtension import org.gradle.api.publish.maven.MavenPublication import org.gradle.testfixtures.ProjectBuilder import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension +import org.jetbrains.kotlin.gradle.util.addBuildEventsListenerRegistryMock +import org.jetbrains.kotlin.gradle.util.disableLegacyWarning import kotlin.test.* class MppPublicationTest { diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ObservableSetTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/ObservableSetTest.kt similarity index 97% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ObservableSetTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/ObservableSetTest.kt index aa68921c450..da90c871694 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ObservableSetTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/ObservableSetTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.unit import org.jetbrains.kotlin.gradle.utils.MutableObservableSetImpl import org.junit.Test diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ResolveKotlinSourceSetsTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/ResolveKotlinSourceSetsTest.kt similarity index 94% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ResolveKotlinSourceSetsTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/ResolveKotlinSourceSetsTest.kt index c2a9db29990..0a913a1e297 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ResolveKotlinSourceSetsTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/ResolveKotlinSourceSetsTest.kt @@ -1,18 +1,19 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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. */ /* Associate compilations are not yet supported by the IDE. KT-34102 */ @file:Suppress("invisible_reference", "invisible_member", "FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.unit import org.gradle.api.Project import org.gradle.testfixtures.ProjectBuilder import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jetbrains.kotlin.gradle.plugin.sources.findSourceSetsDependingOn import org.jetbrains.kotlin.gradle.plugin.sources.internal +import org.jetbrains.kotlin.gradle.util.addBuildEventsListenerRegistryMock import org.junit.Test import kotlin.test.BeforeTest import kotlin.test.assertEquals diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/SourceSetCommonizerTargetTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/SourceSetCommonizerTargetTest.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/SourceSetCommonizerTargetTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/SourceSetCommonizerTargetTest.kt index 9a70902fccf..fa6dbaf6e11 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/SourceSetCommonizerTargetTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/SourceSetCommonizerTargetTest.kt @@ -1,12 +1,12 @@ /* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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. */ /* Associate compilations are not yet supported by the IDE. KT-34102 */ @file:Suppress("invisible_reference", "invisible_member", "FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.unit import org.gradle.api.Project import org.gradle.api.plugins.ExtraPropertiesExtension @@ -16,6 +16,7 @@ import org.jetbrains.kotlin.commonizer.LeafCommonizerTarget import org.jetbrains.kotlin.commonizer.SharedCommonizerTarget import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jetbrains.kotlin.gradle.targets.native.internal.getCommonizerTarget +import org.jetbrains.kotlin.gradle.util.addBuildEventsListenerRegistryMock import org.jetbrains.kotlin.konan.target.KonanTarget.* import kotlin.test.BeforeTest import kotlin.test.Test diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/WhenEvaluatedAndroidOrderingTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/WhenEvaluatedAndroidOrderingTest.kt similarity index 95% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/WhenEvaluatedAndroidOrderingTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/WhenEvaluatedAndroidOrderingTest.kt index fc1ee9cfe80..4c9fe2863a2 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/WhenEvaluatedAndroidOrderingTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/WhenEvaluatedAndroidOrderingTest.kt @@ -5,13 +5,14 @@ @file:Suppress("DuplicatedCode") -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.unit import com.android.build.gradle.LibraryExtension import org.gradle.api.Project import org.gradle.api.internal.project.ProjectInternal import org.gradle.testfixtures.ProjectBuilder import org.jetbrains.kotlin.gradle.plugin.whenEvaluated +import org.jetbrains.kotlin.gradle.util.applyMultiplatformPlugin import org.junit.Test import kotlin.test.BeforeTest import kotlin.test.assertFalse diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ZipUtilsTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/ZipUtilsTest.kt similarity index 99% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ZipUtilsTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/ZipUtilsTest.kt index 49b32793c45..6a745837863 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ZipUtilsTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/ZipUtilsTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.unit import com.intellij.util.io.Compressor import org.gradle.kotlin.dsl.support.unzipTo diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/AbstractKpmExtensionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/AbstractKpmExtensionTest.kt similarity index 87% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/AbstractKpmExtensionTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/AbstractKpmExtensionTest.kt index e59b9c4feef..5243132607e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/AbstractKpmExtensionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/AbstractKpmExtensionTest.kt @@ -1,17 +1,17 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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. */ -package org.jetbrains.kotlin.gradle.kpm +package org.jetbrains.kotlin.gradle.unit.kpm import org.gradle.api.Project import org.gradle.api.artifacts.verification.DependencyVerificationMode import org.gradle.api.internal.project.ProjectInternal import org.gradle.testfixtures.ProjectBuilder -import org.jetbrains.kotlin.gradle.addBuildEventsListenerRegistryMock import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmProject import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinPm20ProjectExtension +import org.jetbrains.kotlin.gradle.util.addBuildEventsListenerRegistryMock abstract class AbstractKpmExtensionTest { protected val project: ProjectInternal = (ProjectBuilder.builder().build() as ProjectInternal).also { project -> diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/BuildKotlinToolingMetadataTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/BuildKotlinToolingMetadataTest.kt similarity index 96% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/BuildKotlinToolingMetadataTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/BuildKotlinToolingMetadataTest.kt index cec3459171d..5f919707b2b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/BuildKotlinToolingMetadataTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/BuildKotlinToolingMetadataTest.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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. */ -package org.jetbrains.kotlin.gradle.kpm +package org.jetbrains.kotlin.gradle.unit.kpm import org.gradle.api.Project import org.gradle.kotlin.dsl.create diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/KotlinCommonFragmentFactoryTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/KotlinCommonFragmentFactoryTest.kt similarity index 88% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/KotlinCommonFragmentFactoryTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/KotlinCommonFragmentFactoryTest.kt index c7b31eafa31..6ebb32df172 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/KotlinCommonFragmentFactoryTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/KotlinCommonFragmentFactoryTest.kt @@ -1,11 +1,11 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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("FunctionName") -package org.jetbrains.kotlin.gradle.kpm +package org.jetbrains.kotlin.gradle.unit.kpm import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmCommonFragmentFactory import kotlin.test.Test diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/KotlinFragmentConfigurationDefinitionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/KotlinFragmentConfigurationDefinitionTest.kt similarity index 99% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/KotlinFragmentConfigurationDefinitionTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/KotlinFragmentConfigurationDefinitionTest.kt index be76a345e93..802ee569a72 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/KotlinFragmentConfigurationDefinitionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/KotlinFragmentConfigurationDefinitionTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.kpm +package org.jetbrains.kotlin.gradle.unit.kpm import org.gradle.api.attributes.Attribute import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.* diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/KotlinJvmVariantFactoryTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/KotlinJvmVariantFactoryTest.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/KotlinJvmVariantFactoryTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/KotlinJvmVariantFactoryTest.kt index bc72107042f..31acbd18801 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/KotlinJvmVariantFactoryTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/KotlinJvmVariantFactoryTest.kt @@ -1,11 +1,11 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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("FunctionName") -package org.jetbrains.kotlin.gradle.kpm +package org.jetbrains.kotlin.gradle.unit.kpm import org.gradle.api.attributes.Attribute import org.gradle.api.tasks.bundling.Zip diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/KotlinNativeVariantFactoryTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/KotlinNativeVariantFactoryTest.kt similarity index 96% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/KotlinNativeVariantFactoryTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/KotlinNativeVariantFactoryTest.kt index 22ac8c2c831..6aec3e9a196 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/KotlinNativeVariantFactoryTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/KotlinNativeVariantFactoryTest.kt @@ -1,11 +1,11 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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("FunctionName") -package org.jetbrains.kotlin.gradle.kpm +package org.jetbrains.kotlin.gradle.unit.kpm import org.gradle.api.tasks.bundling.Zip import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/mpp/KpmCompilerPluginTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/KpmCompilerPluginTest.kt similarity index 96% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/mpp/KpmCompilerPluginTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/KpmCompilerPluginTest.kt index fd9758fa1fd..df15ffb549f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/mpp/KpmCompilerPluginTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/KpmCompilerPluginTest.kt @@ -1,21 +1,21 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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") -package org.jetbrains.kotlin.gradle.mpp +package org.jetbrains.kotlin.gradle.unit.kpm import org.gradle.api.Project import org.gradle.api.artifacts.Configuration -import org.jetbrains.kotlin.gradle.buildProjectWithKPM import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmCompilerPlugin import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmLinuxX64Variant import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.jvm -import org.jetbrains.kotlin.gradle.projectModel import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinNativeCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompilerPluginData +import org.jetbrains.kotlin.gradle.util.buildProjectWithKPM +import org.jetbrains.kotlin.gradle.util.projectModel import org.jetbrains.kotlin.project.model.* import kotlin.test.Test import kotlin.test.assertEquals @@ -100,7 +100,7 @@ class KpmCompilerPluginTest { } } - with(TestPluginWithListeners.Companion) { + with(TestPluginWithListeners) { onGetKpmCompilerPlugin = { throw AssertionError("KPM Compiler Plugin should not be obtained on project evaluate") } onPluginDataGet = { throw AssertionError("Plugin data should not be requested on project evaluate") } } @@ -111,7 +111,7 @@ class KpmCompilerPluginTest { var pluginInitialized = false var pluginDataObtainCount = 0 - with(TestPluginWithListeners.Companion) { + with(TestPluginWithListeners) { onGetKpmCompilerPlugin = { pluginInitialized = true } onPluginDataGet = { pluginDataObtainCount++ } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/KpmGradleFragmentContainerTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/KpmGradleFragmentContainerTest.kt similarity index 90% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/KpmGradleFragmentContainerTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/KpmGradleFragmentContainerTest.kt index 1e191ae03e4..ebbecb8f071 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/KpmGradleFragmentContainerTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/KpmGradleFragmentContainerTest.kt @@ -1,11 +1,11 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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("FunctionName") -package org.jetbrains.kotlin.gradle.kpm +package org.jetbrains.kotlin.gradle.unit.kpm import org.gradle.kotlin.dsl.create import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.* diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/TestHelpers.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/TestHelpers.kt similarity index 92% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/TestHelpers.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/TestHelpers.kt index 632f3fe1685..50add0c6870 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/TestHelpers.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/TestHelpers.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. */ -package org.jetbrains.kotlin.gradle.kpm +package org.jetbrains.kotlin.gradle.unit.kpm import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmFragment import kotlin.reflect.KClass diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/TransitiveRuntimeOnlyConfigurationTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/TransitiveRuntimeOnlyConfigurationTest.kt similarity index 97% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/TransitiveRuntimeOnlyConfigurationTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/TransitiveRuntimeOnlyConfigurationTest.kt index 3cb39af9ed1..1e0106bc346 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/TransitiveRuntimeOnlyConfigurationTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/TransitiveRuntimeOnlyConfigurationTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.kpm +package org.jetbrains.kotlin.gradle.unit.kpm import org.gradle.kotlin.dsl.creating import org.gradle.kotlin.dsl.provideDelegate diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/sources/InternalKotlinSourceSetTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/InternalKotlinSourceSetTest.kt similarity index 94% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/sources/InternalKotlinSourceSetTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/InternalKotlinSourceSetTest.kt index ba406fdc6ef..591ccbfeb56 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/sources/InternalKotlinSourceSetTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/InternalKotlinSourceSetTest.kt @@ -5,23 +5,19 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.sources +package org.jetbrains.kotlin.gradle.unit.sources -import org.jetbrains.kotlin.gradle.assertAllImplementationsAlsoImplement -import org.jetbrains.kotlin.gradle.buildProjectWithMPP import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension -import org.jetbrains.kotlin.gradle.kotlin import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet +import org.jetbrains.kotlin.gradle.plugin.mpp.getHostSpecificMainSharedSourceSets import org.jetbrains.kotlin.gradle.plugin.sources.InternalKotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.sources.internal -import org.jetbrains.kotlin.gradle.plugin.mpp.getHostSpecificMainSharedSourceSets -import org.jetbrains.kotlin.gradle.reflections -import org.junit.jupiter.api.assertAll -import kotlin.reflect.full.isSubclassOf +import org.jetbrains.kotlin.gradle.util.assertAllImplementationsAlsoImplement +import org.jetbrains.kotlin.gradle.util.buildProjectWithMPP +import org.jetbrains.kotlin.gradle.util.kotlin import kotlin.test.Test import kotlin.test.assertEquals -import kotlin.test.fail class InternalKotlinSourceSetTest { @Test diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/sources/SourceSetVisibilityInferenceTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/SourceSetVisibilityInferenceTest.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/sources/SourceSetVisibilityInferenceTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/SourceSetVisibilityInferenceTest.kt index 7b9d76265ea..84a69c26fdc 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/sources/SourceSetVisibilityInferenceTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/SourceSetVisibilityInferenceTest.kt @@ -5,15 +5,15 @@ @file:Suppress("DuplicatedCode") -package org.jetbrains.kotlin.gradle.sources +package org.jetbrains.kotlin.gradle.unit.sources -import org.jetbrains.kotlin.gradle.buildProjectWithMPP import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.sources.UnsatisfiedSourceSetVisibilityException import org.jetbrains.kotlin.gradle.plugin.sources.checkSourceSetVisibilityRequirements import org.jetbrains.kotlin.gradle.plugin.sources.getVisibleSourceSetsFromAssociateCompilations import org.jetbrains.kotlin.gradle.plugin.sources.internal +import org.jetbrains.kotlin.gradle.util.buildProjectWithMPP import org.jetbrains.kotlin.util.capitalizeDecapitalize.decapitalizeAsciiOnly import kotlin.test.Test import kotlin.test.assertEquals diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/sources/android/KotlinAndroidSourceSetLayoutExtensionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/KotlinAndroidSourceSetLayoutExtensionTest.kt similarity index 91% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/sources/android/KotlinAndroidSourceSetLayoutExtensionTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/KotlinAndroidSourceSetLayoutExtensionTest.kt index fa24304e59b..b5be0dba490 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/sources/android/KotlinAndroidSourceSetLayoutExtensionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/KotlinAndroidSourceSetLayoutExtensionTest.kt @@ -5,16 +5,16 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.sources.android +package org.jetbrains.kotlin.gradle.unit.sources.android import org.gradle.testfixtures.ProjectBuilder -import org.jetbrains.kotlin.gradle.buildProjectWithMPP import org.jetbrains.kotlin.gradle.plugin.KotlinAndroidPluginWrapper import org.jetbrains.kotlin.gradle.plugin.sources.android.kotlinAndroidSourceSetLayout import org.jetbrains.kotlin.gradle.plugin.sources.android.multiplatformAndroidSourceSetLayoutV1 import org.jetbrains.kotlin.gradle.plugin.sources.android.multiplatformAndroidSourceSetLayoutV2 import org.jetbrains.kotlin.gradle.plugin.sources.android.singleTargetAndroidSourceSetLayout -import org.jetbrains.kotlin.gradle.setMultiplatformAndroidSourceSetLayoutVersion +import org.jetbrains.kotlin.gradle.util.buildProjectWithMPP +import org.jetbrains.kotlin.gradle.util.setMultiplatformAndroidSourceSetLayoutVersion import org.junit.Test import kotlin.test.assertEquals import kotlin.test.assertFailsWith diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/sources/android/MultiplatformAndroidSourceSetLayoutV1Test.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/MultiplatformAndroidSourceSetLayoutV1Test.kt similarity index 97% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/sources/android/MultiplatformAndroidSourceSetLayoutV1Test.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/MultiplatformAndroidSourceSetLayoutV1Test.kt index b29bb575f7d..0a6d240a393 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/sources/android/MultiplatformAndroidSourceSetLayoutV1Test.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/MultiplatformAndroidSourceSetLayoutV1Test.kt @@ -5,7 +5,7 @@ @file:Suppress("DEPRECATION", "DuplicatedCode", "FunctionName") -package org.jetbrains.kotlin.gradle.sources.android +package org.jetbrains.kotlin.gradle.unit.sources.android import com.android.build.gradle.LibraryExtension import com.android.build.gradle.api.AndroidSourceSet @@ -13,12 +13,12 @@ import org.gradle.api.Action import org.gradle.api.internal.HasConvention import org.gradle.api.internal.project.ProjectInternal import org.gradle.testfixtures.ProjectBuilder -import org.jetbrains.kotlin.gradle.addBuildEventsListenerRegistryMock import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.sources.android.findKotlinSourceSet -import org.jetbrains.kotlin.gradle.setMultiplatformAndroidSourceSetLayoutVersion +import org.jetbrains.kotlin.gradle.util.addBuildEventsListenerRegistryMock +import org.jetbrains.kotlin.gradle.util.setMultiplatformAndroidSourceSetLayoutVersion import kotlin.test.* class MultiplatformAndroidSourceSetLayoutV1Test { diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/sources/android/MultiplatformAndroidSourceSetLayoutV2DiagnosticsTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/MultiplatformAndroidSourceSetLayoutV2DiagnosticsTest.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/sources/android/MultiplatformAndroidSourceSetLayoutV2DiagnosticsTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/MultiplatformAndroidSourceSetLayoutV2DiagnosticsTest.kt index b3b10b9a689..ac3efbfa380 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/sources/android/MultiplatformAndroidSourceSetLayoutV2DiagnosticsTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/MultiplatformAndroidSourceSetLayoutV2DiagnosticsTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.sources.android +package org.jetbrains.kotlin.gradle.unit.sources.android import com.android.build.gradle.LibraryPlugin import org.gradle.api.Project @@ -17,6 +17,7 @@ import org.jetbrains.kotlin.gradle.plugin.sources.android.checker.MultiplatformL import org.jetbrains.kotlin.gradle.plugin.sources.android.checker.MultiplatformLayoutV2MultiplatformLayoutV1StyleSourceDirUsageChecker.V1StyleSourceDirUsageDiagnostic import org.jetbrains.kotlin.gradle.plugin.sources.android.findAndroidSourceSet import org.jetbrains.kotlin.gradle.plugin.sources.android.multiplatformAndroidSourceSetLayoutV2 +import org.jetbrains.kotlin.gradle.util.* import org.junit.Test import kotlin.test.assertEquals import kotlin.test.fail diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/sources/android/MultiplatformAndroidSourceSetLayoutV2Test.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/MultiplatformAndroidSourceSetLayoutV2Test.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/sources/android/MultiplatformAndroidSourceSetLayoutV2Test.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/MultiplatformAndroidSourceSetLayoutV2Test.kt index 5f9f0440fa3..4661c25c019 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/sources/android/MultiplatformAndroidSourceSetLayoutV2Test.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/MultiplatformAndroidSourceSetLayoutV2Test.kt @@ -5,16 +5,16 @@ @file:Suppress("FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle.sources.android +package org.jetbrains.kotlin.gradle.unit.sources.android import com.android.build.gradle.LibraryExtension import com.android.build.gradle.LibraryPlugin import com.android.builder.model.SourceProvider import org.gradle.api.internal.project.ProjectInternal import org.gradle.testfixtures.ProjectBuilder -import org.jetbrains.kotlin.gradle.applyMultiplatformPlugin import org.jetbrains.kotlin.gradle.plugin.sources.android.* -import org.jetbrains.kotlin.gradle.setMultiplatformAndroidSourceSetLayoutVersion +import org.jetbrains.kotlin.gradle.util.applyMultiplatformPlugin +import org.jetbrains.kotlin.gradle.util.setMultiplatformAndroidSourceSetLayoutVersion import org.jetbrains.kotlin.gradle.utils.androidExtension import org.jetbrains.kotlin.gradle.utils.forAllAndroidVariants import org.junit.Test diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/sources/android/SingleTargetAndroidSourceSetLayoutTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/SingleTargetAndroidSourceSetLayoutTest.kt similarity index 96% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/sources/android/SingleTargetAndroidSourceSetLayoutTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/SingleTargetAndroidSourceSetLayoutTest.kt index db9012094ed..631772ce634 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/sources/android/SingleTargetAndroidSourceSetLayoutTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/SingleTargetAndroidSourceSetLayoutTest.kt @@ -5,15 +5,15 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.sources.android +package org.jetbrains.kotlin.gradle.unit.sources.android import com.android.build.gradle.LibraryExtension import com.android.build.gradle.LibraryPlugin import org.gradle.api.internal.project.ProjectInternal import org.gradle.testfixtures.ProjectBuilder -import org.jetbrains.kotlin.gradle.addBuildEventsListenerRegistryMock import org.jetbrains.kotlin.gradle.plugin.KotlinAndroidPluginWrapper import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet +import org.jetbrains.kotlin.gradle.util.addBuildEventsListenerRegistryMock import org.junit.Test import kotlin.test.BeforeTest import kotlin.test.assertEquals diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/sources/android/TestDiagnosticsReporter.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/TestDiagnosticsReporter.kt similarity index 96% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/sources/android/TestDiagnosticsReporter.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/TestDiagnosticsReporter.kt index 0d95526c486..7694e1ca396 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/sources/android/TestDiagnosticsReporter.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/TestDiagnosticsReporter.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. */ -package org.jetbrains.kotlin.gradle.sources.android +package org.jetbrains.kotlin.gradle.unit.sources.android import org.jetbrains.kotlin.gradle.plugin.sources.android.checker.KotlinAndroidSourceSetLayoutChecker import kotlin.test.fail diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/sources/android/generatePairs.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/generatePairs.kt similarity index 91% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/sources/android/generatePairs.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/generatePairs.kt index 20c7aecdf46..d678c1d36ed 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/sources/android/generatePairs.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/generatePairs.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. */ -package org.jetbrains.kotlin.gradle.sources.android +package org.jetbrains.kotlin.gradle.unit.sources.android fun Set.generatePairs(): Sequence> { val values = this.toList() diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/sources/android/getKotlinSourceSetOrFail.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/getKotlinSourceSetOrFail.kt similarity index 96% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/sources/android/getKotlinSourceSetOrFail.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/getKotlinSourceSetOrFail.kt index a28d4a49e61..5f02e31de06 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/sources/android/getKotlinSourceSetOrFail.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/getKotlinSourceSetOrFail.kt @@ -5,7 +5,7 @@ @file:Suppress("DEPRECATION") -package org.jetbrains.kotlin.gradle.sources.android +package org.jetbrains.kotlin.gradle.unit.sources.android import com.android.build.gradle.api.AndroidSourceSet import com.android.builder.model.SourceProvider diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/androidUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/androidUtils.kt similarity index 92% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/androidUtils.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/androidUtils.kt index eeeb99f51d5..c76c08b21e9 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/androidUtils.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/androidUtils.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. */ -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.util import org.junit.Assume import java.io.File diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/assertions.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/assertions.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/assertions.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/assertions.kt index b1b8c342f3d..e39009583aa 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/assertions.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/assertions.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. */ -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.util import org.gradle.api.Project import org.gradle.api.Task diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/buildEventListenerRegistry.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/buildEventListenerRegistry.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/buildEventListenerRegistry.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/buildEventListenerRegistry.kt index cd189576b49..7c1ca678d14 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/buildEventListenerRegistry.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/buildEventListenerRegistry.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. */ -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.util import org.gradle.api.Project import org.gradle.api.internal.project.DefaultProject diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/buildProject.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/buildProject.kt similarity index 57% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/buildProject.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/buildProject.kt index 3c0ebd163e4..bdaef554c34 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/buildProject.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/buildProject.kt @@ -1,19 +1,22 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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. */ -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.util import com.android.build.api.dsl.ApplicationExtension import com.android.build.gradle.LibraryExtension import org.gradle.api.Project +import org.gradle.api.artifacts.verification.DependencyVerificationMode import org.gradle.api.internal.project.ProjectInternal +import org.gradle.api.plugins.ExtraPropertiesExtension import org.gradle.testfixtures.ProjectBuilder import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jetbrains.kotlin.gradle.dsl.kotlinExtension -import org.jetbrains.kotlin.gradle.kpm.applyKpmPlugin +import org.jetbrains.kotlin.gradle.unit.kpm.applyKpmPlugin import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformJvmPlugin +import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinPm20ProjectExtension fun buildProject( @@ -68,4 +71,39 @@ fun Project.androidApplication(code: ApplicationExtension.() -> Unit) { fun Project.projectModel(code: KotlinPm20ProjectExtension.() -> Unit) { val extension = project.extensions.getByType(KotlinPm20ProjectExtension::class.java) extension.code() +} + +fun Project.applyMultiplatformPlugin(): KotlinMultiplatformExtension { + addBuildEventsListenerRegistryMock(this) + disableLegacyWarning(project) + plugins.apply("kotlin-multiplatform") + return extensions.getByName("kotlin") as KotlinMultiplatformExtension +} + +val Project.propertiesExtension: ExtraPropertiesExtension + get() = extensions.getByType(ExtraPropertiesExtension::class.java) + +fun Project.enableGranularSourceSetsMetadata() { + propertiesExtension.set("kotlin.mpp.enableGranularSourceSetsMetadata", "true") +} + +fun Project.enableCInteropCommonization(enabled: Boolean = true) { + propertiesExtension.set(PropertiesProvider.PropertyNames.KOTLIN_MPP_ENABLE_CINTEROP_COMMONIZATION, enabled.toString()) +} + +fun Project.enableHierarchicalStructureByDefault(enabled: Boolean = true) { + propertiesExtension.set(PropertiesProvider.PropertyNames.KOTLIN_MPP_HIERARCHICAL_STRUCTURE_BY_DEFAULT, enabled.toString()) +} + +fun Project.enableDefaultStdlibDependency(enabled: Boolean = true) { + project.propertiesExtension.set(PropertiesProvider.PropertyNames.KOTLIN_STDLIB_DEFAULT_DEPENDENCY, enabled.toString()) +} + +fun Project.setMultiplatformAndroidSourceSetLayoutVersion(version: Int) { + project.propertiesExtension.set(PropertiesProvider.PropertyNames.KOTLIN_MPP_ANDROID_SOURCE_SET_LAYOUT_VERSION, version.toString()) +} + +fun Project.enableDependencyVerification(enabled: Boolean = true) { + gradle.startParameter.dependencyVerificationMode = if (enabled) DependencyVerificationMode.STRICT + else DependencyVerificationMode.OFF } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/compilationUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/compilationUtils.kt similarity index 92% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/compilationUtils.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/compilationUtils.kt index 6f4c453acbf..341862eaf90 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/compilationUtils.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/compilationUtils.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. */ -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.util import org.gradle.api.NamedDomainObjectCollection import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/fileUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/fileUtils.kt similarity index 89% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/fileUtils.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/fileUtils.kt index 18306dd2555..381143be602 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/fileUtils.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/fileUtils.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. */ -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.util import org.gradle.api.Project import java.io.File diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/legacyJsNoWarn.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/legacyJsNoWarn.kt similarity index 83% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/legacyJsNoWarn.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/legacyJsNoWarn.kt index c07377d18e0..b6e8309c1f8 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/legacyJsNoWarn.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/legacyJsNoWarn.kt @@ -1,4 +1,4 @@ -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.util import org.gradle.api.Project import org.jetbrains.kotlin.gradle.plugin.extraProperties diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/reflectionUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/reflectionUtils.kt similarity index 95% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/reflectionUtils.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/reflectionUtils.kt index 5677fa5b3f0..c7cb2caa249 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/reflectionUtils.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/reflectionUtils.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. */ -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.util import org.reflections.Reflections import kotlin.reflect.KClass diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/variants.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/variants.kt similarity index 96% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/variants.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/variants.kt index 344baf1feb1..9f771af4792 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/variants.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/variants.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. */ -package org.jetbrains.kotlin.gradle +package org.jetbrains.kotlin.gradle.util import org.gradle.api.invocation.Gradle import org.jetbrains.kotlin.gradle.plugin.VariantImplementationFactories