Merge tidepool build changes

.gitignore

@@ -18,7 +18,6 @@ profile
 DerivedData
 *.hmap
 *.ipa
-project.xcworkspace
 
 # Bundler
 .bundle
@@ -27,7 +26,7 @@ Carthage
 # We recommend against adding the Pods directory to your .gitignore. However
 # you should judge for yourself, the pros and cons are mentioned at:
 # http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
-# 
+#
 # Note: if you ignore the Pods directory, make sure to uncomment
 # `pod install` in .travis.yml
 #

.travis.yml

@@ -1,7 +1,9 @@
 language: objective-c
-osx_image: xcode10
+osx_image: xcode10.2
 
+before_script:
+    - carthage bootstrap
 
 script:
-# Build Travis project and run tests
-- xcodebuild -project ShareClient.xcodeproj -scheme ShareClient build -destination name="iPhone SE" test
+    # Build Travis project and run tests
+    - xcodebuild -project ShareClient.xcodeproj -scheme Shared build -destination name="iPhone SE" test 

Cartfile.resolved

@@ -1 +1 @@
-github "LoopKit/LoopKit" "7333408f054e269669c91146b0f29bffbdcc150a"
+github "LoopKit/LoopKit" "346f5e85940fb56211035ae2e9f522512f17d0c0"

ShareClient.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

ShareClient.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
+	<false/>
+</dict>
+</plist>

ShareClient.xcodeproj/xcshareddata/xcschemes/ShareClientUI.xcscheme → ShareClient.xcodeproj/xcshareddata/xcschemes/Shared-watchOS.xcscheme

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1010"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
+      buildImplicitDependencies = "NO">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
@@ -14,9 +14,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "43A8EC81210E664300A81379"
-               BuildableName = "ShareClientUI.framework"
-               BlueprintName = "ShareClientUI"
+               BlueprintIdentifier = "A9ED4D91225EB4D30080DEBA"
+               BuildableName = "ShareClient.framework"
+               BlueprintName = "ShareClient-watchOS"
                ReferencedContainer = "container:ShareClient.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -45,9 +45,9 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "43A8EC81210E664300A81379"
-            BuildableName = "ShareClientUI.framework"
-            BlueprintName = "ShareClientUI"
+            BlueprintIdentifier = "A9ED4D91225EB4D30080DEBA"
+            BuildableName = "ShareClient.framework"
+            BlueprintName = "ShareClient-watchOS"
             ReferencedContainer = "container:ShareClient.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -63,9 +63,9 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "43A8EC81210E664300A81379"
-            BuildableName = "ShareClientUI.framework"
-            BlueprintName = "ShareClientUI"
+            BlueprintIdentifier = "A9ED4D91225EB4D30080DEBA"
+            BuildableName = "ShareClient.framework"
+            BlueprintName = "ShareClient-watchOS"
             ReferencedContainer = "container:ShareClient.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

ShareClient.xcodeproj/xcshareddata/xcschemes/ShareClient.xcscheme → ShareClient.xcodeproj/xcshareddata/xcschemes/Shared.xcscheme

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1010"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
+      buildImplicitDependencies = "NO">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
@@ -20,6 +20,20 @@
                ReferencedContainer = "container:ShareClient.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "43A8EC81210E664300A81379"
+               BuildableName = "ShareClientUI.framework"
+               BlueprintName = "ShareClientUI"
+               ReferencedContainer = "container:ShareClient.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction