diff --git a/buildSrc/private/src/main/kotlin/androidx/build/MavenUploadHelper.kt b/buildSrc/private/src/main/kotlin/androidx/build/MavenUploadHelper.kt
index 62cd3a9db0b1d..e0eee09393021 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/MavenUploadHelper.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/MavenUploadHelper.kt
@@ -232,7 +232,7 @@ fun sortPomDependencies(pom: String): String {
         .filterIsInstance<Element>()
         .forEach { element ->
             val deps = element.elements()
-            val sortedDeps = deps.toSortedSet(compareBy { it.stringValue }).toList()
+            val sortedDeps = deps.sortedBy { it.stringValue }.toList()
 
             // Content contains formatting nodes, so to avoid modifying those we replace
             // each element with the sorted element from its respective index. Note this
diff --git a/compose/foundation/foundation/build.gradle b/compose/foundation/foundation/build.gradle
index 02f2834258a7d..85ab66bd0878a 100644
--- a/compose/foundation/foundation/build.gradle
+++ b/compose/foundation/foundation/build.gradle
@@ -117,7 +117,7 @@ if (AndroidXComposePlugin.isMultiplatformEnabled(project)) {
             skikoMain {
                 dependsOn(commonMain)
                 dependencies {
-                    api(libs.skikoCommon)
+                    implementation(libs.skikoCommon)
                 }
             }
 
@@ -135,7 +135,6 @@ if (AndroidXComposePlugin.isMultiplatformEnabled(project)) {
                 dependsOn(jsWasmMain)
                 dependencies {
                     implementation(kotlin("stdlib-js"))
-                    api(libs.skikoCommon)
                 }
             }
 
diff --git a/compose/material/material/build.gradle b/compose/material/material/build.gradle
index 31eddde2dd25e..2f85a21188f19 100644
--- a/compose/material/material/build.gradle
+++ b/compose/material/material/build.gradle
@@ -118,7 +118,12 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
                 implementation(libs.kotlinStdlib)
             }
 
-            jsNativeMain.dependsOn(commonMain)
+            jsNativeMain {
+                dependsOn(commonMain)
+                dependencies {
+                    implementation(libs.skikoCommon)
+                }
+            }
             nativeMain.dependsOn(jsNativeMain)
             jsWasmMain.dependsOn(jsNativeMain)
 
diff --git a/compose/material3/material3/build.gradle b/compose/material3/material3/build.gradle
index 5cb5fab1771ca..ef21af38e1627 100644
--- a/compose/material3/material3/build.gradle
+++ b/compose/material3/material3/build.gradle
@@ -121,6 +121,9 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
 
             skikoMain {
                 dependsOn(commonMain)
+                dependencies {
+                    implementation(libs.skikoCommon)
+                }
             }
 
             desktopMain.dependsOn(skikoMain)
diff --git a/compose/ui/ui-graphics/build.gradle b/compose/ui/ui-graphics/build.gradle
index 23db9001022c5..018e1c510655d 100644
--- a/compose/ui/ui-graphics/build.gradle
+++ b/compose/ui/ui-graphics/build.gradle
@@ -94,7 +94,7 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
             skikoMain {
                 dependsOn(commonMain)
                 dependencies {
-                    api(libs.skikoCommon)
+                    implementation(libs.skikoCommon)
                 }
             }
 
@@ -106,7 +106,6 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
                 dependsOn(jsWasmMain)
                 dependencies {
                     implementation(kotlin("stdlib-js"))
-                    api(libs.skikoCommon)
                 }
             }
 
diff --git a/compose/ui/ui-test-junit4/build.gradle b/compose/ui/ui-test-junit4/build.gradle
index 15a194bfa1a90..eb87364d36a7d 100644
--- a/compose/ui/ui-test-junit4/build.gradle
+++ b/compose/ui/ui-test-junit4/build.gradle
@@ -143,6 +143,9 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
 
             skikoMain {
                 dependsOn(commonMain)
+                dependencies {
+                    implementation(libs.skikoCommon)
+                }
             }
 
             desktopMain.dependsOn(skikoMain)
diff --git a/compose/ui/ui-text/build.gradle b/compose/ui/ui-text/build.gradle
index 5f3a3e04c0c47..359044a9873a4 100644
--- a/compose/ui/ui-text/build.gradle
+++ b/compose/ui/ui-text/build.gradle
@@ -120,7 +120,7 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
             skikoMain {
                 dependsOn(commonMain)
                 dependencies {
-                    api(libs.skikoCommon)
+                    implementation(libs.skikoCommon)
                 }
             }
 
@@ -137,7 +137,6 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
                 dependsOn(jsWasmMain)
                 dependencies {
                     implementation(kotlin("stdlib-js"))
-                    api(libs.skikoCommon)
                 }
             }
 
diff --git a/compose/ui/ui-tooling/build.gradle b/compose/ui/ui-tooling/build.gradle
index 4e1280261d209..b99d341c86351 100644
--- a/compose/ui/ui-tooling/build.gradle
+++ b/compose/ui/ui-tooling/build.gradle
@@ -60,6 +60,7 @@ androidXMultiplatform {
                 dependsOn(commonMain)
                 dependencies {
                     api(project(":compose:runtime:runtime"))
+                    implementation(libs.skikoCommon)
                 }
             }
         }
diff --git a/compose/ui/ui/build.gradle b/compose/ui/ui/build.gradle
index a013109f9dadb..b4f4e19ed5c23 100644
--- a/compose/ui/ui/build.gradle
+++ b/compose/ui/ui/build.gradle
@@ -198,7 +198,7 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
                 dependencies {
                     api(project(":compose:ui:ui-graphics"))
                     api(project(":compose:ui:ui-text"))
-                    api(libs.skikoCommon)
+                    implementation(libs.skikoCommon)
                 }
             }
             desktopMain {
@@ -216,7 +216,6 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
                 dependsOn(jsWasmMain)
                 dependencies {
                     implementation(kotlin("stdlib-js"))
-                    api(libs.skikoCommon)
                 }
             }