diff --git a/buildSrc-fork/public/src/main/kotlin/org/jetbrains/androidx/build/JetBrainsPublication.kt b/buildSrc-fork/public/src/main/kotlin/org/jetbrains/androidx/build/JetBrainsPublication.kt index a25b713c643c4..b45a2519887c0 100644 --- a/buildSrc-fork/public/src/main/kotlin/org/jetbrains/androidx/build/JetBrainsPublication.kt +++ b/buildSrc-fork/public/src/main/kotlin/org/jetbrains/androidx/build/JetBrainsPublication.kt @@ -78,6 +78,7 @@ object JetBrainsPublication { "Jvmmacos-arm64", "Jvmwindows-x64", "Jvmwindows-arm64", + "Jvmall", ) ), ), diff --git a/buildSrc-fork/settingsScripts/skiko-setup.groovy b/buildSrc-fork/settingsScripts/skiko-setup.groovy deleted file mode 100644 index 6205f7dae8d7a..0000000000000 --- a/buildSrc-fork/settingsScripts/skiko-setup.groovy +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.gradle.api.GradleException -import org.gradle.api.initialization.Settings - -class SkikoSetup { - /** - * Declares the skiko entry in the version catalog of the given settings instance. - * - * @param settings The settings instance for the current root project - */ - static void defineSkikoInVersionCatalog(Settings settings) { - settings.dependencyResolutionManagement { - versionCatalogs { - libs { - def skikoOverride = System.getenv("SKIKO_VERSION") - if (skikoOverride != null) { - org.gradle.api.logging.Logging.getLogger(SkikoSetup.class).warn("Using custom version ${skikoOverride} of SKIKO due to " + - "SKIKO_VERSION being set.") - version('skiko', skikoOverride) - } - String os = System.getProperty("os.name").toLowerCase(Locale.US) - String currentOsArtifact - if (os.contains("mac os x") || os.contains("darwin") || os.contains("osx")) { - def arch = System.getProperty("os.arch") - if (arch == "aarch64") { - currentOsArtifact = "skiko-awt-runtime-macos-arm64" - } else { - currentOsArtifact = "skiko-awt-runtime-macos-x64" - } - } else if (os.startsWith("win")) { - currentOsArtifact = "skiko-awt-runtime-windows-x64" - } else if (os.startsWith("linux")) { - def arch = System.getProperty("os.arch") - if (arch == "aarch64") { - currentOsArtifact = "skiko-awt-runtime-linux-arm64" - } else { - currentOsArtifact = "skiko-awt-runtime-linux-x64" - } - } else { - throw new GradleException("Unsupported operating system $os") - } - library("skikoCurrentOs", "org.jetbrains.skiko", - currentOsArtifact).versionRef("skiko") - } - } - } - } -} - -ext.skikoSetup = new SkikoSetup() \ No newline at end of file diff --git a/compose/desktop/desktop/build-fork.gradle b/compose/desktop/desktop/build-fork.gradle index 9a9eeb8695b59..00f70be57cd6b 100644 --- a/compose/desktop/desktop/build-fork.gradle +++ b/compose/desktop/desktop/build-fork.gradle @@ -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) @@ -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()) } } } diff --git a/compose/desktop/desktop/samples-material3/build-fork.gradle b/compose/desktop/desktop/samples-material3/build-fork.gradle index 0ac7cd74cd82f..01ddfd7d6cadb 100644 --- a/compose/desktop/desktop/samples-material3/build-fork.gradle +++ b/compose/desktop/desktop/samples-material3/build-fork.gradle @@ -30,7 +30,7 @@ kotlin { } jvmMain.dependencies { - implementation(libs.skikoCurrentOs) + implementation(libs.skikoAwtRuntime) implementation(project(":compose:material3:material3")) implementation(project(":compose:desktop:desktop")) } diff --git a/compose/desktop/desktop/samples/build-fork.gradle b/compose/desktop/desktop/samples/build-fork.gradle index c9dfee3ef3340..398d3da386dfa 100644 --- a/compose/desktop/desktop/samples/build-fork.gradle +++ b/compose/desktop/desktop/samples/build-fork.gradle @@ -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") { diff --git a/compose/foundation/foundation/build-fork.gradle b/compose/foundation/foundation/build-fork.gradle index 165a949625b70..fd91e20983711 100644 --- a/compose/foundation/foundation/build-fork.gradle +++ b/compose/foundation/foundation/build-fork.gradle @@ -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) diff --git a/compose/material/material/build-fork.gradle b/compose/material/material/build-fork.gradle index b4411603f4e19..f9c738b86290c 100644 --- a/compose/material/material/build-fork.gradle +++ b/compose/material/material/build-fork.gradle @@ -130,7 +130,7 @@ androidXMultiplatform { implementation(project(":compose:ui:ui-test-junit4")) implementation(libs.truth) implementation(libs.junit) - implementation(libs.skikoCurrentOs) + implementation(libs.skikoAwtRuntime) } } diff --git a/compose/material3/material3/build-fork.gradle b/compose/material3/material3/build-fork.gradle index c8036918e6d1a..5439b90820003 100644 --- a/compose/material3/material3/build-fork.gradle +++ b/compose/material3/material3/build-fork.gradle @@ -142,7 +142,7 @@ androidXMultiplatform { implementation(project(":compose:ui:ui-test-junit4")) implementation(libs.truth) implementation(libs.junit) - implementation(libs.skikoCurrentOs) + implementation(libs.skikoAwtRuntime) } } diff --git a/compose/mpp/demo/build.gradle.kts b/compose/mpp/demo/build.gradle.kts index 6d4dcf7c190b2..226578b6745c2 100644 --- a/compose/mpp/demo/build.gradle.kts +++ b/compose/mpp/demo/build.gradle.kts @@ -165,7 +165,7 @@ kotlin { dependsOn(skikoMain) dependencies { implementation(libs.kotlinCoroutinesSwing) - implementation(libs.skikoCurrentOs) + implementation(libs.skikoAwtRuntime) } } diff --git a/compose/ui/ui-graphics/build-fork.gradle b/compose/ui/ui-graphics/build-fork.gradle index fb10c4cbb5ae8..4ca6872b773b9 100644 --- a/compose/ui/ui-graphics/build-fork.gradle +++ b/compose/ui/ui-graphics/build-fork.gradle @@ -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")) } } @@ -185,4 +185,4 @@ tasks.withType(KotlinCompile).configureEach { task -> tasks.findByName("desktopTest").configure { systemProperties["GOLDEN_PATH"] = project.rootDir.absolutePath + "/golden" -} \ No newline at end of file +} diff --git a/compose/ui/ui-test-junit4/build-fork.gradle b/compose/ui/ui-test-junit4/build-fork.gradle index 720c2f0c6320d..e2b33964e567b 100644 --- a/compose/ui/ui-test-junit4/build-fork.gradle +++ b/compose/ui/ui-test-junit4/build-fork.gradle @@ -130,7 +130,7 @@ androidXMultiplatform { dependencies { implementation(libs.truth) implementation(libs.junit) - implementation(libs.skikoCurrentOs) + implementation(libs.skikoAwtRuntime) } } } diff --git a/compose/ui/ui-test/build-fork.gradle b/compose/ui/ui-test/build-fork.gradle index 92f71a7444b94..f91686d44a4e4 100644 --- a/compose/ui/ui-test/build-fork.gradle +++ b/compose/ui/ui-test/build-fork.gradle @@ -164,7 +164,7 @@ androidXMultiplatform { desktopTest { dependsOn(skikoTest) dependencies { - implementation(libs.skikoCurrentOs) + implementation(libs.skikoAwtRuntime) } } diff --git a/compose/ui/ui-text/build-fork.gradle b/compose/ui/ui-text/build-fork.gradle index ae9ce8472e7c1..85c9d13b8e2d1 100644 --- a/compose/ui/ui-text/build-fork.gradle +++ b/compose/ui/ui-text/build-fork.gradle @@ -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")) diff --git a/compose/ui/ui/build-fork.gradle b/compose/ui/ui/build-fork.gradle index 2f4a3da63a3d4..346443fb985f4 100644 --- a/compose/ui/ui/build-fork.gradle +++ b/compose/ui/ui/build-fork.gradle @@ -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")) diff --git a/gradle/libs-fork.versions.toml b/gradle/libs-fork.versions.toml index 7702112aac163..ee60638ef7943 100644 --- a/gradle/libs-fork.versions.toml +++ b/gradle/libs-fork.versions.toml @@ -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" } 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" } diff --git a/navigation/navigation-compose/build-fork.gradle b/navigation/navigation-compose/build-fork.gradle index 973b1e2bffeac..53ef6d0aef68a 100644 --- a/navigation/navigation-compose/build-fork.gradle +++ b/navigation/navigation-compose/build-fork.gradle @@ -141,7 +141,7 @@ androidXMultiplatform { desktopTest { dependsOn(nonAndroidTest) dependencies { - implementation(libs.skikoCurrentOs) + implementation(libs.skikoAwtRuntime) implementation(libs.kotlinCoroutinesSwing) } } diff --git a/settings-buildscript-fork.gradle b/settings-buildscript-fork.gradle index 5013289c7cc2a..130ebbc9f0a2e 100644 --- a/settings-buildscript-fork.gradle +++ b/settings-buildscript-fork.gradle @@ -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) diff --git a/settings-fork.gradle b/settings-fork.gradle index be1b6f251bee5..607433507cdb4 100644 --- a/settings-fork.gradle +++ b/settings-fork.gradle @@ -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.