Browse Source

Revert "Fix signing settings when no Keychain is specified (#1093)"

This reverts commit 5b34141cbe.

We have a compilation error:
```
e: /mnt/agent/work/737a92a2f69083c2/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/validation/ValidatedMacOSSigningSettings.kt: (59, 20): Unresolved reference: keychainFile
```
pull/1152/head
Igor Demin 3 years ago
parent
commit
d956a2a1ee
  1. 2
      gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/validation/ValidatedMacOSSigningSettings.kt

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

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

Loading…
Cancel
Save