فهرست منبع

Merge branch 'dev' into feat/dev-medtrum

Mike Plante 2 ماه پیش
والد
کامیت
4de4dba288
14فایلهای تغییر یافته به همراه61 افزوده شده و 12 حذف شده
  1. 1 1
      CGMBLEKit
  2. 1 1
      Config.xcconfig
  3. 1 1
      DanaKit
  4. 1 1
      G7SensorKit
  5. 1 1
      LibreTransmitter
  6. 1 1
      LoopKit
  7. 1 1
      MinimedKit
  8. 1 1
      OmniBLE
  9. 1 1
      OmniKit
  10. 1 1
      RileyLinkKit
  11. 1 1
      TidepoolService
  12. 1 1
      dexcom-share-client-swift
  13. 36 0
      scripts/define_common_trio.sh
  14. 13 0
      scripts/update_submodules_trio.sh

+ 1 - 1
CGMBLEKit

@@ -1 +1 @@
-Subproject commit a442ea0a21078e82264176a89617d2f9a3a6f36d
+Subproject commit 134396b96170d410b18f9699b92409bc6d35aedb

+ 1 - 1
Config.xcconfig

@@ -19,7 +19,7 @@ TRIO_APP_GROUP_ID = group.org.nightscout.$(DEVELOPMENT_TEAM).trio.trio-app-group
 
 // The developers set the version numbers, please leave them alone
 APP_VERSION = 0.6.0
-APP_DEV_VERSION = 0.6.0.51
+APP_DEV_VERSION = 0.6.0.52
 APP_BUILD_NUMBER = 1
 COPYRIGHT_NOTICE =
 

+ 1 - 1
DanaKit

@@ -1 +1 @@
-Subproject commit bad8fad9ccf980f4a3384b2454a7cd41abe69464
+Subproject commit 3970b2aadc55044c851130567879fd0ae3ade6cc

+ 1 - 1
G7SensorKit

@@ -1 +1 @@
-Subproject commit ee064ddcc1c13e0050ee56d0eec38a6bdc0d3c76
+Subproject commit 0c093050084b63d7af0dc99307dba09239eb3180

+ 1 - 1
LibreTransmitter

@@ -1 +1 @@
-Subproject commit 38cc483f3d7716735ceee6e57b6ed4dd68eaf1d0
+Subproject commit 12dec3ce191afe761fd68a70172ef75638319e20

+ 1 - 1
LoopKit

@@ -1 +1 @@
-Subproject commit edd4e6037d263ef32dd8dd4c0d699c5429097373
+Subproject commit 9c09a6fea98e2638d76d610ba097c4fae14ca220

+ 1 - 1
MinimedKit

@@ -1 +1 @@
-Subproject commit d52c0f8f1fe615760794fdac233ba78657449870
+Subproject commit 942996e3f53c4875553c9827aeee1799a8dbf434

+ 1 - 1
OmniBLE

@@ -1 +1 @@
-Subproject commit ffec85de22d979e4bee6535c374ab72c692e101b
+Subproject commit 3782c584fe800116b6e60754e3be3cd818e033ee

+ 1 - 1
OmniKit

@@ -1 +1 @@
-Subproject commit 64731f0b31d61cae14d00528a9c2bf78ea6da9a6
+Subproject commit 1446be89bfab23ac021d3e22f03b34bda8ce30cf

+ 1 - 1
RileyLinkKit

@@ -1 +1 @@
-Subproject commit 83b211a442672612e1790c2f0d393aeb23600b5f
+Subproject commit 8dad76d15295e13e091be74f6f47dbca5f0eb022

+ 1 - 1
TidepoolService

@@ -1 +1 @@
-Subproject commit b4fb9a0672f6e4a7bfed619fc3193b03a8a2ab79
+Subproject commit a10f9d3ba097daae85de61d4a5bca063f34d64dc

+ 1 - 1
dexcom-share-client-swift

@@ -1 +1 @@
-Subproject commit 82a9179d444b3e79d5e9cfe99bbe7f298c4e8b40
+Subproject commit 8c4f0edfe9356463c66a2e5dff9d00794291ebfd

+ 36 - 0
scripts/define_common_trio.sh

@@ -0,0 +1,36 @@
+#!/bin/zsh
+
+# copied from Loop where this definition was used by more than one script
+# initially we probably will not need that capability, but does no harm to keep it
+# define parameters and arrays used by more than one script
+#   These are always capitalized
+#      TRIO_PROJECTS
+
+# include this file in each script using
+#   source scripts/define_commont_trio.sh
+
+# define the TRIO_PROJECTS used by Trio where for Trio the .gitmodules points
+#   to the downstream fork of loopandlearn in all cases
+#
+# The only submodule that needs a special trio branch (at this time) is LoopKit
+#    put that repository first in the list
+#
+# The scrips in LoopWorkspace are used to update translations and make
+#   sure the loopandlearn branches are up to date
+# Even though MedtrumKit and EversenseKit are not yet part of dev
+#   it does no harm to update those repositories using this script
+TRIO_PROJECTS=( \
+    loopandlearn:LoopKit:trio \
+    loopandlearn:CGMBLEKit:dev \
+    loopandlearn:dexcom-share-client-swift:dev \
+    loopandlearn:G7SensorKit:main \
+    loopandlearn:LibreTransmitter:main \
+    loopandlearn:MinimedKit:main \
+    loopandlearn:OmniBLE:dev \
+    loopandlearn:OmniKit:main \
+    loopandlearn:RileyLinkKit:dev \
+    loopandlearn:TidepoolService:dev \
+    loopandlearn:DanaKit:dev \
+    loopandlearn:EversenseKit:dev \
+    loopandlearn:MedtrumKit:dev \
+)

+ 13 - 0
scripts/update_submodules_trio.sh

@@ -0,0 +1,13 @@
+#!/bin/zsh
+
+source scripts/define_common_trio.sh
+
+for project in ${TRIO_PROJECTS}; do
+  echo "Updating to $project"
+  IFS=":" read user dir branch <<< "$project"
+  echo "Updating to $branch on $user/$project"
+  cd $dir
+  git checkout $branch
+  git pull
+  cd -
+done