Browse Source

More CI fixes (#1649)

* Update Kotlin in SplitPane component

* Use skiko-awt-* artifacts instead of skiko-jvm-*
pull/1658/head
Alexey Tsvetkov 3 years ago committed by Alexey Tsvetkov
parent
commit
8ff2a324b6
  1. 4
      components/gradle.properties
  2. 1
      components/settings.gradle.kts
  3. 2
      gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractJPackageTask.kt
  4. 8
      gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/preview/tasks/AbstractConfigureDesktopPreviewTask.kt
  5. 3
      gradle-plugins/gradle.properties

4
components/gradle.properties

@ -2,5 +2,7 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
kotlin.code.style=official kotlin.code.style=official
# __KOTLIN_COMPOSE_VERSION__
kotlin.version=1.6.10 kotlin.version=1.6.10
compose.version=1.0.1-rc2 # __LATEST_COMPOSE_RELEASE_VERSION__
compose.version=1.0.1

1
components/settings.gradle.kts

@ -1,6 +1,7 @@
pluginManagement { pluginManagement {
repositories { repositories {
gradlePluginPortal() gradlePluginPortal()
mavenCentral()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
google() google()
} }

2
gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractJPackageTask.kt

@ -534,7 +534,7 @@ private class FilesMapping : Serializable {
} }
private fun isSkikoForCurrentOS(lib: File): Boolean = private fun isSkikoForCurrentOS(lib: File): Boolean =
lib.name.startsWith("skiko-jvm-runtime-${currentOS.id}-${currentArch.id}") lib.name.startsWith("skiko-awt-runtime-${currentOS.id}-${currentArch.id}")
&& lib.name.endsWith(".jar") && lib.name.endsWith(".jar")
private fun unpackSkikoForCurrentOS(sourceJar: File, skikoDir: File, fileOperations: FileOperations): List<File> { private fun unpackSkikoForCurrentOS(sourceJar: File, skikoDir: File, fileOperations: FileOperations): List<File> {

8
gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/preview/tasks/AbstractConfigureDesktopPreviewTask.kt

@ -82,13 +82,13 @@ abstract class AbstractConfigureDesktopPreviewTask : AbstractComposeDesktopTask(
var skikoVersion: String? = null var skikoVersion: String? = null
for (file in previewClasspath.files) { for (file in previewClasspath.files) {
if (file.name.endsWith(".jar")) { if (file.name.endsWith(".jar")) {
if (file.name.startsWith("skiko-jvm-runtime-")) { if (file.name.startsWith("skiko-awt-runtime-")) {
hasSkikoJvmRuntime = true hasSkikoJvmRuntime = true
continue continue
} else if (file.name.startsWith("skiko-jvm-")) { } else if (file.name.startsWith("skiko-awt-")) {
hasSkikoJvm = true hasSkikoJvm = true
skikoVersion = file.name skikoVersion = file.name
.removePrefix("skiko-jvm-") .removePrefix("skiko-awt-")
.removeSuffix(".jar") .removeSuffix(".jar")
} }
} }
@ -97,7 +97,7 @@ abstract class AbstractConfigureDesktopPreviewTask : AbstractComposeDesktopTask(
if (hasSkikoJvm && skikoVersion != null && skikoVersion.isNotBlank()) { if (hasSkikoJvm && skikoVersion != null && skikoVersion.isNotBlank()) {
val skikoRuntimeConfig = project.configurations.detachedConfiguration( val skikoRuntimeConfig = project.configurations.detachedConfiguration(
project.dependencies.create("org.jetbrains.skiko:skiko-jvm-runtime-${currentTarget.id}:$skikoVersion") project.dependencies.create("org.jetbrains.skiko:skiko-awt-runtime-${currentTarget.id}:$skikoVersion")
).apply { isTransitive = false } ).apply { isTransitive = false }
return skikoRuntimeConfig.files return skikoRuntimeConfig.files
} }

3
gradle-plugins/gradle.properties

@ -5,7 +5,8 @@ kotlin.code.style=official
# that will be used by published Gradle plugin, # that will be used by published Gradle plugin,
# unless overridden by COMPOSE_GRADLE_PLUGIN_COMPOSE_VERSION env var. # unless overridden by COMPOSE_GRADLE_PLUGIN_COMPOSE_VERSION env var.
# #
compose.version=1.0.1-rc2 # __LATEST_COMPOSE_RELEASE_VERSION__
compose.version=0.0.0-mpp-dev553
compose.with.web=false compose.with.web=false
# A version of Gradle plugin, that will be published, # A version of Gradle plugin, that will be published,

Loading…
Cancel
Save