diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt index 25238b61300..5513f3810e4 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt @@ -743,6 +743,17 @@ class KotlinGradleIT : BaseGradleIT() { } } + @Test + fun testKotlinPluginDependenciesInBuildSrc() { + val project = transformProjectWithPluginsDsl("kotlinPluginDepsInBuildSrc") + project.setupWorkingDir() + project.build("build") { + assertSuccessful() + assertContains("Hi from BuildSrc") + } + + } + @Test fun testInternalTest() = with( Project("internalTest") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinPluginDepsInBuildSrc/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinPluginDepsInBuildSrc/build.gradle.kts new file mode 100644 index 00000000000..4c9f3bc74ab --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinPluginDepsInBuildSrc/build.gradle.kts @@ -0,0 +1,15 @@ +import foo.bar.configureFromBuildSrc + +plugins { + kotlin("jvm") version "" +} + +kotlin { + sourceSets { + main { + languageSettings { + configureFromBuildSrc() + } + } + } +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinPluginDepsInBuildSrc/buildSrc/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinPluginDepsInBuildSrc/buildSrc/build.gradle.kts new file mode 100644 index 00000000000..b98834a7730 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinPluginDepsInBuildSrc/buildSrc/build.gradle.kts @@ -0,0 +1,14 @@ +plugins { + kotlin("jvm") version "" +} + +repositories { + mavenCentral() + mavenLocal() +} + +allprojects { + dependencies { + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin-api:") + } +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinPluginDepsInBuildSrc/buildSrc/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinPluginDepsInBuildSrc/buildSrc/settings.gradle.kts new file mode 100644 index 00000000000..926d2543010 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinPluginDepsInBuildSrc/buildSrc/settings.gradle.kts @@ -0,0 +1,6 @@ +pluginManagement { + repositories { + mavenCentral() + mavenLocal() + } +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinPluginDepsInBuildSrc/buildSrc/src/main/kotlin/SomeHelper.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinPluginDepsInBuildSrc/buildSrc/src/main/kotlin/SomeHelper.kt new file mode 100644 index 00000000000..0e4de1de793 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinPluginDepsInBuildSrc/buildSrc/src/main/kotlin/SomeHelper.kt @@ -0,0 +1,7 @@ +package foo.bar + +import org.jetbrains.kotlin.gradle.plugin.LanguageSettingsBuilder + +fun LanguageSettingsBuilder.configureFromBuildSrc() { + println("Hi from BuildSrc: $this") +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinPluginDepsInBuildSrc/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinPluginDepsInBuildSrc/settings.gradle.kts new file mode 100644 index 00000000000..1a69c220d39 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinPluginDepsInBuildSrc/settings.gradle.kts @@ -0,0 +1,7 @@ + +pluginManagement { + repositories { + mavenCentral() + mavenLocal() + } +} \ No newline at end of file