From 8ff2a324b6a3e766206b1d6f06992957c45a0ed5 Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <654232+AlexeyTsvetkov@users.noreply.github.com>
Date: Wed, 29 Dec 2021 11:23:55 +0300
Subject: [PATCH] More CI fixes (#1649)

* Update Kotlin in SplitPane component

* Use skiko-awt-* artifacts instead of skiko-jvm-*
---
 components/gradle.properties                              | 4 +++-
 components/settings.gradle.kts                            | 1 +
 .../desktop/application/tasks/AbstractJPackageTask.kt     | 2 +-
 .../preview/tasks/AbstractConfigureDesktopPreviewTask.kt  | 8 ++++----
 gradle-plugins/gradle.properties                          | 3 ++-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/components/gradle.properties b/components/gradle.properties
index e6f23541f2..f5c963b26e 100644
--- a/components/gradle.properties
+++ b/components/gradle.properties
@@ -2,5 +2,7 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 android.useAndroidX=true
 android.enableJetifier=true
 kotlin.code.style=official
+# __KOTLIN_COMPOSE_VERSION__
 kotlin.version=1.6.10
-compose.version=1.0.1-rc2
+# __LATEST_COMPOSE_RELEASE_VERSION__
+compose.version=1.0.1
diff --git a/components/settings.gradle.kts b/components/settings.gradle.kts
index 2e9fcc334b..4034e8aa4a 100644
--- a/components/settings.gradle.kts
+++ b/components/settings.gradle.kts
@@ -1,6 +1,7 @@
 pluginManagement {
     repositories {
         gradlePluginPortal()
+        mavenCentral()
         maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
         google()
     }
diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractJPackageTask.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractJPackageTask.kt
index eb80b42a5c..3e53b50033 100644
--- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractJPackageTask.kt
+++ b/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 =
-    lib.name.startsWith("skiko-jvm-runtime-${currentOS.id}-${currentArch.id}")
+    lib.name.startsWith("skiko-awt-runtime-${currentOS.id}-${currentArch.id}")
             && lib.name.endsWith(".jar")
 
 private fun unpackSkikoForCurrentOS(sourceJar: File, skikoDir: File, fileOperations: FileOperations): List<File> {
diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/preview/tasks/AbstractConfigureDesktopPreviewTask.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/preview/tasks/AbstractConfigureDesktopPreviewTask.kt
index 6eab501556..4b2159648f 100644
--- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/preview/tasks/AbstractConfigureDesktopPreviewTask.kt
+++ b/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
             for (file in previewClasspath.files) {
                 if (file.name.endsWith(".jar")) {
-                    if (file.name.startsWith("skiko-jvm-runtime-")) {
+                    if (file.name.startsWith("skiko-awt-runtime-")) {
                         hasSkikoJvmRuntime = true
                         continue
-                    } else if (file.name.startsWith("skiko-jvm-")) {
+                    } else if (file.name.startsWith("skiko-awt-")) {
                         hasSkikoJvm = true
                         skikoVersion = file.name
-                            .removePrefix("skiko-jvm-")
+                            .removePrefix("skiko-awt-")
                             .removeSuffix(".jar")
                     }
                 }
@@ -97,7 +97,7 @@ abstract class AbstractConfigureDesktopPreviewTask : AbstractComposeDesktopTask(
 
             if (hasSkikoJvm && skikoVersion != null && skikoVersion.isNotBlank()) {
                 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 }
                 return skikoRuntimeConfig.files
             }
diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties
index 0b41d54add..a122f55a02 100644
--- a/gradle-plugins/gradle.properties
+++ b/gradle-plugins/gradle.properties
@@ -5,7 +5,8 @@ kotlin.code.style=official
 # that will be used by published Gradle plugin,
 # 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
 
 # A version of Gradle plugin, that will be published,