jlengrand/compose-multiplatform
1
0
Fork 0
mirror of https://github.com/jlengrand/compose-multiplatform.git synced 2026-03-10 08:11:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix signing settings when no Keychain is specified - Fixed (#1152)

Browse Source 
Closes #1086
Closes #1020
This commit is contained in:
Mitchell Syer
2021-09-11 13:01:03 -04:00
committed by GitHub
parent 68d2040fce
commit 8371226f66
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/validation/ValidatedMacOSSigningSettings.kt
View File

@@ -44,14 +44,14 @@ internal fun MacOSSigningSettings.validate(
val signIdentity = this.identity.orNull
?: error(ERR_UNKNOWN_SIGN_ID)
val keychainPath = this.keychain.orNull
val keychainFile =
listOf(project.file(keychainPath), project.rootProject.file(keychainPath))
val keychainFile = if (keychainPath != null) {
val keychainFile = listOf(project.file(keychainPath), project.rootProject.file(keychainPath))
.firstOrNull { it.exists() }
if (keychainPath != null) {
check(keychainFile != null && keychainFile.exists()) {
check(keychainFile != null) {
"$ERR_PREFIX could not find the specified keychain: $keychainPath"
}
}
keychainFile
} else null
return ValidatedMacOSSigningSettings(
bundleID = bundleID,