Bump to 0.5.0 + prep for swift 3

TakeScoop · Sep 20, 2016 · c20bdf1 · c20bdf1
1 parent 1ffad14
commit c20bdf1
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 45 deletions.
diff --git a/.swift-version b/.swift-version
@@ -0,0 +1 @@
+3.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,9 @@
 Change Log
 ==========
 
-## [Unreleased (master)][master]
+## [master]
+
+## [0.5.0]
 
  - **Breaking**: Converted code base to Swift 3.0.
  - Improved performance around background image generation when shadow height is zero.
@@ -33,7 +35,8 @@ Change Log
 
  - Initial release
 
-[master]: https://github.com/TakeScoop/scoop-ios/compare/0.4.0...master
+[master]: https://github.com/TakeScoop/scoop-ios/compare/0.5.0...master
+[0.5.0]: https://github.com/TakeScoop/scoop-ios/compare/0.4.0...0.5.0
 [0.4.0]: https://github.com/TakeScoop/scoop-ios/compare/0.3.0...0.4.0
 [0.3.0]: https://github.com/TakeScoop/scoop-ios/compare/0.2.0...0.3.0
 [0.2.0]: https://github.com/TakeScoop/scoop-ios/compare/0.1.0...0.2.0

diff --git a/Examples/SwiftyButtonExample/SwiftyButtonExample.xcodeproj/project.pbxproj b/Examples/SwiftyButtonExample/SwiftyButtonExample.xcodeproj/project.pbxproj
@@ -204,6 +204,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -240,6 +241,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.1;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
+				SWIFT_VERSION = 3.0;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;

diff --git a/Examples/SwiftyButtonExample/SwiftyButtonExample/AppDelegate.swift b/Examples/SwiftyButtonExample/SwiftyButtonExample/AppDelegate.swift
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]?) -> Bool {
         // Override point for customization after application launch.
         return true
     }

diff --git a/Examples/SwiftyButtonPlayground.playground/Contents.swift b/Examples/SwiftyButtonPlayground.playground/Contents.swift
@@ -4,7 +4,7 @@
 
 let button = SwiftyButton(frame: CGRect(x: 0, y: 0, width: 70, height: 50))
 button.setTitle("Button", for: .normal)
-button.setTitleColor(UIColor.white(), for: .normal)
+button.setTitleColor(.white, for: .normal)
 
 button
 
@@ -23,16 +23,16 @@ button.isHighlighted = true
 button.buttonPressDepth = 0.5
 
 
-button.disabledButtonColor = UIColor.gray()
-button.disabledShadowColor = UIColor.darkGray()
+button.disabledButtonColor = .gray
+button.disabledShadowColor = .darkGray
 button.isHighlighted = false
 button.isEnabled = false
 
 let flatButton = SwiftyButton(frame: CGRect(x: 0, y: 0, width: 120, height: 50))
 flatButton.setTitle("Flat Button", for: .normal)
-flatButton.setTitleColor(UIColor.white(), for: .normal)
-flatButton.buttonColor = UIColor.green()
-flatButton.highlightedColor = UIColor.darkGray()
+flatButton.setTitleColor(.white, for: .normal)
+flatButton.buttonColor = .green
+flatButton.highlightedColor = .darkGray
 flatButton.shadowHeight = 0
 flatButton
 

diff --git a/Examples/SwiftyButtonPlayground.playground/timeline.xctimeline b/Examples/SwiftyButtonPlayground.playground/timeline.xctimeline
@@ -3,92 +3,92 @@
    version = "3.0">
    <TimelineItems>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=0&amp;CharacterRangeLoc=507&amp;EndingColumnNumber=7&amp;EndingLineNumber=18&amp;StartingColumnNumber=1&amp;StartingLineNumber=18&amp;Timestamp=489650774.72279"
+         documentLocation = "#CharacterRangeLen=0&amp;CharacterRangeLoc=498&amp;EndingColumnNumber=7&amp;EndingLineNumber=18&amp;StartingColumnNumber=1&amp;StartingLineNumber=18&amp;Timestamp=496091881.057521"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=6&amp;CharacterRangeLoc=509&amp;EndingColumnNumber=7&amp;EndingLineNumber=21&amp;StartingColumnNumber=1&amp;StartingLineNumber=21&amp;Timestamp=489650774.723041"
+         documentLocation = "#CharacterRangeLen=6&amp;CharacterRangeLoc=500&amp;EndingColumnNumber=7&amp;EndingLineNumber=21&amp;StartingColumnNumber=1&amp;StartingLineNumber=21&amp;Timestamp=496091881.057695"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=0&amp;CharacterRangeLoc=566&amp;EndingColumnNumber=7&amp;EndingLineNumber=22&amp;StartingColumnNumber=1&amp;StartingLineNumber=22&amp;Timestamp=489650795.2366"
+         documentLocation = "#CharacterRangeLen=0&amp;CharacterRangeLoc=557&amp;EndingColumnNumber=7&amp;EndingLineNumber=22&amp;StartingColumnNumber=1&amp;StartingLineNumber=22&amp;Timestamp=496091881.05784"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=0&amp;CharacterRangeLoc=566&amp;EndingColumnNumber=7&amp;EndingLineNumber=22&amp;StartingColumnNumber=1&amp;StartingLineNumber=22&amp;Timestamp=489650795.236733"
+         documentLocation = "#CharacterRangeLen=0&amp;CharacterRangeLoc=557&amp;EndingColumnNumber=7&amp;EndingLineNumber=22&amp;StartingColumnNumber=1&amp;StartingLineNumber=22&amp;Timestamp=496091881.057975"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=0&amp;CharacterRangeLoc=1075&amp;EndingColumnNumber=6&amp;EndingLineNumber=25&amp;StartingColumnNumber=1&amp;StartingLineNumber=25&amp;Timestamp=489650814.341743"
+         documentLocation = "#CharacterRangeLen=0&amp;CharacterRangeLoc=1021&amp;EndingColumnNumber=6&amp;EndingLineNumber=25&amp;StartingColumnNumber=1&amp;StartingLineNumber=25&amp;Timestamp=496091889.141678"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=0&amp;CharacterRangeLoc=507&amp;EndingColumnNumber=5&amp;EndingLineNumber=18&amp;StartingColumnNumber=1&amp;StartingLineNumber=18&amp;Timestamp=489650774.723881"
+         documentLocation = "#CharacterRangeLen=0&amp;CharacterRangeLoc=498&amp;EndingColumnNumber=5&amp;EndingLineNumber=18&amp;StartingColumnNumber=1&amp;StartingLineNumber=18&amp;Timestamp=496091881.058456"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=0&amp;CharacterRangeLoc=507&amp;EndingColumnNumber=7&amp;EndingLineNumber=18&amp;StartingColumnNumber=1&amp;StartingLineNumber=18&amp;Timestamp=489650774.724088"
+         documentLocation = "#CharacterRangeLen=0&amp;CharacterRangeLoc=498&amp;EndingColumnNumber=7&amp;EndingLineNumber=18&amp;StartingColumnNumber=1&amp;StartingLineNumber=18&amp;Timestamp=496091881.058592"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=6&amp;CharacterRangeLoc=433&amp;EndingColumnNumber=7&amp;EndingLineNumber=14&amp;StartingColumnNumber=1&amp;StartingLineNumber=14&amp;Timestamp=489650774.724301"
+         documentLocation = "#CharacterRangeLen=6&amp;CharacterRangeLoc=424&amp;EndingColumnNumber=7&amp;EndingLineNumber=14&amp;StartingColumnNumber=1&amp;StartingLineNumber=14&amp;Timestamp=496091881.058756"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=6&amp;CharacterRangeLoc=459&amp;EndingColumnNumber=7&amp;EndingLineNumber=16&amp;StartingColumnNumber=1&amp;StartingLineNumber=16&amp;Timestamp=489650774.724519"
+         documentLocation = "#CharacterRangeLen=6&amp;CharacterRangeLoc=450&amp;EndingColumnNumber=7&amp;EndingLineNumber=16&amp;StartingColumnNumber=1&amp;StartingLineNumber=16&amp;Timestamp=496091881.058888"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=0&amp;CharacterRangeLoc=430&amp;EndingColumnNumber=7&amp;EndingLineNumber=12&amp;StartingColumnNumber=1&amp;StartingLineNumber=12&amp;Timestamp=489650774.724766"
+         documentLocation = "#CharacterRangeLen=0&amp;CharacterRangeLoc=421&amp;EndingColumnNumber=7&amp;EndingLineNumber=12&amp;StartingColumnNumber=1&amp;StartingLineNumber=12&amp;Timestamp=496091881.059017"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=6&amp;CharacterRangeLoc=538&amp;EndingColumnNumber=7&amp;EndingLineNumber=22&amp;StartingColumnNumber=1&amp;StartingLineNumber=22&amp;Timestamp=489650795.237658"
+         documentLocation = "#CharacterRangeLen=6&amp;CharacterRangeLoc=529&amp;EndingColumnNumber=7&amp;EndingLineNumber=22&amp;StartingColumnNumber=1&amp;StartingLineNumber=22&amp;Timestamp=496091881.059145"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=6&amp;CharacterRangeLoc=347&amp;EndingColumnNumber=7&amp;EndingLineNumber=11&amp;StartingColumnNumber=1&amp;StartingLineNumber=11&amp;Timestamp=489650774.725216"
+         documentLocation = "#CharacterRangeLen=6&amp;CharacterRangeLoc=338&amp;EndingColumnNumber=7&amp;EndingLineNumber=11&amp;StartingColumnNumber=1&amp;StartingLineNumber=11&amp;Timestamp=496091881.059272"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=6&amp;CharacterRangeLoc=484&amp;EndingColumnNumber=7&amp;EndingLineNumber=18&amp;StartingColumnNumber=1&amp;StartingLineNumber=18&amp;Timestamp=489650774.725448"
+         documentLocation = "#CharacterRangeLen=6&amp;CharacterRangeLoc=475&amp;EndingColumnNumber=7&amp;EndingLineNumber=18&amp;StartingColumnNumber=1&amp;StartingLineNumber=18&amp;Timestamp=496091881.059399"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=6&amp;CharacterRangeLoc=691&amp;EndingColumnNumber=7&amp;EndingLineNumber=29&amp;StartingColumnNumber=1&amp;StartingLineNumber=29&amp;Timestamp=489650795.238132"
+         documentLocation = "#CharacterRangeLen=6&amp;CharacterRangeLoc=664&amp;EndingColumnNumber=7&amp;EndingLineNumber=29&amp;StartingColumnNumber=1&amp;StartingLineNumber=29&amp;Timestamp=496091881.059534"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=6&amp;CharacterRangeLoc=255&amp;EndingColumnNumber=7&amp;EndingLineNumber=8&amp;StartingColumnNumber=1&amp;StartingLineNumber=8&amp;Timestamp=489650774.725887"
+         documentLocation = "#CharacterRangeLen=6&amp;CharacterRangeLoc=246&amp;EndingColumnNumber=7&amp;EndingLineNumber=8&amp;StartingColumnNumber=1&amp;StartingLineNumber=8&amp;Timestamp=496091881.05973"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=1&amp;CharacterRangeLoc=1074&amp;EndingColumnNumber=10&amp;EndingLineNumber=29&amp;StartingColumnNumber=1&amp;StartingLineNumber=29&amp;Timestamp=489650814.343285"
+         documentLocation = "#CharacterRangeLen=1&amp;CharacterRangeLoc=1020&amp;EndingColumnNumber=10&amp;EndingLineNumber=29&amp;StartingColumnNumber=1&amp;StartingLineNumber=29&amp;Timestamp=496091889.144163"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=10&amp;CharacterRangeLoc=1021&amp;EndingColumnNumber=11&amp;EndingLineNumber=36&amp;StartingColumnNumber=1&amp;StartingLineNumber=36&amp;Timestamp=489650814.343422"
+         documentLocation = "#CharacterRangeLen=10&amp;CharacterRangeLoc=967&amp;EndingColumnNumber=11&amp;EndingLineNumber=36&amp;StartingColumnNumber=1&amp;StartingLineNumber=36&amp;Timestamp=496091889.144387"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>
       <LoggerValueHistoryTimelineItem
-         documentLocation = "#CharacterRangeLen=10&amp;CharacterRangeLoc=1065&amp;EndingColumnNumber=11&amp;EndingLineNumber=39&amp;StartingColumnNumber=1&amp;StartingLineNumber=39&amp;Timestamp=489650814.343555"
+         documentLocation = "#CharacterRangeLen=10&amp;CharacterRangeLoc=1011&amp;EndingColumnNumber=11&amp;EndingLineNumber=39&amp;StartingColumnNumber=1&amp;StartingLineNumber=39&amp;Timestamp=496091889.144679"
          selectedRepresentationIndex = "0"
          shouldTrackSuperviewWidth = "NO">
       </LoggerValueHistoryTimelineItem>

diff --git a/README.md b/README.md
@@ -21,10 +21,10 @@ Usage
 
 ```swift
 let button = SwiftyButton()
-button.buttonColor      = .cyan()
-button.highlightedColor = .blue()
-button.shadowHeight     = 0
-button.cornerRadius     = 5
+button.buttonColor = .cyan
+button.highlightedColor = .blue
+button.shadowHeight = 0
+button.cornerRadius  = 5
 ```
 
 ### Pressable Button
@@ -33,8 +33,8 @@ button.cornerRadius     = 5
 
 ```swift
 let button = SwiftyButton()
-button.buttonColor  = .cyan()
-button.shadowColor  = .blue()
+button.buttonColor = .cyan
+button.shadowColor = .blue
 button.shadowHeight = 5
 button.cornerRadius = 5
 ```
@@ -44,14 +44,14 @@ button.cornerRadius = 5
 Here is a list of all the properties of SwiftyButton that you can modify. Those are all editable directly from Interface Builder. See `SwiftyButtonDefaults` to set defaults for those properties.
 
 ```swift
-button.buttonColor         = UIColor.cyan()
-button.highlightedColor    = UIColor.cyan()
-button.shadowColor         = UIColor.blue()
-button.disabledButtonColor = UIColor.gray()
-button.disabledShadowColor = UIColor.darkGray()
-button.shadowHeight        = 10
-button.cornerRadius        = 8
-button.buttonPressDepth    = 0.5 // In percentage of shadowHeight
+button.buttonColor = .cyan
+button.highlightedColor = .cyan
+button.shadowColor = .blue
+button.disabledButtonColor = .gray
+button.disabledShadowColor = .darkGray
+button.shadowHeight = 10
+button.cornerRadius = 8
+button.buttonPressDepth = 0.5 // In percentage of shadowHeight
 ```
 
 ### Interface Builder (Storyboard/XIB)
@@ -69,7 +69,7 @@ Defaults
 You can set defaults that will be applied for any new instance of SwiftyButton by modifying the `SwiftyButtonDefaults` structure:
 
 ```swift
-SwiftyButtonDefaults.buttonColor = UIColor.cyan()
+SwiftyButtonDefaults.buttonColor = .cyan
 SwiftyButtonDefaults.cornerRadius = 8
 ...
 ```

diff --git a/SwiftyButton.podspec b/SwiftyButton.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "SwiftyButton"
-  s.version      = "0.4.0"
+  s.version      = "0.5.0"
   s.summary      = "Simple and customizable button in Swift"
 
   s.description  = <<-DESC
@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
   s.license      = "MIT"
   s.author       = { "Scoop" => "[email protected]" }
 
-  s.source       = { :git => "https://github.com/TakeScoop/SwiftyButton.git", :tag => "0.4.0" }
+  s.source       = { :git => "https://github.com/TakeScoop/SwiftyButton.git", :tag => s.version }
   s.source_files = "SwiftyButton/SwiftyButton.swift", "SwiftyButton/SwiftyButton+ResizableImage.swift"
   s.framework    = "UIKit"
 

diff --git a/SwiftyButton.xcodeproj/project.pbxproj b/SwiftyButton.xcodeproj/project.pbxproj
@@ -250,6 +250,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -290,6 +291,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.1;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";

diff --git a/SwiftyButton/Info.plist b/SwiftyButton/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.4.0</string>
+	<string>0.5.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>