Check that teamID is set (#3708)

The parameter is mandatory with notarytool
JetBrains · Sep 19, 2023 · a73909e · a73909e
1 parent 50d45f3
commit a73909e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/...ins/compose/desktop/application/internal/validation/ValidatedMacOSNotarizationSettings.kt b/...ins/compose/desktop/application/internal/validation/ValidatedMacOSNotarizationSettings.kt
@@ -11,7 +11,7 @@ import org.jetbrains.compose.desktop.application.internal.ComposeProperties
 internal data class ValidatedMacOSNotarizationSettings(
     val appleID: String,
     val password: String,
-    val teamID: String?
+    val teamID: String
 )
 
 internal fun MacOSNotarizationSettings?.validate(): ValidatedMacOSNotarizationSettings {
@@ -25,10 +25,13 @@ internal fun MacOSNotarizationSettings?.validate(): ValidatedMacOSNotarizationSe
     check(!password.orNull.isNullOrEmpty()) {
         ERR_PASSWORD_IS_EMPTY
     }
+    check(!teamID.orNull.isNullOrEmpty()) {
+        TEAM_ID_IS_EMPTY
+    }
     return ValidatedMacOSNotarizationSettings(
         appleID = appleID.orNull!!,
         password = password.orNull!!,
-        teamID  = teamID.orNull
+        teamID  = teamID.orNull!!
     )
 }
 
@@ -45,3 +48,8 @@ private val ERR_PASSWORD_IS_EMPTY =
                |  * Use '${ComposeProperties.MAC_NOTARIZATION_PASSWORD}' Gradle property;
                |  * Or use 'nativeDistributions.macOS.notarization.password' DSL property;
             """.trimMargin()
+private val TEAM_ID_IS_EMPTY =
+    """|$ERR_PREFIX teamID is null or empty. To specify:
+               |  * Use '${ComposeProperties.MAC_NOTARIZATION_TEAM_ID_PROVIDER}' Gradle property;
+               |  * Or use 'nativeDistributions.macOS.notarization.teamID' DSL property;
+            """.trimMargin()
diff --git a/...c/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractNotarizationTask.kt b/...c/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractNotarizationTask.kt
@@ -55,7 +55,7 @@ abstract class AbstractNotarizationTask @Inject constructor(
             "--wait",
             "--apple-id",
             notarization.appleID,
-            "--team-id".takeIf { notarization.teamID != null },
+            "--team-id",
             notarization.teamID,
             packageFile.absolutePath
         )