Skip to content

Commit

Permalink
Merge branch 'swift'
Browse files Browse the repository at this point in the history
# Conflicts:
#	DateTools.podspec
#	DateTools/Examples/DateToolsExample/DateToolsExample.xcodeproj/xcshareddata/xcschemes/DateTools.xcscheme
  • Loading branch information
MatthewYork committed Feb 3, 2017
2 parents 31efdb2 + c36311e commit e99f79b
Show file tree
Hide file tree
Showing 224 changed files with 12,068 additions and 49 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ DerivedData
.idea/
*.hmap
*.xccheckout
.build/

#CocoaPods
Pods
1 change: 1 addition & 0 deletions .swift-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.0
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
language: objective-c
language: swift

before_script:
- gem install xcpretty
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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>


24 changes: 24 additions & 0 deletions DateTools/Examples/DateToolsExample/DateTools macOS/Info.plist
Original file line number Diff line number Diff line change
@@ -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>
Original file line number Diff line number Diff line change
@@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
File renamed without changes
File renamed without changes
Loading

0 comments on commit e99f79b

Please sign in to comment.