diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts index 5060d863c53..8a6526c2651 100644 --- a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts @@ -253,19 +253,19 @@ if (!kotlinBuildProperties.isInJpsBuildIdeaSync) { targets.create("functionalRegressionTest") { testTask.configure { - include("**/org/jetbrains/kotlin/gradle/regression/**") + include("**/org/jetbrains/kotlin/gradle/regressionTests/**") } } targets.create("functionalIdeTest") { testTask.configure { - include("**/org/jetbrains/kotlin/gradle/ide/**") + include("**/org/jetbrains/kotlin/gradle/ideTests/**") } } targets.create("functionalUnitTest") { testTask.configure { - include("**/org/jetbrains/kotlin/gradle/unit/**") + include("**/org/jetbrains/kotlin/gradle/unitTests/**") } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/kpm/AbstractLightweightIdeaDependencyResolutionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/kpm/AbstractLightweightIdeaDependencyResolutionTest.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/kpm/AbstractLightweightIdeaDependencyResolutionTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/kpm/AbstractLightweightIdeaDependencyResolutionTest.kt index 5d5cab7f65d..b4443335f62 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/kpm/AbstractLightweightIdeaDependencyResolutionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/kpm/AbstractLightweightIdeaDependencyResolutionTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.ide.kpm +package org.jetbrains.kotlin.gradle.ideTests.kpm import org.gradle.api.Project import org.gradle.api.artifacts.dsl.RepositoryHandler diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/kpm/IdeaKpmProjectModelSerializableTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/kpm/IdeaKpmProjectModelSerializableTest.kt similarity index 92% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/kpm/IdeaKpmProjectModelSerializableTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/kpm/IdeaKpmProjectModelSerializableTest.kt index b731ff047b1..9d0faaad17b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/kpm/IdeaKpmProjectModelSerializableTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/kpm/IdeaKpmProjectModelSerializableTest.kt @@ -5,12 +5,12 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.ide.kpm +package org.jetbrains.kotlin.gradle.ideTests.kpm import org.gradle.kotlin.dsl.create import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmProject -import org.jetbrains.kotlin.gradle.unit.kpm.AbstractKpmExtensionTest -import org.jetbrains.kotlin.gradle.unit.kpm.buildIdeaKpmProjectModel +import org.jetbrains.kotlin.gradle.unitTests.kpm.AbstractKpmExtensionTest +import org.jetbrains.kotlin.gradle.unitTests.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/ide/kpm/MviKotlinIdeaDependencyResolutionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/kpm/MviKotlinIdeaDependencyResolutionTest.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/kpm/MviKotlinIdeaDependencyResolutionTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/kpm/MviKotlinIdeaDependencyResolutionTest.kt index fde1078bc36..b2daadfe2cd 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/kpm/MviKotlinIdeaDependencyResolutionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/kpm/MviKotlinIdeaDependencyResolutionTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle.ide.kpm +package org.jetbrains.kotlin.gradle.ideTests.kpm import com.android.build.gradle.LibraryExtension import com.android.build.gradle.LibraryPlugin @@ -17,8 +17,8 @@ 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.plugin.mpp.pm20.* -import org.jetbrains.kotlin.gradle.unit.kpm.applyKpmPlugin -import org.jetbrains.kotlin.gradle.unit.kpm.buildIdeaKpmProjectModel +import org.jetbrains.kotlin.gradle.unitTests.kpm.applyKpmPlugin +import org.jetbrains.kotlin.gradle.unitTests.kpm.buildIdeaKpmProjectModel import org.jetbrains.kotlin.gradle.util.addBuildEventsListenerRegistryMock import org.jetbrains.kotlin.gradle.util.assumeAndroidSdkAvailable import org.jetbrains.kotlin.konan.target.KonanTarget.* diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/kpm/SimpleProjectToProjectDependencyResolutionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/kpm/SimpleProjectToProjectDependencyResolutionTest.kt similarity index 97% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/kpm/SimpleProjectToProjectDependencyResolutionTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/kpm/SimpleProjectToProjectDependencyResolutionTest.kt index 63c7cd02df4..479ac49c485 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/kpm/SimpleProjectToProjectDependencyResolutionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/kpm/SimpleProjectToProjectDependencyResolutionTest.kt @@ -5,11 +5,11 @@ @file:Suppress("FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle.ide.kpm +package org.jetbrains.kotlin.gradle.ideTests.kpm import org.jetbrains.kotlin.gradle.idea.kpm.name -import org.jetbrains.kotlin.gradle.unit.kpm.applyKpmPlugin -import org.jetbrains.kotlin.gradle.unit.kpm.buildIdeaKpmProjectModel +import org.jetbrains.kotlin.gradle.unitTests.kpm.applyKpmPlugin +import org.jetbrains.kotlin.gradle.unitTests.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/ide/kpm/StdlibKotlinIdeaDependencyResolutionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/kpm/StdlibKotlinIdeaDependencyResolutionTest.kt similarity index 97% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/kpm/StdlibKotlinIdeaDependencyResolutionTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/kpm/StdlibKotlinIdeaDependencyResolutionTest.kt index 74ddd7142bb..6dbb3383f82 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/kpm/StdlibKotlinIdeaDependencyResolutionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/kpm/StdlibKotlinIdeaDependencyResolutionTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle.ide.kpm +package org.jetbrains.kotlin.gradle.ideTests.kpm import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmDependency.Companion.CLASSPATH_BINARY_TYPE import org.jetbrains.kotlin.gradle.idea.testFixtures.kpm.TestIdeaKpmBinaryDependencyMatcher @@ -16,8 +16,8 @@ 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.unitTests.kpm.applyKpmPlugin +import org.jetbrains.kotlin.gradle.unitTests.kpm.buildIdeaKpmProjectModel import org.jetbrains.kotlin.gradle.util.enableDefaultStdlibDependency import org.junit.Test diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeDependsOnDependencyResolverTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/IdeDependsOnDependencyResolverTest.kt similarity index 97% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeDependsOnDependencyResolverTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/IdeDependsOnDependencyResolverTest.kt index acc50070917..abc964f0b5d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeDependsOnDependencyResolverTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/IdeDependsOnDependencyResolverTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.ide.tcs +package org.jetbrains.kotlin.gradle.ideTests.tcs import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinSourceDependency diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeJvmAndAndroidDependencyResolutionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/IdeJvmAndAndroidDependencyResolutionTest.kt similarity index 97% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeJvmAndAndroidDependencyResolutionTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/IdeJvmAndAndroidDependencyResolutionTest.kt index e8dfcd3f9f5..b03edeb0e5e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeJvmAndAndroidDependencyResolutionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/IdeJvmAndAndroidDependencyResolutionTest.kt @@ -5,13 +5,13 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.ide.tcs +package org.jetbrains.kotlin.gradle.ideTests.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.ide.kpm.mavenCentralCacheRedirector +import org.jetbrains.kotlin.gradle.ideTests.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.* diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeNativePlatformDependencyResolverTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/IdeNativePlatformDependencyResolverTest.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeNativePlatformDependencyResolverTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/IdeNativePlatformDependencyResolverTest.kt index 6057f9c0e8d..7fef5b18680 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeNativePlatformDependencyResolverTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/IdeNativePlatformDependencyResolverTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.ide.tcs +package org.jetbrains.kotlin.gradle.ideTests.tcs import org.jetbrains.kotlin.compilerRunner.konanVersion import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeNativeStdlibResolverTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/IdeNativeStdlibResolverTest.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeNativeStdlibResolverTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/IdeNativeStdlibResolverTest.kt index 8e3bd01b249..55350e4c265 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeNativeStdlibResolverTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/IdeNativeStdlibResolverTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle.ide.tcs +package org.jetbrains.kotlin.gradle.ideTests.tcs import org.jetbrains.kotlin.compilerRunner.konanVersion import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeOriginalMetadataDependencyResolverTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/IdeOriginalMetadataDependencyResolverTest.kt similarity index 96% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeOriginalMetadataDependencyResolverTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/IdeOriginalMetadataDependencyResolverTest.kt index fa950723d90..a7df8b89f3a 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeOriginalMetadataDependencyResolverTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/IdeOriginalMetadataDependencyResolverTest.kt @@ -5,10 +5,10 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.ide.tcs +package org.jetbrains.kotlin.gradle.ideTests.tcs import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension -import org.jetbrains.kotlin.gradle.ide.kpm.mavenCentralCacheRedirector +import org.jetbrains.kotlin.gradle.ideTests.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.plugin.ide.dependencyResolvers.IdeOriginalMetadataDependencyResolver diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdePlatformDependencyResolverTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/IdePlatformDependencyResolverTest.kt similarity index 96% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdePlatformDependencyResolverTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/IdePlatformDependencyResolverTest.kt index da50c70d386..ff672b7fe12 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdePlatformDependencyResolverTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/IdePlatformDependencyResolverTest.kt @@ -5,10 +5,10 @@ @file:Suppress("FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle.ide.tcs +package org.jetbrains.kotlin.gradle.ideTests.tcs import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension -import org.jetbrains.kotlin.gradle.ide.kpm.mavenCentralCacheRedirector +import org.jetbrains.kotlin.gradle.ideTests.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.plugin.ide.dependencyResolvers.IdeBinaryDependencyResolver diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeSourceDependencyResolutionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/IdeSourceDependencyResolutionTest.kt similarity index 99% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeSourceDependencyResolutionTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/IdeSourceDependencyResolutionTest.kt index 2231ef00700..54d75380c54 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeSourceDependencyResolutionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/IdeSourceDependencyResolutionTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle.ide.tcs +package org.jetbrains.kotlin.gradle.ideTests.tcs import org.gradle.api.Project import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeSourceSetConstraintTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/IdeSourceSetConstraintTest.kt similarity index 99% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeSourceSetConstraintTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/IdeSourceSetConstraintTest.kt index 961ba58e2ea..905a929faef 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeSourceSetConstraintTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/IdeSourceSetConstraintTest.kt @@ -5,13 +5,13 @@ @file:Suppress("FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle.ide.tcs +package org.jetbrains.kotlin.gradle.ideTests.tcs 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.util.enableDependencyVerification -import org.jetbrains.kotlin.gradle.ide.kpm.mavenCentralCacheRedirector +import org.jetbrains.kotlin.gradle.ideTests.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/tcs/IdeSourcesAndDocumentationResolutionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/IdeSourcesAndDocumentationResolutionTest.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeSourcesAndDocumentationResolutionTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/IdeSourcesAndDocumentationResolutionTest.kt index 4806a385912..7889680277f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeSourcesAndDocumentationResolutionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/IdeSourcesAndDocumentationResolutionTest.kt @@ -5,10 +5,10 @@ @file:Suppress("FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle.ide.tcs +package org.jetbrains.kotlin.gradle.ideTests.tcs import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension -import org.jetbrains.kotlin.gradle.ide.kpm.mavenCentralCacheRedirector +import org.jetbrains.kotlin.gradle.ideTests.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 diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeStdlibResolutionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/IdeStdlibResolutionTest.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeStdlibResolutionTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/IdeStdlibResolutionTest.kt index 6175484ffa7..02bb8f835ea 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeStdlibResolutionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/IdeStdlibResolutionTest.kt @@ -5,13 +5,13 @@ @file:Suppress("FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle.ide.tcs +package org.jetbrains.kotlin.gradle.ideTests.tcs import org.gradle.api.Project import org.jetbrains.kotlin.compilerRunner.konanVersion 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.ideTests.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 diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeTransformedMetadataDependencyResolverTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/IdeTransformedMetadataDependencyResolverTest.kt similarity index 95% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeTransformedMetadataDependencyResolverTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/IdeTransformedMetadataDependencyResolverTest.kt index 30284ebc0f4..1f30d26863d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/IdeTransformedMetadataDependencyResolverTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/IdeTransformedMetadataDependencyResolverTest.kt @@ -5,13 +5,12 @@ @file:Suppress("FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle.ide.tcs +package org.jetbrains.kotlin.gradle.ideTests.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.ide.kpm.mavenCentralCacheRedirector +import org.jetbrains.kotlin.gradle.ideTests.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 diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/PrepareKotlinIdeaImportTaskTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/PrepareKotlinIdeaImportTaskTest.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/PrepareKotlinIdeaImportTaskTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/PrepareKotlinIdeaImportTaskTest.kt index ed9923acc0f..a1e2cfe58de 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/PrepareKotlinIdeaImportTaskTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/PrepareKotlinIdeaImportTaskTest.kt @@ -6,7 +6,7 @@ @file:Suppress("FunctionName") @file:OptIn(Idea222Api::class) -package org.jetbrains.kotlin.gradle.ide.tcs +package org.jetbrains.kotlin.gradle.ideTests.tcs import org.gradle.api.internal.project.ProjectInternal import org.gradle.testfixtures.ProjectBuilder diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/externalTargetApi/ExternalAndroidTargetPrototypeSmokeTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/externalTargetApi/ExternalAndroidTargetPrototypeSmokeTest.kt similarity index 96% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/externalTargetApi/ExternalAndroidTargetPrototypeSmokeTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/externalTargetApi/ExternalAndroidTargetPrototypeSmokeTest.kt index ed26568b26b..f41f401ddf6 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/externalTargetApi/ExternalAndroidTargetPrototypeSmokeTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/externalTargetApi/ExternalAndroidTargetPrototypeSmokeTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.ide.tcs.externalTargetApi +package org.jetbrains.kotlin.gradle.ideTests.tcs.externalTargetApi import org.gradle.api.publish.PublishingExtension import org.gradle.api.publish.maven.MavenPublication @@ -16,7 +16,7 @@ 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.ide.kpm.mavenCentralCacheRedirector +import org.jetbrains.kotlin.gradle.ideTests.kpm.mavenCentralCacheRedirector import org.jetbrains.kotlin.gradle.plugin.ide.kotlinIdeMultiplatformImport import org.jetbrains.kotlin.gradle.util.* import org.jetbrains.kotlin.gradle.utils.getByType diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/ideaKotlinDependencyMatcherBuilders.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/ideaKotlinDependencyMatcherBuilders.kt similarity index 91% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/ideaKotlinDependencyMatcherBuilders.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/tcs/ideaKotlinDependencyMatcherBuilders.kt index 5b794670fd5..cb4a74f8f1a 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/tcs/ideaKotlinDependencyMatcherBuilders.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ideTests/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.tcs +package org.jetbrains.kotlin.gradle.ideTests.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/regression/ArchiveReproducibilityTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/ArchiveReproducibilityTest.kt similarity index 97% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/ArchiveReproducibilityTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/ArchiveReproducibilityTest.kt index cf8d5d52583..2a0ece8e5a7 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/ArchiveReproducibilityTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/ArchiveReproducibilityTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.regression +package org.jetbrains.kotlin.gradle.regressionTests import org.gradle.api.Project import org.gradle.api.tasks.bundling.AbstractArchiveTask diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/CInteropTaskTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/CInteropTaskTest.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/CInteropTaskTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/CInteropTaskTest.kt index ca5bdc8b3dc..13f48c6c877 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/CInteropTaskTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/CInteropTaskTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.regression +package org.jetbrains.kotlin.gradle.regressionTests import org.jetbrains.kotlin.gradle.MultiplatformExtensionTest import org.jetbrains.kotlin.gradle.plugin.mpp.DefaultCInteropSettings diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/CommonizerTaskTests.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/CommonizerTaskTests.kt similarity index 99% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/CommonizerTaskTests.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/CommonizerTaskTests.kt index 873beaf8a7d..f5a9fb1dc84 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/CommonizerTaskTests.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/CommonizerTaskTests.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle.regression +package org.jetbrains.kotlin.gradle.regressionTests import org.gradle.api.internal.project.ProjectInternal import org.gradle.testfixtures.ProjectBuilder diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/ConfigurationsTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/ConfigurationsTest.kt similarity index 99% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/ConfigurationsTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/ConfigurationsTest.kt index a4f05c662b1..ff91cd49512 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/ConfigurationsTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/ConfigurationsTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.regression +package org.jetbrains.kotlin.gradle.regressionTests import org.gradle.api.attributes.AttributeContainer import org.gradle.api.attributes.Category diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/IdeImportPropertiesConsistencyTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/IdeImportPropertiesConsistencyTest.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/IdeImportPropertiesConsistencyTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/IdeImportPropertiesConsistencyTest.kt index 66306e55bfb..ebcecf5adf8 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/IdeImportPropertiesConsistencyTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/IdeImportPropertiesConsistencyTest.kt @@ -5,7 +5,7 @@ /* Associate compilations are not yet supported by the IDE. KT-34102 */ @file:Suppress("invisible_reference", "invisible_member", "FunctionName") -package org.jetbrains.kotlin.gradle.regression +package org.jetbrains.kotlin.gradle.regressionTests import org.gradle.api.Project import org.gradle.testfixtures.ProjectBuilder diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/JvmAndAndroidIntermediateSourceSetTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/JvmAndAndroidIntermediateSourceSetTest.kt similarity index 99% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/JvmAndAndroidIntermediateSourceSetTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/JvmAndAndroidIntermediateSourceSetTest.kt index f558a30747b..6f9873a2d78 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/JvmAndAndroidIntermediateSourceSetTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/JvmAndAndroidIntermediateSourceSetTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.regression +package org.jetbrains.kotlin.gradle.regressionTests import com.android.build.gradle.LibraryExtension import org.gradle.api.internal.project.ProjectInternal diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT31459JvmMainClassesTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KT31459JvmMainClassesTest.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT31459JvmMainClassesTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KT31459JvmMainClassesTest.kt index 572b69dc278..b807f9879a7 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT31459JvmMainClassesTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KT31459JvmMainClassesTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.regression +package org.jetbrains.kotlin.gradle.regressionTests 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/regression/KT41641AbsentAndroidTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KT41641AbsentAndroidTarget.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT41641AbsentAndroidTarget.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KT41641AbsentAndroidTarget.kt index fe0ef5ffdad..f4f5fe349a5 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT41641AbsentAndroidTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KT41641AbsentAndroidTarget.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.regression +package org.jetbrains.kotlin.gradle.regressionTests import com.android.build.gradle.LibraryExtension import org.jetbrains.kotlin.gradle.MultiplatformExtensionTest diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT46273JvmTargetAndOrphanTestSourceSetTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KT46273JvmTargetAndOrphanTestSourceSetTest.kt similarity index 96% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT46273JvmTargetAndOrphanTestSourceSetTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KT46273JvmTargetAndOrphanTestSourceSetTest.kt index c84913c3d17..08b02db4451 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT46273JvmTargetAndOrphanTestSourceSetTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KT46273JvmTargetAndOrphanTestSourceSetTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.regression +package org.jetbrains.kotlin.gradle.regressionTests import org.jetbrains.kotlin.gradle.MultiplatformExtensionTest import org.jetbrains.kotlin.gradle.plugin.sources.DefaultKotlinSourceSet diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT54783JvmWithJavaCompilationFactoryTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KT54783JvmWithJavaCompilationFactoryTest.kt similarity index 96% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT54783JvmWithJavaCompilationFactoryTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KT54783JvmWithJavaCompilationFactoryTest.kt index 21480ecd117..33a6ca88f37 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT54783JvmWithJavaCompilationFactoryTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KT54783JvmWithJavaCompilationFactoryTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.regression +package org.jetbrains.kotlin.gradle.regressionTests import org.gradle.kotlin.dsl.getByType import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT54867KotlinWithJavaCompilationClasspathTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KT54867KotlinWithJavaCompilationClasspathTest.kt similarity index 97% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT54867KotlinWithJavaCompilationClasspathTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KT54867KotlinWithJavaCompilationClasspathTest.kt index b767fa09fac..eb7f62e719a 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT54867KotlinWithJavaCompilationClasspathTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KT54867KotlinWithJavaCompilationClasspathTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.regression +package org.jetbrains.kotlin.gradle.regressionTests import org.jetbrains.kotlin.gradle.dsl.kotlinJvmExtension import org.jetbrains.kotlin.gradle.plugin.mpp.javaSourceSets diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT55347JsProjectImport.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KT55347JsProjectImport.kt similarity index 97% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT55347JsProjectImport.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KT55347JsProjectImport.kt index ade718f3da4..c2ef53081dc 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KT55347JsProjectImport.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KT55347JsProjectImport.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.regression +package org.jetbrains.kotlin.gradle.regressionTests import org.jetbrains.kotlin.gradle.dsl.KotlinJsProjectExtension import org.jetbrains.kotlin.gradle.dsl.kotlinExtension diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KotlinCompileTaskSourcesTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KotlinCompileTaskSourcesTest.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KotlinCompileTaskSourcesTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KotlinCompileTaskSourcesTest.kt index e5a46487218..421ff3002c1 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KotlinCompileTaskSourcesTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KotlinCompileTaskSourcesTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.regression +package org.jetbrains.kotlin.gradle.regressionTests import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinCommonCompilation diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KotlinJvmFunctionalTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KotlinJvmFunctionalTest.kt similarity index 96% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KotlinJvmFunctionalTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KotlinJvmFunctionalTest.kt index f1729236572..a9dba8f10db 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KotlinJvmFunctionalTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KotlinJvmFunctionalTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.regression +package org.jetbrains.kotlin.gradle.regressionTests import org.jetbrains.kotlin.gradle.dsl.kotlinExtension import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.targets diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KotlinNativeCompileRefinesPathsTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KotlinNativeCompileRefinesPathsTest.kt similarity index 97% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KotlinNativeCompileRefinesPathsTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KotlinNativeCompileRefinesPathsTest.kt index 267dbd557a4..b85f37c964f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regression/KotlinNativeCompileRefinesPathsTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KotlinNativeCompileRefinesPathsTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.regression +package org.jetbrains.kotlin.gradle.regressionTests import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinSharedNativeCompilation diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/AndroidGradlePluginVersionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/AndroidGradlePluginVersionTest.kt similarity index 97% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/AndroidGradlePluginVersionTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/AndroidGradlePluginVersionTest.kt index d47e943f912..28a70b81ab9 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/AndroidGradlePluginVersionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/AndroidGradlePluginVersionTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.unit +package org.jetbrains.kotlin.gradle.unitTests 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/unit/BuildKotlinToolingMetadataTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/BuildKotlinToolingMetadataTest.kt similarity index 99% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/BuildKotlinToolingMetadataTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/BuildKotlinToolingMetadataTest.kt index 0742605f46f..fd3ef1d0cba 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/BuildKotlinToolingMetadataTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/BuildKotlinToolingMetadataTest.kt @@ -6,7 +6,7 @@ /* Associate compilations are not yet supported by the IDE. KT-34102 */ @file:Suppress("invisible_reference", "invisible_member", "FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle.unit +package org.jetbrains.kotlin.gradle.unitTests import com.android.build.gradle.BaseExtension import org.gradle.api.JavaVersion diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/CInteropCommonizerTaskTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/CInteropCommonizerTaskTest.kt similarity index 99% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/CInteropCommonizerTaskTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/CInteropCommonizerTaskTest.kt index 1a36f835e5c..fbc29306d7b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/CInteropCommonizerTaskTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/CInteropCommonizerTaskTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle.unit +package org.jetbrains.kotlin.gradle.unitTests import org.jetbrains.kotlin.commonizer.CommonizerTarget import org.jetbrains.kotlin.commonizer.SharedCommonizerTarget diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/CInteropMetadataDependencyTransformationTaskTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/CInteropMetadataDependencyTransformationTaskTest.kt similarity index 99% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/CInteropMetadataDependencyTransformationTaskTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/CInteropMetadataDependencyTransformationTaskTest.kt index ec923141bea..a9eed63f860 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/CInteropMetadataDependencyTransformationTaskTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/CInteropMetadataDependencyTransformationTaskTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle.unit +package org.jetbrains.kotlin.gradle.unitTests import org.gradle.api.internal.TaskInternal import org.jetbrains.kotlin.gradle.MultiplatformExtensionTest diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/CompilationSpecificPluginPath.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/CompilationSpecificPluginPath.kt similarity index 99% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/CompilationSpecificPluginPath.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/CompilationSpecificPluginPath.kt index fc892d2bbca..f28ae030181 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/CompilationSpecificPluginPath.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/CompilationSpecificPluginPath.kt @@ -4,7 +4,7 @@ */ @file:Suppress("FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle.unit +package org.jetbrains.kotlin.gradle.unitTests import org.gradle.api.Project import org.gradle.api.artifacts.Configuration diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/CompositeMetadataArtifactTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/CompositeMetadataArtifactTest.kt similarity index 99% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/CompositeMetadataArtifactTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/CompositeMetadataArtifactTest.kt index 8f755878edf..2cc18c83ed2 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/CompositeMetadataArtifactTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/CompositeMetadataArtifactTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.unit +package org.jetbrains.kotlin.gradle.unitTests import org.gradle.kotlin.dsl.support.unzipTo import org.gradle.kotlin.dsl.support.zipTo diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/DisabledCInteropCommonizationWarningTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/DisabledCInteropCommonizationWarningTest.kt similarity index 99% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/DisabledCInteropCommonizationWarningTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/DisabledCInteropCommonizationWarningTest.kt index a4367ae4658..28bf59aec1c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/DisabledCInteropCommonizationWarningTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/DisabledCInteropCommonizationWarningTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.unit +package org.jetbrains.kotlin.gradle.unitTests import org.gradle.api.Project import org.gradle.api.internal.project.ProjectInternal diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/InternalKotlinCompilationTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/InternalKotlinCompilationTest.kt similarity index 94% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/InternalKotlinCompilationTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/InternalKotlinCompilationTest.kt index 2494a3eba3b..1b5685d8029 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/InternalKotlinCompilationTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/InternalKotlinCompilationTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.unit +package org.jetbrains.kotlin.gradle.unitTests import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation import org.jetbrains.kotlin.gradle.plugin.mpp.InternalKotlinCompilation diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/InternalKotlinTargetTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/InternalKotlinTargetTest.kt similarity index 93% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/InternalKotlinTargetTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/InternalKotlinTargetTest.kt index 8b84207e0dd..bf29197704f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/InternalKotlinTargetTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/InternalKotlinTargetTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.unit +package org.jetbrains.kotlin.gradle.unitTests import org.jetbrains.kotlin.gradle.plugin.KotlinTarget import org.jetbrains.kotlin.gradle.plugin.mpp.InternalKotlinTarget diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/InvokeWhenCreatedTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/InvokeWhenCreatedTest.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/InvokeWhenCreatedTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/InvokeWhenCreatedTest.kt index 3dc96d4c26d..13b7e0f35d8 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/InvokeWhenCreatedTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/InvokeWhenCreatedTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.unit +package org.jetbrains.kotlin.gradle.unitTests import org.gradle.api.Named import org.gradle.api.UnknownDomainObjectException diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KaptApiTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KaptApiTest.kt similarity index 99% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KaptApiTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KaptApiTest.kt index 88d23b3fdb3..014223f2af9 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KaptApiTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/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.unit +package org.jetbrains.kotlin.gradle.unitTests import org.gradle.api.internal.project.ProjectInternal import org.jetbrains.kotlin.gradle.internal.Kapt3GradleSubplugin diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinAndroidDependsOnEdgesTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinAndroidDependsOnEdgesTest.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinAndroidDependsOnEdgesTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinAndroidDependsOnEdgesTest.kt index 364a44a6d99..9f1a5a723f2 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinAndroidDependsOnEdgesTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinAndroidDependsOnEdgesTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle.unit +package org.jetbrains.kotlin.gradle.unitTests import com.android.build.gradle.LibraryExtension import org.gradle.api.internal.project.ProjectInternal diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinCompileApiTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinCompileApiTest.kt similarity index 99% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinCompileApiTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinCompileApiTest.kt index ad76ccafc3f..4034267802c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinCompileApiTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/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.unit +package org.jetbrains.kotlin.gradle.unitTests import org.gradle.api.internal.project.ProjectInternal import org.jetbrains.kotlin.gradle.dsl.ExplicitApiMode diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinMultiplatformAndroidGradlePluginCompatibilityHealthCheckTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinMultiplatformAndroidGradlePluginCompatibilityHealthCheckTest.kt similarity index 99% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinMultiplatformAndroidGradlePluginCompatibilityHealthCheckTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinMultiplatformAndroidGradlePluginCompatibilityHealthCheckTest.kt index ec0ae4b9f36..cc22a19a593 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinMultiplatformAndroidGradlePluginCompatibilityHealthCheckTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinMultiplatformAndroidGradlePluginCompatibilityHealthCheckTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle.unit +package org.jetbrains.kotlin.gradle.unitTests import com.android.build.gradle.LibraryPlugin import org.gradle.testfixtures.ProjectBuilder diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinProjectStructureMetadataSerializationTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinProjectStructureMetadataSerializationTest.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinProjectStructureMetadataSerializationTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinProjectStructureMetadataSerializationTest.kt index 9a73fe665f0..6e36ddd86e8 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinProjectStructureMetadataSerializationTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinProjectStructureMetadataSerializationTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.unit +package org.jetbrains.kotlin.gradle.unitTests 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/unit/KotlinTargetHierarchyBuilderTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinTargetHierarchyBuilderTest.kt similarity index 97% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinTargetHierarchyBuilderTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinTargetHierarchyBuilderTest.kt index 485cc72b308..8de59fac4e7 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinTargetHierarchyBuilderTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinTargetHierarchyBuilderTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.unit +package org.jetbrains.kotlin.gradle.unitTests import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension import org.jetbrains.kotlin.gradle.plugin.KotlinTargetHierarchyBuilder diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinTargetHierarchyDescriptorTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinTargetHierarchyDescriptorTest.kt similarity index 99% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinTargetHierarchyDescriptorTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinTargetHierarchyDescriptorTest.kt index b40fcc306b2..f8a7d5c191b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinTargetHierarchyDescriptorTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinTargetHierarchyDescriptorTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.unit +package org.jetbrains.kotlin.gradle.unitTests import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension import org.jetbrains.kotlin.gradle.plugin.KotlinTargetHierarchyDescriptor diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinTargetHierarchyDslTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinTargetHierarchyDslTest.kt similarity index 99% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinTargetHierarchyDslTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinTargetHierarchyDslTest.kt index da807c2ba93..ccb6dc8884b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinTargetHierarchyDslTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinTargetHierarchyDslTest.kt @@ -5,9 +5,8 @@ @file:Suppress("FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle.unit +package org.jetbrains.kotlin.gradle.unitTests -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 diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinToolingVersionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinToolingVersionTest.kt similarity index 95% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinToolingVersionTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinToolingVersionTest.kt index e74461750d1..0cfed98c5c8 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/KotlinToolingVersionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinToolingVersionTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.unit +package org.jetbrains.kotlin.gradle.unitTests 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/unit/MppPublicationTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/MppPublicationTest.kt similarity index 99% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/MppPublicationTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/MppPublicationTest.kt index 6f91994e555..68cb8ccab10 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/MppPublicationTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/MppPublicationTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.unit +package org.jetbrains.kotlin.gradle.unitTests import org.gradle.api.attributes.Attribute import org.gradle.api.attributes.AttributeContainer diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/ObservableSetTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/ObservableSetTest.kt similarity index 97% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/ObservableSetTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/ObservableSetTest.kt index da90c871694..ef97415a90e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/ObservableSetTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/ObservableSetTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.unit +package org.jetbrains.kotlin.gradle.unitTests 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/unit/ResolveKotlinSourceSetsTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/ResolveKotlinSourceSetsTest.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/ResolveKotlinSourceSetsTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/ResolveKotlinSourceSetsTest.kt index 0a913a1e297..6f0e22ade38 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/ResolveKotlinSourceSetsTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/ResolveKotlinSourceSetsTest.kt @@ -6,7 +6,7 @@ /* Associate compilations are not yet supported by the IDE. KT-34102 */ @file:Suppress("invisible_reference", "invisible_member", "FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle.unit +package org.jetbrains.kotlin.gradle.unitTests import org.gradle.api.Project import org.gradle.testfixtures.ProjectBuilder diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/SourceSetCommonizerTargetTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/SourceSetCommonizerTargetTest.kt similarity index 99% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/SourceSetCommonizerTargetTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/SourceSetCommonizerTargetTest.kt index fa6dbaf6e11..28fc3c79e5d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/SourceSetCommonizerTargetTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/SourceSetCommonizerTargetTest.kt @@ -6,7 +6,7 @@ /* Associate compilations are not yet supported by the IDE. KT-34102 */ @file:Suppress("invisible_reference", "invisible_member", "FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle.unit +package org.jetbrains.kotlin.gradle.unitTests import org.gradle.api.Project import org.gradle.api.plugins.ExtraPropertiesExtension diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/WhenEvaluatedAndroidOrderingTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/WhenEvaluatedAndroidOrderingTest.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/WhenEvaluatedAndroidOrderingTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/WhenEvaluatedAndroidOrderingTest.kt index 6a567988a7b..3b7d2b18e5b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/WhenEvaluatedAndroidOrderingTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/WhenEvaluatedAndroidOrderingTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle.unit +package org.jetbrains.kotlin.gradle.unitTests import com.android.build.gradle.LibraryExtension import org.gradle.api.Project diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/ZipUtilsTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/ZipUtilsTest.kt similarity index 99% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/ZipUtilsTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/ZipUtilsTest.kt index 6a745837863..83f0c350c1c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/ZipUtilsTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/ZipUtilsTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.unit +package org.jetbrains.kotlin.gradle.unitTests 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/unit/kpm/AbstractKpmExtensionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/kpm/AbstractKpmExtensionTest.kt similarity index 96% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/AbstractKpmExtensionTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/kpm/AbstractKpmExtensionTest.kt index 5243132607e..d2fcdb23dce 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/AbstractKpmExtensionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/kpm/AbstractKpmExtensionTest.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.unit.kpm +package org.jetbrains.kotlin.gradle.unitTests.kpm import org.gradle.api.Project import org.gradle.api.artifacts.verification.DependencyVerificationMode diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/BuildKotlinToolingMetadataTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/kpm/BuildKotlinToolingMetadataTest.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/BuildKotlinToolingMetadataTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/kpm/BuildKotlinToolingMetadataTest.kt index 419c35fe701..32dd3f2d4e3 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/BuildKotlinToolingMetadataTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/kpm/BuildKotlinToolingMetadataTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.unit.kpm +package org.jetbrains.kotlin.gradle.unitTests.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/unit/kpm/KotlinCommonFragmentFactoryTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/kpm/KotlinCommonFragmentFactoryTest.kt similarity index 94% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/KotlinCommonFragmentFactoryTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/kpm/KotlinCommonFragmentFactoryTest.kt index 6ebb32df172..0b0f598a9bc 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/KotlinCommonFragmentFactoryTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/kpm/KotlinCommonFragmentFactoryTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.unit.kpm +package org.jetbrains.kotlin.gradle.unitTests.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/unit/kpm/KotlinFragmentConfigurationDefinitionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/kpm/KotlinFragmentConfigurationDefinitionTest.kt similarity index 99% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/KotlinFragmentConfigurationDefinitionTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/kpm/KotlinFragmentConfigurationDefinitionTest.kt index 802ee569a72..8d8ab70152f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/KotlinFragmentConfigurationDefinitionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/kpm/KotlinFragmentConfigurationDefinitionTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.unit.kpm +package org.jetbrains.kotlin.gradle.unitTests.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/unit/kpm/KotlinJvmVariantFactoryTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/kpm/KotlinJvmVariantFactoryTest.kt similarity index 99% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/KotlinJvmVariantFactoryTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/kpm/KotlinJvmVariantFactoryTest.kt index 31acbd18801..4944c45b3be 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/KotlinJvmVariantFactoryTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/kpm/KotlinJvmVariantFactoryTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.unit.kpm +package org.jetbrains.kotlin.gradle.unitTests.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/unit/kpm/KotlinNativeVariantFactoryTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/kpm/KotlinNativeVariantFactoryTest.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/KotlinNativeVariantFactoryTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/kpm/KotlinNativeVariantFactoryTest.kt index 6aec3e9a196..1e6d1fbc559 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/KotlinNativeVariantFactoryTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/kpm/KotlinNativeVariantFactoryTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.unit.kpm +package org.jetbrains.kotlin.gradle.unitTests.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/unit/kpm/KpmCompilerPluginTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/kpm/KpmCompilerPluginTest.kt similarity index 99% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/KpmCompilerPluginTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/kpm/KpmCompilerPluginTest.kt index df15ffb549f..d97bf641ca0 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/KpmCompilerPluginTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/kpm/KpmCompilerPluginTest.kt @@ -4,7 +4,7 @@ */ @file:Suppress("invisible_reference", "invisible_member", "FunctionName") -package org.jetbrains.kotlin.gradle.unit.kpm +package org.jetbrains.kotlin.gradle.unitTests.kpm import org.gradle.api.Project import org.gradle.api.artifacts.Configuration diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/KpmGradleFragmentContainerTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/kpm/KpmGradleFragmentContainerTest.kt similarity index 95% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/KpmGradleFragmentContainerTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/kpm/KpmGradleFragmentContainerTest.kt index ebbecb8f071..f71971e4337 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/KpmGradleFragmentContainerTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/kpm/KpmGradleFragmentContainerTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.unit.kpm +package org.jetbrains.kotlin.gradle.unitTests.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/unit/kpm/TestHelpers.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/kpm/TestHelpers.kt similarity index 91% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/TestHelpers.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/kpm/TestHelpers.kt index 50add0c6870..6ddd5c2419a 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/TestHelpers.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/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.unit.kpm +package org.jetbrains.kotlin.gradle.unitTests.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/unit/kpm/TransitiveRuntimeOnlyConfigurationTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/kpm/TransitiveRuntimeOnlyConfigurationTest.kt similarity index 97% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/TransitiveRuntimeOnlyConfigurationTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/kpm/TransitiveRuntimeOnlyConfigurationTest.kt index 6f61d78ca10..8613f6f11a9 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/kpm/TransitiveRuntimeOnlyConfigurationTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/kpm/TransitiveRuntimeOnlyConfigurationTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.unit.kpm +package org.jetbrains.kotlin.gradle.unitTests.kpm import kotlin.test.Test import kotlin.test.assertEquals diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/InternalKotlinSourceSetTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/sources/InternalKotlinSourceSetTest.kt similarity index 99% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/InternalKotlinSourceSetTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/sources/InternalKotlinSourceSetTest.kt index 3ca4e51347a..de5922283e4 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/InternalKotlinSourceSetTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/sources/InternalKotlinSourceSetTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.unit.sources +package org.jetbrains.kotlin.gradle.unitTests.sources import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/SourceSetVisibilityInferenceTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/sources/SourceSetVisibilityInferenceTest.kt similarity index 99% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/SourceSetVisibilityInferenceTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/sources/SourceSetVisibilityInferenceTest.kt index 52718639fbb..7e36b0c425a 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/SourceSetVisibilityInferenceTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/sources/SourceSetVisibilityInferenceTest.kt @@ -5,7 +5,7 @@ @file:Suppress("DuplicatedCode") -package org.jetbrains.kotlin.gradle.unit.sources +package org.jetbrains.kotlin.gradle.unitTests.sources import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/KotlinAndroidSourceSetLayoutExtensionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/sources/android/KotlinAndroidSourceSetLayoutExtensionTest.kt similarity index 97% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/KotlinAndroidSourceSetLayoutExtensionTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/sources/android/KotlinAndroidSourceSetLayoutExtensionTest.kt index b5be0dba490..c2453911f0f 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/KotlinAndroidSourceSetLayoutExtensionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/sources/android/KotlinAndroidSourceSetLayoutExtensionTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.unit.sources.android +package org.jetbrains.kotlin.gradle.unitTests.sources.android import org.gradle.testfixtures.ProjectBuilder import org.jetbrains.kotlin.gradle.plugin.KotlinAndroidPluginWrapper diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/MultiplatformAndroidSourceSetLayoutV1Test.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/sources/android/MultiplatformAndroidSourceSetLayoutV1Test.kt similarity index 99% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/MultiplatformAndroidSourceSetLayoutV1Test.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/sources/android/MultiplatformAndroidSourceSetLayoutV1Test.kt index 0a6d240a393..4f4323d7aa7 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/MultiplatformAndroidSourceSetLayoutV1Test.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/sources/android/MultiplatformAndroidSourceSetLayoutV1Test.kt @@ -5,7 +5,7 @@ @file:Suppress("DEPRECATION", "DuplicatedCode", "FunctionName") -package org.jetbrains.kotlin.gradle.unit.sources.android +package org.jetbrains.kotlin.gradle.unitTests.sources.android import com.android.build.gradle.LibraryExtension import com.android.build.gradle.api.AndroidSourceSet diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/MultiplatformAndroidSourceSetLayoutV2DiagnosticsTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/sources/android/MultiplatformAndroidSourceSetLayoutV2DiagnosticsTest.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/MultiplatformAndroidSourceSetLayoutV2DiagnosticsTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/sources/android/MultiplatformAndroidSourceSetLayoutV2DiagnosticsTest.kt index ac3efbfa380..2d754b74d95 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/MultiplatformAndroidSourceSetLayoutV2DiagnosticsTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/sources/android/MultiplatformAndroidSourceSetLayoutV2DiagnosticsTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName") -package org.jetbrains.kotlin.gradle.unit.sources.android +package org.jetbrains.kotlin.gradle.unitTests.sources.android import com.android.build.gradle.LibraryPlugin import org.gradle.api.Project diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/MultiplatformAndroidSourceSetLayoutV2Test.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/sources/android/MultiplatformAndroidSourceSetLayoutV2Test.kt similarity index 99% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/MultiplatformAndroidSourceSetLayoutV2Test.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/sources/android/MultiplatformAndroidSourceSetLayoutV2Test.kt index 4661c25c019..6dbd8902575 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/MultiplatformAndroidSourceSetLayoutV2Test.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/sources/android/MultiplatformAndroidSourceSetLayoutV2Test.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle.unit.sources.android +package org.jetbrains.kotlin.gradle.unitTests.sources.android import com.android.build.gradle.LibraryExtension import com.android.build.gradle.LibraryPlugin diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/SingleTargetAndroidSourceSetLayoutTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/sources/android/SingleTargetAndroidSourceSetLayoutTest.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/SingleTargetAndroidSourceSetLayoutTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/sources/android/SingleTargetAndroidSourceSetLayoutTest.kt index 285dec2fb65..b0c584f8351 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/SingleTargetAndroidSourceSetLayoutTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/sources/android/SingleTargetAndroidSourceSetLayoutTest.kt @@ -5,7 +5,7 @@ @file:Suppress("FunctionName", "DuplicatedCode") -package org.jetbrains.kotlin.gradle.unit.sources.android +package org.jetbrains.kotlin.gradle.unitTests.sources.android import com.android.build.gradle.LibraryExtension import com.android.build.gradle.LibraryPlugin diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/TestDiagnosticsReporter.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/sources/android/TestDiagnosticsReporter.kt similarity index 96% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/TestDiagnosticsReporter.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/sources/android/TestDiagnosticsReporter.kt index 7ae390a92fa..eadbd47ab65 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/TestDiagnosticsReporter.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/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.unit.sources.android +package org.jetbrains.kotlin.gradle.unitTests.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/unit/sources/android/generatePairs.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/sources/android/generatePairs.kt similarity index 90% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/generatePairs.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/sources/android/generatePairs.kt index d678c1d36ed..5f4cb66a4e8 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/generatePairs.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/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.unit.sources.android +package org.jetbrains.kotlin.gradle.unitTests.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/unit/sources/android/getKotlinSourceSetOrFail.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/sources/android/getKotlinSourceSetOrFail.kt similarity index 96% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/getKotlinSourceSetOrFail.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/sources/android/getKotlinSourceSetOrFail.kt index 5f02e31de06..e6be296289d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unit/sources/android/getKotlinSourceSetOrFail.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/sources/android/getKotlinSourceSetOrFail.kt @@ -5,7 +5,7 @@ @file:Suppress("DEPRECATION") -package org.jetbrains.kotlin.gradle.unit.sources.android +package org.jetbrains.kotlin.gradle.unitTests.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/util/buildProject.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/buildProject.kt index bdaef554c34..ef82511e19c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/buildProject.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/buildProject.kt @@ -14,7 +14,7 @@ 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.unit.kpm.applyKpmPlugin +import org.jetbrains.kotlin.gradle.unitTests.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