Merge branch 'release/1.2'

notbenoit · Oct 25, 2016 · f990f7c · f990f7c
2 parents bdafbe8 + a3c5853
commit f990f7c
Show file tree

Hide file tree

Showing 8 changed files with 371 additions and 366 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,10 @@
 language: objective-c
-osx_image: xcode7.2
+osx_image: xcode8
 xcode_workspace: EZClockView.xcworkspace
 xcode_scheme: EZClockView iOS
-xcode_sdk: iphonesimulator9.2
+xcode_sdk: iphonesimulator10.0
+env:
+  global:
+  - IOS_SDK=iphonesimulator10.0
+script:
+  - xcodebuild -workspace EZClockView.xcworkspace -scheme EZClockView\ iOS -sdk $IOS_SDK build analyze
diff --git a/EZClockView.podspec b/EZClockView.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'EZClockView'
-  s.version = '1.1.2'
+  s.version = '1.2'
   s.license = 'MIT'
   s.summary = 'iOS framework to display and customize a clock.'
   s.homepage = 'https://github.com/notbenoit/EZClockView'

diff --git a/EZClockView.xcodeproj/project.pbxproj b/EZClockView.xcodeproj/project.pbxproj
@@ -258,7 +258,7 @@
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 2.3;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -277,7 +277,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.notbenoit.$(PRODUCT_NAME:rfc1034identifier)";
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 2.3;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};

diff --git a/Sample.playground/section-1.swift b/Sample.playground/section-1.swift
@@ -21,7 +21,7 @@
 import UIKit
 import EZClockView
 
-let view = UIView(frame: CGRect(origin: CGPointZero, size: CGSizeMake(300.0, 200.0)))
+let view = UIView(frame: CGRect(origin: CGPoint.zero, size: CGSize(width: 300.0, height: 200.0)))
 
 let clock = EZClockView(frame: view.bounds)
 
@@ -31,8 +31,8 @@ clock.minutes = 12
 clock.seconds = 47
 
 // You can also setup time like this
-clock.setTime(NSDate(), animated: true)
-clock.setTime(NSDate())
+clock.setTime(Date(), animated: true)
+clock.setTime(Date())
 
 // Customize face with border thickness and background color
 clock.faceBorderWidth = 3
@@ -53,7 +53,7 @@ clock.markingHourLength = 10
 clock.markingMinuteLength = 5
 clock.markingHourThickness = 3
 
-clock.markingMinuteColor = UIColor.darkGrayColor()
+clock.markingMinuteColor = UIColor.darkGray
 
 
 view.addSubview(clock)
diff --git a/Sample.playground/timeline.xctimeline b/Sample.playground/timeline.xctimeline
@@ -3,7 +3,7 @@
    version = "3.0">
    <TimelineItems>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=4&amp;CharacterRangeLoc=2077&amp;EndingColumnNumber=5&amp;EndingLineNumber=58&amp;StartingColumnNumber=1&amp;StartingLineNumber=58&amp;Timestamp=451474120.210766"
+         documentLocation = "#CharacterRangeLen=4&amp;CharacterRangeLoc=2078&amp;EndingColumnNumber=5&amp;EndingLineNumber=58&amp;StartingColumnNumber=1&amp;StartingLineNumber=58&amp;Timestamp=499091189.634526"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>