Merge pull request #12 from tbaranes/feature/swift4

Bump 2.0 including Swift 4 support

Author: Tom Baranes

.swiftlint.yml

@@ -0,0 +1,40 @@
+disabled_rules:
+ - todo
+ - force_try
+ - force_cast
+private_outlet:
+    allow_private_set: true
+opt_in_rules:
+ - closure_spacing
+ - conditional_returns_on_newline
+ - empty_count
+ - explicit_init
+ - overridden_super_call
+ - redundant_nil_coalescing
+ - nimble_operator
+ - closure_end_indentation
+ - first_where
+ - attributes
+ - operator_usage_whitespace
+ - prohibited_super_call
+ - number_separator
+ - object_literal
+ - fatal_error_message
+ - private_outlet
+ - implicit_return
+ - multiline_parameters
+ - vertical_parameter_alignment_on_call
+ - unneeded_parentheses_in_closure_argument
+ - joined_default_parameter
+ - pattern_matching_keywords
+ - array_init
+ - contains_over_first_not_nil
+ - let_var_whitespace
+ - literal_expression_end_indentation
+ - multiline_arguments
+ # - quick_discouraged_call
+ - quick_discouraged_focused_test
+ - quick_discouraged_pending_test
+ - sorted_first_last
+ - strict_fileprivate
+ # - trailing_closure // false positive

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode9
+osx_image: xcode9.1
 notifications:
   email: false
 branches:
@@ -14,9 +14,9 @@ env:
   - TVOS_FRAMEWORK_SCHEME="IncrementableLabel tvOS"
   - EXAMPLE_SCHEME="iOS Example"
   matrix:
-    - DESTINATION="OS=11.0,name=iPhone 6S"         SCHEME="$IOS_FRAMEWORK_SCHEME"     RUN_TESTS="YES" BUILD_EXAMPLE="YES"
+    - DESTINATION="OS=11.1,name=iPhone 6S"         SCHEME="$IOS_FRAMEWORK_SCHEME"     RUN_TESTS="YES" BUILD_EXAMPLE="YES"
     - DESTINATION="OS=10.0,name=iPhone 5"          SCHEME="$IOS_FRAMEWORK_SCHEME"     RUN_TESTS="YES" BUILD_EXAMPLE="YES"
-    - DESTINATION="OS=11.0,name=Apple TV 1080p"    SCHEME="$TVOS_FRAMEWORK_SCHEME"    RUN_TESTS="YES" BUILD_EXAMPLE="NO"
+    - DESTINATION="OS=11.1,name=Apple TV"          SCHEME="$TVOS_FRAMEWORK_SCHEME"    RUN_TESTS="YES" BUILD_EXAMPLE="NO"
 script:
   - set -o pipefail
   - xcodebuild -version

CHANGELOG.md

@@ -4,20 +4,12 @@ All notable changes to the project will be documented in this file.
 
 ---
 
-## Next
+## [2.0.0](https://github.com/tbaranes/IncrementableLabel/releases/tag/2.0.0) (28-11-2017)
 
 #### API breaking changes
 
-N/A
-
-#### Enhancements
-
 - Swift 4 and Xcode 9 support
 
-#### Bugfixes
-
-N/A
-
 ## [1.2.0](https://github.com/tbaranes/IncrementableLabel/releases/tag/1.2.0) (11-09-2016)
 
 #### API breaking changes

IncrementableLabel Example/.swiftlint.yml

@@ -34,13 +34,13 @@ class ViewController: UIViewController {
         label2.format = "%f"
         label2.increment(fromValue: 0.0, toValue: 100.0, duration: 3)
 
-        label3.option = .EaseInOut
+        label3.option = .easeInOut
         label3.stringFormatter = { value in
             return String(format: "EaseInOutAnimation: %d", Int(value))
         }
         label3.increment(fromValue: 0.0, toValue: 100.0, duration: 3)
 
-        label4.option = .EaseOut
+        label4.option = .easeOut
         label4.attributedTextFormatter = { value in
             let string = String(format: "EaseOutAnimation + attributedString: %d", Int(value))
             let attributedString = NSMutableAttributedString(string: string, attributes: [NSFontAttributeName: UIFont.boldSystemFont(ofSize: 16.0)])

IncrementableLabel Example/Example/iOS Example/ViewController.swift

@@ -4,7 +4,7 @@ Pod::Spec.new do |s|
 
 s.name            	= "IncrementableLabel"
 s.module_name      	= "IncrementableLabel"
-s.version          	= "1.2.0"
+s.version          	= "2.0.0"
 s.summary          	= "IncrementableLabel is the easiest way to have incrementable numbers in an UILabel!"
 s.description      	= "IncrementableLabel is the easiest way to have incrementable numbers in an UILabel! Available on iOS and tVOS"
 s.homepage         	= "https://github.com/recisio/IncrementableLabel"

IncrementableLabel.podspec

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>2.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

IncrementableLabel/.swiftlint.yml

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>2.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

IncrementableLabel/IncrementableLabel iOS/Info.plist

@@ -13,8 +13,8 @@
 		E26980FF1CDEAADF001E9707 /* IncrementableLabel.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E26980B31CDEA7A6001E9707 /* IncrementableLabel.framework */; };
 		E269810A1CDEAB4F001E9707 /* IncrementableLabelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E26981091CDEAB4F001E9707 /* IncrementableLabelTests.swift */; };
 		E269810B1CDEAB4F001E9707 /* IncrementableLabelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E26981091CDEAB4F001E9707 /* IncrementableLabelTests.swift */; };
-		E2A4B65D1D847663005E6710 /* IncrementableLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2A4B65C1D847663005E6710 /* IncrementableLabel.swift */; };
-		E2A4B65E1D847663005E6710 /* IncrementableLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2A4B65C1D847663005E6710 /* IncrementableLabel.swift */; };
+		E29CDB911FCD5960003BDD0A /* IncrementableLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E29CDB901FCD5960003BDD0A /* IncrementableLabel.swift */; };
+		E29CDB921FCD5960003BDD0A /* IncrementableLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E29CDB901FCD5960003BDD0A /* IncrementableLabel.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -46,7 +46,7 @@
 		E26980FA1CDEAADF001E9707 /* IncrementableLabel tvOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "IncrementableLabel tvOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		E26980FE1CDEAADF001E9707 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		E26981091CDEAB4F001E9707 /* IncrementableLabelTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IncrementableLabelTests.swift; sourceTree = "<group>"; };
-		E2A4B65C1D847663005E6710 /* IncrementableLabel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IncrementableLabel.swift; sourceTree = "<group>"; };
+		E29CDB901FCD5960003BDD0A /* IncrementableLabel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IncrementableLabel.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -86,7 +86,7 @@
 		E26980861CDEA6DA001E9707 = {
 			isa = PBXGroup;
 			children = (
-				E2A4B65B1D847663005E6710 /* Source */,
+				E29CDB8F1FCD5960003BDD0A /* Source */,
 				E26980921CDEA6DB001E9707 /* IncrementableLabel iOS */,
 				E26980B41CDEA7A6001E9707 /* IncrementableLabel tvOS */,
 				E26980F51CDEAAC5001E9707 /* Tests */,
@@ -158,12 +158,13 @@
 			path = "IncrementableLabel Core Tests";
 			sourceTree = "<group>";
 		};
-		E2A4B65B1D847663005E6710 /* Source */ = {
+		E29CDB8F1FCD5960003BDD0A /* Source */ = {
 			isa = PBXGroup;
 			children = (
-				E2A4B65C1D847663005E6710 /* IncrementableLabel.swift */,
+				E29CDB901FCD5960003BDD0A /* IncrementableLabel.swift */,
 			);
-			path = Source;
+			name = Source;
+			path = ../Source;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -354,7 +355,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if which swiftlint >/dev/null; then\n    swiftlint\nelse\n    echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
+			shellScript = "swiftlint --config ../.swiftlint.yml";
 		};
 		E2773E981D20128600365CDF /* Run Script - ⚠️ SwiftLint */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -368,7 +369,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if which swiftlint >/dev/null; then\n    swiftlint\nelse\n    echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
+			shellScript = "swiftlint --config ../.swiftlint.yml";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -377,15 +378,15 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E2A4B65D1D847663005E6710 /* IncrementableLabel.swift in Sources */,
+				E29CDB911FCD5960003BDD0A /* IncrementableLabel.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		E26980AE1CDEA7A6001E9707 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E2A4B65E1D847663005E6710 /* IncrementableLabel.swift in Sources */,
+				E29CDB921FCD5960003BDD0A /* IncrementableLabel.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};