From 2080608cda9ad93a03c606f78cde4c1b3c9c1798 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Sat, 14 Jan 2023 12:50:57 -0600 Subject: [PATCH 01/54] Update to new Loop dev --- Loop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Loop b/Loop index 0d9ed8744c..ed5472259b 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit 0d9ed8744c4adca1fab66689f40b92092c804899 +Subproject commit ed5472259bdc2968ee98fb33d4f51eb5dbe7c6a0 From 620a7329caa00ac75217065c37024f83b022945c Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Fri, 20 Jan 2023 16:29:22 -0600 Subject: [PATCH 02/54] Add Tidepool Service --- .gitmodules | 6 ++++ Loop.xcworkspace/contents.xcworkspacedata | 6 ++++ .../xcschemes/Loop (Workspace).xcscheme | 28 +++++++++++++++++++ TidepoolKit | 1 + TidepoolService | 1 + rileylink_ios | 2 +- 6 files changed, 43 insertions(+), 1 deletion(-) create mode 160000 TidepoolKit create mode 160000 TidepoolService diff --git a/.gitmodules b/.gitmodules index 93a3716d01..fd3101427e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -46,3 +46,9 @@ [submodule "G7SensorKit"] path = G7SensorKit url = https://github.com/LoopKit/G7SensorKit.git +[submodule "TidepoolService"] + path = TidepoolService + url = https://github.com/LoopKit/TidepoolService.git +[submodule "TidepoolKit"] + path = TidepoolKit + url = https://github.com/LoopKit/TidepoolKit.git diff --git a/Loop.xcworkspace/contents.xcworkspacedata b/Loop.xcworkspace/contents.xcworkspacedata index 7fb19613f6..a70a1d9a5c 100644 --- a/Loop.xcworkspace/contents.xcworkspacedata +++ b/Loop.xcworkspace/contents.xcworkspacedata @@ -31,6 +31,12 @@ + + + + diff --git a/Loop.xcworkspace/xcshareddata/xcschemes/Loop (Workspace).xcscheme b/Loop.xcworkspace/xcshareddata/xcschemes/Loop (Workspace).xcscheme index 0f192961e3..d78e847696 100644 --- a/Loop.xcworkspace/xcshareddata/xcschemes/Loop (Workspace).xcscheme +++ b/Loop.xcworkspace/xcshareddata/xcschemes/Loop (Workspace).xcscheme @@ -244,6 +244,34 @@ ReferencedContainer = "container:LogglyService/LogglyService.xcodeproj"> + + + + + + + + Date: Fri, 20 Jan 2023 17:09:49 -0600 Subject: [PATCH 03/54] Default to production environment --- TidepoolService | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TidepoolService b/TidepoolService index e58d95e37b..52b0b4a7a2 160000 --- a/TidepoolService +++ b/TidepoolService @@ -1 +1 @@ -Subproject commit e58d95e37bc394c86c807eff92d18a9cc5733052 +Subproject commit 52b0b4a7a2f281912d4776bf08b4c970ea66e91d From 0ef3ccb93e69b8fabc92c4421ea33390969b9951 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Fri, 20 Jan 2023 17:40:42 -0600 Subject: [PATCH 04/54] Record override percent and target --- Loop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Loop b/Loop index ed5472259b..c57ee31808 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit ed5472259bdc2968ee98fb33d4f51eb5dbe7c6a0 +Subproject commit c57ee31808fd79d281c02aa707b708f0e0d77916 From 74bc05e5bcbe86bc1460bc5602679bcdfeca3064 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Sat, 21 Jan 2023 20:38:50 -0600 Subject: [PATCH 05/54] Changes to use com.loopkit.Loop client id for TidepoolService --- Loop | 2 +- LoopKit | 2 +- TidepoolService | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Loop b/Loop index c57ee31808..874ecbb756 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit c57ee31808fd79d281c02aa707b708f0e0d77916 +Subproject commit 874ecbb7569e9b6a0943c9a628537bf25456299c diff --git a/LoopKit b/LoopKit index 0d5929e677..4d10387c5f 160000 --- a/LoopKit +++ b/LoopKit @@ -1 +1 @@ -Subproject commit 0d5929e677e8fa6526860ba9538f1317067f7802 +Subproject commit 4d10387c5f42426783a8a30cfd821aa67bf96b36 diff --git a/TidepoolService b/TidepoolService index 52b0b4a7a2..48cfe459d3 160000 --- a/TidepoolService +++ b/TidepoolService @@ -1 +1 @@ -Subproject commit 52b0b4a7a2f281912d4776bf08b4c970ea66e91d +Subproject commit 48cfe459d312914b1721dece7109c4db3add3d5f From 977146fb082a6fd9c16a5e89f87432b7ee48bb77 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Sun, 22 Jan 2023 15:48:28 -0600 Subject: [PATCH 06/54] TidepoolService fixes, Loop URL Scheme, Fix mock data for dexcom cgm on simulator, Fix dexcom share to work with email usernames --- AmplitudeService | 2 +- CGMBLEKit | 2 +- LogglyService | 2 +- Loop | 2 +- LoopKit | 2 +- NightscoutService | 2 +- TidepoolService | 2 +- dexcom-share-client-swift | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/AmplitudeService b/AmplitudeService index dd6624d35a..ef30c168e2 160000 --- a/AmplitudeService +++ b/AmplitudeService @@ -1 +1 @@ -Subproject commit dd6624d35a915dc57c627df2cfc062ceaa209ee5 +Subproject commit ef30c168e2494ee74d9547c745b1bc7257695920 diff --git a/CGMBLEKit b/CGMBLEKit index a371955c44..fe5f36c197 160000 --- a/CGMBLEKit +++ b/CGMBLEKit @@ -1 +1 @@ -Subproject commit a371955c44962bdb8f842607c0c0e49a1f4ada6a +Subproject commit fe5f36c197eeeef07648481016ee3e6843c6cd56 diff --git a/LogglyService b/LogglyService index 6e4133d4c3..090d3c5e1b 160000 --- a/LogglyService +++ b/LogglyService @@ -1 +1 @@ -Subproject commit 6e4133d4c3fa63fd3615153330ab5ecaff3cf3b1 +Subproject commit 090d3c5e1b312fe563378c623109e72ba8de0e17 diff --git a/Loop b/Loop index 874ecbb756..5d5339f28f 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit 874ecbb7569e9b6a0943c9a628537bf25456299c +Subproject commit 5d5339f28fea70ebc632a7f1a08bd8f57a84b8b8 diff --git a/LoopKit b/LoopKit index 4d10387c5f..1ccc830b18 160000 --- a/LoopKit +++ b/LoopKit @@ -1 +1 @@ -Subproject commit 4d10387c5f42426783a8a30cfd821aa67bf96b36 +Subproject commit 1ccc830b1884b928b04f320738c3bb3d1f51cdb5 diff --git a/NightscoutService b/NightscoutService index 8e9cadf8f1..4e36ec36c6 160000 --- a/NightscoutService +++ b/NightscoutService @@ -1 +1 @@ -Subproject commit 8e9cadf8f1a29b50a8ee3c14e1c60c92f4092292 +Subproject commit 4e36ec36c6c9125fd8f4f0d25fef4c1da07d22ad diff --git a/TidepoolService b/TidepoolService index 48cfe459d3..19367ffab4 160000 --- a/TidepoolService +++ b/TidepoolService @@ -1 +1 @@ -Subproject commit 48cfe459d312914b1721dece7109c4db3add3d5f +Subproject commit 19367ffab477a9488e8d1ab528d2e69362d39efb diff --git a/dexcom-share-client-swift b/dexcom-share-client-swift index 1f07ca019e..4cc426b5bb 160000 --- a/dexcom-share-client-swift +++ b/dexcom-share-client-swift @@ -1 +1 @@ -Subproject commit 1f07ca019ebb436f5d06ebe4154019501d93c1fb +Subproject commit 4cc426b5bbff4aced34825d1d20a296e82730d7a From a8b7a5c39b0cd90656010fd93735ca23141e6bba Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Sun, 22 Jan 2023 17:04:49 -0600 Subject: [PATCH 07/54] Watch complication fixes --- Loop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Loop b/Loop index 5d5339f28f..c038346e4c 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit 5d5339f28fea70ebc632a7f1a08bd8f57a84b8b8 +Subproject commit c038346e4cfeee10e8a43381902616323114898c From a0fbaa987adb1aca4e87d1ad3d490f327bc7bcf1 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Sun, 22 Jan 2023 18:20:43 -0600 Subject: [PATCH 08/54] Upload automated boluses to Tidepool with a subtype of .normal --- TidepoolKit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TidepoolKit b/TidepoolKit index 0d1fe7eb83..1be78942a3 160000 --- a/TidepoolKit +++ b/TidepoolKit @@ -1 +1 @@ -Subproject commit 0d1fe7eb834b22fc4487d6d549316190d9ffe438 +Subproject commit 1be78942a3f19a925b27386e7b19ebaa538c47a1 From 605e58b821f4cc7ad9f2c251251cbbd3a3d06274 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Thu, 26 Jan 2023 22:32:17 -0600 Subject: [PATCH 09/54] Import new translations --- AmplitudeService | 2 +- CGMBLEKit | 2 +- G7SensorKit | 2 +- Loop | 2 +- LoopKit | 2 +- LoopOnboarding | 2 +- LoopSupport | 2 +- NightscoutAPIClient | 2 +- NightscoutService | 2 +- OmniBLE | 2 +- dexcom-share-client-swift | 2 +- rileylink_ios | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/AmplitudeService b/AmplitudeService index ef30c168e2..06bfc57a7d 160000 --- a/AmplitudeService +++ b/AmplitudeService @@ -1 +1 @@ -Subproject commit ef30c168e2494ee74d9547c745b1bc7257695920 +Subproject commit 06bfc57a7d615d96439d3bbbe9455e808b2fd7a7 diff --git a/CGMBLEKit b/CGMBLEKit index fe5f36c197..d4aa3e7fce 160000 --- a/CGMBLEKit +++ b/CGMBLEKit @@ -1 +1 @@ -Subproject commit fe5f36c197eeeef07648481016ee3e6843c6cd56 +Subproject commit d4aa3e7fcefcaa941ebd658babb4069878dee0ba diff --git a/G7SensorKit b/G7SensorKit index 27c84efbdf..ea302521b2 160000 --- a/G7SensorKit +++ b/G7SensorKit @@ -1 +1 @@ -Subproject commit 27c84efbdf3a4aa99431e89ef96fdcfa6ad99e53 +Subproject commit ea302521b23e370b38feb773ab46b60f42f03b24 diff --git a/Loop b/Loop index c038346e4c..d35e1fee86 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit c038346e4cfeee10e8a43381902616323114898c +Subproject commit d35e1fee861d591ec499302e4b4dcea1ac6dd93f diff --git a/LoopKit b/LoopKit index 1ccc830b18..2a267267dc 160000 --- a/LoopKit +++ b/LoopKit @@ -1 +1 @@ -Subproject commit 1ccc830b1884b928b04f320738c3bb3d1f51cdb5 +Subproject commit 2a267267dce55c0b5fe15ecd6546495f49cca837 diff --git a/LoopOnboarding b/LoopOnboarding index 2b3a970453..9db1257ff3 160000 --- a/LoopOnboarding +++ b/LoopOnboarding @@ -1 +1 @@ -Subproject commit 2b3a970453bfa7d0890df6dc802cab9b0820dc8d +Subproject commit 9db1257ff357a5a9128554fcbe0cb36e43921187 diff --git a/LoopSupport b/LoopSupport index 00b2cfdff1..5cb5d9197c 160000 --- a/LoopSupport +++ b/LoopSupport @@ -1 +1 @@ -Subproject commit 00b2cfdff1c412d01ab6e6958c37ce54e35f8e22 +Subproject commit 5cb5d9197cae78d2cca259598b16cbf6a6ddcfb3 diff --git a/NightscoutAPIClient b/NightscoutAPIClient index 6cb67c3614..de49c89c79 160000 --- a/NightscoutAPIClient +++ b/NightscoutAPIClient @@ -1 +1 @@ -Subproject commit 6cb67c3614c278ec1fc445324ac96059d5495210 +Subproject commit de49c89c79d2964000d1d55c3da5248e6e1f737c diff --git a/NightscoutService b/NightscoutService index 4e36ec36c6..d0bd77cbc7 160000 --- a/NightscoutService +++ b/NightscoutService @@ -1 +1 @@ -Subproject commit 4e36ec36c6c9125fd8f4f0d25fef4c1da07d22ad +Subproject commit d0bd77cbc787c09621e4fa1fe24d1f187b7597dc diff --git a/OmniBLE b/OmniBLE index 6d9b57d649..c6c56adf08 160000 --- a/OmniBLE +++ b/OmniBLE @@ -1 +1 @@ -Subproject commit 6d9b57d6491449c691f42c1a33d40300e985a714 +Subproject commit c6c56adf083512079e49cfb28f9817f37ef03014 diff --git a/dexcom-share-client-swift b/dexcom-share-client-swift index 4cc426b5bb..4e04cdf651 160000 --- a/dexcom-share-client-swift +++ b/dexcom-share-client-swift @@ -1 +1 @@ -Subproject commit 4cc426b5bbff4aced34825d1d20a296e82730d7a +Subproject commit 4e04cdf651c4c890417818636f7f4070638adbcf diff --git a/rileylink_ios b/rileylink_ios index 85ec41b36d..2d69e8b442 160000 --- a/rileylink_ios +++ b/rileylink_ios @@ -1 +1 @@ -Subproject commit 85ec41b36d60aef1f01bd6cddfa67a54bf6d69f8 +Subproject commit 2d69e8b442cedc9a4818eb392e56cff9ee12b51d From 0da39858761127a33537c57a1f5df259b5d5fb97 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Sat, 28 Jan 2023 14:37:53 -0600 Subject: [PATCH 10/54] Show login email on Tidepool Service settings, and include translations for Tidepool Service --- TidepoolKit | 2 +- TidepoolService | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/TidepoolKit b/TidepoolKit index 1be78942a3..a1ee596cd4 160000 --- a/TidepoolKit +++ b/TidepoolKit @@ -1 +1 @@ -Subproject commit 1be78942a3f19a925b27386e7b19ebaa538c47a1 +Subproject commit a1ee596cd4d0b8f17d3bc05683ceb252783e3568 diff --git a/TidepoolService b/TidepoolService index 19367ffab4..1c7aebdd10 160000 --- a/TidepoolService +++ b/TidepoolService @@ -1 +1 @@ -Subproject commit 19367ffab477a9488e8d1ab528d2e69362d39efb +Subproject commit 1c7aebdd105f91cc62a77c63294e1f992dc96854 From fc1ce33201b21a58efb3b5bcab987c9a5bd0d1dd Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Sat, 28 Jan 2023 23:52:16 -0600 Subject: [PATCH 11/54] Updated translations from Lokalise --- AmplitudeService | 2 +- CGMBLEKit | 2 +- G7SensorKit | 2 +- Loop | 2 +- LoopKit | 2 +- LoopOnboarding | 2 +- LoopSupport | 2 +- NightscoutAPIClient | 2 +- NightscoutService | 2 +- OmniBLE | 2 +- dexcom-share-client-swift | 2 +- rileylink_ios | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/AmplitudeService b/AmplitudeService index 06bfc57a7d..f4ff9a7319 160000 --- a/AmplitudeService +++ b/AmplitudeService @@ -1 +1 @@ -Subproject commit 06bfc57a7d615d96439d3bbbe9455e808b2fd7a7 +Subproject commit f4ff9a7319c7d99a17c66f7ad61764cb118be489 diff --git a/CGMBLEKit b/CGMBLEKit index d4aa3e7fce..ee1f525806 160000 --- a/CGMBLEKit +++ b/CGMBLEKit @@ -1 +1 @@ -Subproject commit d4aa3e7fcefcaa941ebd658babb4069878dee0ba +Subproject commit ee1f5258061b40395b7c4d7aeeac8cce759c22e6 diff --git a/G7SensorKit b/G7SensorKit index ea302521b2..fdf0af7cb1 160000 --- a/G7SensorKit +++ b/G7SensorKit @@ -1 +1 @@ -Subproject commit ea302521b23e370b38feb773ab46b60f42f03b24 +Subproject commit fdf0af7cb12fb595f28b2ed2a40ca1e3cf611915 diff --git a/Loop b/Loop index d35e1fee86..ebb2bea92e 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit d35e1fee861d591ec499302e4b4dcea1ac6dd93f +Subproject commit ebb2bea92e6bd43b131365620576d1c1dac2d3b7 diff --git a/LoopKit b/LoopKit index 2a267267dc..fd62d737b7 160000 --- a/LoopKit +++ b/LoopKit @@ -1 +1 @@ -Subproject commit 2a267267dce55c0b5fe15ecd6546495f49cca837 +Subproject commit fd62d737b7cefeeb0747debd8bf725a93529ecd8 diff --git a/LoopOnboarding b/LoopOnboarding index 9db1257ff3..6aeeed8f93 160000 --- a/LoopOnboarding +++ b/LoopOnboarding @@ -1 +1 @@ -Subproject commit 9db1257ff357a5a9128554fcbe0cb36e43921187 +Subproject commit 6aeeed8f93b93b7a282840b2de9ce665be8f8939 diff --git a/LoopSupport b/LoopSupport index 5cb5d9197c..d22feeecca 160000 --- a/LoopSupport +++ b/LoopSupport @@ -1 +1 @@ -Subproject commit 5cb5d9197cae78d2cca259598b16cbf6a6ddcfb3 +Subproject commit d22feeecca21a1b76c995229751d7e092db5e15d diff --git a/NightscoutAPIClient b/NightscoutAPIClient index de49c89c79..7a41422b25 160000 --- a/NightscoutAPIClient +++ b/NightscoutAPIClient @@ -1 +1 @@ -Subproject commit de49c89c79d2964000d1d55c3da5248e6e1f737c +Subproject commit 7a41422b2568d14bb974b8aebe3796015174ca8f diff --git a/NightscoutService b/NightscoutService index d0bd77cbc7..c7951cb3ca 160000 --- a/NightscoutService +++ b/NightscoutService @@ -1 +1 @@ -Subproject commit d0bd77cbc787c09621e4fa1fe24d1f187b7597dc +Subproject commit c7951cb3ca14e4492b606cbfede1707fa86f9ad8 diff --git a/OmniBLE b/OmniBLE index c6c56adf08..5ea6054b25 160000 --- a/OmniBLE +++ b/OmniBLE @@ -1 +1 @@ -Subproject commit c6c56adf083512079e49cfb28f9817f37ef03014 +Subproject commit 5ea6054b25c90cc79dc5d4b7838e6bd6d1a5d567 diff --git a/dexcom-share-client-swift b/dexcom-share-client-swift index 4e04cdf651..400dfdebc7 160000 --- a/dexcom-share-client-swift +++ b/dexcom-share-client-swift @@ -1 +1 @@ -Subproject commit 4e04cdf651c4c890417818636f7f4070638adbcf +Subproject commit 400dfdebc72a46398a91f6f7b6d4abf511b06f74 diff --git a/rileylink_ios b/rileylink_ios index 2d69e8b442..07bc5ba2b8 160000 --- a/rileylink_ios +++ b/rileylink_ios @@ -1 +1 @@ -Subproject commit 2d69e8b442cedc9a4818eb392e56cff9ee12b51d +Subproject commit 07bc5ba2b8819830bb7a74f43001fc3cba559cfe From f0bcd2eef8eeeff4c4d3a13a72f1d0cf02e73283 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Sun, 29 Jan 2023 10:00:48 -0600 Subject: [PATCH 12/54] Add feature to skip onboarding --- LoopOnboarding | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LoopOnboarding b/LoopOnboarding index 6aeeed8f93..c174427654 160000 --- a/LoopOnboarding +++ b/LoopOnboarding @@ -1 +1 @@ -Subproject commit 6aeeed8f93b93b7a282840b2de9ce665be8f8939 +Subproject commit c1744276547f45a42478e289d7dd32f700bad437 From bd4cbd008754d92713c3199cbe9dedba91d757d7 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Sun, 29 Jan 2023 12:03:36 -0600 Subject: [PATCH 13/54] Translation updates --- Loop | 2 +- LoopSupport | 2 +- rileylink_ios | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Loop b/Loop index ebb2bea92e..ddf9634b52 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit ebb2bea92e6bd43b131365620576d1c1dac2d3b7 +Subproject commit ddf9634b5238486560a49f28894f72cfc2394fad diff --git a/LoopSupport b/LoopSupport index d22feeecca..ea98958f4a 160000 --- a/LoopSupport +++ b/LoopSupport @@ -1 +1 @@ -Subproject commit d22feeecca21a1b76c995229751d7e092db5e15d +Subproject commit ea98958f4a1b2c04d5b105edfb7d047980f6b0fa diff --git a/rileylink_ios b/rileylink_ios index 07bc5ba2b8..fcf07604b3 160000 --- a/rileylink_ios +++ b/rileylink_ios @@ -1 +1 @@ -Subproject commit 07bc5ba2b8819830bb7a74f43001fc3cba559cfe +Subproject commit fcf07604b36dfef142231bf90a8f573cde9485c4 From d1b1b60d725e4725816d997ba5ef4b07ef12b80a Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Sun, 29 Jan 2023 14:13:51 -0600 Subject: [PATCH 14/54] Fix string interpolation for translated strings --- LoopKit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LoopKit b/LoopKit index fd62d737b7..afd5fce5ba 160000 --- a/LoopKit +++ b/LoopKit @@ -1 +1 @@ -Subproject commit fd62d737b7cefeeb0747debd8bf725a93529ecd8 +Subproject commit afd5fce5ba87dc46e6de767f6391bdc391dabb29 From a9c4e9bcb19412e1ab419a52d65b76cc3f1efa42 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Tue, 31 Jan 2023 08:12:18 -0600 Subject: [PATCH 15/54] Localization fix --- Loop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Loop b/Loop index ddf9634b52..f5e18996e6 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit ddf9634b5238486560a49f28894f72cfc2394fad +Subproject commit f5e18996e627451d56bfa8bbfa08e077681fc695 From 819963a33cbac34fe454ae8f75fb370650441c49 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Thu, 9 Feb 2023 17:23:08 -0600 Subject: [PATCH 16/54] Profile expiration viewer and translation string fix --- Loop | 2 +- rileylink_ios | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Loop b/Loop index f5e18996e6..3e7288514c 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit f5e18996e627451d56bfa8bbfa08e077681fc695 +Subproject commit 3e7288514c0c3235cb07dc28048e1d365d8fee9d diff --git a/rileylink_ios b/rileylink_ios index fcf07604b3..2c9d4d3b89 160000 --- a/rileylink_ios +++ b/rileylink_ios @@ -1 +1 @@ -Subproject commit fcf07604b36dfef142231bf90a8f573cde9485c4 +Subproject commit 2c9d4d3b898d5d3687eb7cd9647ec1085a53e915 From 5d5a275bcfa36f0f08fe10444cd117a2f756eab6 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Thu, 9 Feb 2023 17:39:03 -0600 Subject: [PATCH 17/54] Import from Lokalise --- AmplitudeService | 2 +- CGMBLEKit | 2 +- G7SensorKit | 2 +- LogglyService | 2 +- Loop | 2 +- LoopKit | 2 +- LoopOnboarding | 2 +- LoopSupport | 2 +- NightscoutAPIClient | 2 +- NightscoutService | 2 +- OmniBLE | 2 +- Scripts/export_localizations.sh | 19 ++++++++++++ Scripts/import_localizations.sh | 51 +++++++++++++++++++++++++++++++++ TidepoolKit | 2 +- TidepoolService | 2 +- dexcom-share-client-swift | 2 +- rileylink_ios | 2 +- 17 files changed, 85 insertions(+), 15 deletions(-) create mode 100755 Scripts/export_localizations.sh create mode 100755 Scripts/import_localizations.sh diff --git a/AmplitudeService b/AmplitudeService index f4ff9a7319..0588fe27dc 160000 --- a/AmplitudeService +++ b/AmplitudeService @@ -1 +1 @@ -Subproject commit f4ff9a7319c7d99a17c66f7ad61764cb118be489 +Subproject commit 0588fe27dc4241ac5030dd023c0f165604ad0559 diff --git a/CGMBLEKit b/CGMBLEKit index ee1f525806..a71fd86022 160000 --- a/CGMBLEKit +++ b/CGMBLEKit @@ -1 +1 @@ -Subproject commit ee1f5258061b40395b7c4d7aeeac8cce759c22e6 +Subproject commit a71fd860221169e36c27b0ad8087f63c3addc8fd diff --git a/G7SensorKit b/G7SensorKit index fdf0af7cb1..811f0499cb 160000 --- a/G7SensorKit +++ b/G7SensorKit @@ -1 +1 @@ -Subproject commit fdf0af7cb12fb595f28b2ed2a40ca1e3cf611915 +Subproject commit 811f0499cb4d10c8eb1c9bbfd460901fc0f7dfb0 diff --git a/LogglyService b/LogglyService index 090d3c5e1b..5cc4bd4913 160000 --- a/LogglyService +++ b/LogglyService @@ -1 +1 @@ -Subproject commit 090d3c5e1b312fe563378c623109e72ba8de0e17 +Subproject commit 5cc4bd49134c5a5d7a1cdfb29a3bfc7c440c95da diff --git a/Loop b/Loop index 3e7288514c..35379a8152 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit 3e7288514c0c3235cb07dc28048e1d365d8fee9d +Subproject commit 35379a81526ef83de35041356048de35e8aa1704 diff --git a/LoopKit b/LoopKit index afd5fce5ba..1c465acacf 160000 --- a/LoopKit +++ b/LoopKit @@ -1 +1 @@ -Subproject commit afd5fce5ba87dc46e6de767f6391bdc391dabb29 +Subproject commit 1c465acacf19ef8576f81dacdc0e5e5a6211f217 diff --git a/LoopOnboarding b/LoopOnboarding index c174427654..794259e3cc 160000 --- a/LoopOnboarding +++ b/LoopOnboarding @@ -1 +1 @@ -Subproject commit c1744276547f45a42478e289d7dd32f700bad437 +Subproject commit 794259e3cc738d22fee7c62f442db9cd62f9dec3 diff --git a/LoopSupport b/LoopSupport index ea98958f4a..806c8430c1 160000 --- a/LoopSupport +++ b/LoopSupport @@ -1 +1 @@ -Subproject commit ea98958f4a1b2c04d5b105edfb7d047980f6b0fa +Subproject commit 806c8430c1a9143d4687261a7e5410c24a2768b1 diff --git a/NightscoutAPIClient b/NightscoutAPIClient index 7a41422b25..14a1967dbd 160000 --- a/NightscoutAPIClient +++ b/NightscoutAPIClient @@ -1 +1 @@ -Subproject commit 7a41422b2568d14bb974b8aebe3796015174ca8f +Subproject commit 14a1967dbd45be9209bd6f3cbb63be1b9388f564 diff --git a/NightscoutService b/NightscoutService index c7951cb3ca..0a25f901bd 160000 --- a/NightscoutService +++ b/NightscoutService @@ -1 +1 @@ -Subproject commit c7951cb3ca14e4492b606cbfede1707fa86f9ad8 +Subproject commit 0a25f901bdf7d8ceb3ca1262351a290d8ce1b1f8 diff --git a/OmniBLE b/OmniBLE index 5ea6054b25..31e6b6e2c7 160000 --- a/OmniBLE +++ b/OmniBLE @@ -1 +1 @@ -Subproject commit 5ea6054b25c90cc79dc5d4b7838e6bd6d1a5d567 +Subproject commit 31e6b6e2c7dd5d98b31ec51843e23d636972eb39 diff --git a/Scripts/export_localizations.sh b/Scripts/export_localizations.sh new file mode 100755 index 0000000000..c93cdb243b --- /dev/null +++ b/Scripts/export_localizations.sh @@ -0,0 +1,19 @@ +#!/bin/zsh + +LANGUAGES=(ar es ru en zh-Hans nl fr de it nb pl ru es ja pt-BR vi da sv fi ro tr he sk) + +xcodebuild -exportLocalizations -localizationPath xlocs "${LANGUAGES[@]/#/-exportLanguage }" + +mkdir -p xliff +find xclocs -name '*.xliff' -exec cp {} xliff \; + +cd xliff + +foreach lang in $LANGUAGES + echo lokalise2 \ + --token $LOKALISE_TOKEN \ + --project-id 8069387863cdd837d11dd0.82955128 \ + file upload \ + --file ${lang}.xliff \ + --lang-iso ${lang} +end diff --git a/Scripts/import_localizations.sh b/Scripts/import_localizations.sh new file mode 100755 index 0000000000..14b3fba653 --- /dev/null +++ b/Scripts/import_localizations.sh @@ -0,0 +1,51 @@ +#!/bin/zsh + +# Install the Lokalise command line tools from https://github.com/lokalise/lokalise-cli-2-go +# Generate an API Token (not an SDK Token!) following the instructions here: https://docs.lokalise.com/en/articles/1929556-api-tokens +# export LOKALISE_TOKEN="" + +set -e + +date=`date` + +# Fetch translations from Lokalise +lokalise2 \ + --token "$LOKALISE_TOKEN" \ + --project-id "8069387863cdd837d11dd0.82955128" \ + file download \ + --format xliff \ + --bundle-structure "%LANG_ISO%.%FORMAT%" \ + --original-filenames=false \ + --export-empty-as skip \ + --replace-breaks=false \ + --unzip-to ./xliff + + +# Build Loop +set -o pipefail && time xcodebuild -workspace Loop.xcworkspace -scheme 'Loop (Workspace)' build | xcpretty + + +# Apply translations +foreach file in xliff/*.xliff + xcodebuild -workspace Loop.xcworkspace -scheme "Loop (Workspace)" -importLocalizations -localizationPath $file +end + + +# Generate branches, commit and push. +projects=(LoopKit:AmplitudeService:dev LoopKit:CGMBLEKit:dev LoopKit:G7SensorKit:main LoopKit:LogglyService:dev LoopKit:Loop:dev LoopKit:LoopKit:dev LoopKit:LoopOnboarding:dev LoopKit:LoopSupport:dev LoopKit:NightscoutAPIClient:master ps2:NightscoutService:dev LoopKit:OmniBLE:dev LoopKit:TidepoolKit:dev LoopKit:TidepoolService:dev LoopKit:dexcom-share-client-swift:dev ps2:rileylink_ios:dev) +for project in ${projects}; do + echo "Working on $project" + IFS=":" read user dir branch <<< "$project" + echo "parts = $user $dir $branch" + cd $dir + set +e + git checkout -b translations + git add . + git commit -am "Updated translations from Lokalise on ${date}" + git push -f + pr=$(gh pr create -B $branch -R $user/$dir --fill 2>&1 | grep http) + echo "PR = $pr" + open $pr + cd .. +done + diff --git a/TidepoolKit b/TidepoolKit index a1ee596cd4..43afdea84f 160000 --- a/TidepoolKit +++ b/TidepoolKit @@ -1 +1 @@ -Subproject commit a1ee596cd4d0b8f17d3bc05683ceb252783e3568 +Subproject commit 43afdea84f14bbb4b80b759f25acbfda5c58cbc9 diff --git a/TidepoolService b/TidepoolService index 1c7aebdd10..38644504ef 160000 --- a/TidepoolService +++ b/TidepoolService @@ -1 +1 @@ -Subproject commit 1c7aebdd105f91cc62a77c63294e1f992dc96854 +Subproject commit 38644504eff144dc81f60bdf6e71f4334078b173 diff --git a/dexcom-share-client-swift b/dexcom-share-client-swift index 400dfdebc7..7a0e3e92ed 160000 --- a/dexcom-share-client-swift +++ b/dexcom-share-client-swift @@ -1 +1 @@ -Subproject commit 400dfdebc72a46398a91f6f7b6d4abf511b06f74 +Subproject commit 7a0e3e92ed2485f6bf7eda97421a442484e056cd diff --git a/rileylink_ios b/rileylink_ios index 2c9d4d3b89..2bcca70784 160000 --- a/rileylink_ios +++ b/rileylink_ios @@ -1 +1 @@ -Subproject commit 2c9d4d3b898d5d3687eb7cd9647ec1085a53e915 +Subproject commit 2bcca70784e54e9debab604f88da83164eb3abc5 From 337cb6c04bf12f23edde3f743b7ec468cbc20771 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Fri, 10 Feb 2023 08:25:52 -0600 Subject: [PATCH 18/54] Localization updates --- Loop | 2 +- Loop.xcworkspace/contents.xcworkspacedata | 10 ++++++++ Scripts/export_localizations.sh | 29 +++++++++++++---------- rileylink_ios | 2 +- 4 files changed, 28 insertions(+), 15 deletions(-) diff --git a/Loop b/Loop index 35379a8152..f6efd728f1 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit 35379a81526ef83de35041356048de35e8aa1704 +Subproject commit f6efd728f164b8479ef929714a31980907a64432 diff --git a/Loop.xcworkspace/contents.xcworkspacedata b/Loop.xcworkspace/contents.xcworkspacedata index a70a1d9a5c..2b1c12fc70 100644 --- a/Loop.xcworkspace/contents.xcworkspacedata +++ b/Loop.xcworkspace/contents.xcworkspacedata @@ -1,6 +1,16 @@ + + + + + + diff --git a/Scripts/export_localizations.sh b/Scripts/export_localizations.sh index c93cdb243b..b9f08a1b71 100755 --- a/Scripts/export_localizations.sh +++ b/Scripts/export_localizations.sh @@ -2,18 +2,21 @@ LANGUAGES=(ar es ru en zh-Hans nl fr de it nb pl ru es ja pt-BR vi da sv fi ro tr he sk) -xcodebuild -exportLocalizations -localizationPath xlocs "${LANGUAGES[@]/#/-exportLanguage }" +argstring="${LANGUAGES[@]/#/-exportLanguage }" +IFS=" "; args=( $=argstring ) -mkdir -p xliff -find xclocs -name '*.xliff' -exec cp {} xliff \; +xcodebuild -exportLocalizations -localizationPath xlocs $args -cd xliff - -foreach lang in $LANGUAGES - echo lokalise2 \ - --token $LOKALISE_TOKEN \ - --project-id 8069387863cdd837d11dd0.82955128 \ - file upload \ - --file ${lang}.xliff \ - --lang-iso ${lang} -end +#mkdir -p xliff +#find xclocs -name '*.xliff' -exec cp {} xliff \; +# +#cd xliff +# +#foreach lang in $LANGUAGES +# echo lokalise2 \ +# --token $LOKALISE_TOKEN \ +# --project-id 8069387863cdd837d11dd0.82955128 \ +# file upload \ +# --file ${lang}.xliff \ +# --lang-iso ${lang} +#end diff --git a/rileylink_ios b/rileylink_ios index 2bcca70784..3ad1307d9d 160000 --- a/rileylink_ios +++ b/rileylink_ios @@ -1 +1 @@ -Subproject commit 2bcca70784e54e9debab604f88da83164eb3abc5 +Subproject commit 3ad1307d9d49e940d0b7c3cb8c5a4de23be7bf7d From 7b68d4bad9a6558b80b20bf749c6afcfb0470b67 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Fri, 10 Feb 2023 09:19:59 -0600 Subject: [PATCH 19/54] Map iOS language names to iso language names --- Scripts/export_localizations.sh | 35 +++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/Scripts/export_localizations.sh b/Scripts/export_localizations.sh index b9f08a1b71..5edd56e3c5 100755 --- a/Scripts/export_localizations.sh +++ b/Scripts/export_localizations.sh @@ -1,22 +1,27 @@ #!/bin/zsh +set -e + LANGUAGES=(ar es ru en zh-Hans nl fr de it nb pl ru es ja pt-BR vi da sv fi ro tr he sk) argstring="${LANGUAGES[@]/#/-exportLanguage }" IFS=" "; args=( $=argstring ) -xcodebuild -exportLocalizations -localizationPath xlocs $args - -#mkdir -p xliff -#find xclocs -name '*.xliff' -exec cp {} xliff \; -# -#cd xliff -# -#foreach lang in $LANGUAGES -# echo lokalise2 \ -# --token $LOKALISE_TOKEN \ -# --project-id 8069387863cdd837d11dd0.82955128 \ -# file upload \ -# --file ${lang}.xliff \ -# --lang-iso ${lang} -#end +xcodebuild -exportLocalizations -localizationPath xclocs $args + +mkdir -p xliff +find xclocs -name '*.xliff' -exec cp {} xliff \; + +cd xliff + +foreach lang in $LANGUAGES + + lang_iso=$(sed "s/zh-Hans/zh_Hans_CN/g; s/pt-BR/pt_BR/g" <<<"$lang") + + lokalise2 \ + --token $LOKALISE_TOKEN \ + --project-id 8069387863cdd837d11dd0.82955128 \ + file upload \ + --file ${lang}.xliff \ + --lang-iso ${lang_iso} +end From 319b611b3349f4e7aba8d6556623e3bb8ef4e2a4 Mon Sep 17 00:00:00 2001 From: Billy Booth Date: Mon, 13 Feb 2023 10:03:17 -0600 Subject: [PATCH 20/54] Validate repository secrets (#36) * Validate repository secrets Adds support for validation of repository secrets. * Validate $FASTLANE_KEY as unencrypted PKCS#8 * Number workflows to guide sequential exection --- .github/workflows/add_identifiers.yml | 8 ++- .github/workflows/build_loop.yml | 8 ++- .github/workflows/create_certs.yml | 8 ++- .github/workflows/validate_secrets.yml | 70 ++++++++++++++++++++++++++ fastlane/Fastfile | 18 +++++++ 5 files changed, 109 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/validate_secrets.yml diff --git a/.github/workflows/add_identifiers.yml b/.github/workflows/add_identifiers.yml index e28cbd2cac..62a2b543f5 100644 --- a/.github/workflows/add_identifiers.yml +++ b/.github/workflows/add_identifiers.yml @@ -1,9 +1,15 @@ -name: Add Identifiers +name: 2. Add Identifiers +run-name: Add Identifiers on: workflow_dispatch: jobs: + secrets: + uses: ./.github/workflows/validate_secrets.yml + secrets: inherit + identifiers: + needs: secrets runs-on: macos-12 steps: # Uncomment to manually select latest Xcode if needed diff --git a/.github/workflows/build_loop.yml b/.github/workflows/build_loop.yml index 7cf9921471..1094350dac 100644 --- a/.github/workflows/build_loop.yml +++ b/.github/workflows/build_loop.yml @@ -1,9 +1,15 @@ -name: Build Loop +name: 4. Build Loop +run-name: Build Loop on: workflow_dispatch: jobs: + secrets: + uses: ./.github/workflows/validate_secrets.yml + secrets: inherit + build: + needs: secrets runs-on: macos-12 steps: # Uncomment to manually select latest Xcode if needed diff --git a/.github/workflows/create_certs.yml b/.github/workflows/create_certs.yml index 95a224c82b..82961983c0 100644 --- a/.github/workflows/create_certs.yml +++ b/.github/workflows/create_certs.yml @@ -1,9 +1,15 @@ -name: Create Certificates +name: 3. Create Certificates +run-name: Create Certificates on: workflow_dispatch: jobs: + secrets: + uses: ./.github/workflows/validate_secrets.yml + secrets: inherit + certificates: + needs: secrets runs-on: macos-12 steps: # Uncomment to manually select latest Xcode if needed diff --git a/.github/workflows/validate_secrets.yml b/.github/workflows/validate_secrets.yml new file mode 100644 index 0000000000..70401888c6 --- /dev/null +++ b/.github/workflows/validate_secrets.yml @@ -0,0 +1,70 @@ +name: 1. Validate Secrets +run-name: Validate Secrets +on: [workflow_call, workflow_dispatch] + +jobs: + validate: + runs-on: macos-12 + steps: + # Checks-out the repo + - name: Checkout Repo + uses: actions/checkout@v3 + + # Validates the repo secrets + - name: Validate Secrets + run: | + # Validate Secrets + echo Validating Repository Secrets... + + # Validate TEAMID + if [ -z "$TEAMID" ]; then + failed=true + echo "::error::TEAMID secret is unset or empty. Set it and try again." + elif [ ${#TEAMID} -ne 10 ]; then + failed=true + echo "::error::TEAMID secret is set but has wrong length. Verify that it is set correctly and try again." + fi + + # Validate GH_PAT + if [ -z "$GH_PAT" ]; then + failed=true + echo "::error::GH_PAT secret is unset or empty. Set it and try again." + elif [ "$(gh api -H "Accept: application/vnd.github+json" /repos/${{ github.repository_owner }}/Match-Secrets | jq --raw-output '.permissions.push')" != "true" ]; then + failed=true + echo "::error::GH_PAT secret is set but invalid or lacking appropriate privileges on the ${{ github.repository_owner }}/Match-Secrets repository. Verify that it is set correctly and try again." + fi + + # Validate FASTLANE_ISSUER_ID, FASTLANE_KEY_ID, and FASTLANE_KEY + if [ -z "$FASTLANE_ISSUER_ID" ] || [ -z "$FASTLANE_KEY_ID" ] || [ -z "$FASTLANE_KEY" ]; then + failed=true + [ -z "$FASTLANE_ISSUER_ID" ] && echo "::error::The FASTLANE_ISSUER_ID secret is unset or empty. Set it and try again." + [ -z "$FASTLANE_KEY_ID" ] && echo "::error::The FASTLANE_KEY_ID secret is unset or empty. Set it and try again." + [ -z "$FASTLANE_KEY" ] && echo "::error::The FASTLANE_KEY secret is unset or empty. Set it and try again." + elif ! echo "$FASTLANE_KEY" | openssl pkcs8 -nocrypt >/dev/null; then + failed=true + echo "::error::The FASTLANE_KEY secret is set but invalid. Verify that it is set correctly and try again." + elif ! fastlane validate_secrets; then + failed=true + echo "::error::Unable to create a valid authorization token for the App Store Connect API.\ + Verify that the FASTLANE_ISSUER_ID, FASTLANE_KEY_ID, and FASTLANE_KEY secrets are set correctly and try again." + fi + + # Validate MATCH_PASSWORD + if [ -z "$MATCH_PASSWORD" ]; then + failed=true + echo "::error::The MATCH_PASSWORD secret is unset or empty. Set it and try again." + fi + + # Exit unsuccessfully if secret validation failed. + if [ $failed ]; then + exit 2 + fi + shell: bash + env: + TEAMID: ${{ secrets.TEAMID }} + GH_PAT: ${{ secrets.GH_PAT }} + FASTLANE_ISSUER_ID: ${{ secrets.FASTLANE_ISSUER_ID }} + FASTLANE_KEY_ID: ${{ secrets.FASTLANE_KEY_ID }} + FASTLANE_KEY: ${{ secrets.FASTLANE_KEY }} + MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} + GH_TOKEN: ${{ secrets.GH_PAT }} diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 61542919a0..70ef2ba575 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -231,6 +231,24 @@ platform :ios do ) end + desc "Validate Secrets" + lane :validate_secrets do + setup_ci if ENV['CI'] + ENV["MATCH_READONLY"] = true.to_s + + app_store_connect_api_key( + key_id: "#{FASTLANE_KEY_ID}", + issuer_id: "#{FASTLANE_ISSUER_ID}", + key_content: "#{FASTLANE_KEY}" + ) + + def find_bundle_id(identifier) + bundle_id = Spaceship::ConnectAPI::BundleId.find(identifier) + end + + find_bundle_id("com.#{TEAMID}.loopkit.Loop") + end + desc "Nuke Certs" lane :nuke_certs do setup_ci if ENV['CI'] From b36573acee11f8642c857058efac1f238db9defd Mon Sep 17 00:00:00 2001 From: Eric Jensen Date: Mon, 13 Feb 2023 11:27:02 -0500 Subject: [PATCH 21/54] Add commented placeholder for URL scheme name overrride (#31) --- LoopConfigOverride.xcconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/LoopConfigOverride.xcconfig b/LoopConfigOverride.xcconfig index c6bee74430..3ffab2cb93 100644 --- a/LoopConfigOverride.xcconfig +++ b/LoopConfigOverride.xcconfig @@ -6,6 +6,9 @@ // Customize this to change the app name displayed //MAIN_APP_DISPLAY_NAME = Loop +// Customize this to change the URL to open Loop to something other than the display name +//URL_SCHEME_NAME = $(MAIN_APP_DISPLAY_NAME) + // Features SWIFT_ACTIVE_COMPILATION_CONDITIONS = $(inherited) SIMULATORS_ENABLED //DEBUG_FEATURES_ENABLED From a574124abd6b311f392f1841d0e3bcfffcd77bbd Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Sun, 19 Feb 2023 18:31:37 -0600 Subject: [PATCH 22/54] Misc updates (#37) --- Loop | 2 +- LoopKit | 2 +- OmniBLE | 2 +- TidepoolService | 2 +- rileylink_ios | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Loop b/Loop index f6efd728f1..26b62c174a 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit f6efd728f164b8479ef929714a31980907a64432 +Subproject commit 26b62c174ab37f8393f0e9f3b03fcaf2e540692b diff --git a/LoopKit b/LoopKit index 1c465acacf..b71d39169e 160000 --- a/LoopKit +++ b/LoopKit @@ -1 +1 @@ -Subproject commit 1c465acacf19ef8576f81dacdc0e5e5a6211f217 +Subproject commit b71d39169ee22dd6b4cadbc086e3b074af9f0c46 diff --git a/OmniBLE b/OmniBLE index 31e6b6e2c7..e5e4dde82e 160000 --- a/OmniBLE +++ b/OmniBLE @@ -1 +1 @@ -Subproject commit 31e6b6e2c7dd5d98b31ec51843e23d636972eb39 +Subproject commit e5e4dde82ee4041d7e9da87851e28bdc9367c019 diff --git a/TidepoolService b/TidepoolService index 38644504ef..892fa78783 160000 --- a/TidepoolService +++ b/TidepoolService @@ -1 +1 @@ -Subproject commit 38644504eff144dc81f60bdf6e71f4334078b173 +Subproject commit 892fa7878329220f5d5218d72c69b37b08e5ce20 diff --git a/rileylink_ios b/rileylink_ios index 3ad1307d9d..e6d6db8e24 160000 --- a/rileylink_ios +++ b/rileylink_ios @@ -1 +1 @@ -Subproject commit 3ad1307d9d49e940d0b7c3cb8c5a4de23be7bf7d +Subproject commit e6d6db8e246c52b83bbcc42284d83191bedcad50 From d92b861334a0eefe14c5383ce10b7f27eaa9062d Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Mon, 20 Feb 2023 10:51:58 -0600 Subject: [PATCH 23/54] Add missed meal detection notifications --- Loop | 2 +- LoopKit | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Loop b/Loop index 26b62c174a..64996c1fd0 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit 26b62c174ab37f8393f0e9f3b03fcaf2e540692b +Subproject commit 64996c1fd00d8ddd134b6ad2ce4f121f0d3a5aca diff --git a/LoopKit b/LoopKit index b71d39169e..65bf31d80e 160000 --- a/LoopKit +++ b/LoopKit @@ -1 +1 @@ -Subproject commit b71d39169ee22dd6b4cadbc086e3b074af9f0c46 +Subproject commit 65bf31d80ee52c0d9e79e1443c78dcde2427ac91 From 524b861bda335e73d672f67025eeb2bb6977d5ef Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Mon, 20 Feb 2023 11:40:37 -0600 Subject: [PATCH 24/54] Loop dosing manager test updates --- Loop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Loop b/Loop index 64996c1fd0..0fe777591e 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit 64996c1fd00d8ddd134b6ad2ce4f121f0d3a5aca +Subproject commit 0fe777591e8cd2dbc742b350fdda5c9e1a060a2c From f2d9b3cce738cb900f5c96c21e2a9616ae2f457b Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Tue, 21 Feb 2023 17:15:41 -0600 Subject: [PATCH 25/54] Fix optional binding from non-optional variable. Errors on Xcode 14.3 --- Loop | 2 +- Loop.xcworkspace/xcshareddata/swiftpm/Package.resolved | 1 - LoopKit | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Loop b/Loop index 0fe777591e..786368168c 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit 0fe777591e8cd2dbc742b350fdda5c9e1a060a2c +Subproject commit 786368168c7b76462010e73821b85ebff9b298d7 diff --git a/Loop.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Loop.xcworkspace/xcshareddata/swiftpm/Package.resolved index ddb7dcb75f..26d5e57967 100644 --- a/Loop.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Loop.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -41,7 +41,6 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mattrubin/OneTimePassword", "state" : { - "branch" : "develop", "revision" : "8e4022f2852d77240d0a17482cbfe325354aac70" } }, diff --git a/LoopKit b/LoopKit index 65bf31d80e..8124437af0 160000 --- a/LoopKit +++ b/LoopKit @@ -1 +1 @@ -Subproject commit 65bf31d80ee52c0d9e79e1443c78dcde2427ac91 +Subproject commit 8124437af095b385f9ff49586c8c926b4d1619bb From d12303e77d90ec810e69056035da36d6f87fb272 Mon Sep 17 00:00:00 2001 From: bjornoleh <63544115+bjornoleh@users.noreply.github.com> Date: Fri, 10 Mar 2023 19:19:06 +0100 Subject: [PATCH 26/54] build_loop workflow: add commented template for build on push and on schedule (#38) Includes comments with instructions for un-commenting to enable builds on push and automated builds every two months on: #push: #schedule: #- cron: '0 17 1 */2 *' # Runs at 17:00 UTC on the 1st in Jan, Mar, May, Jul, Sep and Nov. --- .github/workflows/build_loop.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/build_loop.yml b/.github/workflows/build_loop.yml index 1094350dac..26ee8c1ed1 100644 --- a/.github/workflows/build_loop.yml +++ b/.github/workflows/build_loop.yml @@ -2,6 +2,13 @@ name: 4. Build Loop run-name: Build Loop on: workflow_dispatch: + + ## Remove the "#" sign from the beginning of the line below to get automated builds on push (code changes in your repository) + #push: + + ## Remove the "#" sign from the beginning of the two lines below to get automated builds every two months + #schedule: + #- cron: '0 17 1 */2 *' # Runs at 17:00 UTC on the 1st in Jan, Mar, May, Jul, Sep and Nov. jobs: secrets: From 46ed7ff46bfcd0b9942db70b59363c675fb712aa Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Fri, 10 Mar 2023 17:25:55 -0600 Subject: [PATCH 27/54] Bring in misc updates (#40) --- Loop | 2 +- .../xcschemes/Loop (Workspace).xcscheme | 14 -------------- LoopKit | 2 +- OmniBLE | 2 +- rileylink_ios | 2 +- 5 files changed, 4 insertions(+), 18 deletions(-) diff --git a/Loop b/Loop index 786368168c..4909f52b71 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit 786368168c7b76462010e73821b85ebff9b298d7 +Subproject commit 4909f52b7198582dab8b0b39697901594ef9311d diff --git a/Loop.xcworkspace/xcshareddata/xcschemes/Loop (Workspace).xcscheme b/Loop.xcworkspace/xcshareddata/xcschemes/Loop (Workspace).xcscheme index d78e847696..132dfae403 100644 --- a/Loop.xcworkspace/xcshareddata/xcschemes/Loop (Workspace).xcscheme +++ b/Loop.xcworkspace/xcshareddata/xcschemes/Loop (Workspace).xcscheme @@ -132,20 +132,6 @@ ReferencedContainer = "container:AmplitudeService/AmplitudeService.xcodeproj"> - - - - Date: Fri, 10 Mar 2023 23:44:51 -0600 Subject: [PATCH 28/54] Translations update --- AmplitudeService | 2 +- CGMBLEKit | 2 +- G7SensorKit | 2 +- LogglyService | 2 +- Loop | 2 +- LoopKit | 2 +- LoopOnboarding | 2 +- LoopSupport | 2 +- NightscoutAPIClient | 2 +- NightscoutService | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/AmplitudeService b/AmplitudeService index 0588fe27dc..2ee3b253fd 160000 --- a/AmplitudeService +++ b/AmplitudeService @@ -1 +1 @@ -Subproject commit 0588fe27dc4241ac5030dd023c0f165604ad0559 +Subproject commit 2ee3b253fd240475010f45281e21439ca0f695a6 diff --git a/CGMBLEKit b/CGMBLEKit index a71fd86022..99dc051aff 160000 --- a/CGMBLEKit +++ b/CGMBLEKit @@ -1 +1 @@ -Subproject commit a71fd860221169e36c27b0ad8087f63c3addc8fd +Subproject commit 99dc051affd5cec5e31471491b5857d51699d740 diff --git a/G7SensorKit b/G7SensorKit index 811f0499cb..667361729f 160000 --- a/G7SensorKit +++ b/G7SensorKit @@ -1 +1 @@ -Subproject commit 811f0499cb4d10c8eb1c9bbfd460901fc0f7dfb0 +Subproject commit 667361729ff3db1687d946b9b89cb8b242edaf25 diff --git a/LogglyService b/LogglyService index 5cc4bd4913..11c9875e62 160000 --- a/LogglyService +++ b/LogglyService @@ -1 +1 @@ -Subproject commit 5cc4bd49134c5a5d7a1cdfb29a3bfc7c440c95da +Subproject commit 11c9875e6298253e974d3caf0fd5d53b1efad024 diff --git a/Loop b/Loop index 4909f52b71..6881b79abb 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit 4909f52b7198582dab8b0b39697901594ef9311d +Subproject commit 6881b79abb5b9abcb8cedc35b3f707f9e32bb626 diff --git a/LoopKit b/LoopKit index 4ca39ce571..5cc6722f66 160000 --- a/LoopKit +++ b/LoopKit @@ -1 +1 @@ -Subproject commit 4ca39ce571b67628cb3d324caf77eb2ad6a3a388 +Subproject commit 5cc6722f664220d8c5f2cde766d0f7ce9c972ddc diff --git a/LoopOnboarding b/LoopOnboarding index 794259e3cc..23e40a2576 160000 --- a/LoopOnboarding +++ b/LoopOnboarding @@ -1 +1 @@ -Subproject commit 794259e3cc738d22fee7c62f442db9cd62f9dec3 +Subproject commit 23e40a2576ca60bb378ecadaf0e481c019d22aec diff --git a/LoopSupport b/LoopSupport index 806c8430c1..93f6a12377 160000 --- a/LoopSupport +++ b/LoopSupport @@ -1 +1 @@ -Subproject commit 806c8430c1a9143d4687261a7e5410c24a2768b1 +Subproject commit 93f6a12377bb5228c11cc29d0391e8579ec6cb93 diff --git a/NightscoutAPIClient b/NightscoutAPIClient index 14a1967dbd..5ec7fc09db 160000 --- a/NightscoutAPIClient +++ b/NightscoutAPIClient @@ -1 +1 @@ -Subproject commit 14a1967dbd45be9209bd6f3cbb63be1b9388f564 +Subproject commit 5ec7fc09db57be04e5930b5c0e5abab3ec98f8aa diff --git a/NightscoutService b/NightscoutService index 0a25f901bd..ff64f6e744 160000 --- a/NightscoutService +++ b/NightscoutService @@ -1 +1 @@ -Subproject commit 0a25f901bdf7d8ceb3ca1262351a290d8ce1b1f8 +Subproject commit ff64f6e744d071dc05265b3a6fd57d452611b818 From 8c6bf43705a7fb2a55396ea4e1a3033f6617de3e Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Fri, 10 Mar 2023 23:58:13 -0600 Subject: [PATCH 29/54] Ensure environment variablse set for localization import --- Scripts/import_localizations.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Scripts/import_localizations.sh b/Scripts/import_localizations.sh index 14b3fba653..2f542711a3 100755 --- a/Scripts/import_localizations.sh +++ b/Scripts/import_localizations.sh @@ -3,8 +3,13 @@ # Install the Lokalise command line tools from https://github.com/lokalise/lokalise-cli-2-go # Generate an API Token (not an SDK Token!) following the instructions here: https://docs.lokalise.com/en/articles/1929556-api-tokens # export LOKALISE_TOKEN="" +# export GH_TOKEN="" set -e +set -u + +: "$LOKALISE_TOKEN" +: "$GH_TOKEN" date=`date` From 1069efe15f1115bc0dfea2672127a463628a20c4 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Sat, 11 Mar 2023 07:41:02 -0600 Subject: [PATCH 30/54] Add missed rileylink_ios translations --- rileylink_ios | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rileylink_ios b/rileylink_ios index e7bef9bed9..cbb3cde4ba 160000 --- a/rileylink_ios +++ b/rileylink_ios @@ -1 +1 @@ -Subproject commit e7bef9bed9d461751a5b0a6f0bddbd14777a949a +Subproject commit cbb3cde4ba75cb5756a3328a2cfd26d37753da19 From 3b83f8ebdebe00cd18d4bd7db025daf86ad6d9ae Mon Sep 17 00:00:00 2001 From: Marion Barker Date: Sat, 11 Mar 2023 05:46:34 -0800 Subject: [PATCH 31/54] Update README and testflight instruction files (#39) * Update GitHub build instructions * Add link to testflight.md in README * grammar fix * Update for clarity * update GitHub row to Secrets and variables * fix link and add notes * fix typo * Change suggested expiration for GH_PAT to 90 days * Update README * Clarify a comment on testflight instructions --- README.md | 21 +++++-- fastlane/testflight.md | 123 ++++++++++++++++++++++++++++++++--------- 2 files changed, 114 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index 8318a646f3..6cb7088943 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,19 @@ # LoopWorkspace -## Clone +The Loop app can be built using GitHub in a browser on any computer or using a Mac with Xcode. + +* Non-developers may prefer the GitHub method +* Developers or Loopers who want full build control may prefer the Mac/Xcode method + +## GitHub Build Instructions + +The GitHub Build Instructions are at this [link](fastlane/testflight.md) and further expanded in [LoopDocs: Browser Build](https://loopkit.github.io/loopdocs/gh-actions/gh-overview/). + +## Mac/Xcode Build Instructions + +The rest of this README contains information needed for Mac/Xcode build. Additonal instructions are found in [LoopDocs: Mac/Xcode Build](https://loopkit.github.io/loopdocs/build/overview/). + +### Clone This repository uses git submodules to pull in the various workspace dependencies. @@ -12,7 +25,7 @@ git clone --branch= --recurse-submodules https://github.com/LoopKit/Loop Replace `` with the initial LoopWorkspace repository branch you wish to checkout. -## Open +### Open Change to the cloned directory and open the workspace in Xcode: @@ -21,13 +34,13 @@ cd LoopWorkspace xed . ``` -## Input your development team +### Input your development team You should be able to build to a simulator without changing anything. But if you wish to build to a real device, you'll need a developer account, and you'll need to tell Xcode about your team id, which you can find at https://developer.apple.com/. Select the LoopConfigOverride file in Xcode's project navigator, uncomment the `LOOP_DEVELOPMENT_TEAM`, and replace the existing team id with your own id. -## Build +### Build Select the "Loop (Workspace)" scheme (not the "Loop" scheme) and Build, Run, or Test. diff --git a/fastlane/testflight.md b/fastlane/testflight.md index 7bb08ebdd0..aa0c6ec1bb 100644 --- a/fastlane/testflight.md +++ b/fastlane/testflight.md @@ -1,53 +1,104 @@ -# Using Github Actions + FastLane to deploy to TestFlight +# Using GitHub Actions + FastLane to deploy to TestFlight -These instructions allow you to build Loop without having access to a Mac. They also allow you to easily install Loop on phones that are not connected to your computer. So you can send builds and updates to those you care for easily, or have an easy to access backup if you run Loop for yourself. You do not need to worry about correct Xcode/Mac versions either. An app built using this method can easily be deployed to newer versions of iOS, as soon as they are available. +These instructions allow you to build Loop without having access to a Mac. -The setup steps are somewhat involved, but nearly all are one time steps. Subsequent builds are trivial. Note that TestFlight requires apple id accounts 13 years or older. Your app must be updated once every 90 days, but it's a simple click to make a new build and can be done from anywhere. +* You can install Loop on phones via TestFlight that are not connected to your computer +* You can send builds and updates to those you care for +* You can install Loop on your phone using only the TestFlight app if a phone was lost or the app is accidentally deleted +* You do not need to worry about specific Xcode/Mac versions for a given iOS + +The setup steps are somewhat involved, but nearly all are one time steps. Subsequent builds are trivial. Your app must be updated once every 90 days, but it's a simple click to make a new build and can be done from anywhere. The 90-day update is a TestFlight requirement, which can be automated. + +There are more detailed instructions in LoopDocs for using GitHub for Browser Builds of Loop, including troubleshooting and build errors. Please refer to: + +* [LoopDocs: GitHub Overview](https://loopkit.github.io/loopdocs/gh-actions/gh-overview/) +* [LoopDocs: GitHub Errors](https://loopkit.github.io/loopdocs/gh-actions/gh-errors/) + +Note that installing with TestFlight, (in the US), requires the Apple ID account holder to be 13 years or older. For younger Loopers, an adult must log into Media & Purchase on the child's phone to install Loop. More details on this can be found in [LoopDocs](https://loopkit.github.io/loopdocs/gh-actions/gh-deploy/#install-testflight-loop-for-child). ## Prerequisites -* A [github account](https://github.com/signup). The free level comes with plenty of storage and free compute time to build loop, multiple times a day, if you wanted to. -* A paid [Apple Developer account](https://developer.apple.com). You may be able to use the free version, but that has not been tested. +* A [GitHub account](https://github.com/signup). The free level comes with plenty of storage and free compute time to build loop, multiple times a day, if you wanted to. +* A paid [Apple Developer account](https://developer.apple.com). * Some time. Set aside a couple of hours to perform the setup. +## Save 6 Secrets + +You require 6 Secrets (alphanumeric items) to use the GitHub build method and if you use the GitHub method to build more than Loop, e.g., Loop Follow or LoopCaregiver, you will use the same 6 Secrets for each app you build with this method. Each secret is indentified below by `ALL_CAPITAL_LETTER_NAMES`. + +* Four Secrets are from your Apple Account +* Two Secrets are from your GitHub account +* Be sure to save the 6 Secrets in a text file using a text editor + - Do **NOT** use a smart editor, which might auto-correct and change case, because these Secrets are case sensitive ## Generate App Store Connect API Key +This step is common for all GitHub Browser Builds; do this step only once. You will be saving 4 Secrets from your Apple Account in this step. + 1. Sign in to the [Apple developer portal page](https://developer.apple.com/account/resources/certificates/list). -1. Copy the team id from the upper right of the screen. Record this as your `TEAMID`. -1. Go to the [App Store Connect](https://appstoreconnect.apple.com/access/api) interface, click the "Keys" tab, and create a new key with "Admin" access. Give it a name like "FastLane API Key". -1. Record the key id; this will be used for `FASTLANE_KEY_ID`. +1. Copy the Team ID from the upper right of the screen. Record this as your `TEAMID`. +1. Go to the [App Store Connect](https://appstoreconnect.apple.com/access/api) interface, click the "Keys" tab, and create a new key with "Admin" access. Give it the name: "FastLane API Key". 1. Record the issuer id; this will be used for `FASTLANE_ISSUER_ID`. +1. Record the key id; this will be used for `FASTLANE_KEY_ID`. 1. Download the API key itself, and open it in a text editor. The contents of this file will be used for `FASTLANE_KEY`. Copy the full text, including the "-----BEGIN PRIVATE KEY-----" and "-----END PRIVATE KEY-----" lines. -## Setup Github -1. Create a [new empty repository](https://github.com/new) titled `Match-Secrets`. It should be private. -1. Fork https://github.com/LoopKit/LoopWorkspace into your account. +## Create GitHub Personal Access Token + +Log into your GitHub account to create a personal access token; this is one of two GitHub secrets needed for your build. + 1. Create a [new personal access token](https://github.com/settings/tokens/new): - * Enter a name for your token. Something like "FastLane Access Token". - * 30 days is fine, or you can select longer if you'd like. + * Enter a name for your token, use "FastLane Access Token". + * Change the selection to 90 days. * Select the `repo` permission scope. * Click "Generate token". * Copy the token and record it. It will be used below as `GH_PAT`. -1. In the forked LoopWorkspace repo, go to Settings -> Secrets -> Actions. + +## Make up a Password + +This is the second one of two GitHub secrets needed for your build. + +The first time you build with the GitHub Browser Build method for any DIY app, you will make up a password and record it as `MATCH_PASSWORD`. Note, if you later lose `MATCH_PASSWORD`, you will need to delete and make a new Match-Secrets repository (next step). + +## Setup GitHub Match-Secrets Repository + +The creation of the Match-Secrets repository is a common step for all GitHub Browser Builds; do this step only once. You must be logged into your GitHub account. + +1. Create a [new empty repository](https://github.com/new) titled `Match-Secrets`. It should be private. + +Once created, you will not take any direct actions with this repository; it needs to be there for the GitHub to use as you progress through the steps. + +## Setup GitHub LoopWorkspace Repository + +1. Fork https://github.com/LoopKit/LoopWorkspace into your account. +1. In the forked LoopWorkspace repo, go to Settings -> Secrets and variables -> Actions. 1. For each of the following secrets, tap on "New repository secret", then add the name of the secret, along with the value you recorded for it: * `TEAMID` - * `FASTLANE_KEY_ID` * `FASTLANE_ISSUER_ID` + * `FASTLANE_KEY_ID` * `FASTLANE_KEY` * `GH_PAT` - * `MATCH_PASSWORD` - just make up a password for this + * `MATCH_PASSWORD` + +## Validate repository secrets + +This step validates most of your six Secrets and provides error messages if it detects an issue with one or more. + +1. Click on the "Actions" tab of your LoopWorkspace repository and enable workflows if needed +1. On the left side, select "1. Validate Secrets". +1. On the right side, click "Run Workflow", and tap the green `Run workflow` button. +1. Wait, and within a minute or two you should see a green checkmark indicating the workflow succeeded. +1. The workflow will check if the required secrets are added and that they are correctly formatted. If errors are detected, please check the run log for details. ## Add Identifiers for Loop App 1. Click on the "Actions" tab of your LoopWorkspace repository. -1. Select "Add Identifiers". -1. Click "Run Workflow", and tap the green button. +1. On the left side, select "2. Add Identifiers". +1. On the right side, click "Run Workflow", and tap the green `Run workflow` button. 1. Wait, and within a minute or two you should see a green checkmark indicating the workflow succeeded. ## Create App Group -If you have already built Loop via Xcode using this Apple ID, you can skip on to [Create Loop App in App Store Connect](#create-loop-app-in-app-store-connect). +If you have already built Loop via Xcode using this Apple ID, you can skip on to [Add App Group to Bundle Identifiers](#add-app-group-to-bundle-identifiers). 1. Go to [Register an App Group](https://developer.apple.com/account/resources/identifiers/applicationGroup/add/) on the apple developer site. 1. For Description, use "Loop App Group". @@ -56,6 +107,10 @@ If you have already built Loop via Xcode using this Apple ID, you can skip on to ## Add App Group to Bundle Identifiers +Note 1 - If you previously built with Xcode, the `Names` listed below may be different, but the `Identifiers` will match. A table is provided below the steps to assist. The Add Identifier Action that you completed above generates 6 identifiers, but only 4 need to be modified as indicated in this step. + +Note 2 - Depending on your build history, you may find some of the Identifiers are already configured - and you are just verifying the status; but in other cases, you will need to configure the Identifiers. + 1. Go to [Certificates, Identifiers & Profiles](https://developer.apple.com/account/resources/identifiers/list) on the apple developer site. 1. For each of the following identifier names: * Loop @@ -70,6 +125,18 @@ If you have already built Loop via Xcode using this Apple ID, you can skip on to 1. Click "Confirm". 1. Remember to do this for each of the identifiers above. +#### Table with Name and Identifier for Loop 3 + +| NAME | IDENTIFIER | +|-------|------------| +| Loop | com.TEAMID.loopkit.Loop | +| Loop Intent Extension | com.TEAMID.loopkit.Loop.Loop-Intent-Extension | +| Loop Status Extension | com.TEAMID.loopkit.Loop.statuswidget | +| Small Status Widget | com.TEAMID.loopkit.Loop.SmallStatusWidget | +| WatchApp | com.TEAMID.loopkit.Loop.LoopWatch | +| WatchAppExtension | com.TEAMID.loopkit.Loop.LoopWatch.watchkitextension | + + ## Add Time Sensitive Notifications to Loop App ID 1. Go to [Certificates, Identifiers & Profiles](https://developer.apple.com/account/resources/identifiers/list) on the apple developer site. 1. Click on the "Loop" identifier @@ -80,7 +147,7 @@ If you have already built Loop via Xcode using this Apple ID, you can skip on to ## Create Loop App in App Store Connect -If you have created a Loop app in App Store Connect before, you can skip this section as well. +If you have created a Loop app in App Store Connect before, you can skip this section. 1. Go to the [apps list](https://appstoreconnect.apple.com/apps) on App Store Connect and click the blue "plus" icon to create a New App. * Select "iOS". @@ -95,18 +162,22 @@ You do not need to fill out the next form. That is for submitting to the app sto ## Create Building Certficates -1. Go back to the "Actions" tab of your LoopWorkspace repository in github. -1. Select "Create Certificates". -1. Click "Run Workflow", and tap the green button. +1. Go back to the "Actions" tab of your LoopWorkspace repository in GitHub. +1. On the left side, select "3. Create Certificates". +1. On the right side, click "Run Workflow", and tap the green `Run workflow` button. 1. Wait, and within a minute or two you should see a green checkmark indicating the workflow succeeded. -## Build Loop! +## Build Loop 1. Click on the "Actions" tab of your LoopWorkspace repository. -1. Select "Build Loop". -1. Click "Run Workflow", select your branch, and tap the green button. +1. On the left side, select "4. Build Loop". +1. On the right side, click "Run Workflow", and tap the green `Run workflow` button. 1. You have some time now. Go enjoy a coffee. The build should take about 20-30 minutes. 1. Your app should eventually appear on [App Store Connect](https://appstoreconnect.apple.com/apps). 1. For each phone/person you would like to support Loop on: * Add them in [Users and Access](https://appstoreconnect.apple.com/access/users) on App Store Connect. * Add them to your TestFlight Internal Testing group. + +## TestFlight and Deployment Details + +Please refer to [LoopDocs: Set Up Users](https://loopkit.github.io/loopdocs/gh-actions/gh-first-time/#set-up-users-and-access-testflight) and [LoopDocs: Deploy](https://loopkit.github.io/loopdocs/gh-actions/gh-deploy/) From 44479c2fc13838f2668d00c327f508b4b05557a0 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Sat, 11 Mar 2023 08:35:40 -0600 Subject: [PATCH 32/54] Ensure LOKALISE_TOKEN is set for export --- LoopKit | 2 +- Scripts/export_localizations.sh | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/LoopKit b/LoopKit index 5cc6722f66..8e830597ef 160000 --- a/LoopKit +++ b/LoopKit @@ -1 +1 @@ -Subproject commit 5cc6722f664220d8c5f2cde766d0f7ce9c972ddc +Subproject commit 8e830597ef6d1672277a2e30026e1ad0ca5b35e9 diff --git a/Scripts/export_localizations.sh b/Scripts/export_localizations.sh index 5edd56e3c5..e02bace964 100755 --- a/Scripts/export_localizations.sh +++ b/Scripts/export_localizations.sh @@ -1,6 +1,9 @@ #!/bin/zsh set -e +set -u + +: "$LOKALISE_TOKEN" LANGUAGES=(ar es ru en zh-Hans nl fr de it nb pl ru es ja pt-BR vi da sv fi ro tr he sk) From 43aed207602bc3856988b697f2ee4be46d10f4eb Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Sat, 11 Mar 2023 10:05:28 -0600 Subject: [PATCH 33/54] Bring in missing OmniBLE translations --- Loop.xcworkspace/xcshareddata/swiftpm/Package.resolved | 9 +++++++++ LoopKit | 2 +- NightscoutAPIClient | 2 +- NightscoutService | 2 +- OmniBLE | 2 +- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Loop.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Loop.xcworkspace/xcshareddata/swiftpm/Package.resolved index 26d5e57967..8ef5acb7a9 100644 --- a/Loop.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Loop.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -36,6 +36,15 @@ "version" : "1.4.3" } }, + { + "identity" : "nightscoutkit", + "kind" : "remoteSourceControl", + "location" : "https://github.com/LoopKit/NightscoutKit", + "state" : { + "branch" : "main", + "revision" : "54c668c7154eca0ccd7b5714e1d206e488cd1bd9" + } + }, { "identity" : "onetimepassword", "kind" : "remoteSourceControl", diff --git a/LoopKit b/LoopKit index 8e830597ef..09d2464767 160000 --- a/LoopKit +++ b/LoopKit @@ -1 +1 @@ -Subproject commit 8e830597ef6d1672277a2e30026e1ad0ca5b35e9 +Subproject commit 09d2464767a9ccfc9592636f87bafb49d13b401d diff --git a/NightscoutAPIClient b/NightscoutAPIClient index 5ec7fc09db..ec8efc6025 160000 --- a/NightscoutAPIClient +++ b/NightscoutAPIClient @@ -1 +1 @@ -Subproject commit 5ec7fc09db57be04e5930b5c0e5abab3ec98f8aa +Subproject commit ec8efc6025c6124a25ac11760269cb5f195ae669 diff --git a/NightscoutService b/NightscoutService index ff64f6e744..7ef11a6082 160000 --- a/NightscoutService +++ b/NightscoutService @@ -1 +1 @@ -Subproject commit ff64f6e744d071dc05265b3a6fd57d452611b818 +Subproject commit 7ef11a60824316a0e7c5e2944cdcb9212d07e5de diff --git a/OmniBLE b/OmniBLE index 8f6eb1b19c..528eec4b6c 160000 --- a/OmniBLE +++ b/OmniBLE @@ -1 +1 @@ -Subproject commit 8f6eb1b19c360f84c49f2fbcfb70646a46bb2775 +Subproject commit 528eec4b6c738712d050efc3e538f96439f8c18d From 895bd26b2273a44a316b226beb5f1619f18d21ec Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Sat, 11 Mar 2023 10:22:04 -0600 Subject: [PATCH 34/54] Migrate to NightscoutKit --- NightscoutAPIClient | 2 +- NightscoutService | 2 +- rileylink_ios | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NightscoutAPIClient b/NightscoutAPIClient index ec8efc6025..7a05935f95 160000 --- a/NightscoutAPIClient +++ b/NightscoutAPIClient @@ -1 +1 @@ -Subproject commit ec8efc6025c6124a25ac11760269cb5f195ae669 +Subproject commit 7a05935f958887c938cef8d99ff94865d5daa2b5 diff --git a/NightscoutService b/NightscoutService index 7ef11a6082..19daa23fa4 160000 --- a/NightscoutService +++ b/NightscoutService @@ -1 +1 @@ -Subproject commit 7ef11a60824316a0e7c5e2944cdcb9212d07e5de +Subproject commit 19daa23fa411f542bfe48d7566997c027883b70b diff --git a/rileylink_ios b/rileylink_ios index cbb3cde4ba..3a0ae2986e 160000 --- a/rileylink_ios +++ b/rileylink_ios @@ -1 +1 @@ -Subproject commit cbb3cde4ba75cb5756a3328a2cfd26d37753da19 +Subproject commit 3a0ae2986e7c7db8e440e117f67124b1a8e2ad62 From 3993f7942234dcf8c26f9be6b4ec30cd52a5c143 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Sat, 11 Mar 2023 10:33:30 -0600 Subject: [PATCH 35/54] LoopKit test fix update --- LoopKit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LoopKit b/LoopKit index 09d2464767..4c00a16744 160000 --- a/LoopKit +++ b/LoopKit @@ -1 +1 @@ -Subproject commit 09d2464767a9ccfc9592636f87bafb49d13b401d +Subproject commit 4c00a1674405fc95e5002cef9331b748a620f723 From 9d01f68fd1d5d9b563114e51ac5393d3eeec479b Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Sun, 12 Mar 2023 11:11:47 -0500 Subject: [PATCH 36/54] Remove old tests from schemes --- .../xcshareddata/xcschemes/Loop (Workspace).xcscheme | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Loop.xcworkspace/xcshareddata/xcschemes/Loop (Workspace).xcscheme b/Loop.xcworkspace/xcshareddata/xcschemes/Loop (Workspace).xcscheme index 132dfae403..18e24ba52a 100644 --- a/Loop.xcworkspace/xcshareddata/xcschemes/Loop (Workspace).xcscheme +++ b/Loop.xcworkspace/xcshareddata/xcschemes/Loop (Workspace).xcscheme @@ -449,16 +449,6 @@ ReferencedContainer = "container:rileylink_ios/RileyLink.xcodeproj"> - - - - Date: Mon, 13 Mar 2023 08:31:52 -0500 Subject: [PATCH 37/54] Bring in omnipod dose tracking fixes --- OmniBLE | 2 +- rileylink_ios | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OmniBLE b/OmniBLE index 528eec4b6c..662c89b784 160000 --- a/OmniBLE +++ b/OmniBLE @@ -1 +1 @@ -Subproject commit 528eec4b6c738712d050efc3e538f96439f8c18d +Subproject commit 662c89b784c163a13b512ecd048e972c4262d885 diff --git a/rileylink_ios b/rileylink_ios index 3a0ae2986e..fab7767bd4 160000 --- a/rileylink_ios +++ b/rileylink_ios @@ -1 +1 @@ -Subproject commit 3a0ae2986e7c7db8e440e117f67124b1a8e2ad62 +Subproject commit fab7767bd45a2bf0491e84c98742e9f5835b8861 From 6e9360229d8ca0992911fb6d241ee89c5c39917f Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Mon, 13 Mar 2023 09:48:04 -0500 Subject: [PATCH 38/54] Remove timer based refresh on omnipods. Refresh will happen on bringing Loop the foreground. --- OmniBLE | 2 +- rileylink_ios | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OmniBLE b/OmniBLE index 662c89b784..317157757b 160000 --- a/OmniBLE +++ b/OmniBLE @@ -1 +1 @@ -Subproject commit 662c89b784c163a13b512ecd048e972c4262d885 +Subproject commit 317157757b4a4a3e38f0089aa40e0cab5b45d0f0 diff --git a/rileylink_ios b/rileylink_ios index fab7767bd4..25754b332e 160000 --- a/rileylink_ios +++ b/rileylink_ios @@ -1 +1 @@ -Subproject commit fab7767bd45a2bf0491e84c98742e9f5835b8861 +Subproject commit 25754b332ecafa918a78fc9f22e9b1ea238ac135 From 41026ab73d3f60299a2f94f6eb0ee5d3d07b996e Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Mon, 13 Mar 2023 11:08:18 -0500 Subject: [PATCH 39/54] Localization fixes for iOS 15 --- LoopSupport | 2 +- TidepoolKit | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LoopSupport b/LoopSupport index 93f6a12377..b70a40948c 160000 --- a/LoopSupport +++ b/LoopSupport @@ -1 +1 @@ -Subproject commit 93f6a12377bb5228c11cc29d0391e8579ec6cb93 +Subproject commit b70a40948c43532f76d483f09d2e953d2b3efb49 diff --git a/TidepoolKit b/TidepoolKit index 43afdea84f..e02aeef213 160000 --- a/TidepoolKit +++ b/TidepoolKit @@ -1 +1 @@ -Subproject commit 43afdea84f14bbb4b80b759f25acbfda5c58cbc9 +Subproject commit e02aeef21348e9d6597a5301148f089ce7530a6b From a35ad8a1923cd94d2fefc544e6b1ead69b0d466d Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Mon, 13 Mar 2023 11:10:02 -0500 Subject: [PATCH 40/54] Localization fixes for iOS 15 --- G7SensorKit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/G7SensorKit b/G7SensorKit index 667361729f..0ee0d3ba53 160000 --- a/G7SensorKit +++ b/G7SensorKit @@ -1 +1 @@ -Subproject commit 667361729ff3db1687d946b9b89cb8b242edaf25 +Subproject commit 0ee0d3ba53db9322f53fba27d8d17147fa800131 From 779f4ef49e1655df5c3bebed44c162b366b3dbc0 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Mon, 13 Mar 2023 20:43:34 -0500 Subject: [PATCH 41/54] Fix en and he localizations that were initialized to Spanish --- LoopSupport | 2 +- TidepoolKit | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LoopSupport b/LoopSupport index b70a40948c..a3e89c0f5e 160000 --- a/LoopSupport +++ b/LoopSupport @@ -1 +1 @@ -Subproject commit b70a40948c43532f76d483f09d2e953d2b3efb49 +Subproject commit a3e89c0f5ed958f5ee76d655cb10a65de2d23a54 diff --git a/TidepoolKit b/TidepoolKit index e02aeef213..25c3f83741 160000 --- a/TidepoolKit +++ b/TidepoolKit @@ -1 +1 @@ -Subproject commit e02aeef21348e9d6597a5301148f089ce7530a6b +Subproject commit 25c3f8374118d3a38870e93dac0db579bd1ae6cf From 8908ad2936412b239f29f45c12ca1b8d3c35329e Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Tue, 14 Mar 2023 10:52:45 -0500 Subject: [PATCH 42/54] Fix more localizations that were incorrectly initialized to spanish. --- TidepoolKit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TidepoolKit b/TidepoolKit index 25c3f83741..5ec8e04e1b 160000 --- a/TidepoolKit +++ b/TidepoolKit @@ -1 +1 @@ -Subproject commit 25c3f8374118d3a38870e93dac0db579bd1ae6cf +Subproject commit 5ec8e04e1b8e8c14bf7237a96d86d87863b61f6d From 3afeb7e2e5686e0eb694ff5934387c5992709a2b Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Wed, 15 Mar 2023 06:34:45 -0500 Subject: [PATCH 43/54] Medtronic Temp basal tracking fix --- rileylink_ios | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rileylink_ios b/rileylink_ios index 25754b332e..1400e224b3 160000 --- a/rileylink_ios +++ b/rileylink_ios @@ -1 +1 @@ -Subproject commit 25754b332ecafa918a78fc9f22e9b1ea238ac135 +Subproject commit 1400e224b33062cac08f084f37391007ceebc8a3 From 0665a7faae66260d55bf950d42356923d0e2834f Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Wed, 15 Mar 2023 08:56:17 -0500 Subject: [PATCH 44/54] Fix healthkit observation --- LoopKit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LoopKit b/LoopKit index 4c00a16744..874ab0f731 160000 --- a/LoopKit +++ b/LoopKit @@ -1 +1 @@ -Subproject commit 4c00a1674405fc95e5002cef9331b748a620f723 +Subproject commit 874ab0f73172604b9bea950c00605dfe2ceb9867 From 948c2c72f99a45e98ec357e829f0db76c6e66aca Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Wed, 15 Mar 2023 09:17:10 -0500 Subject: [PATCH 45/54] Tests cleanup, and add back LoopKitHostedTests to main loop workspace scheme --- .../xcshareddata/xcschemes/Loop (Workspace).xcscheme | 10 ++++++++++ LoopKit | 2 +- TidepoolService | 2 +- rileylink_ios | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Loop.xcworkspace/xcshareddata/xcschemes/Loop (Workspace).xcscheme b/Loop.xcworkspace/xcshareddata/xcschemes/Loop (Workspace).xcscheme index 18e24ba52a..88d49e15bd 100644 --- a/Loop.xcworkspace/xcshareddata/xcschemes/Loop (Workspace).xcscheme +++ b/Loop.xcworkspace/xcshareddata/xcschemes/Loop (Workspace).xcscheme @@ -489,6 +489,16 @@ ReferencedContainer = "container:Loop/Loop.xcodeproj"> + + + + Date: Wed, 15 Mar 2023 09:20:08 -0500 Subject: [PATCH 46/54] Rename Xcode workspace for Loop to LoopWorkspace, and rename primary scheme to match, so that it is selected by default --- .../xcschemes/Learn (Workspace).xcscheme | 156 ------------------ .../contents.xcworkspacedata | 0 .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../xcshareddata/WorkspaceSettings.xcsettings | 0 .../xcshareddata/swiftpm/Package.resolved | 0 .../xcschemes/LoopWorkspace.xcscheme | 0 README.md | 2 +- 7 files changed, 1 insertion(+), 157 deletions(-) delete mode 100644 Loop.xcworkspace/xcshareddata/xcschemes/Learn (Workspace).xcscheme rename {Loop.xcworkspace => LoopWorkspace.xcworkspace}/contents.xcworkspacedata (100%) rename {Loop.xcworkspace => LoopWorkspace.xcworkspace}/xcshareddata/IDEWorkspaceChecks.plist (100%) rename {Loop.xcworkspace => LoopWorkspace.xcworkspace}/xcshareddata/WorkspaceSettings.xcsettings (100%) rename {Loop.xcworkspace => LoopWorkspace.xcworkspace}/xcshareddata/swiftpm/Package.resolved (100%) rename Loop.xcworkspace/xcshareddata/xcschemes/Loop (Workspace).xcscheme => LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme (100%) diff --git a/Loop.xcworkspace/xcshareddata/xcschemes/Learn (Workspace).xcscheme b/Loop.xcworkspace/xcshareddata/xcschemes/Learn (Workspace).xcscheme deleted file mode 100644 index 8b80d86f0d..0000000000 --- a/Loop.xcworkspace/xcshareddata/xcschemes/Learn (Workspace).xcscheme +++ /dev/null @@ -1,156 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Loop.xcworkspace/contents.xcworkspacedata b/LoopWorkspace.xcworkspace/contents.xcworkspacedata similarity index 100% rename from Loop.xcworkspace/contents.xcworkspacedata rename to LoopWorkspace.xcworkspace/contents.xcworkspacedata diff --git a/Loop.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/LoopWorkspace.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from Loop.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to LoopWorkspace.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Loop.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/LoopWorkspace.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from Loop.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to LoopWorkspace.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/Loop.xcworkspace/xcshareddata/swiftpm/Package.resolved b/LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved similarity index 100% rename from Loop.xcworkspace/xcshareddata/swiftpm/Package.resolved rename to LoopWorkspace.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/Loop.xcworkspace/xcshareddata/xcschemes/Loop (Workspace).xcscheme b/LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme similarity index 100% rename from Loop.xcworkspace/xcshareddata/xcschemes/Loop (Workspace).xcscheme rename to LoopWorkspace.xcworkspace/xcshareddata/xcschemes/LoopWorkspace.xcscheme diff --git a/README.md b/README.md index 6cb7088943..6d5a1c60ed 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ Select the LoopConfigOverride file in Xcode's project navigator, uncomment the ` ### Build -Select the "Loop (Workspace)" scheme (not the "Loop" scheme) and Build, Run, or Test. +Select the "LoopWorkspace" scheme (not the "Loop" scheme) and Build, Run, or Test. Image showing how to select the Loop (Workspace) scheme in Xcode From 3dffec985447edfb166c3f0416c160f582b31e55 Mon Sep 17 00:00:00 2001 From: sethgagnon <597958+sethgagnon@users.noreply.github.com> Date: Wed, 15 Mar 2023 11:24:27 -0400 Subject: [PATCH 47/54] Update Fastfile (#42) --- fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 70ef2ba575..44f1573372 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -130,7 +130,7 @@ platform :ios do gym( export_method: "app-store", - scheme: "Loop (Workspace)", + scheme: "LoopWorkspace", output_name: "Loop.ipa", configuration: "Release", destination: 'generic/platform=iOS', From f82b886e65496b53f506f48dfb8fdd105a677a7d Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Wed, 15 Mar 2023 15:59:27 -0500 Subject: [PATCH 48/54] Rename LoopWorkspace in circleci tasks --- .circleci/config.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f8c8865673..2bbb6ab20b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,11 +9,8 @@ jobs: command: git submodule update --init --recursive --depth 1 - run: name: Build Loop - command: set -o pipefail && time xcodebuild -workspace Loop.xcworkspace -scheme 'Loop (Workspace)' -destination 'platform=iOS Simulator,name=iPhone 13,OS=15.5' build | xcpretty - - run: - name: Build Learn - command: set -o pipefail && time xcodebuild -workspace Loop.xcworkspace -scheme 'Learn (Workspace)' -destination 'platform=iOS Simulator,name=iPhone 13,OS=15.5' build | xcpretty + command: set -o pipefail && time xcodebuild -workspace LoopWorkspace.xcworkspace -scheme 'LoopWorkspace' -destination 'platform=iOS Simulator,name=iPhone 13,OS=15.5' build | xcpretty - run: name: Run Tests - command: set -o pipefail && time xcodebuild -workspace Loop.xcworkspace -scheme 'Loop (Workspace)' -destination 'platform=iOS Simulator,name=iPhone 13,OS=15.5' test | xcpretty + command: set -o pipefail && time xcodebuild -workspace LoopWorkspace.xcworkspace -scheme 'LoopWorkspace' -destination 'platform=iOS Simulator,name=iPhone 13,OS=15.5' test | xcpretty From 3d23008383138fd59cf0881a66574171ace0753c Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Wed, 15 Mar 2023 17:18:02 -0500 Subject: [PATCH 49/54] Update for workspace rename --- Loop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Loop b/Loop index 6881b79abb..3c05a39a3a 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit 6881b79abb5b9abcb8cedc35b3f707f9e32bb626 +Subproject commit 3c05a39a3a92a9ada82fec64ab9748e0d3c1f11d From a9f73f6754dba4cb622e0fb718eca40076d36e1e Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Thu, 16 Mar 2023 21:38:20 -0500 Subject: [PATCH 50/54] Upload temp and scheduled basals to Tidepool with the correct automation flags --- LoopKit | 2 +- TidepoolService | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LoopKit b/LoopKit index 1046181d09..dedcfbce68 160000 --- a/LoopKit +++ b/LoopKit @@ -1 +1 @@ -Subproject commit 1046181d09d830ef1dbbd4b3ef749bca5c22097a +Subproject commit dedcfbce6802f09bcbcd4d76e3d8739baa302012 diff --git a/TidepoolService b/TidepoolService index 2403fe3c96..f31f515347 160000 --- a/TidepoolService +++ b/TidepoolService @@ -1 +1 @@ -Subproject commit 2403fe3c968719e532b430b978820d7b2e5d9ed7 +Subproject commit f31f5153479839533e40a5e3fc17bab87ba6f4f1 From 025bafc1352f775db82ba9ee6968d39b9d7c494c Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Thu, 16 Mar 2023 21:55:24 -0500 Subject: [PATCH 51/54] Update README.md Remove old image with incorrect scheme name. --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 6d5a1c60ed..0cdf6dfedd 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,3 @@ Select the LoopConfigOverride file in Xcode's project navigator, uncomment the ` ### Build Select the "LoopWorkspace" scheme (not the "Loop" scheme) and Build, Run, or Test. - -Image showing how to select the Loop (Workspace) scheme in Xcode - From 908faad180a758c53928e35fd7bc5e92a839301e Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Thu, 16 Mar 2023 22:09:57 -0500 Subject: [PATCH 52/54] Fix basal overlay test --- LoopKit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LoopKit b/LoopKit index dedcfbce68..6073eb1f4a 160000 --- a/LoopKit +++ b/LoopKit @@ -1 +1 @@ -Subproject commit dedcfbce6802f09bcbcd4d76e3d8739baa302012 +Subproject commit 6073eb1f4adaaeeb449589c21f251db2138b2c89 From c285bf7dca85d6edb37cb0eb270f09ade0792bf7 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Fri, 17 Mar 2023 07:38:46 -0500 Subject: [PATCH 53/54] Fault code updates for omnipod --- OmniBLE | 2 +- rileylink_ios | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OmniBLE b/OmniBLE index 317157757b..41bd40f4f0 160000 --- a/OmniBLE +++ b/OmniBLE @@ -1 +1 @@ -Subproject commit 317157757b4a4a3e38f0089aa40e0cab5b45d0f0 +Subproject commit 41bd40f4f0a074e60e0f9a763358a99519e43dcb diff --git a/rileylink_ios b/rileylink_ios index 871ebd7f0e..8a68c41e2c 160000 --- a/rileylink_ios +++ b/rileylink_ios @@ -1 +1 @@ -Subproject commit 871ebd7f0e723869732251303f4d83e9618b3549 +Subproject commit 8a68c41e2ce05e47e1a5707d0c4ad05309bd3861 From ab17b946fb3b1027685b0d75954ea74b73545544 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Fri, 17 Mar 2023 10:25:38 -0500 Subject: [PATCH 54/54] Update Loop submodule revision to Loop 3.2 --- Loop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Loop b/Loop index 3c05a39a3a..a1fb919703 160000 --- a/Loop +++ b/Loop @@ -1 +1 @@ -Subproject commit 3c05a39a3a92a9ada82fec64ab9748e0d3c1f11d +Subproject commit a1fb919703987bf5daad390f589fec3481953c33