Updated MapCache and CoreGPX pods

merlos · Oct 4, 2020 · 64f6c6e · 64f6c6e
1 parent fddf596
commit 64f6c6e
Show file tree

Hide file tree

Showing 31 changed files with 1,131 additions and 732 deletions.
diff --git a/OpenGpxTracker.xcodeproj/project.pbxproj b/OpenGpxTracker.xcodeproj/project.pbxproj
@@ -151,11 +151,11 @@
 		0175AC0523F01519003323C3 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
 		0175AC0723F01523003323C3 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
 		120DE70F22B274910055C4CB /* GPXSession.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GPXSession.swift; sourceTree = "<group>"; };
-		12A1A44324D561AC0057ED7A /* CoreDataHelper+FetchRequests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CoreDataHelper+FetchRequests.swift"; sourceTree = "<group>"; };
 		1262DD9624F9568F00B5C2EA /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Interface.strings; sourceTree = "<group>"; };
 		1262DD9724F9568F00B5C2EA /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Localizable.strings; sourceTree = "<group>"; };
 		1262DD9824F9568F00B5C2EA /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		1262DD9924F9568F00B5C2EA /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		12A1A44324D561AC0057ED7A /* CoreDataHelper+FetchRequests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CoreDataHelper+FetchRequests.swift"; sourceTree = "<group>"; };
 		12D4905424C448540065D995 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Interface.strings; sourceTree = "<group>"; };
 		12D4905524C448540065D995 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = "<group>"; };
 		12D4905624C448540065D995 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -1040,7 +1040,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -1089,7 +1089,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -1108,7 +1108,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = OpenGpxTracker/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MARKETING_VERSION = 1.7.2;
 				PRODUCT_BUNDLE_IDENTIFIER = org.merlos.OpenGpxTracker;
@@ -1129,7 +1129,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = OpenGpxTracker/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MARKETING_VERSION = 1.7.2;
 				PRODUCT_BUNDLE_IDENTIFIER = org.merlos.OpenGpxTracker;

diff --git a/OpenGpxTracker.xcodeproj/xcshareddata/xcschemes/OpenGpxTracker-Watch (Complication).xcscheme b/OpenGpxTracker.xcodeproj/xcshareddata/xcschemes/OpenGpxTracker-Watch (Complication).xcscheme
@@ -41,8 +41,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -52,8 +50,8 @@
             ReferencedContainer = "container:OpenGpxTracker.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -66,29 +64,16 @@
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES"
       launchAutomaticallySubstyle = "32">
-      <RemoteRunnable
-         runnableDebuggingMode = "2"
-         BundleIdentifier = "com.apple.Carousel"
-         RemotePath = "/GPX Tracker">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "BF692F562209AAF900F8A0F1"
-            BuildableName = "OpenGpxTracker-Watch.app"
-            BlueprintName = "OpenGpxTracker-Watch"
-            ReferencedContainer = "container:OpenGpxTracker.xcodeproj">
-         </BuildableReference>
-      </RemoteRunnable>
-      <MacroExpansion>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "BF692F562209AAF900F8A0F1"
             BuildableName = "OpenGpxTracker-Watch.app"
             BlueprintName = "OpenGpxTracker-Watch"
             ReferencedContainer = "container:OpenGpxTracker.xcodeproj">
          </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      </BuildableProductRunnable>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -97,27 +82,16 @@
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES"
       launchAutomaticallySubstyle = "32">
-      <RemoteRunnable
-         runnableDebuggingMode = "2"
-         BundleIdentifier = "com.apple.Carousel"
-         RemotePath = "/GPX Tracker">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "BF692F562209AAF900F8A0F1"
             BuildableName = "OpenGpxTracker-Watch.app"
             BlueprintName = "OpenGpxTracker-Watch"
             ReferencedContainer = "container:OpenGpxTracker.xcodeproj">
          </BuildableReference>
-      </RemoteRunnable>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "BF692F562209AAF900F8A0F1"
-            BuildableName = "OpenGpxTracker-Watch.app"
-            BlueprintName = "OpenGpxTracker-Watch"
-            ReferencedContainer = "container:OpenGpxTracker.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
+      </BuildableProductRunnable>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

diff --git a/OpenGpxTracker.xcodeproj/xcshareddata/xcschemes/OpenGpxTracker-Watch (Notification).xcscheme b/OpenGpxTracker.xcodeproj/xcshareddata/xcschemes/OpenGpxTracker-Watch (Notification).xcscheme
@@ -41,8 +41,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -52,8 +50,8 @@
             ReferencedContainer = "container:OpenGpxTracker.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -66,29 +64,16 @@
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES"
       launchAutomaticallySubstyle = "8">
-      <RemoteRunnable
-         runnableDebuggingMode = "2"
-         BundleIdentifier = "com.apple.Carousel"
-         RemotePath = "/GPX Tracker">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "BF692F562209AAF900F8A0F1"
-            BuildableName = "OpenGpxTracker-Watch.app"
-            BlueprintName = "OpenGpxTracker-Watch"
-            ReferencedContainer = "container:OpenGpxTracker.xcodeproj">
-         </BuildableReference>
-      </RemoteRunnable>
-      <MacroExpansion>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "BF692F562209AAF900F8A0F1"
             BuildableName = "OpenGpxTracker-Watch.app"
             BlueprintName = "OpenGpxTracker-Watch"
             ReferencedContainer = "container:OpenGpxTracker.xcodeproj">
          </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      </BuildableProductRunnable>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -97,27 +82,16 @@
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES"
       launchAutomaticallySubstyle = "8">
-      <RemoteRunnable
-         runnableDebuggingMode = "2"
-         BundleIdentifier = "com.apple.Carousel"
-         RemotePath = "/GPX Tracker">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "BF692F562209AAF900F8A0F1"
             BuildableName = "OpenGpxTracker-Watch.app"
             BlueprintName = "OpenGpxTracker-Watch"
             ReferencedContainer = "container:OpenGpxTracker.xcodeproj">
          </BuildableReference>
-      </RemoteRunnable>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "BF692F562209AAF900F8A0F1"
-            BuildableName = "OpenGpxTracker-Watch.app"
-            BlueprintName = "OpenGpxTracker-Watch"
-            ReferencedContainer = "container:OpenGpxTracker.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
+      </BuildableProductRunnable>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

diff --git a/OpenGpxTracker.xcodeproj/xcshareddata/xcschemes/OpenGpxTracker-Watch.xcscheme b/OpenGpxTracker.xcodeproj/xcshareddata/xcschemes/OpenGpxTracker-Watch.xcscheme
@@ -41,8 +41,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -52,8 +50,8 @@
             ReferencedContainer = "container:OpenGpxTracker.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -65,29 +63,16 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <RemoteRunnable
-         runnableDebuggingMode = "2"
-         BundleIdentifier = "com.apple.Carousel"
-         RemotePath = "/GPX Tracker">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "BF692F562209AAF900F8A0F1"
-            BuildableName = "OpenGpxTracker-Watch.app"
-            BlueprintName = "OpenGpxTracker-Watch"
-            ReferencedContainer = "container:OpenGpxTracker.xcodeproj">
-         </BuildableReference>
-      </RemoteRunnable>
-      <MacroExpansion>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "BF692F562209AAF900F8A0F1"
             BuildableName = "OpenGpxTracker-Watch.app"
             BlueprintName = "OpenGpxTracker-Watch"
             ReferencedContainer = "container:OpenGpxTracker.xcodeproj">
          </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      </BuildableProductRunnable>
       <LocationScenarioReference
          identifier = "Tokyo, Japan"
          referenceType = "1">
@@ -99,27 +84,16 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <RemoteRunnable
-         runnableDebuggingMode = "2"
-         BundleIdentifier = "com.apple.Carousel"
-         RemotePath = "/GPX Tracker">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "BF692F562209AAF900F8A0F1"
             BuildableName = "OpenGpxTracker-Watch.app"
             BlueprintName = "OpenGpxTracker-Watch"
             ReferencedContainer = "container:OpenGpxTracker.xcodeproj">
          </BuildableReference>
-      </RemoteRunnable>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "BF692F562209AAF900F8A0F1"
-            BuildableName = "OpenGpxTracker-Watch.app"
-            BlueprintName = "OpenGpxTracker-Watch"
-            ReferencedContainer = "container:OpenGpxTracker.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
+      </BuildableProductRunnable>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

diff --git a/Podfile b/Podfile
@@ -5,9 +5,9 @@ def shared_pods
 end
 
 target 'OpenGpxTracker' do
-    platform :ios, '8.0'
+    platform :ios, '9.0'
     shared_pods
-    pod 'MapCache', '~> 0.8.0'
+    pod 'MapCache', '~> 0.9.0'
     #pod 'MapCache', git: 'https://github.com/merlos/MapCache.git' :branch => 'master'
 
 end

diff --git a/Podfile.lock b/Podfile.lock
@@ -1,20 +1,20 @@
 PODS:
-  - CoreGPX (0.7.4)
-  - MapCache (0.8.0)
+  - CoreGPX (0.8.1)
+  - MapCache (0.9.0)
 
 DEPENDENCIES:
   - CoreGPX
-  - MapCache (~> 0.8.0)
+  - MapCache (~> 0.9.0)
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
     - CoreGPX
     - MapCache
 
 SPEC CHECKSUMS:
-  CoreGPX: 9927a0158614c4baed08ecdb772fdc24efd92e49
-  MapCache: dce6387196fb94e58f8ac3ae7b8ca6bda15f15ae
+  CoreGPX: 2d1deecae3c99674bb1165935c350f9c0e54e5ab
+  MapCache: b0a9f5f9a0ed7cbac45443fea0e7e03a97bf0c66
 
-PODFILE CHECKSUM: c49315bb353e7304cd79b1e2ecb18a9a923e10b3
+PODFILE CHECKSUM: c61e9630b0b0516aedcfdcf6798dbfb7fc6c0eef
 
 COCOAPODS: 1.7.5
diff --git a/Pods/CoreGPX/Classes/Converters.swift b/Pods/CoreGPX/Classes/Converters.swift