Skip to content
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

Jump to bottom

Fix eager tryGetSkikoRuntimeIfNeeded #4918

Merged
merged 2 commits into from
Jun 3, 2024
Merged

Fix eager tryGetSkikoRuntimeIfNeeded #4918

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
77eb2d3
Fix eager tryGetSkikoRuntimeIfNeeded
eymar Jun 3, 2024
1501b73
Fix according to PR review
eymar Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ompose/src/main/kotlin/org/jetbrains/compose/desktop/preview/internal/configurePreview.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ private fun registerConfigurePreviewTask(
) { previewTask ->
runtimeFiles.configureUsageBy(previewTask) { (runtimeJars, _) ->
previewClasspath = runtimeJars
skikoRuntime = tryGetSkikoRuntimeIfNeeded()
skikoRuntime.set(project.provider { tryGetSkikoRuntimeIfNeeded() })
}
}
}
Expand Down
6 changes: 4 additions & 2 deletions ...kotlin/org/jetbrains/compose/desktop/preview/tasks/AbstractConfigureDesktopPreviewTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ abstract class AbstractConfigureDesktopPreviewTask : AbstractComposeDesktopTask(
internal lateinit var previewClasspath: FileCollection

@get:InputFiles
internal lateinit var skikoRuntime: FileCollection
internal abstract val skikoRuntime: Property<FileCollection>

@get:Internal
internal val javaHome: Property<String> = objects.notNullProperty<String>().apply {
Expand Down Expand Up @@ -58,10 +58,12 @@ abstract class AbstractConfigureDesktopPreviewTask : AbstractComposeDesktopTask(
javaExecutable = javaExecutable(javaHome.get()),
hostClasspath = hostClasspath.files.asSequence().pathString()
)

val skikoRuntimeFiles = skikoRuntime.get()
val previewClasspathString =
(previewClasspath.files.asSequence() +
uiTooling.files.asSequence() +
skikoRuntime.files.asSequence()
skikoRuntimeFiles.files.asSequence()
).pathString()

val gradleLogger = logger
Expand Down