Remove warnings and update CI configuration

daehn · Oct 2, 2017 · b688f59 · b688f59
1 parent 37649c1
commit b688f59
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: objective-c
-osx_image: xcode8
+osx_image: xcode9
 
 script:
-    - set -o pipefail && xcodebuild clean build test -scheme ChainedAnimation -destination "OS=10.0,name=iPhone 7" | xcpretty
+    - set -o pipefail && xcodebuild clean build test -scheme ChainedAnimation -destination "OS=11.0,name=iPhone 8" | xcpretty
 after_script:
     - bash <(curl -s https://codecov.io/bash)
diff --git a/ChainedAnimation.xcodeproj/project.pbxproj b/ChainedAnimation.xcodeproj/project.pbxproj
@@ -437,6 +437,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -489,6 +490,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -513,7 +515,6 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -533,7 +534,6 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -545,7 +545,6 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.silvandaehn.ChainedAnimationTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -557,7 +556,6 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.silvandaehn.ChainedAnimationTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
@@ -571,7 +569,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.silvandaehn.ChainedAnimationExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -585,7 +582,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.silvandaehn.ChainedAnimationExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

diff --git a/ChainedAnimation/AnimationConfiguration.swift b/ChainedAnimation/AnimationConfiguration.swift
@@ -23,7 +23,7 @@ struct AnimationConfiguration {
         self.completion = completion
     }
 
-    mutating func add(Completion completion: @escaping Completion) {
+    mutating func add(completion: @escaping Completion) {
         let currentCompletion = self.completion
         self.completion = {
             currentCompletion?($0)

diff --git a/ChainedAnimationExample/ViewController.swift b/ChainedAnimationExample/ViewController.swift
@@ -70,7 +70,7 @@ class ViewController: UIViewController {
     }
 
     func layoutSubheader() {
-        subheader.text = "This is an awesome application."
+        subheader.text = "This is an example application."
         subheader.font = UIFont(name: "Avenir Next", size: 18)
         subheader.textColor = .black
         subheader.sizeToFit()

diff --git a/ChainedAnimationTests/AnimationConfigurationTests.swift b/ChainedAnimationTests/AnimationConfigurationTests.swift
@@ -60,7 +60,7 @@ class AnimationConfigurationTests: ChainedAnimationTestCase {
 
         // When
         let secondCompletion = TestCompletion()
-        sut.add(Completion: secondCompletion.closure)
+        sut.add(completion: secondCompletion.closure)
 
         Animator.perform(configuration: sut)
 
@@ -80,8 +80,8 @@ class AnimationConfigurationTests: ChainedAnimationTestCase {
         // When
         let secondCompletion = TestCompletion()
         let thirdCompletion = TestCompletion()
-        sut.add(Completion: secondCompletion.closure)
-        sut.add(Completion: thirdCompletion.closure)
+        sut.add(completion: secondCompletion.closure)
+        sut.add(completion: thirdCompletion.closure)
 
         Animator.perform(configuration: sut)
 

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # ChainedAnimation
 
-[![Build Status](https://travis-ci.org/daehn/ChainedAnimation.svg?branch=develop)](https://travis-ci.org/daehn/ChainedAnimation) ![Swift 3.0](https://img.shields.io/badge/Swift-3.0-orange.svg?style=flat) [![codecov](https://codecov.io/gh/daehn/ChainedAnimation/branch/develop/graph/badge.svg)](https://codecov.io/gh/daehn/ChainedAnimation) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) [![CocoaPods](https://img.shields.io/cocoapods/v/ChainedAnimation.svg?style=flat)](https://cocoapods.org/pods/ChainedAnimation)
+[![Build Status](https://travis-ci.org/daehn/ChainedAnimation.svg?branch=develop)](https://travis-ci.org/daehn/ChainedAnimation) ![Swift 4.0](https://img.shields.io/badge/Swift-4.0-orange.svg?style=flat) [![codecov](https://codecov.io/gh/daehn/ChainedAnimation/branch/develop/graph/badge.svg)](https://codecov.io/gh/daehn/ChainedAnimation) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) [![CocoaPods](https://img.shields.io/cocoapods/v/ChainedAnimation.svg?style=flat)](https://cocoapods.org/pods/ChainedAnimation)
 
 ## Usage