From c6d2ada60023d8d097c8533925ef6e499a415dc4 Mon Sep 17 00:00:00 2001 From: marionbarker Date: Fri, 28 Mar 2025 22:21:38 -0700 Subject: [PATCH 1/5] Configure the version number in LoopWorkspace, not Loop --- LoopVersion.xcconfig | 17 +++++++++++++++++ .../contents.xcworkspacedata | 3 +++ 2 files changed, 20 insertions(+) create mode 100644 LoopVersion.xcconfig diff --git a/LoopVersion.xcconfig b/LoopVersion.xcconfig new file mode 100644 index 0000000000..e66809cba9 --- /dev/null +++ b/LoopVersion.xcconfig @@ -0,0 +1,17 @@ +// +// LoopVersion.xcconfig +// LoopWorkspace +// +// Created by Darin Krauss on 1/30/20. +// Copyright © 2020 LoopKit Authors. All rights reserved. +// + +// Loop is only built using LoopWorkspace, so read +// the version number from LoopWorkspace + +// Version [DEFAULT] +LOOP_MARKETING_VERSION = 3.5.0 +CURRENT_PROJECT_VERSION = 57 + +// Optional override +#include? "VersionOverride.xcconfig" diff --git a/LoopWorkspace.xcworkspace/contents.xcworkspacedata b/LoopWorkspace.xcworkspace/contents.xcworkspacedata index b1d1574f06..c4258f9c51 100644 --- a/LoopWorkspace.xcworkspace/contents.xcworkspacedata +++ b/LoopWorkspace.xcworkspace/contents.xcworkspacedata @@ -20,6 +20,9 @@ + + From 1e3ba3e0346a8aa85e9cc2619221d450a11b3ff0 Mon Sep 17 00:00:00 2001 From: marionbarker Date: Tue, 1 Apr 2025 07:42:22 -0700 Subject: [PATCH 2/5] Revert "Configure the version number in LoopWorkspace, not Loop" This reverts commit c6d2ada60023d8d097c8533925ef6e499a415dc4. --- LoopVersion.xcconfig | 17 ----------------- .../contents.xcworkspacedata | 3 --- 2 files changed, 20 deletions(-) delete mode 100644 LoopVersion.xcconfig diff --git a/LoopVersion.xcconfig b/LoopVersion.xcconfig deleted file mode 100644 index e66809cba9..0000000000 --- a/LoopVersion.xcconfig +++ /dev/null @@ -1,17 +0,0 @@ -// -// LoopVersion.xcconfig -// LoopWorkspace -// -// Created by Darin Krauss on 1/30/20. -// Copyright © 2020 LoopKit Authors. All rights reserved. -// - -// Loop is only built using LoopWorkspace, so read -// the version number from LoopWorkspace - -// Version [DEFAULT] -LOOP_MARKETING_VERSION = 3.5.0 -CURRENT_PROJECT_VERSION = 57 - -// Optional override -#include? "VersionOverride.xcconfig" diff --git a/LoopWorkspace.xcworkspace/contents.xcworkspacedata b/LoopWorkspace.xcworkspace/contents.xcworkspacedata index c4258f9c51..b1d1574f06 100644 --- a/LoopWorkspace.xcworkspace/contents.xcworkspacedata +++ b/LoopWorkspace.xcworkspace/contents.xcworkspacedata @@ -20,9 +20,6 @@ - - From 649d63eea6040b52c1f485e5e9c00ef001341ef4 Mon Sep 17 00:00:00 2001 From: marionbarker Date: Mon, 31 Mar 2025 21:03:01 -0700 Subject: [PATCH 3/5] Add VersionOverride for DIY numbering --- LoopWorkspace.xcworkspace/contents.xcworkspacedata | 3 +++ VersionOverride.xcconfig | 12 ++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 VersionOverride.xcconfig diff --git a/LoopWorkspace.xcworkspace/contents.xcworkspacedata b/LoopWorkspace.xcworkspace/contents.xcworkspacedata index b1d1574f06..2c8d0d6304 100644 --- a/LoopWorkspace.xcworkspace/contents.xcworkspacedata +++ b/LoopWorkspace.xcworkspace/contents.xcworkspacedata @@ -96,4 +96,7 @@ + + diff --git a/VersionOverride.xcconfig b/VersionOverride.xcconfig new file mode 100644 index 0000000000..f2af2cbe2b --- /dev/null +++ b/VersionOverride.xcconfig @@ -0,0 +1,12 @@ +// +// VersionOverride.xcconfig +// LoopWorkspace +// +// Created 3/31/2025 +// Copyright © 2020 LoopKit Authors. All rights reserved. +// + +// Version [for DIY Loop] +// configure the version number in LoopWorkspace +LOOP_MARKETING_VERSION = 3.5.0 +CURRENT_PROJECT_VERSION = 57 From c8eb5a68d2b38300d627e95f36854c424319868e Mon Sep 17 00:00:00 2001 From: marionbarker Date: Tue, 1 Apr 2025 09:58:45 -0700 Subject: [PATCH 4/5] reorder the VersionOverride.xcconfig position in Xcode file display --- LoopWorkspace.xcworkspace/contents.xcworkspacedata | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/LoopWorkspace.xcworkspace/contents.xcworkspacedata b/LoopWorkspace.xcworkspace/contents.xcworkspacedata index 2c8d0d6304..9097fa2796 100644 --- a/LoopWorkspace.xcworkspace/contents.xcworkspacedata +++ b/LoopWorkspace.xcworkspace/contents.xcworkspacedata @@ -20,6 +20,9 @@ + + @@ -96,7 +99,4 @@ - - From c2e4f86a171c93e4255babe9fe6b9d60635fea8b Mon Sep 17 00:00:00 2001 From: marionbarker Date: Mon, 7 Apr 2025 15:05:11 -0700 Subject: [PATCH 5/5] update Loop: version number change and UI bug fixes --- Loop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Loop b/Loop index f63edf9b70..0a3a165189 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit f63edf9b70177c141d5d67fbaff568b4baa6d3a6 +Subproject commit 0a3a1651894f06ddce7a2feff9b6d299a34e6d2d