WatchOS support

Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.1)
+    CFPropertyList (3.0.2)
     activesupport (4.2.11.1)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -63,16 +63,16 @@ GEM
     dotenv (2.7.5)
     emoji_regex (1.0.1)
     escape (0.0.4)
-    excon (0.71.0)
-    faraday (0.17.0)
+    excon (0.72.0)
+    faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
       faraday (>= 0.7.4)
       http-cookie (~> 1.0.0)
     faraday_middleware (0.13.1)
       faraday (>= 0.7.4, < 1.0)
     fastimage (2.1.7)
-    fastlane (2.136.0)
+    fastlane (2.141.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.3, < 3.0.0)
       babosa (>= 1.0.2, < 2.0.0)
@@ -81,13 +81,13 @@ GEM
       commander-fastlane (>= 4.4.6, < 5.0.0)
       dotenv (>= 2.1.1, < 3.0.0)
       emoji_regex (>= 0.1, < 2.0)
-      excon (>= 0.45.0, < 1.0.0)
+      excon (>= 0.71.0, < 1.0.0)
       faraday (~> 0.17)
       faraday-cookie_jar (~> 0.0.6)
       faraday_middleware (~> 0.13.1)
       fastimage (>= 2.1.0, < 3.0.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
-      google-api-client (>= 0.21.2, < 0.24.0)
+      google-api-client (>= 0.29.2, < 0.37.0)
       google-cloud-storage (>= 1.15.0, < 2.0.0)
       highline (>= 1.7.2, < 2.0.0)
       json (< 3.0.0)
@@ -106,44 +106,48 @@ GEM
       tty-screen (>= 0.6.3, < 1.0.0)
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
-      xcodeproj (>= 1.8.1, < 2.0.0)
+      xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
-    ffi (1.11.2)
+    ffi (1.12.1)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
-    google-api-client (0.23.9)
+    google-api-client (0.36.4)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.5, < 0.7.0)
+      googleauth (~> 0.9)
       httpclient (>= 2.8.1, < 3.0)
-      mime-types (~> 3.0)
+      mini_mime (~> 1.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
-      signet (~> 0.9)
-    google-cloud-core (1.4.1)
+      signet (~> 0.12)
+    google-cloud-core (1.5.0)
       google-cloud-env (~> 1.0)
+      google-cloud-errors (~> 1.0)
     google-cloud-env (1.3.0)
       faraday (~> 0.11)
-    google-cloud-storage (1.16.0)
+    google-cloud-errors (1.0.0)
+    google-cloud-storage (1.25.1)
+      addressable (~> 2.5)
       digest-crc (~> 0.4)
-      google-api-client (~> 0.23)
+      google-api-client (~> 0.33)
       google-cloud-core (~> 1.2)
-      googleauth (>= 0.6.2, < 0.10.0)
-    googleauth (0.6.7)
+      googleauth (~> 0.9)
+      mini_mime (~> 1.0)
+    googleauth (0.10.0)
       faraday (~> 0.12)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
-      signet (~> 0.7)
+      signet (~> 0.12)
     highline (1.7.10)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     httpclient (2.8.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jazzy (0.12.0)
+    jazzy (0.13.1)
       cocoapods (~> 1.5)
       mustache (~> 1.1)
       open4
@@ -152,20 +156,18 @@ GEM
       sassc (~> 2.1)
       sqlite3 (~> 1.3)
       xcinvoke (~> 0.3.0)
-    json (2.2.0)
+    json (2.3.0)
     jwt (2.1.0)
     liferaft (0.0.6)
-    memoist (0.16.1)
-    mime-types (3.3)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
-    mini_magick (4.9.5)
-    minitest (5.13.0)
+    memoist (0.16.2)
+    mini_magick (4.10.1)
+    mini_mime (1.0.2)
+    minitest (5.14.0)
     molinillo (0.6.6)
     multi_json (1.14.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
-    mustache (1.1.0)
+    mustache (1.1.1)
     nanaimo (0.2.6)
     nap (1.1.0)
     naturally (2.2.0)
@@ -191,30 +193,30 @@ GEM
       faraday (~> 0.9)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    simctl (1.6.6)
+    simctl (1.6.7)
       CFPropertyList
       naturally
     slack-notifier (2.3.2)
-    sqlite3 (1.4.1)
+    sqlite3 (1.4.2)
     terminal-notifier (2.0.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
-    tty-cursor (0.7.0)
+    tty-cursor (0.7.1)
     tty-screen (0.7.0)
-    tty-spinner (0.9.1)
+    tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.6)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.6.1)
     word_wrap (1.0.0)
     xcinvoke (0.3.0)
       liferaft (~> 0.0.6)
-    xcodeproj (1.13.0)
+    xcodeproj (1.14.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -235,4 +237,4 @@ DEPENDENCIES
   mini_magick (>= 4.9.4)
 
 BUNDLED WITH
-   2.1.4
+   1.17.3

GeoTrackKit.podspec

@@ -4,7 +4,7 @@
 
 Pod::Spec.new do |s|
   s.name      = 'GeoTrackKit'
-  s.version   = '1.0.0'
+  s.version   = '1.1.0'
   s.summary   = 'Geo Tracking and statistics for iOS'
   s.description = <<-DESC
 A Geo Location Tracking and statistic calculation library for iOS.  It also provides rendering location tracks over a map for you.
@@ -31,12 +31,13 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
     LICENSE
   }
 
-  s.platform = :ios, '9.0'
+  s.ios.deployment_target = '11.0'
   s.swift_version = '5.0'
   s.default_subspecs = 'Core'
 
   # Core Tracking functionality + Apple Maps rendering
   s.subspec 'Core' do |ss|
+    ss.ios.deployment_target = '11.0'
     ss.source_files = 'GeoTrackKit/Core/**/*.{swift,h,m}'
   end
 
@@ -47,4 +48,29 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
     ss.dependency 'GeoTrackKit/Core'
   end
 
+  s.subspec 'SQLite' do |ss|
+    ss.ios.deployment_target = '11.0'
+    ss.source_files = 'GeoTrackKit/SQLite/**/*.{swift,h,m}'
+    ss.dependency 'SQLite.swift'
+    ss.dependency 'GeoTrackKit/Core'
+  end
+
+
+  # Watch
+  s.subspec 'WatchCore' do |ss|
+    ss.watchos.deployment_target = '6.0'
+    ss.source_files = 'GeoTrackKit/Core/**/*.{swift,h,m}'
+    ss.watchos.exclude_files = [
+      "GeoTrackKit/Core/**/GeoTrackMap.swift",
+      "GeoTrackKit/Core/**/UIGeoTrack.swift"
+    ]
+  end
+
+  s.subspec 'SQLiteWatch' do |ss|
+    ss.watchos.deployment_target = '6.0'
+    ss.source_files = 'GeoTrackKit/SQLite/**/*.{swift,h,m}'
+    ss.dependency 'SQLite.swift'
+    ss.dependency 'GeoTrackKit/WatchCore'
+  end
+
 end

GeoTrackKit/Core/Extension/CLLocationExtension.swift

@@ -6,6 +6,7 @@
 //
 //  A set of convenience extensions to provide a friendly string value and then serialization functions
 
+import CoreGraphics
 import CoreLocation
 
 public extension CLLocation {

GeoTrackKit/Core/Extension/NumberExtensions.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import CoreGraphics
 
 extension Double {
 

GeoTrackKit/Core/GeoTrackKitErrors.swift

@@ -12,6 +12,7 @@ enum GeoTrackKitError: LocalizedError {
     case authNoErrorButUnsuccessful
     case workoutWithoutRoutes
     case sampleMissingPoints
+    case notWorkoutType
 
     /// A description of the error
     public var errorDescription: String? {
@@ -26,6 +27,8 @@ enum GeoTrackKitError: LocalizedError {
             return "Workout did not have any associated routes"
         case .sampleMissingPoints:
             return "Route called back without any points"
+        case .notWorkoutType:
+            return "The samples were not the workout type"
         }
     }