From 6a95dc9aba5a2d79ca07137c0fd873afbbee662a Mon Sep 17 00:00:00 2001
From: marionbarker <marionbarker@earthlink.net>
Date: Fri, 28 Mar 2025 22:12:30 -0700
Subject: [PATCH 1/5] Configure the version number in LoopWorkspace, not Loop

---
 Version.xcconfig | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/Version.xcconfig b/Version.xcconfig
index a7c7fe29d1..fc699f3bd5 100644
--- a/Version.xcconfig
+++ b/Version.xcconfig
@@ -6,9 +6,6 @@
 //  Copyright © 2020 LoopKit Authors. All rights reserved.
 //
 
-// Version [DEFAULT]
-LOOP_MARKETING_VERSION = 3.5.0
-CURRENT_PROJECT_VERSION = 57
-
-// Optional override
-#include? "VersionOverride.xcconfig"
+// Loop is only built using LoopWorkspace, so read
+//   the version number from LoopWorkspace
+#include "../LoopVersion.xcconfig"

From 93a0047e4a4c18434df9d51cba5494941ba2e936 Mon Sep 17 00:00:00 2001
From: marionbarker <marionbarker@earthlink.net>
Date: Sat, 29 Mar 2025 10:58:30 -0700
Subject: [PATCH 2/5] report the LoopWorkspace branch in Settings

---
 Loop/Managers/SupportManager.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Loop/Managers/SupportManager.swift b/Loop/Managers/SupportManager.swift
index 58cddddf74..18f3df912d 100644
--- a/Loop/Managers/SupportManager.swift
+++ b/Loop/Managers/SupportManager.swift
@@ -227,7 +227,7 @@ extension SupportManager: SupportUIDelegate {
     }
     
     private var branchNameIfNotReleaseBranch: String? {
-        return BuildDetails.default.gitBranch.filter { branch in
+        return BuildDetails.default.workspaceGitBranch.filter { branch in
             return branch != "" &&
                 branch != "main" &&
                 branch != "master" &&

From 3b2377132264c3fc6fa6a4e89eae5ab596e23e8e Mon Sep 17 00:00:00 2001
From: marionbarker <marionbarker@earthlink.net>
Date: Tue, 1 Apr 2025 07:36:11 -0700
Subject: [PATCH 3/5] Revert "Configure the version number in LoopWorkspace,
 not Loop"

This reverts commit 6a95dc9aba5a2d79ca07137c0fd873afbbee662a.
---
 Version.xcconfig | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Version.xcconfig b/Version.xcconfig
index fc699f3bd5..a7c7fe29d1 100644
--- a/Version.xcconfig
+++ b/Version.xcconfig
@@ -6,6 +6,9 @@
 //  Copyright © 2020 LoopKit Authors. All rights reserved.
 //
 
-// Loop is only built using LoopWorkspace, so read
-//   the version number from LoopWorkspace
-#include "../LoopVersion.xcconfig"
+// Version [DEFAULT]
+LOOP_MARKETING_VERSION = 3.5.0
+CURRENT_PROJECT_VERSION = 57
+
+// Optional override
+#include? "VersionOverride.xcconfig"

From 967bc7f669b92891bcc4b06098b123885d8000fe Mon Sep 17 00:00:00 2001
From: marionbarker <marionbarker@earthlink.net>
Date: Mon, 31 Mar 2025 14:24:29 -0700
Subject: [PATCH 4/5] enable VersionOveride to be placed in LoopWorkspace

---
 Version.xcconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Version.xcconfig b/Version.xcconfig
index a7c7fe29d1..9f2c5b0a37 100644
--- a/Version.xcconfig
+++ b/Version.xcconfig
@@ -12,3 +12,4 @@ CURRENT_PROJECT_VERSION = 57
 
 // Optional override
 #include? "VersionOverride.xcconfig"
+#include? "../VersionOverride.xcconfig"

From faebc1a520a6e8ebcfdfd159ea815ea6434f4c2f Mon Sep 17 00:00:00 2001
From: marionbarker <marionbarker@earthlink.net>
Date: Tue, 1 Apr 2025 10:03:24 -0700
Subject: [PATCH 5/5] reorder search for version override, add note about
 version for DIY Loop

---
 Version.xcconfig | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Version.xcconfig b/Version.xcconfig
index 9f2c5b0a37..c5da25416b 100644
--- a/Version.xcconfig
+++ b/Version.xcconfig
@@ -6,10 +6,11 @@
 //  Copyright © 2020 LoopKit Authors. All rights reserved.
 //
 
-// Version [DEFAULT]
-LOOP_MARKETING_VERSION = 3.5.0
-CURRENT_PROJECT_VERSION = 57
+// Version
+//   [for DIY Loop] configure the version number in LoopWorkspace
+LOOP_MARKETING_VERSION = 1.0
+CURRENT_PROJECT_VERSION = 1
 
-// Optional override
-#include? "VersionOverride.xcconfig"
+// Optional override (enables override of version)
 #include? "../VersionOverride.xcconfig"
+#include? "VersionOverride.xcconfig"