Skip to content

Add skiko dependencies to gradle plugin #3370

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

Closed
MatkovIvan wants to merge 1 commit into from
Closed

Add skiko dependencies to gradle plugin #3370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 19 additions & 0 deletions gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
import org.jetbrains.kotlin.gradle.dsl.KotlinCompile

internal val composeVersion get() = ComposeBuildConfig.composeVersion
internal val skikoVersion get() = ComposeBuildConfig.skikoVersion

class ComposePlugin : Plugin<Project> {
override fun apply(project: Project) {
Expand Down Expand Up @@ -90,6 +91,7 @@ class ComposePlugin : Plugin<Project> {
@Deprecated("Use compose.html", replaceWith = ReplaceWith("html"))
val web: WebDependencies get() = WebDependencies
val html: HtmlDependencies get() = HtmlDependencies
val skiko: SkikoDependencies
}

object DesktopDependencies {
Expand Down Expand Up @@ -158,6 +160,21 @@ class ComposePlugin : Plugin<Project> {
composeDependency("org.jetbrains.compose.html:html-test-utils")
}
}

object SkikoDependencies {
val common = skikoDependency("org.jetbrains.skiko:skiko")
val desktop = skikoDependency("org.jetbrains.skiko:skiko-awt")
val linux_x64 = skikoDependency("org.jetbrains.skiko:skiko-awt-runtime-linux-x64")
val linux_arm64 = skikoDependency("org.jetbrains.skiko:skiko-awt-runtime-linux-arm64")
val windows_x64 = skikoDependency("org.jetbrains.skiko:skiko-awt-runtime-windows-x64")
val windows_arm64 = skikoDependency("org.jetbrains.skiko:skiko-awt-runtime-windows-arm64")
val macos_x64 = skikoDependency("org.jetbrains.skiko:skiko-awt-runtime-macos-x64")
val macos_arm64 = skikoDependency("org.jetbrains.skiko:skiko-awt-runtime-macos-arm64")

val currentOs by lazy {
skikoDependency("org.jetbrains.skiko:skiko-awt-runtime-${currentTarget.id}")
}
}
}

fun RepositoryHandler.jetbrainsCompose(): MavenArtifactRepository =
Expand All @@ -169,6 +186,8 @@ fun DependencyHandler.compose(groupWithArtifact: String) = composeDependency(gro

private fun composeDependency(groupWithArtifact: String) = "$groupWithArtifact:$composeVersion"

private fun skikoDependency(groupWithArtifact: String) = "$groupWithArtifact:$skikoVersion"

private fun setUpGroovyDslExtensions(project: Project) {
project.plugins.withId("org.jetbrains.kotlin.multiplatform") {
(project.extensions.getByName("kotlin") as? ExtensionAware)?.apply {
Expand Down
2 changes: 2 additions & 0 deletions gradle-plugins/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ compose.tests.compiler.compatible.kotlin.version=1.8.20
compose.tests.js.compiler.compatible.kotlin.version=1.8.20
# __SUPPORTED_GRADLE_VERSIONS__
compose.tests.gradle.versions=7.3.3, 8.1
# Skiko version that used by Compose Libraries
skiko.version=0.7.69

# A version of Gradle plugin, that will be published,
# unless overridden by COMPOSE_GRADLE_PLUGIN_VERSION env var.
Expand Down