From d956a2a1ee7ffcf34ad7af5b5f01d41e0390626e Mon Sep 17 00:00:00 2001
From: Igor Demin <igordmn@gmail.com>
Date: Fri, 10 Sep 2021 19:45:56 +0300
Subject: [PATCH] Revert "Fix signing settings when no Keychain is specified
 (#1093)"

This reverts commit 5b34141cbe40a269ddc38151da0d111d1a5cf0f4.

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
```
---
 .../internal/validation/ValidatedMacOSSigningSettings.kt    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/validation/ValidatedMacOSSigningSettings.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/validation/ValidatedMacOSSigningSettings.kt
index cb90c8b9b3..3ca82fb6a1 100644
--- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/validation/ValidatedMacOSSigningSettings.kt
+++ b/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
         ?: error(ERR_UNKNOWN_SIGN_ID)
     val keychainPath = this.keychain.orNull
+    val keychainFile =
+        listOf(project.file(keychainPath), project.rootProject.file(keychainPath))
+            .firstOrNull { it.exists() }
     if (keychainPath != null) {
-        val keychainFile =
-            listOf(project.file(keychainPath), project.rootProject.file(keychainPath))
-                .firstOrNull { it.exists() }
         check(keychainFile != null && keychainFile.exists()) {
             "$ERR_PREFIX could not find the specified keychain: $keychainPath"
         }