Merge remote-tracking branch 'origin/support-arm64-targets' into next

Scogun · Jan 9, 2024 · 304f67e · 304f67e
2 parents f0cc4df + d23fc9c
commit 304f67e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,5 @@
 /.idea/
 /build/
 /build/classes/kotlin/jvm/main/
-/build/classes/kotlin/jvm/test/
+/build/classes/kotlin/jvm/test/
+/gradle-*.properties
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     kotlin("multiplatform") version "1.9.22"
     id("maven-publish")
     id("signing")
+    id("net.saliman.properties") version("1.5.2")
 }
 
 group = "com.ucasoft.kcron"
@@ -17,8 +18,10 @@ kotlin {
         }
     }
     linuxX64()
+    linuxArm64()
     mingwX64()
     macosX64()
+    macosArm64()
     js(IR) {
         browser()
         nodejs()
@@ -117,6 +120,14 @@ signing {
     sign(publishing.publications)
 }
 
+tasks.withType<Sign>().configureEach {
+    val propName = "signing.skip"
+    onlyIf("$propName is set") {
+        val skipSigning = project.extra.properties[propName]?.toString()?.toBooleanStrict() ?: false
+        !skipSigning
+    }
+}
+
 tasks.withType<AbstractPublishToMaven>().configureEach {
     val signingTasks = tasks.withType<Sign>()
     mustRunAfter(signingTasks)