Revert "Update Fastfile"

This reverts commit 73db843.

Author: achkars

fastlane/Fastfile

@@ -12,8 +12,7 @@
 
 default_platform(:ios)
 
-TEAMID = ENV["TEAMID"]
-TEAMID_SUFFIX = ENV["TEAMID_SUFFIX"].to_s.empty? ? "" : "-#{ENV["TEAMID_SUFFIX"]}"
+TEAMID = ENV["TEAMID_SUFFIX"].to_s.empty? ? "#{ENV["TEAMID"]}" : "#{ENV["TEAMID"]}-#{ENV["TEAMID_SUFFIX"]}"
 GH_PAT = ENV["GH_PAT"]
 GITHUB_WORKSPACE = ENV["GITHUB_WORKSPACE"]
 GITHUB_REPOSITORY_OWNER = ENV["GITHUB_REPOSITORY_OWNER"]
@@ -41,7 +40,7 @@ platform :ios do
     )
 
     previous_build_number = latest_testflight_build_number(
-      app_identifier: "com.#{TEAMID}#{TEAMID_SUFFIX}.loopkit.Loop",
+      app_identifier: "com.#{TEAMID}.loopkit.Loop",
       api_key: api_key,
     )
 
@@ -52,17 +51,16 @@ platform :ios do
       build_number: current_build_number
     )      
 
-    UI.message("Using app identifiers with TEAMID=#{TEAMID} SUFFIX=#{TEAMID_SUFFIX}")
     match(
       type: "appstore",
       git_basic_authorization: Base64.strict_encode64("#{GITHUB_REPOSITORY_OWNER}:#{GH_PAT}"),
       app_identifier: [
-        "com.#{TEAMID}#{TEAMID_SUFFIX}.loopkit.Loop", 
-        "com.#{TEAMID}#{TEAMID_SUFFIX}.loopkit.Loop.statuswidget", 
-        "com.#{TEAMID}#{TEAMID_SUFFIX}.loopkit.Loop.LoopWatch.watchkitextension", 
-        "com.#{TEAMID}#{TEAMID_SUFFIX}.loopkit.Loop.LoopWatch", 
-        "com.#{TEAMID}#{TEAMID_SUFFIX}.loopkit.Loop.Loop-Intent-Extension",
-        "com.#{TEAMID}#{TEAMID_SUFFIX}.loopkit.Loop.LoopWidgetExtension"
+        "com.#{TEAMID}.loopkit.Loop", 
+        "com.#{TEAMID}.loopkit.Loop.statuswidget", 
+        "com.#{TEAMID}.loopkit.Loop.LoopWatch.watchkitextension", 
+        "com.#{TEAMID}.loopkit.Loop.LoopWatch", 
+        "com.#{TEAMID}.loopkit.Loop.Loop-Intent-Extension",
+        "com.#{TEAMID}.loopkit.Loop.LoopWidgetExtension"
       ]
     )
 
@@ -72,7 +70,7 @@ platform :ios do
 
     update_code_signing_settings(
       path: "#{GITHUB_WORKSPACE}/Loop/Loop.xcodeproj",
-      profile_name: mapping["com.#{TEAMID}#{TEAMID_SUFFIX}.loopkit.Loop"],
+      profile_name: mapping["com.#{TEAMID}.loopkit.Loop"],
       code_sign_identity: "iPhone Distribution",
       targets: ["Loop"]
     )
@@ -85,35 +83,35 @@ platform :ios do
 
     update_code_signing_settings(
       path: "#{GITHUB_WORKSPACE}/Loop/Loop.xcodeproj",
-      profile_name: mapping["com.#{TEAMID}#{TEAMID_SUFFIX}.loopkit.Loop.statuswidget"],
+      profile_name: mapping["com.#{TEAMID}.loopkit.Loop.statuswidget"],
       code_sign_identity: "iPhone Distribution",
       targets: ["Loop Status Extension"]
     )
 
     update_code_signing_settings(
       path: "#{GITHUB_WORKSPACE}/Loop/Loop.xcodeproj",
-      profile_name: mapping["com.#{TEAMID}#{TEAMID_SUFFIX}.loopkit.Loop.LoopWatch.watchkitextension"],
+      profile_name: mapping["com.#{TEAMID}.loopkit.Loop.LoopWatch.watchkitextension"],
       code_sign_identity: "iPhone Distribution",
       targets: ["WatchApp Extension"]
     )
 
     update_code_signing_settings(
       path: "#{GITHUB_WORKSPACE}/Loop/Loop.xcodeproj",
-      profile_name: mapping["com.#{TEAMID}#{TEAMID_SUFFIX}.loopkit.Loop.LoopWatch"],
+      profile_name: mapping["com.#{TEAMID}.loopkit.Loop.LoopWatch"],
       code_sign_identity: "iPhone Distribution",
       targets: ["WatchApp"]
     )
 
     update_code_signing_settings(
       path: "#{GITHUB_WORKSPACE}/Loop/Loop.xcodeproj",
-      profile_name: mapping["com.#{TEAMID}#{TEAMID_SUFFIX}.loopkit.Loop.Loop-Intent-Extension"],
+      profile_name: mapping["com.#{TEAMID}.loopkit.Loop.Loop-Intent-Extension"],
       code_sign_identity: "iPhone Distribution",
       targets: ["Loop Intent Extension"]
     )
 
     update_code_signing_settings(
       path: "#{GITHUB_WORKSPACE}/Loop/Loop.xcodeproj",
-      profile_name: mapping["com.#{TEAMID}#{TEAMID_SUFFIX}.loopkit.Loop.LoopWidgetExtension"],
+      profile_name: mapping["com.#{TEAMID}.loopkit.Loop.LoopWidgetExtension"],
       code_sign_identity: "iPhone Distribution",
       targets: ["Loop Widget Extension"]
     )
@@ -124,8 +122,8 @@ platform :ios do
       output_name: "Loop.ipa",
       configuration: "Release",
       destination: 'generic/platform=iOS',
-      buildlog_path: 'buildlog',
-      xcargs: "MAIN_APP_BUNDLE_IDENTIFIER=com.#{TEAMID}#{TEAMID_SUFFIX}.loopkit.Loop"
+      buildlog_path: 'buildlog'
+      xcargs: "MAIN_APP_BUNDLE_IDENTIFIER=com.#{TEAMID}.loopkit.Loop"
     )
 
     copy_artifacts(
@@ -173,30 +171,30 @@ platform :ios do
       end
     end
 
-    configure_bundle_id("Loop", "com.#{TEAMID}#{TEAMID_SUFFIX}.loopkit.Loop", [
+    configure_bundle_id("Loop", "com.#{TEAMID}.loopkit.Loop", [
       Spaceship::ConnectAPI::BundleIdCapability::Type::APP_GROUPS,
       Spaceship::ConnectAPI::BundleIdCapability::Type::HEALTHKIT,
       Spaceship::ConnectAPI::BundleIdCapability::Type::PUSH_NOTIFICATIONS,
       Spaceship::ConnectAPI::BundleIdCapability::Type::SIRIKIT,
       Spaceship::ConnectAPI::BundleIdCapability::Type::NFC_TAG_READING
     ])
 
-    configure_bundle_id("Loop Intent Extension", "com.#{TEAMID}#{TEAMID_SUFFIX}.loopkit.Loop.Loop-Intent-Extension", [
+    configure_bundle_id("Loop Intent Extension", "com.#{TEAMID}.loopkit.Loop.Loop-Intent-Extension", [
       Spaceship::ConnectAPI::BundleIdCapability::Type::APP_GROUPS
     ])
 
-    configure_bundle_id("Loop Status Extension", "com.#{TEAMID}#{TEAMID_SUFFIX}.loopkit.Loop.statuswidget", [
+    configure_bundle_id("Loop Status Extension", "com.#{TEAMID}.loopkit.Loop.statuswidget", [
       Spaceship::ConnectAPI::BundleIdCapability::Type::APP_GROUPS
     ])
 
-    configure_bundle_id("WatchApp", "com.#{TEAMID}#{TEAMID_SUFFIX}.loopkit.Loop.LoopWatch", [])
+    configure_bundle_id("WatchApp", "com.#{TEAMID}.loopkit.Loop.LoopWatch", [])
 
-    configure_bundle_id("WatchApp Extension", "com.#{TEAMID}#{TEAMID_SUFFIX}.loopkit.Loop.LoopWatch.watchkitextension", [
+    configure_bundle_id("WatchApp Extension", "com.#{TEAMID}.loopkit.Loop.LoopWatch.watchkitextension", [
       Spaceship::ConnectAPI::BundleIdCapability::Type::HEALTHKIT,
       Spaceship::ConnectAPI::BundleIdCapability::Type::SIRIKIT
     ])
 
-    configure_bundle_id("Loop Widget Extension", "com.#{TEAMID}#{TEAMID_SUFFIX}.loopkit.Loop.LoopWidgetExtension", [
+    configure_bundle_id("Loop Widget Extension", "com.#{TEAMID}.loopkit.Loop.LoopWidgetExtension", [
       Spaceship::ConnectAPI::BundleIdCapability::Type::APP_GROUPS
     ])
 
@@ -219,12 +217,12 @@ platform :ios do
       verbose: true,
       git_basic_authorization: Base64.strict_encode64("#{GITHUB_REPOSITORY_OWNER}:#{GH_PAT}"),
       app_identifier: [
-        "com.#{TEAMID}#{TEAMID_SUFFIX}.loopkit.Loop", 
-        "com.#{TEAMID}#{TEAMID_SUFFIX}.loopkit.Loop.statuswidget", 
-        "com.#{TEAMID}#{TEAMID_SUFFIX}.loopkit.Loop.LoopWatch.watchkitextension", 
-        "com.#{TEAMID}#{TEAMID_SUFFIX}.loopkit.Loop.LoopWatch", 
-        "com.#{TEAMID}#{TEAMID_SUFFIX}.loopkit.Loop.Loop-Intent-Extension",
-        "com.#{TEAMID}#{TEAMID_SUFFIX}.loopkit.Loop.LoopWidgetExtension",
+        "com.#{TEAMID}.loopkit.Loop", 
+        "com.#{TEAMID}.loopkit.Loop.statuswidget", 
+        "com.#{TEAMID}.loopkit.Loop.LoopWatch.watchkitextension", 
+        "com.#{TEAMID}.loopkit.Loop.LoopWatch", 
+        "com.#{TEAMID}.loopkit.Loop.Loop-Intent-Extension",
+        "com.#{TEAMID}.loopkit.Loop.LoopWidgetExtension",
       ]
     )
   end
@@ -244,7 +242,7 @@ platform :ios do
       bundle_id = Spaceship::ConnectAPI::BundleId.find(identifier)
     end
 
-    find_bundle_id("com.#{TEAMID}#{TEAMID_SUFFIX}.loopkit.Loop")
+    find_bundle_id("com.#{TEAMID}.loopkit.Loop")
 
     match(
       type: "appstore",
@@ -267,7 +265,7 @@ platform :ios do
 
     match_nuke(
       type: "appstore",
-      team_id: "#{TEAMID}#{TEAMID_SUFFIX}",
+      team_id: "#{TEAMID}",
       skip_confirmation: true,
       git_basic_authorization: Base64.strict_encode64("#{GITHUB_REPOSITORY_OWNER}:#{GH_PAT}")
     )
@@ -324,4 +322,4 @@ platform :ios do
     new_certificate_needed_content = File.read(file_path)
     puts "Certificate creation or renewal needed: #{new_certificate_needed_content}"
   end
-end
+end