From 3cc961ead36903abe0fa356d97d88bd9ee0961c3 Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <654232+AlexeyTsvetkov@users.noreply.github.com>
Date: Mon, 22 Nov 2021 10:09:27 +0300
Subject: [PATCH] Fix build helpers (#1424)

* Fix relocation of download task

* Fix environment variable typo

* Update build-helpers
---
 build-helpers/build.gradle.kts            | 2 +-
 build-helpers/publishing/build.gradle.kts | 1 +
 compose/settings.gradle.kts               | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build-helpers/build.gradle.kts b/build-helpers/build.gradle.kts
index 87a8539d3b..e7c1818aac 100644
--- a/build-helpers/build.gradle.kts
+++ b/build-helpers/build.gradle.kts
@@ -53,7 +53,7 @@ fun PublishingExtension.configurePublishing(project: Project) {
             credentials {
                 username =
                     System.getenv("COMPOSE_INTERNAL_REPO_USERNAME")
-                        ?: System.getenv("COMPOSE_REPO_KEY")
+                        ?: System.getenv("COMPOSE_REPO_USERNAME")
                         ?: ""
                 password =
                     System.getenv("COMPOSE_INTERNAL_REPO_KEY")
diff --git a/build-helpers/publishing/build.gradle.kts b/build-helpers/publishing/build.gradle.kts
index da4ff48bc1..873a657fcb 100644
--- a/build-helpers/publishing/build.gradle.kts
+++ b/build-helpers/publishing/build.gradle.kts
@@ -40,6 +40,7 @@ val shadowJar by tasks.registering(ShadowJar::class) {
     relocate(fromPackage, toPackage)
     archiveClassifier.set("shadow")
     configurations = listOf(embeddedDependencies)
+    from(sourceSets["main"]!!.output)
     exclude("META-INF/gradle-plugins/de.undercouch.download.properties")
 }
 
diff --git a/compose/settings.gradle.kts b/compose/settings.gradle.kts
index 2ee48851ee..ddf5eccb2a 100644
--- a/compose/settings.gradle.kts
+++ b/compose/settings.gradle.kts
@@ -6,7 +6,7 @@ pluginManagement {
             maven("https://maven.pkg.jetbrains.space/public/p/space/maven")
         }
         dependencies {
-            classpath("org.jetbrains.compose.internal.build-helpers:publishing:0.1.3")
+            classpath("org.jetbrains.compose.internal.build-helpers:publishing:0.1.4")
         }
     }
 }