diff --git a/compiler/build-tools/kotlin-build-tools-api-tests/build.gradle.kts b/compiler/build-tools/kotlin-build-tools-api-tests/build.gradle.kts index e79e1c31d39..3418e3e3625 100644 --- a/compiler/build-tools/kotlin-build-tools-api-tests/build.gradle.kts +++ b/compiler/build-tools/kotlin-build-tools-api-tests/build.gradle.kts @@ -10,6 +10,12 @@ plugins { dependencies { api(kotlinStdlib()) + compileOnly(project(":kotlin-tooling-core")) // to reuse `KotlinToolingVersion` + compileOnly(project(":compiler:build-tools:kotlin-build-tools-api")) + + api(platform(libs.junit.bom)) + compileOnly(libs.junit.jupiter.engine) + compileOnly(libs.junit.jupiter.params) } kotlin { @@ -32,6 +38,12 @@ class BuildToolsApiTestSuit( ) val testMatrix = listOf( + BuildToolsApiTestSuit( + "example", + BuildToolsVersion(KotlinToolingVersion(project.version.toString()), isCurrent = true), + BuildToolsVersion(KotlinToolingVersion(project.version.toString()), isCurrent = true), + onlyCompatibilityTests = false, + ), BuildToolsApiTestSuit( "testSnapshotToSnapshot", BuildToolsVersion(KotlinToolingVersion(project.version.toString()), isCurrent = true), @@ -104,9 +116,11 @@ testing { dependencies { useJUnitJupiter(libs.versions.junit5.get()) - compileOnly(project()) // propagate stdlib from the main dependencies for compilation, - // the runtime dependency provides the actual required version - implementation(project(":kotlin-tooling-core")) // to reuse `KotlinToolingVersion` + compileOnly(project()) // propagate stdlib from the main dependencies for compilation, the runtime dependency provides the actual required version + implementation(project()) { + isTransitive = false + } + implementation(project(":kotlin-tooling-core")) if (suitConfig.apiVersion.isCurrent) { compileOnly(project(":compiler:build-tools:kotlin-build-tools-api")) diff --git a/compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/CompatibilityTests.kt b/compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/CompatibilityTests.kt similarity index 100% rename from compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/CompatibilityTests.kt rename to compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/CompatibilityTests.kt diff --git a/compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/buildToolsVersion.kt b/compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/buildToolsVersion.kt similarity index 100% rename from compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/buildToolsVersion.kt rename to compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/buildToolsVersion.kt diff --git a/compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/compilation/assertions/compilationAssertions.kt b/compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/assertions/compilationAssertions.kt similarity index 100% rename from compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/compilation/assertions/compilationAssertions.kt rename to compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/assertions/compilationAssertions.kt diff --git a/compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/compilation/assertions/filesAssertions.kt b/compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/assertions/filesAssertions.kt similarity index 100% rename from compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/compilation/assertions/filesAssertions.kt rename to compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/assertions/filesAssertions.kt diff --git a/compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/compilation/assertions/logAssertions.kt b/compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/assertions/logAssertions.kt similarity index 100% rename from compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/compilation/assertions/logAssertions.kt rename to compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/assertions/logAssertions.kt diff --git a/compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/compilation/model/AbstractModule.kt b/compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/model/AbstractModule.kt similarity index 100% rename from compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/compilation/model/AbstractModule.kt rename to compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/model/AbstractModule.kt diff --git a/compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/compilation/model/BaseCompilationTest.kt b/compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/model/BaseCompilationTest.kt similarity index 100% rename from compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/compilation/model/BaseCompilationTest.kt rename to compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/model/BaseCompilationTest.kt diff --git a/compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/compilation/model/CompilationOutcome.kt b/compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/model/CompilationOutcome.kt similarity index 100% rename from compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/compilation/model/CompilationOutcome.kt rename to compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/model/CompilationOutcome.kt diff --git a/compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/compilation/model/DefaultStrategyAgnosticCompilationTest.kt b/compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/model/DefaultStrategyAgnosticCompilationTest.kt similarity index 100% rename from compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/compilation/model/DefaultStrategyAgnosticCompilationTest.kt rename to compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/model/DefaultStrategyAgnosticCompilationTest.kt diff --git a/compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/compilation/model/DefaultStrategyAgnosticCompilationTestArgumentProvider.kt b/compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/model/DefaultStrategyAgnosticCompilationTestArgumentProvider.kt similarity index 100% rename from compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/compilation/model/DefaultStrategyAgnosticCompilationTestArgumentProvider.kt rename to compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/model/DefaultStrategyAgnosticCompilationTestArgumentProvider.kt diff --git a/compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/compilation/model/Dependency.kt b/compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/model/Dependency.kt similarity index 100% rename from compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/compilation/model/Dependency.kt rename to compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/model/Dependency.kt diff --git a/compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/compilation/model/JvmModule.kt b/compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/model/JvmModule.kt similarity index 100% rename from compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/compilation/model/JvmModule.kt rename to compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/model/JvmModule.kt diff --git a/compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/compilation/model/LogLevel.kt b/compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/model/LogLevel.kt similarity index 100% rename from compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/compilation/model/LogLevel.kt rename to compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/model/LogLevel.kt diff --git a/compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/compilation/model/Module.kt b/compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/model/Module.kt similarity index 100% rename from compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/compilation/model/Module.kt rename to compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/model/Module.kt diff --git a/compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/compilation/model/Project.kt b/compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/model/Project.kt similarity index 95% rename from compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/compilation/model/Project.kt rename to compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/model/Project.kt index 9c54c3e4ec4..481cfd8d714 100644 --- a/compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/compilation/model/Project.kt +++ b/compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/model/Project.kt @@ -28,7 +28,7 @@ class Project( val moduleDirectory = projectDirectory.resolve(moduleName) val module = JvmModule(this, moduleName, moduleDirectory, dependencies, additionalCompilationArguments) module.sourcesDirectory.createDirectories() - val templatePath = Paths.get("src/testCommon/resources/modules/$moduleName") + val templatePath = Paths.get("src/main/resources/modules/$moduleName") assert(templatePath.isDirectory()) { "Template for $moduleName not found. Expected template directory path is $templatePath" } diff --git a/compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/compilation/model/TestKotlinLogger.kt b/compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/model/TestKotlinLogger.kt similarity index 100% rename from compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/compilation/model/TestKotlinLogger.kt rename to compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/model/TestKotlinLogger.kt diff --git a/compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/compilation/scenario/Scenario.kt b/compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/scenario/Scenario.kt similarity index 100% rename from compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/compilation/scenario/Scenario.kt rename to compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/scenario/Scenario.kt diff --git a/compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/compilation/scenario/ScenarioModule.kt b/compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/scenario/ScenarioModule.kt similarity index 100% rename from compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/compilation/scenario/ScenarioModule.kt rename to compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/scenario/ScenarioModule.kt diff --git a/compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/compilation/scenario/scenarioDsl.kt b/compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/scenario/scenarioDsl.kt similarity index 100% rename from compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/kotlin/compilation/scenario/scenarioDsl.kt rename to compiler/build-tools/kotlin-build-tools-api-tests/src/main/kotlin/compilation/scenario/scenarioDsl.kt diff --git a/compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/resources/modules/jvm-module-1/bar.kt b/compiler/build-tools/kotlin-build-tools-api-tests/src/main/resources/modules/jvm-module-1/bar.kt similarity index 100% rename from compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/resources/modules/jvm-module-1/bar.kt rename to compiler/build-tools/kotlin-build-tools-api-tests/src/main/resources/modules/jvm-module-1/bar.kt diff --git a/compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/resources/modules/jvm-module-1/baz.kt b/compiler/build-tools/kotlin-build-tools-api-tests/src/main/resources/modules/jvm-module-1/baz.kt similarity index 100% rename from compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/resources/modules/jvm-module-1/baz.kt rename to compiler/build-tools/kotlin-build-tools-api-tests/src/main/resources/modules/jvm-module-1/baz.kt diff --git a/compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/resources/modules/jvm-module-1/foo.kt b/compiler/build-tools/kotlin-build-tools-api-tests/src/main/resources/modules/jvm-module-1/foo.kt similarity index 100% rename from compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/resources/modules/jvm-module-1/foo.kt rename to compiler/build-tools/kotlin-build-tools-api-tests/src/main/resources/modules/jvm-module-1/foo.kt diff --git a/compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/resources/modules/jvm-module-2/a.kt b/compiler/build-tools/kotlin-build-tools-api-tests/src/main/resources/modules/jvm-module-2/a.kt similarity index 100% rename from compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/resources/modules/jvm-module-2/a.kt rename to compiler/build-tools/kotlin-build-tools-api-tests/src/main/resources/modules/jvm-module-2/a.kt diff --git a/compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/resources/modules/jvm-module-2/b.kt b/compiler/build-tools/kotlin-build-tools-api-tests/src/main/resources/modules/jvm-module-2/b.kt similarity index 100% rename from compiler/build-tools/kotlin-build-tools-api-tests/src/testCommon/resources/modules/jvm-module-2/b.kt rename to compiler/build-tools/kotlin-build-tools-api-tests/src/main/resources/modules/jvm-module-2/b.kt