Skip to content

Do not expose skiko library #689

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: jb-main
Choose a base branch
from
Draft

Do not expose skiko library #689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
625e0aa
Do not expose skiko library
MatkovIvan Jul 18, 2023
254fb6f
Include skiko to all required modules
MatkovIvan Jul 19, 2023
22fe418
Fix out of bounds on build
MatkovIvan Jul 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildSrc/private/src/main/kotlin/androidx/build/MavenUploadHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions compose/foundation/foundation/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ if (AndroidXComposePlugin.isMultiplatformEnabled(project)) {
skikoMain {
dependsOn(commonMain)
dependencies {
api(libs.skikoCommon)
implementation(libs.skikoCommon)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Native tests are failing

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep. We need to revisit our API because there are a few skiko types "leaks" into public

}
}

Expand All @@ -135,7 +135,6 @@ if (AndroidXComposePlugin.isMultiplatformEnabled(project)) {
dependsOn(jsWasmMain)
dependencies {
implementation(kotlin("stdlib-js"))
api(libs.skikoCommon)
}
}

Expand Down
7 changes: 6 additions & 1 deletion compose/material/material/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 3 additions & 0 deletions compose/material3/material3/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,9 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {

skikoMain {
dependsOn(commonMain)
dependencies {
implementation(libs.skikoCommon)
}
}

desktopMain.dependsOn(skikoMain)
Expand Down
3 changes: 1 addition & 2 deletions compose/ui/ui-graphics/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
skikoMain {
dependsOn(commonMain)
dependencies {
api(libs.skikoCommon)
implementation(libs.skikoCommon)
Copy link
Collaborator

@igordmn igordmn Jul 18, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you also add a section API Change to the message? The plan is to make a link to this PR in the CHANGELOG.

P.S. Probably will be better to do that in the DSL PR in compose-multiplatform repo

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

JetBrains/compose-multiplatform#3370

}
}

Expand All @@ -106,7 +106,6 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
dependsOn(jsWasmMain)
dependencies {
implementation(kotlin("stdlib-js"))
api(libs.skikoCommon)
}
}

Expand Down
3 changes: 3 additions & 0 deletions compose/ui/ui-test-junit4/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,9 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {

skikoMain {
dependsOn(commonMain)
dependencies {
implementation(libs.skikoCommon)
}
}

desktopMain.dependsOn(skikoMain)
Expand Down
3 changes: 1 addition & 2 deletions compose/ui/ui-text/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
skikoMain {
dependsOn(commonMain)
dependencies {
api(libs.skikoCommon)
implementation(libs.skikoCommon)
}
}

Expand All @@ -137,7 +137,6 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
dependsOn(jsWasmMain)
dependencies {
implementation(kotlin("stdlib-js"))
api(libs.skikoCommon)
}
}

Expand Down
1 change: 1 addition & 0 deletions compose/ui/ui-tooling/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ androidXMultiplatform {
dependsOn(commonMain)
dependencies {
api(project(":compose:runtime:runtime"))
implementation(libs.skikoCommon)
}
}
}
Expand Down
3 changes: 1 addition & 2 deletions compose/ui/ui/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -216,7 +216,6 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
dependsOn(jsWasmMain)
dependencies {
implementation(kotlin("stdlib-js"))
api(libs.skikoCommon)
}
}

Expand Down