Browse Source

Fix build helpers (#1424)

* Fix relocation of download task

* Fix environment variable typo

* Update build-helpers
pull/1438/head
Alexey Tsvetkov 3 years ago committed by GitHub
parent
commit
3cc961ead3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      build-helpers/build.gradle.kts
  2. 1
      build-helpers/publishing/build.gradle.kts
  3. 2
      compose/settings.gradle.kts

2
build-helpers/build.gradle.kts

@ -53,7 +53,7 @@ fun PublishingExtension.configurePublishing(project: Project) {
credentials { credentials {
username = username =
System.getenv("COMPOSE_INTERNAL_REPO_USERNAME") System.getenv("COMPOSE_INTERNAL_REPO_USERNAME")
?: System.getenv("COMPOSE_REPO_KEY") ?: System.getenv("COMPOSE_REPO_USERNAME")
?: "" ?: ""
password = password =
System.getenv("COMPOSE_INTERNAL_REPO_KEY") System.getenv("COMPOSE_INTERNAL_REPO_KEY")

1
build-helpers/publishing/build.gradle.kts

@ -40,6 +40,7 @@ val shadowJar by tasks.registering(ShadowJar::class) {
relocate(fromPackage, toPackage) relocate(fromPackage, toPackage)
archiveClassifier.set("shadow") archiveClassifier.set("shadow")
configurations = listOf(embeddedDependencies) configurations = listOf(embeddedDependencies)
from(sourceSets["main"]!!.output)
exclude("META-INF/gradle-plugins/de.undercouch.download.properties") exclude("META-INF/gradle-plugins/de.undercouch.download.properties")
} }

2
compose/settings.gradle.kts

@ -6,7 +6,7 @@ pluginManagement {
maven("https://maven.pkg.jetbrains.space/public/p/space/maven") maven("https://maven.pkg.jetbrains.space/public/p/space/maven")
} }
dependencies { dependencies {
classpath("org.jetbrains.compose.internal.build-helpers:publishing:0.1.3") classpath("org.jetbrains.compose.internal.build-helpers:publishing:0.1.4")
} }
} }
} }

Loading…
Cancel
Save