Add Kotlin Gradle plugins bom

This should help with failed variants selection between different Kotlin
 Gradle plugins versions.

 ^KT-54691 In Progress
This commit is contained in:
Yahor Berdnikau
2023-01-02 12:48:18 +01:00
committed by Space Team
parent 7d881842b4
commit b9aac83135
16 changed files with 65 additions and 4 deletions
+1
View File
@@ -44,6 +44,7 @@ val kotlinGradlePluginAndItsRequired = arrayOf(
":kotlin-daemon-embeddable",
":kotlin-daemon-client",
":kotlin-project-model",
":kotlin-gradle-plugins-bom",
":kotlin-gradle-plugin-api",
":kotlin-gradle-plugin-annotations",
":kotlin-gradle-plugin-idea",
@@ -10,6 +10,8 @@ pill {
}
dependencies {
api(platform(project(":kotlin-gradle-plugins-bom")))
compileOnly(project(":kotlin-gradle-plugin"))
compileOnly(project(":kotlin-compiler-embeddable"))
@@ -10,6 +10,7 @@ pill {
}
dependencies {
commonApi(platform(project(":kotlin-gradle-plugins-bom")))
commonApi(project(":kotlin-gradle-plugin-model"))
commonCompileOnly(project(":kotlin-compiler-embeddable"))
@@ -10,6 +10,7 @@ pill {
}
dependencies {
commonApi(platform(project(":kotlin-gradle-plugins-bom")))
commonApi(project(":kotlin-gradle-plugin-model"))
commonCompileOnly(project(":compiler"))
@@ -10,6 +10,7 @@ publish()
standardPublicJars()
dependencies {
api(platform(project(":kotlin-gradle-plugins-bom")))
compileOnly(kotlinStdlib())
}
@@ -5,6 +5,7 @@ plugins {
}
dependencies {
commonApi(platform(project(":kotlin-gradle-plugins-bom")))
commonApi(project(":kotlin-gradle-plugin-annotations"))
commonApi(project(":native:kotlin-native-utils"))
commonApi(project(":kotlin-project-model"))
@@ -31,4 +32,4 @@ tasks {
apiBuild {
inputJar.value(jar.flatMap { it.archiveFile })
}
}
}
@@ -1,4 +1,8 @@
plugins {
id("gradle-plugin-dependency-configuration")
id("jps-compatible")
}
}
dependencies {
api(platform(project(":kotlin-gradle-plugins-bom")))
}
@@ -29,6 +29,7 @@ kotlin.sourceSets.all {
}
dependencies {
commonApi(platform(project(":kotlin-gradle-plugins-bom")))
commonApi(project(":kotlin-gradle-plugin-api"))
commonApi(project(":kotlin-gradle-plugin-model"))
commonApi(project(":kotlin-tooling-core"))
@@ -0,0 +1,40 @@
import plugins.signLibraryPublication
plugins {
id("java-platform")
id("maven-publish")
}
dependencies {
constraints {
// kotlin-gradle-plugin-api
api(project(":kotlin-gradle-plugin-api"))
api(project(":kotlin-gradle-plugin-annotations"))
api(project(":kotlin-gradle-plugin-model"))
api(project(":native:kotlin-native-utils"))
api(project(":kotlin-tooling-core"))
// plugins
api(project(":kotlin-gradle-plugin"))
api(project(":atomicfu"))
api(project(":kotlin-allopen"))
api(project(":kotlin-lombok"))
api(project(":kotlin-noarg"))
api(project(":kotlin-sam-with-receiver"))
api(project(":kotlin-serialization"))
api(project(":kotlin-assignment"))
}
}
configureCommonPublicationSettingsForGradle(signLibraryPublication)
publishing {
publications {
create<MavenPublication>("myPlatform") {
from(components["javaPlatform"])
pom {
packaging = "pom"
}
}
}
}
@@ -6,9 +6,10 @@ plugins {
}
dependencies {
embedded(project(":kotlin-lombok-compiler-plugin")) { isTransitive = false }
commonApi(platform(project(":kotlin-gradle-plugins-bom")))
commonApi(project(":kotlin-gradle-plugin-model"))
embedded(project(":kotlin-lombok-compiler-plugin")) { isTransitive = false }
}
projectTest(parallel = true)
@@ -10,6 +10,7 @@ pill {
}
dependencies {
commonApi(platform(project(":kotlin-gradle-plugins-bom")))
commonApi(project(":kotlin-gradle-plugin-model"))
commonCompileOnly(project(":compiler"))
@@ -10,6 +10,7 @@ pill {
}
dependencies {
commonApi(platform(project(":kotlin-gradle-plugins-bom")))
commonApi(project(":kotlin-gradle-plugin-model"))
commonCompileOnly(project(":compiler"))
@@ -10,6 +10,8 @@ pill {
}
dependencies {
commonApi(platform(project(":kotlin-gradle-plugins-bom")))
commonCompileOnly(project(":kotlin-gradle-plugin"))
commonCompileOnly(project(":kotlin-compiler-embeddable"))
@@ -15,6 +15,7 @@ kotlin.sourceSets.configureEach {
}
dependencies {
api(platform(project(":kotlin-gradle-plugins-bom")))
compileOnly(kotlinStdlib())
testImplementation(project(":kotlin-test:kotlin-test-junit"))
}
+1
View File
@@ -8,6 +8,7 @@ description = "Kotlin/Native utils"
dependencies {
compileOnly(kotlinStdlib())
api(project(":kotlin-util-io"))
api(platform(project(":kotlin-gradle-plugins-bom")))
testImplementation(commonDependency("junit:junit"))
testImplementation(kotlinStdlib())
+2
View File
@@ -246,6 +246,7 @@ include ":kotlin-imports-dumper-compiler-plugin",
":kotlin-gradle-plugin-model",
":kotlin-gradle-plugin-test-utils-embeddable",
":kotlin-gradle-plugin-integration-tests",
":kotlin-gradle-plugins-bom",
":gradle:android-test-fixes",
":gradle:regression-benchmark-templates",
":gradle:regression-benchmarks",
@@ -750,6 +751,7 @@ project(':kotlin-gradle-plugin-tcs-android').projectDir = "$rootDir/libraries/to
project(':kotlin-gradle-plugin-model').projectDir = "$rootDir/libraries/tools/kotlin-gradle-plugin-model" as File
project(':kotlin-gradle-plugin-test-utils-embeddable').projectDir = "$rootDir/libraries/tools/kotlin-gradle-plugin-test-utils-embeddable" as File
project(':kotlin-gradle-plugin-integration-tests').projectDir = "$rootDir/libraries/tools/kotlin-gradle-plugin-integration-tests" as File
project(':kotlin-gradle-plugins-bom').projectDir = "$rootDir/libraries/tools/kotlin-gradle-plugins-bom" as File
project(':gradle:android-test-fixes').projectDir = "$rootDir/libraries/tools/gradle/android-test-fixes" as File
project(":gradle:regression-benchmark-templates").projectDir = "$rootDir/libraries/tools/gradle/regression-benchmark-templates" as File
project(":gradle:regression-benchmarks").projectDir = "$rootDir/libraries/tools/gradle/regression-benchmarks" as File