Browse Source

Include preview-rpc into Compose Gradle plugin (#1302)

To fix resolving the plugin from Gradle plugin portal,
when no additional plugin repositories are declared
pull/1312/head
Alexey Tsvetkov 3 years ago committed by GitHub
parent
commit
633c6c055c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 22
      gradle-plugins/compose/build.gradle.kts

22
gradle-plugins/compose/build.gradle.kts

@ -38,25 +38,31 @@ sourceSets.main.configure {
java.srcDir(buildConfigDir) java.srcDir(buildConfigDir)
} }
val embedded by configurations.creating val embeddedDependencies by configurations.creating
dependencies { dependencies {
// By default, Gradle resolves plugins only via Gradle Plugin Portal.
// To avoid declaring an additional repo, all dependencies must:
// 1. Either be provided by Gradle at runtime (e.g. gradleApi());
// 2. Or be included and optionally relocated.
// Use `embedded` helper to include a dependency.
fun embedded(dep: Any) {
compileOnly(dep)
embeddedDependencies(dep)
}
compileOnly(gradleApi()) compileOnly(gradleApi())
compileOnly(localGroovy()) compileOnly(localGroovy())
compileOnly(kotlin("gradle-plugin-api")) compileOnly(kotlin("gradle-plugin-api"))
compileOnly(kotlin("gradle-plugin")) compileOnly(kotlin("gradle-plugin"))
implementation(project(":preview-rpc"))
testImplementation(gradleTestKit()) testImplementation(gradleTestKit())
testImplementation(platform("org.junit:junit-bom:5.7.0")) testImplementation(platform("org.junit:junit-bom:5.7.0"))
testImplementation("org.junit.jupiter:junit-jupiter") testImplementation("org.junit.jupiter:junit-jupiter")
fun embeddedCompileOnly(dep: String) {
compileOnly(dep)
embedded(dep)
}
// include relocated download task to avoid potential runtime conflicts // include relocated download task to avoid potential runtime conflicts
embeddedCompileOnly("de.undercouch:gradle-download-task:4.1.1") embedded("de.undercouch:gradle-download-task:4.1.1")
embedded(project(":preview-rpc"))
} }
val shadow = tasks.named<ShadowJar>("shadowJar") { val shadow = tasks.named<ShadowJar>("shadowJar") {
@ -64,7 +70,7 @@ val shadow = tasks.named<ShadowJar>("shadowJar") {
val toPackage = "org.jetbrains.compose.$fromPackage" val toPackage = "org.jetbrains.compose.$fromPackage"
relocate(fromPackage, toPackage) relocate(fromPackage, toPackage)
archiveClassifier.set("shadow") archiveClassifier.set("shadow")
configurations = listOf(embedded) configurations = listOf(embeddedDependencies)
exclude("META-INF/gradle-plugins/de.undercouch.download.properties") exclude("META-INF/gradle-plugins/de.undercouch.download.properties")
} }

Loading…
Cancel
Save