Skip to content

Commit b688f59

Browse files
committed
Remove warnings and update CI configuration
1 parent 37649c1 commit b688f59

File tree

6 files changed

+10
-14
lines changed

6 files changed

+10
-14
lines changed

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: objective-c
2-
osx_image: xcode8
2+
osx_image: xcode9
33

44
script:
5-
- set -o pipefail && xcodebuild clean build test -scheme ChainedAnimation -destination "OS=10.0,name=iPhone 7" | xcpretty
5+
- set -o pipefail && xcodebuild clean build test -scheme ChainedAnimation -destination "OS=11.0,name=iPhone 8" | xcpretty
66
after_script:
77
- bash <(curl -s https://codecov.io/bash)

ChainedAnimation.xcodeproj/project.pbxproj

+2-6
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,7 @@
437437
SDKROOT = iphoneos;
438438
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
439439
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
440+
SWIFT_VERSION = 4.0;
440441
TARGETED_DEVICE_FAMILY = "1,2";
441442
VERSIONING_SYSTEM = "apple-generic";
442443
VERSION_INFO_PREFIX = "";
@@ -489,6 +490,7 @@
489490
MTL_ENABLE_DEBUG_INFO = NO;
490491
SDKROOT = iphoneos;
491492
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
493+
SWIFT_VERSION = 4.0;
492494
TARGETED_DEVICE_FAMILY = "1,2";
493495
VALIDATE_PRODUCT = YES;
494496
VERSIONING_SYSTEM = "apple-generic";
@@ -513,7 +515,6 @@
513515
SKIP_INSTALL = YES;
514516
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
515517
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
516-
SWIFT_VERSION = 4.0;
517518
};
518519
name = Debug;
519520
};
@@ -533,7 +534,6 @@
533534
PRODUCT_NAME = "$(TARGET_NAME)";
534535
SKIP_INSTALL = YES;
535536
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
536-
SWIFT_VERSION = 4.0;
537537
};
538538
name = Release;
539539
};
@@ -545,7 +545,6 @@
545545
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
546546
PRODUCT_BUNDLE_IDENTIFIER = com.silvandaehn.ChainedAnimationTests;
547547
PRODUCT_NAME = "$(TARGET_NAME)";
548-
SWIFT_VERSION = 3.0;
549548
};
550549
name = Debug;
551550
};
@@ -557,7 +556,6 @@
557556
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
558557
PRODUCT_BUNDLE_IDENTIFIER = com.silvandaehn.ChainedAnimationTests;
559558
PRODUCT_NAME = "$(TARGET_NAME)";
560-
SWIFT_VERSION = 3.0;
561559
};
562560
name = Release;
563561
};
@@ -571,7 +569,6 @@
571569
PRODUCT_BUNDLE_IDENTIFIER = com.silvandaehn.ChainedAnimationExample;
572570
PRODUCT_NAME = "$(TARGET_NAME)";
573571
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
574-
SWIFT_VERSION = 4.0;
575572
};
576573
name = Debug;
577574
};
@@ -585,7 +582,6 @@
585582
PRODUCT_BUNDLE_IDENTIFIER = com.silvandaehn.ChainedAnimationExample;
586583
PRODUCT_NAME = "$(TARGET_NAME)";
587584
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
588-
SWIFT_VERSION = 4.0;
589585
};
590586
name = Release;
591587
};

ChainedAnimation/AnimationConfiguration.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ struct AnimationConfiguration {
2323
self.completion = completion
2424
}
2525

26-
mutating func add(Completion completion: @escaping Completion) {
26+
mutating func add(completion: @escaping Completion) {
2727
let currentCompletion = self.completion
2828
self.completion = {
2929
currentCompletion?($0)

ChainedAnimationExample/ViewController.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class ViewController: UIViewController {
7070
}
7171

7272
func layoutSubheader() {
73-
subheader.text = "This is an awesome application."
73+
subheader.text = "This is an example application."
7474
subheader.font = UIFont(name: "Avenir Next", size: 18)
7575
subheader.textColor = .black
7676
subheader.sizeToFit()

ChainedAnimationTests/AnimationConfigurationTests.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class AnimationConfigurationTests: ChainedAnimationTestCase {
6060

6161
// When
6262
let secondCompletion = TestCompletion()
63-
sut.add(Completion: secondCompletion.closure)
63+
sut.add(completion: secondCompletion.closure)
6464

6565
Animator.perform(configuration: sut)
6666

@@ -80,8 +80,8 @@ class AnimationConfigurationTests: ChainedAnimationTestCase {
8080
// When
8181
let secondCompletion = TestCompletion()
8282
let thirdCompletion = TestCompletion()
83-
sut.add(Completion: secondCompletion.closure)
84-
sut.add(Completion: thirdCompletion.closure)
83+
sut.add(completion: secondCompletion.closure)
84+
sut.add(completion: thirdCompletion.closure)
8585

8686
Animator.perform(configuration: sut)
8787

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# ChainedAnimation
22

3-
[![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)
3+
[![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)
44

55
## Usage
66

0 commit comments

Comments
 (0)