Unverified Commit ce67f6ba authored by Ivan Matkov's avatar Ivan Matkov Committed by GitHub

Fix missing sign task dependencies (#1097)

Publishing CI fails after Gradle update because of it
parent 12e43a89
...@@ -9,12 +9,20 @@ import org.gradle.api.Project ...@@ -9,12 +9,20 @@ import org.gradle.api.Project
import org.jetbrains.kotlin.gradle.plugin.KotlinTarget import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinCompileTool import org.jetbrains.kotlin.gradle.tasks.KotlinCompileTool
import registerSkikoTask import registerSkikoTask
import skiaVersion
import supportAndroid import supportAndroid
import supportAwt
import supportNativeIosArm64
import supportNativeIosSimulatorArm64
import supportNativeIosX64
import supportNativeLinux
import supportNativeMac
import supportNativeTvosArm64
import supportNativeTvosSimulatorArm64
import supportNativeTvosX64
import supportWeb import supportWeb
import toTitleCase import toTitleCase
import java.io.File import java.io.File
import skiaVersion
import supportNativeLinux
fun skiaHeadersDirs(skiaDir: File): List<File> = fun skiaHeadersDirs(skiaDir: File): List<File> =
listOf( listOf(
...@@ -176,6 +184,103 @@ fun Project.configureSignAndPublishDependencies() { ...@@ -176,6 +184,103 @@ fun Project.configureSignAndPublishDependencies() {
} }
} }
} }
if (supportNativeMac) {
val publishMacosArm64 = "publishMacosArm64PublicationTo"
val publishMacosX64 = "publishMacosX64PublicationTo"
val signMacosArm64 = "signMacosArm64Publication"
val signMacosX64 = "signMacosX64Publication"
tasks.configureEach {
when {
name.startsWith(publishMacosArm64) -> {
dependsOn(signMacosArm64)
dependsOn(signMacosX64)
}
name.startsWith(publishMacosX64) -> {
dependsOn(signMacosArm64)
dependsOn(signMacosX64)
}
}
}
}
// iOS family
if (supportNativeIosArm64 || supportNativeIosSimulatorArm64 || supportNativeIosX64) {
val publishIosArm64 = "publishIosArm64PublicationTo"
val publishIosSimArm64 = "publishIosSimulatorArm64PublicationTo"
val publishIosX64 = "publishIosX64PublicationTo"
val signIosArm64 = "signIosArm64Publication"
val signIosSimArm64 = "signIosSimulatorArm64Publication"
val signIosX64 = "signIosX64Publication"
tasks.configureEach {
when {
name.startsWith(publishIosArm64) -> {
if (supportNativeIosArm64) dependsOn(signIosArm64)
if (supportNativeIosSimulatorArm64) dependsOn(signIosSimArm64)
if (supportNativeIosX64) dependsOn(signIosX64)
}
name.startsWith(publishIosSimArm64) -> {
if (supportNativeIosArm64) dependsOn(signIosArm64)
if (supportNativeIosSimulatorArm64) dependsOn(signIosSimArm64)
if (supportNativeIosX64) dependsOn(signIosX64)
}
name.startsWith(publishIosX64) -> {
if (supportNativeIosArm64) dependsOn(signIosArm64)
if (supportNativeIosSimulatorArm64) dependsOn(signIosSimArm64)
if (supportNativeIosX64) dependsOn(signIosX64)
}
}
}
}
// tvOS family
if (supportNativeTvosArm64 || supportNativeTvosSimulatorArm64 || supportNativeTvosX64) {
val publishTvosArm64 = "publishTvosArm64PublicationTo"
val publishTvosSimArm64 = "publishTvosSimulatorArm64PublicationTo"
val publishTvosX64 = "publishTvosX64PublicationTo"
val signTvosArm64 = "signTvosArm64Publication"
val signTvosSimArm64 = "signTvosSimulatorArm64Publication"
val signTvosX64 = "signTvosX64Publication"
tasks.configureEach {
when {
name.startsWith(publishTvosArm64) -> {
if (supportNativeTvosArm64) dependsOn(signTvosArm64)
if (supportNativeTvosSimulatorArm64) dependsOn(signTvosSimArm64)
if (supportNativeTvosX64) dependsOn(signTvosX64)
}
name.startsWith(publishTvosSimArm64) -> {
if (supportNativeTvosArm64) dependsOn(signTvosArm64)
if (supportNativeTvosSimulatorArm64) dependsOn(signTvosSimArm64)
if (supportNativeTvosX64) dependsOn(signTvosX64)
}
name.startsWith(publishTvosX64) -> {
if (supportNativeTvosArm64) dependsOn(signTvosArm64)
if (supportNativeTvosSimulatorArm64) dependsOn(signTvosSimArm64)
if (supportNativeTvosX64) dependsOn(signTvosX64)
}
}
}
}
// Cross-publication pairs due to shared javadoc: KotlinMultiplatform <-> AWT
tasks.configureEach {
val publishKmp = "publishKotlinMultiplatformPublicationTo"
val publishAwt = "publishAwtPublicationTo"
val signKmp = "signKotlinMultiplatformPublication"
val signAwt = "signAwtPublication"
when {
name.startsWith(publishKmp) -> {
if (supportAwt) dependsOn(signAwt)
}
name.startsWith(publishAwt) -> {
dependsOn(signKmp)
}
}
}
} }
fun KotlinTarget.generateVersion( fun KotlinTarget.generateVersion(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment