azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move atomicfu plugin into common sourceset

Browse Source 
This should fix missing classes in plugin variants artifacts

^KT-52777 Fixed
This commit is contained in:
Yahor Berdnikau
2022-06-14 13:04:45 +02:00
parent bfe09de95f
commit 236a0ca6f0
7 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/atomicfu/src/main/kotlin/org/jetbrains/kotlinx/atomicfu/gradle/AtomicfuKotlinGradleSubplugin.kt → libraries/tools/atomicfu/src/common/kotlin/org/jetbrains/kotlinx/atomicfu/gradle/AtomicfuKotlinGradleSubplugin.kt
View File
libraries/tools/atomicfu/src/main/resources/META-INF/gradle-plugins/kotlinx-atomicfu.properties → libraries/tools/atomicfu/src/common/resources/META-INF/gradle-plugins/kotlinx-atomicfu.properties
View File
libraries/tools/atomicfu/src/main/resources/META-INF/services/org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin → libraries/tools/atomicfu/src/common/resources/META-INF/services/org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin
View File
libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
+5
View File
@@ -38,6 +38,11 @@ dependencies {
requireCapability("org.jetbrains.kotlin:kotlin-sam-with-receiver-common")
}
}
testImplementation(project(":atomicfu")) {
capabilities {
requireCapability("org.jetbrains.kotlin:atomicfu-common")
}
}
testImplementation(project(":kotlin-gradle-plugin-model"))
testImplementation(project(":kotlin-gradle-build-metrics"))
testImplementation(project(":kotlin-project-model"))
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/PluginsDslIT.kt
+5 -1
View File
@@ -40,7 +40,11 @@ class PluginsDslIT : KGPBaseTest() {
"org.jetbrains.kotlin.allopen.gradle.AllOpenGradleSubplugin",
"org.jetbrains.kotlin.allopen.gradle.SpringGradleSubplugin",
"org.jetbrains.kotlin.noarg.gradle.NoArgGradleSubplugin",
"org.jetbrains.kotlin.noarg.gradle.KotlinJpaSubplugin"
"org.jetbrains.kotlin.noarg.gradle.KotlinJpaSubplugin",
"org.jetbrains.kotlinx.atomicfu.gradle.AtomicfuKotlinGradleSubplugin",
"org.jetbrains.kotlin.lombok.gradle.LombokSubplugin",
"org.jetbrains.kotlin.samWithReceiver.gradle.SamWithReceiverGradleSubplugin",
"org.jetbrains.kotlinx.serialization.gradle.SerializationGradleSubplugin"
)
build("build") {
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/projectSetupDefaults.kt
+2
View File
@@ -34,6 +34,7 @@ internal val DEFAULT_GROOVY_SETTINGS_FILE =
id "org.jetbrains.kotlin.plugin.serialization" version "${'$'}kotlin_version"
id "org.jetbrains.kotlin.test.fixes.android" version "${'$'}test_fixes_version"
id "org.jetbrains.kotlin.gradle-subplugin-example" version "${'$'}kotlin_version"
id "org.jetbrains.kotlin.plugin.atomicfu" version "${'$'}kotlin_version"
}
resolutionStrategy {
@@ -86,6 +87,7 @@ internal val DEFAULT_KOTLIN_SETTINGS_FILE =
id("org.jetbrains.kotlin.plugin.serialization") version kotlin_version
id("org.jetbrains.kotlin.test.fixes.android") version test_fixes_version
id("org.jetbrains.kotlin.gradle-subplugin-example") version kotlin_version
id("org.jetbrains.kotlin.plugin.atomicfu") version kotlin_version
}
resolutionStrategy {
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/pluginsDsl/applyAllPlugins/build.gradle
+4
View File
@@ -5,6 +5,10 @@ plugins {
id 'org.jetbrains.kotlin.plugin.spring'
id 'org.jetbrains.kotlin.plugin.noarg'
id 'org.jetbrains.kotlin.plugin.jpa'
id 'org.jetbrains.kotlin.plugin.atomicfu'
id 'org.jetbrains.kotlin.plugin.lombok'
id 'org.jetbrains.kotlin.plugin.sam.with.receiver'
id 'org.jetbrains.kotlin.plugin.serialization'
}
repositories {