From 17a349ba340d980fab616ddf6f5a61b42182b422 Mon Sep 17 00:00:00 2001 From: Cameron Ingham Date: Mon, 26 Jun 2023 12:39:31 -0700 Subject: [PATCH 1/3] Added MixpanelService to Loop --- .gitmodules | 3 +++ LoopWorkspace.xcworkspace/contents.xcworkspacedata | 3 +++ .../xcshareddata/swiftpm/Package.resolved | 9 +++++++++ .../xcshareddata/xcschemes/LoopWorkspace.xcscheme | 14 ++++++++++++++ MixpanelService | 1 + 5 files changed, 30 insertions(+) create mode 160000 MixpanelService diff --git a/.gitmodules b/.gitmodules index 12afa2e72b..e122314dbe 100644 --- a/.gitmodules +++ b/.gitmodules @@ -55,3 +55,6 @@ [submodule "MinimedKit"] path = MinimedKit url = https://github.com/LoopKit/MinimedKit.git +[submodule "MixpanelService"] + path = MixpanelService + url = https://github.com/tidepool-org/MixpanelService.git diff --git a/LoopWorkspace.xcworkspace/contents.xcworkspacedata b/LoopWorkspace.xcworkspace/contents.xcworkspacedata index cc4b0ca5e3..fe30fafb4f 100644 --- a/LoopWorkspace.xcworkspace/contents.xcworkspacedata +++ b/LoopWorkspace.xcworkspace/contents.xcworkspacedata @@ -70,6 +70,9 @@ + + diff --git a/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved b/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved index 6fd27f864d..6138f902f1 100644 --- a/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -36,6 +36,15 @@ "version" : "1.7.1" } }, + { + "identity" : "mixpanel-swift", + "kind" : "remoteSourceControl", + "location" : "https://github.com/mixpanel/mixpanel-swift.git", + "state" : { + "branch" : "master", + "revision" : "c676a9737c76e127e3ae5776247b226bc6d7652d" + } + }, { "identity" : "mkringprogressview", "kind" : "remoteSourceControl", diff --git a/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme b/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme index 7487ee219e..c6fcca2314 100644 --- a/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme +++ b/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme @@ -104,6 +104,20 @@ ReferencedContainer = "container:AmplitudeService/AmplitudeService.xcodeproj"> + + + + Date: Mon, 26 Jun 2023 16:07:59 -0700 Subject: [PATCH 2/3] Update module url --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index e122314dbe..66dc275cda 100644 --- a/.gitmodules +++ b/.gitmodules @@ -57,4 +57,4 @@ url = https://github.com/LoopKit/MinimedKit.git [submodule "MixpanelService"] path = MixpanelService - url = https://github.com/tidepool-org/MixpanelService.git + url = https://github.com/LoopKit/MixpanelService From d62bdab8c708f749f7e9841a5d29f08ea9806ed4 Mon Sep 17 00:00:00 2001 From: Cameron Ingham Date: Tue, 11 Jul 2023 13:01:19 -0700 Subject: [PATCH 3/3] bump mixpanel --- MixpanelService | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MixpanelService b/MixpanelService index af1340fa7c..68a5bf8dd0 160000 --- a/MixpanelService +++ b/MixpanelService @@ -1 +1 @@ -Subproject commit af1340fa7c8c4c40cccd603d2afe4191551a0c58 +Subproject commit 68a5bf8dd01a98b6908d5e4cb0ae38d55a993fd5