From 65d7f4fef28bf06c813e702c090c566a13dbf3cf Mon Sep 17 00:00:00 2001 From: Tom Baranes Date: Thu, 24 Nov 2016 15:10:55 +0100 Subject: [PATCH 1/4] Updating deployment target --- Diff.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Diff.podspec b/Diff.podspec index 940d91a..a23126e 100644 --- a/Diff.podspec +++ b/Diff.podspec @@ -12,7 +12,7 @@ This library generates differences between any two Collections (and Strings). It s.author = { "Wojtek Czekalski" => "me@wczekalski.com" } s.social_media_url = "https://twitter.com/wokalski" - s.platforms = { :ios => "9.0", :osx => "10.11", :tvos => "10.0", :watchos => "3.0" } + s.platforms = { :ios => "8.0", :osx => "10.10", :tvos => "9.0", :watchos => "3.0" } s.osx.exclude_files = "Sources/Diff+UIKit.swift" s.watchos.exclude_files = "Sources/Diff+UIKit.swift" From 6042678627f4fd4879ccd7a781b4cd0b2a68c6bd Mon Sep 17 00:00:00 2001 From: Tom Baranes Date: Fri, 25 Nov 2016 08:48:28 +0100 Subject: [PATCH 2/4] Add all supported os to travis --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index 26f50a3..be9c744 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,10 @@ env: - WATCHOS_SDK=watchsimulator3.1 matrix: + - DESTINATION="OS=8.1,name=iPhone 4s" SDK="$IOS_SDK" SCHEME="$SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" + - DESTINATION="OS=8.2,name=iPhone 5" SDK="$IOS_SDK" SCHEME="$SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" + - DESTINATION="OS=8.3,name=iPhone 5s" SDK="$IOS_SDK" SCHEME="$SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" + - DESTINATION="OS=8.4,name=iPhone 6" SDK="$IOS_SDK" SCHEME="$SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" - DESTINATION="OS=9.0,name=iPhone 6" SDK="$IOS_SDK" SCHEME="$SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" - DESTINATION="OS=9.1,name=iPhone 6s" SDK="$IOS_SDK" SCHEME="$SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" - DESTINATION="OS=9.2,name=iPhone 6s Plus" SDK="$IOS_SDK" SCHEME="$SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" @@ -28,6 +32,9 @@ env: - DESTINATION="arch=x86_64" SDK="$OSX_SDK" SCHEME="$SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO" + - DESTINATION="OS=9.0,name=Apple TV 1080p" SDK="$TVOS_SDK" SCHEME="$SCHEME" RUN_TESTS="NO" BUILD_EXAMPLE="NO" POD_LINT="NO" + - DESTINATION="OS=9.1,name=Apple TV 1080p" SDK="$TVOS_SDK" SCHEME="$SCHEME" RUN_TESTS="NO" BUILD_EXAMPLE="NO" POD_LINT="NO" + - DESTINATION="OS=9.2,name=Apple TV 1080p" SDK="$TVOS_SDK" SCHEME="$SCHEME" RUN_TESTS="NO" BUILD_EXAMPLE="NO" POD_LINT="NO" - DESTINATION="OS=10.0,name=Apple TV 1080p" SDK="$TVOS_SDK" SCHEME="$SCHEME" RUN_TESTS="NO" BUILD_EXAMPLE="NO" POD_LINT="NO" - DESTINATION="OS=10.1,name=Apple TV 1080p" SDK="$TVOS_SDK" SCHEME="$SCHEME" RUN_TESTS="NO" BUILD_EXAMPLE="NO" POD_LINT="NO" From 42d43a68cbb0fa7bababb41b4b501416a8313cbd Mon Sep 17 00:00:00 2001 From: Tom Baranes Date: Fri, 25 Nov 2016 10:53:10 +0100 Subject: [PATCH 3/4] Add a sleep to encounter travis timeout --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index be9c744..3b820c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,6 +51,6 @@ script: - if [ $RUN_TESTS != "YES" ]; then xcodebuild clean build -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" ONLY_ACTIVE_ARCH=NO CODE_SIGNING_REQUIRED=NO | xcpretty -c; fi - swift build - after_success: - bash <(curl -s https://codecov.io/bash) + - sleep 5 # Workaround for https://github.com/travis-ci/travis-ci/issues/4725 \ No newline at end of file From 525228fad8a95c9f659a5b46d6971b1b171325ca Mon Sep 17 00:00:00 2001 From: Tom Baranes Date: Fri, 25 Nov 2016 10:56:13 +0100 Subject: [PATCH 4/4] Add new line at the end of the travis file --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3b820c3..5e46e92 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,4 +53,4 @@ script: - swift build after_success: - bash <(curl -s https://codecov.io/bash) - - sleep 5 # Workaround for https://github.com/travis-ci/travis-ci/issues/4725 \ No newline at end of file + - sleep 5 # Workaround for https://github.com/travis-ci/travis-ci/issues/4725