From 2da57445bbc9d87f7ad5e66f6a06471feda3d292 Mon Sep 17 00:00:00 2001
From: Igor Demin <igordmn@gmail.com>
Date: Mon, 29 Apr 2024 09:33:51 +0200
Subject: [PATCH] 1

---
 .../JetbrainsAndroidXRedirectingPublicationHelpers.kt       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildSrc/private/src/main/kotlin/androidx/build/jetbrains/JetbrainsAndroidXRedirectingPublicationHelpers.kt b/buildSrc/private/src/main/kotlin/androidx/build/jetbrains/JetbrainsAndroidXRedirectingPublicationHelpers.kt
index 0c63d7e54fedc..27f360551a496 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/jetbrains/JetbrainsAndroidXRedirectingPublicationHelpers.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/jetbrains/JetbrainsAndroidXRedirectingPublicationHelpers.kt
@@ -110,7 +110,7 @@ internal fun Project.publishAndroidxReference(target: AbstractKotlinTarget, newR
                 // required for publication.
                 val configurationName = usage.name + "-published"
                 configurations.matching { it.name == configurationName }.all { conf ->
-                    newRootComponent.addUsageFromConfiguration(conf)
+                    newRootComponent.addUsageFromConfiguration(conf, usage)
                 }
             }
         }
@@ -130,14 +130,14 @@ internal class CustomRootComponent(
 
     private val extraUsages = mutableSetOf<UsageContext>()
 
-    fun addUsageFromConfiguration(configuration: Configuration) {
+    fun addUsageFromConfiguration(configuration: Configuration, defaultUsage: KotlinUsageContext) {
         val newDependency = customizeDependencyPerConfiguration(configuration)
 
         extraUsages.add(
             CustomUsage(
                 name = configuration.name,
                 attributes = configuration.attributes,
-                dependencies = setOf(newDependency)
+                dependencies = setOf(newDependency) + defaultUsage.dependencies
             )
         )
     }