Merge branch 'swift'

# Conflicts:
#	DateTools.podspec
#	DateTools/Examples/DateToolsExample/DateToolsExample.xcodeproj/xcshareddata/xcschemes/DateTools.xcscheme

Author: MatthewYork

.gitignore

@@ -16,6 +16,7 @@ DerivedData
 .idea/
 *.hmap
 *.xccheckout
+.build/
 
 #CocoaPods
 Pods

.swift-version

@@ -0,0 +1 @@
+3.0

.travis.yml

@@ -1,4 +1,4 @@
-language: objective-c
+language: swift
 
 before_script: 
 - gem install xcpretty

DateTools/DTConstants.h DateTools/DateTools/DTConstants.h

@@ -0,0 +1,19 @@
+//
+//  DateTools macOS.h
+//  DateTools macOS
+//
+//  Created by Tom Baranes on 22/09/2016.
+//
+//
+
+#import <Cocoa/Cocoa.h>
+
+//! Project version number for DateTools macOS.
+FOUNDATION_EXPORT double DateTools_macOSVersionNumber;
+
+//! Project version string for DateTools macOS.
+FOUNDATION_EXPORT const unsigned char DateTools_macOSVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <DateTools_macOS/PublicHeader.h>
+
+

DateTools/DTConstants.m DateTools/DateTools/DTConstants.m

@@ -0,0 +1,24 @@
+<?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>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>

DateTools/DTError.h DateTools/DateTools/DTError.h

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0800"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "E2A14E5A1D94155D00645D6B"
+               BuildableName = "DateTools.framework"
+               BlueprintName = "DateTools macOS"
+               ReferencedContainer = "container:DateToolsExample.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "E2A14E5A1D94155D00645D6B"
+            BuildableName = "DateTools.framework"
+            BlueprintName = "DateTools macOS"
+            ReferencedContainer = "container:DateToolsExample.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "E2A14E5A1D94155D00645D6B"
+            BuildableName = "DateTools.framework"
+            BlueprintName = "DateTools macOS"
+            ReferencedContainer = "container:DateToolsExample.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

DateTools/DTError.m DateTools/DateTools/DTError.m

@@ -15,7 +15,11 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "908837C81B637C240063096B"
+<<<<<<< HEAD:Examples/DateToolsExample/DateToolsExample.xcodeproj/xcshareddata/xcschemes/DateTools.xcscheme
                BuildableName = "DateTools iOS.framework"
+=======
+               BuildableName = "DateTools.framework"
+>>>>>>> swift:DateTools/Examples/DateToolsExample/DateToolsExample.xcodeproj/xcshareddata/xcschemes/DateTools.xcscheme
                BlueprintName = "DateTools iOS"
                ReferencedContainer = "container:DateToolsExample.xcodeproj">
             </BuildableReference>
@@ -57,7 +61,11 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "908837C81B637C240063096B"
+<<<<<<< HEAD:Examples/DateToolsExample/DateToolsExample.xcodeproj/xcshareddata/xcschemes/DateTools.xcscheme
             BuildableName = "DateTools iOS.framework"
+=======
+            BuildableName = "DateTools.framework"
+>>>>>>> swift:DateTools/Examples/DateToolsExample/DateToolsExample.xcodeproj/xcshareddata/xcschemes/DateTools.xcscheme
             BlueprintName = "DateTools iOS"
             ReferencedContainer = "container:DateToolsExample.xcodeproj">
          </BuildableReference>
@@ -79,7 +87,11 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "908837C81B637C240063096B"
+<<<<<<< HEAD:Examples/DateToolsExample/DateToolsExample.xcodeproj/xcshareddata/xcschemes/DateTools.xcscheme
             BuildableName = "DateTools iOS.framework"
+=======
+            BuildableName = "DateTools.framework"
+>>>>>>> swift:DateTools/Examples/DateToolsExample/DateToolsExample.xcodeproj/xcshareddata/xcschemes/DateTools.xcscheme
             BlueprintName = "DateTools iOS"
             ReferencedContainer = "container:DateToolsExample.xcodeproj">
          </BuildableReference>
@@ -97,7 +109,11 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "908837C81B637C240063096B"
+<<<<<<< HEAD:Examples/DateToolsExample/DateToolsExample.xcodeproj/xcshareddata/xcschemes/DateTools.xcscheme
             BuildableName = "DateTools iOS.framework"
+=======
+            BuildableName = "DateTools.framework"
+>>>>>>> swift:DateTools/Examples/DateToolsExample/DateToolsExample.xcodeproj/xcshareddata/xcschemes/DateTools.xcscheme
             BlueprintName = "DateTools iOS"
             ReferencedContainer = "container:DateToolsExample.xcodeproj">
          </BuildableReference>