Skip to content

Commit e99f79b

Browse files
MatthewYorkMatthewYork
committed
Merge branch 'swift'
# Conflicts: # DateTools.podspec # DateTools/Examples/DateToolsExample/DateToolsExample.xcodeproj/xcshareddata/xcschemes/DateTools.xcscheme
2 parents 31efdb2 + c36311e commit e99f79b

File tree

224 files changed

+12068
-49
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

224 files changed

+12068
-49
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ DerivedData
1616
.idea/
1717
*.hmap
1818
*.xccheckout
19+
.build/
1920

2021
#CocoaPods
2122
Pods

‎.swift-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.0

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
language: objective-c
1+
language: swift
22

33
before_script:
44
- gem install xcpretty

DateTools/DTConstants.h renamed to DateTools/DateTools/DTConstants.h

File renamed without changes.

DateTools/DTConstants.m renamed to DateTools/DateTools/DTConstants.m

File renamed without changes.

DateTools/DTError.h renamed to DateTools/DateTools/DTError.h

File renamed without changes.

DateTools/DTError.m renamed to DateTools/DateTools/DTError.m

File renamed without changes.

DateTools/DTTimePeriod.h renamed to DateTools/DateTools/DTTimePeriod.h

File renamed without changes.

DateTools/DTTimePeriod.m renamed to DateTools/DateTools/DTTimePeriod.m

File renamed without changes.

DateTools/DTTimePeriodChain.h renamed to DateTools/DateTools/DTTimePeriodChain.h

File renamed without changes.

0 commit comments

Comments
 (0)