Skip to content

Use single skiko-awt-runtime-all fat jar dependency on Desktop #3198

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

Open
Hubert Błaszczyk (hub-bla) wants to merge 2 commits into
base: jb-main
Choose a base branch
from
+17 −81
Open

Use single skiko-awt-runtime-all fat jar dependency on Desktop #3198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
099d71e
Use skiko-awt-runtime-all dependency on Desktop
hub-bla Jul 9, 2026
bf96c0e
Use skikoAwtRuntimeAll instead of skikoCurrentOs artifact
hub-bla Jul 10, 2026
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
1 change: 1 addition & 0 deletions buildSrc-fork/public/src/main/kotlin/org/jetbrains/androidx/build/JetBrainsPublication.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ object JetBrainsPublication {
"Jvmmacos-arm64",
"Jvmwindows-x64",
"Jvmwindows-arm64",
"Jvmall",
)
),
),
Expand Down
65 changes: 0 additions & 65 deletions buildSrc-fork/settingsScripts/skiko-setup.groovy
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion compose/desktop/desktop/build-fork.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ androidXMultiplatform {
resources.srcDirs += "src/jvmTest/res"
dependencies {
implementation(libs.kotlinCoroutinesTest)
implementation(libs.skikoCurrentOs)
implementation(libs.skikoAwtRuntime)
implementation(project(":compose:ui:ui-test-junit4"))
implementation(libs.junit)
implementation(libs.truth)
Expand Down Expand Up @@ -110,6 +110,7 @@ afterEvaluate {
jvmOs(it, "macos-arm64", libs.skikoAwtRuntimeMacOsArm64.get())
jvmOs(it, "windows-x64", libs.skikoAwtRuntimeWindowsX64.get())
jvmOs(it, "windows-arm64", libs.skikoAwtRuntimeWindowsArm64.get())
jvmOs(it, "all", libs.skikoAwtRuntime.get())
}
}
}
2 changes: 1 addition & 1 deletion compose/desktop/desktop/samples-material3/build-fork.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ kotlin {
}

jvmMain.dependencies {
implementation(libs.skikoCurrentOs)
implementation(libs.skikoAwtRuntime)
implementation(project(":compose:material3:material3"))
implementation(project(":compose:desktop:desktop"))
}
Expand Down
2 changes: 1 addition & 1 deletion compose/desktop/desktop/samples/build-fork.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ kotlin {
resources.srcDirs += "src/jvmMain/res"

dependencies {
implementation(libs.skikoCurrentOs)
implementation(libs.skikoAwtRuntime)
implementation(project(":compose:desktop:desktop"))

implementation("org.jetbrains.compose.material:material-icons-core:1.7.3") {
Expand Down
2 changes: 1 addition & 1 deletion compose/foundation/foundation/build-fork.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ androidXMultiplatform {
implementation(project(":compose:ui:ui-test-junit4"))
implementation(libs.truth)
implementation(libs.junit)
implementation(libs.skikoCurrentOs)
implementation(libs.skikoAwtRuntime)
implementation(libs.kotlinCoroutinesSwing)
implementation(libs.mockitoCore4)
implementation(libs.mockitoKotlin4)
Expand Down
2 changes: 1 addition & 1 deletion compose/material/material/build-fork.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ androidXMultiplatform {
implementation(project(":compose:ui:ui-test-junit4"))
implementation(libs.truth)
implementation(libs.junit)
implementation(libs.skikoCurrentOs)
implementation(libs.skikoAwtRuntime)
}
}

Expand Down
2 changes: 1 addition & 1 deletion compose/material3/material3/build-fork.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ androidXMultiplatform {
implementation(project(":compose:ui:ui-test-junit4"))
implementation(libs.truth)
implementation(libs.junit)
implementation(libs.skikoCurrentOs)
implementation(libs.skikoAwtRuntime)
}
}

Expand Down
2 changes: 1 addition & 1 deletion compose/mpp/demo/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ kotlin {
dependsOn(skikoMain)
dependencies {
implementation(libs.kotlinCoroutinesSwing)
implementation(libs.skikoCurrentOs)
implementation(libs.skikoAwtRuntime)
}
}

Expand Down
4 changes: 2 additions & 2 deletions compose/ui/ui-graphics/build-fork.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ androidXMultiplatform {
dependencies {
implementation(libs.junit)
implementation(libs.truth)
implementation(libs.skikoCurrentOs)
implementation(libs.skikoAwtRuntime)
implementation(project(":compose:ui:ui-test-junit4"))
}
}
Expand Down Expand Up @@ -185,4 +185,4 @@ tasks.withType(KotlinCompile).configureEach { task ->

tasks.findByName("desktopTest").configure {
systemProperties["GOLDEN_PATH"] = project.rootDir.absolutePath + "/golden"
}
}
2 changes: 1 addition & 1 deletion compose/ui/ui-test-junit4/build-fork.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ androidXMultiplatform {
dependencies {
implementation(libs.truth)
implementation(libs.junit)
implementation(libs.skikoCurrentOs)
implementation(libs.skikoAwtRuntime)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion compose/ui/ui-test/build-fork.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ androidXMultiplatform {
desktopTest {
dependsOn(skikoTest)
dependencies {
implementation(libs.skikoCurrentOs)
implementation(libs.skikoAwtRuntime)
}
}

Expand Down
2 changes: 1 addition & 1 deletion compose/ui/ui-text/build-fork.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ androidXMultiplatform {
dependencies {
implementation(libs.truth)
implementation(libs.junit)
implementation(libs.skikoCurrentOs)
implementation(libs.skikoAwtRuntime)
implementation(project(":compose:foundation:foundation"))
implementation(project(":compose:ui:ui-test-junit4"))
implementation(project(":internal-testutils-fonts"))
Expand Down
2 changes: 1 addition & 1 deletion compose/ui/ui/build-fork.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ androidXMultiplatform {
implementation(libs.mockitoCore4)
implementation(libs.mockitoKotlin)
implementation(libs.mockitoKotlin4)
implementation(libs.skikoCurrentOs)
implementation(libs.skikoAwtRuntime)
implementation(libs.kotlinCoroutinesSwing)
implementation(libs.kotlinCoroutinesTest)
implementation(project(":compose:material:material"))
Expand Down
1 change: 1 addition & 0 deletions gradle/libs-fork.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@ skikoAwtRuntimeWindowsX64 = { module = "org.jetbrains.skiko:skiko-awt-runtime-wi
skikoAwtRuntimeWindowsArm64 = { module = "org.jetbrains.skiko:skiko-awt-runtime-windows-arm64", version.ref = "skiko" }
skikoAwtRuntimeLinuxX64 = { module = "org.jetbrains.skiko:skiko-awt-runtime-linux-x64", version.ref = "skiko" }
skikoAwtRuntimeLinuxArm64 = { module = "org.jetbrains.skiko:skiko-awt-runtime-linux-arm64", version.ref = "skiko" }
skikoAwtRuntime = { module = "org.jetbrains.skiko:skiko-awt-runtime-all", version.ref = "skiko" }

@MatkovIvan Ivan Matkov (MatkovIvan) Jul 9, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Seems unused. Do we want to use in inside this repo (tests, etc) like it was in previous iterations?

Not a blocker, just checking

@hub-bla Hubert Błaszczyk (hub-bla) Jul 10, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

I agree, if we're making now the fat jar artifact as a main one we should test on it. Fixed

skikoJsWasmRuntime = { module = "org.jetbrains.skiko:skiko-js-wasm-runtime", version.ref = "skiko" }
skikoWasmJs = { module = "org.jetbrains.skiko:skiko-wasm-js", version.ref = "skiko" }
spdxGradlePluginz = { module = "org.spdx:spdx-gradle-plugin", version.ref = "spdxGradlePlugin" }
Expand Down
2 changes: 1 addition & 1 deletion navigation/navigation-compose/build-fork.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ androidXMultiplatform {
desktopTest {
dependsOn(nonAndroidTest)
dependencies {
implementation(libs.skikoCurrentOs)
implementation(libs.skikoAwtRuntime)
implementation(libs.kotlinCoroutinesSwing)
}
}
Expand Down
1 change: 0 additions & 1 deletion settings-buildscript-fork.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ ext.configureForkBuildscript = { ScriptHandler buildscriptHandler ->
ext.supportRootFolder = buildscript.sourceFile.getParentFile()
apply(from: "buildSrc-fork/repos.gradle")
apply(from: "buildSrc-fork/settingsScripts/project-dependency-graph.groovy")
apply(from: "buildSrc-fork/settingsScripts/skiko-setup.groovy")

repos.addMavenRepositories(repositories)

Expand Down
1 change: 0 additions & 1 deletion settings-fork.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ dependencyResolutionManagement {
}

def supportRootFolder = buildscript.sourceFile.getParentFile()
skikoSetup.defineSkikoInVersionCatalog(settings)

/* In JetBrains Fork we don't force Android Studio usage.
// Abort immediately if we're running in Studio, but not a managed instance of Studio.
Expand Down
Loading