Skip to content

Commit 236a0ca

Browse files
committed
Move atomicfu plugin into common sourceset
This should fix missing classes in plugin variants artifacts ^KT-52777 Fixed
1 parent bfe09de commit 236a0ca

File tree

7 files changed

+16
-1
lines changed

7 files changed

+16
-1
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.

libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ dependencies {
3838
requireCapability("org.jetbrains.kotlin:kotlin-sam-with-receiver-common")
3939
}
4040
}
41+
testImplementation(project(":atomicfu")) {
42+
capabilities {
43+
requireCapability("org.jetbrains.kotlin:atomicfu-common")
44+
}
45+
}
4146
testImplementation(project(":kotlin-gradle-plugin-model"))
4247
testImplementation(project(":kotlin-gradle-build-metrics"))
4348
testImplementation(project(":kotlin-project-model"))

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/PluginsDslIT.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,11 @@ class PluginsDslIT : KGPBaseTest() {
4040
"org.jetbrains.kotlin.allopen.gradle.AllOpenGradleSubplugin",
4141
"org.jetbrains.kotlin.allopen.gradle.SpringGradleSubplugin",
4242
"org.jetbrains.kotlin.noarg.gradle.NoArgGradleSubplugin",
43-
"org.jetbrains.kotlin.noarg.gradle.KotlinJpaSubplugin"
43+
"org.jetbrains.kotlin.noarg.gradle.KotlinJpaSubplugin",
44+
"org.jetbrains.kotlinx.atomicfu.gradle.AtomicfuKotlinGradleSubplugin",
45+
"org.jetbrains.kotlin.lombok.gradle.LombokSubplugin",
46+
"org.jetbrains.kotlin.samWithReceiver.gradle.SamWithReceiverGradleSubplugin",
47+
"org.jetbrains.kotlinx.serialization.gradle.SerializationGradleSubplugin"
4448
)
4549

4650
build("build") {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/projectSetupDefaults.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ internal val DEFAULT_GROOVY_SETTINGS_FILE =
3434
id "org.jetbrains.kotlin.plugin.serialization" version "${'$'}kotlin_version"
3535
id "org.jetbrains.kotlin.test.fixes.android" version "${'$'}test_fixes_version"
3636
id "org.jetbrains.kotlin.gradle-subplugin-example" version "${'$'}kotlin_version"
37+
id "org.jetbrains.kotlin.plugin.atomicfu" version "${'$'}kotlin_version"
3738
}
3839
3940
resolutionStrategy {
@@ -86,6 +87,7 @@ internal val DEFAULT_KOTLIN_SETTINGS_FILE =
8687
id("org.jetbrains.kotlin.plugin.serialization") version kotlin_version
8788
id("org.jetbrains.kotlin.test.fixes.android") version test_fixes_version
8889
id("org.jetbrains.kotlin.gradle-subplugin-example") version kotlin_version
90+
id("org.jetbrains.kotlin.plugin.atomicfu") version kotlin_version
8991
}
9092
9193
resolutionStrategy {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/pluginsDsl/applyAllPlugins/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ plugins {
55
id 'org.jetbrains.kotlin.plugin.spring'
66
id 'org.jetbrains.kotlin.plugin.noarg'
77
id 'org.jetbrains.kotlin.plugin.jpa'
8+
id 'org.jetbrains.kotlin.plugin.atomicfu'
9+
id 'org.jetbrains.kotlin.plugin.lombok'
10+
id 'org.jetbrains.kotlin.plugin.sam.with.receiver'
11+
id 'org.jetbrains.kotlin.plugin.serialization'
812
}
913

1014
repositories {

0 commit comments

Comments
 (0)