From 85a7e6ced77d58f11d2c45b64b6ea10c3001fc87 Mon Sep 17 00:00:00 2001
From: "dima.avdeev" <99798741+dima-avdeev-jb@users.noreply.github.com>
Date: Mon, 20 Jun 2022 13:27:08 +0300
Subject: [PATCH] compose gradle plugin, lazy initialization of teamId for iOS
 deploy (#2132)

---
 .../configureTaskToGenerateXcodeProject.kt    |  4 ++--
 .../internal/registerConnectedDeviceTasks.kt  | 20 ++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/uikit/internal/configureTaskToGenerateXcodeProject.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/uikit/internal/configureTaskToGenerateXcodeProject.kt
index 8453e9a4249..f66db8085e8 100644
--- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/uikit/internal/configureTaskToGenerateXcodeProject.kt
+++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/uikit/internal/configureTaskToGenerateXcodeProject.kt
@@ -13,7 +13,7 @@ internal fun Project.configureTaskToGenerateXcodeProject(
     id: String,
     projectName: String,
     bundleIdPrefix: String,
-    teamId: String? = null,
+    getTeamId: () -> String? = { null },
     taskInstallXcodeGen: TaskProvider<*>,
 ): TaskProvider<AbstractComposeIosTask> = tasks.composeIosTask<AbstractComposeIosTask>("iosGenerateXcodeProject$id") {
     dependsOn(taskInstallXcodeGen)
@@ -26,7 +26,7 @@ internal fun Project.configureTaskToGenerateXcodeProject(
             options:
               bundleIdPrefix: $bundleIdPrefix
             settings:
-              ${if (teamId != null) "DEVELOPMENT_TEAM: \"$teamId\"" else ""}
+              ${if (getTeamId() != null) "DEVELOPMENT_TEAM: \"${getTeamId()}\"" else ""}
               CODE_SIGN_IDENTITY: "iPhone Developer"
               CODE_SIGN_STYLE: Automatic
               MARKETING_VERSION: "1.0"
diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/uikit/internal/registerConnectedDeviceTasks.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/uikit/internal/registerConnectedDeviceTasks.kt
index a4194c287ad..70a98797400 100644
--- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/uikit/internal/registerConnectedDeviceTasks.kt
+++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/uikit/internal/registerConnectedDeviceTasks.kt
@@ -28,15 +28,17 @@ fun Project.registerConnectedDeviceTasks(
         id = id,
         projectName = projectName,
         bundleIdPrefix = bundleIdPrefix,
-        teamId = deploy.teamId ?: getLocalProperty(TEAM_ID_PROPERTY_KEY)
-        ?: error(
-            buildString {
-                appendLine("In local.properties (${localPropertiesFile.absolutePath})")
-                appendLine("Add property")
-                appendLine("$TEAM_ID_PROPERTY_KEY=***")
-                appendLine("Or set teamId in deploy with id: $id")
-            }
-        ),
+        getTeamId = {
+            deploy.teamId ?: getLocalProperty(TEAM_ID_PROPERTY_KEY)
+            ?: error(
+                buildString {
+                    appendLine("In local.properties (${localPropertiesFile.absolutePath})")
+                    appendLine("Add property")
+                    appendLine("$TEAM_ID_PROPERTY_KEY=***")
+                    appendLine("Or set teamId in deploy with id: $id")
+                }
+            )
+        },
         taskInstallXcodeGen = taskInstallXcodeGen,
     )