From 5b204996ca53d6f27b2c066f3bb7f869487736c5 Mon Sep 17 00:00:00 2001 From: Anton Aleksandrov Date: Sun, 26 Feb 2017 22:41:12 -0600 Subject: [PATCH 1/2] Updated to Swift 3.0.2 --- .swift-version | 2 +- .travis.yml | 16 ++++++++++++++-- Package.swift | 2 +- README.md | 9 ++------- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.swift-version b/.swift-version index cb2b00e..b502146 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -3.0.1 +3.0.2 diff --git a/.travis.yml b/.travis.yml index ca3628a..07c4dc9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,13 +4,13 @@ os: language: generic env: global: - - SWIFT_VERSION=3.0.1 + - SWIFT_VERSION=3.0.2 sudo: required dist: trusty -osx_image: xcode8 +osx_image: xcode8.2 notifications: email: @@ -23,6 +23,9 @@ install: sudo apt-get install -y libcurl4-openssl-dev libblocksruntime-dev libkqueue-dev libpthread-workqueue-dev libbsd-dev; sudo rm /usr/bin/ld && sudo ln -s /usr/bin/ld.gold /usr/bin/ld; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then + gem install slather; + fi - git --version script: @@ -30,3 +33,12 @@ script: - swift package fetch # clones all dependencies - swift build # build project - swift test #run tests + +after_success: + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then + swift package generate-xcodeproj; + slather setup BluemixObjectStorage.xcodeproj + xcodebuild -project BluemixObjectStorage.xcodeproj -scheme BluemixObjectStorage build; + xcodebuild -project BluemixObjectStorage.xcodeproj -scheme BluemixObjectStorage -enableCodeCoverage YES test; + slather coverage --coveralls --binary-basename BluemixObjectStorage.framework -v; + fi diff --git a/Package.swift b/Package.swift index 690e584..f5ec4a2 100644 --- a/Package.swift +++ b/Package.swift @@ -16,6 +16,6 @@ import PackageDescription let package = Package( name: "BluemixObjectStorage", dependencies: [ - .Package(url: "https://github.com/ibm-bluemix-mobile-services/bluemix-simple-http-client-swift.git", majorVersion: 0, minor: 5) + .Package(url: "https://github.com/ibm-bluemix-mobile-services/bluemix-simple-http-client-swift.git", majorVersion: 0, minor: 6) ] ) diff --git a/README.md b/README.md index 42e0129..db98ed2 100644 --- a/README.md +++ b/README.md @@ -11,17 +11,12 @@ import PackageDescription let package = Package( dependencies: [ - .Package(url: "https://github.com/ibm-bluemix-mobile-services/bluemix-objectstorage-serversdk-swift.git", majorVersion: 0, minor: 6) + .Package(url: "https://github.com/ibm-bluemix-mobile-services/bluemix-objectstorage-serversdk-swift.git", majorVersion: 0, minor: 7) ] ) ``` -* 0.6.x releases were tested on OSX and Linux with 3.0.1 -* 0.6.x releases were tested on OSX and Linux with DEVELOPMENT-SNAPSHOT-2016-09-07-a -* 0.5.x releases were tested on OSX and Linux with DEVELOPMENT-SNAPSHOT-2016-06-20-a -* 0.4.x releases were tested on OSX and Linux with DEVELOPMENT-SNAPSHOT-2016-06-06-a -* 0.3.x releases were tested on OSX and Linux with DEVELOPMENT-SNAPSHOT-2016-05-03-a -* 0.2.x releases were tested on OSX and Linux with DEVELOPMENT-SNAPSHOT-2016-04-25-a +* 0.7.x releases were tested on OSX and Linux with Swift 3.0.2 ## Usage From 17c71db22e0ef33c652f7b061586b7fd9406c4f7 Mon Sep 17 00:00:00 2001 From: Anton Aleksandrov Date: Sun, 26 Feb 2017 22:47:55 -0600 Subject: [PATCH 2/2] fixed slather --- .ruby-version | 1 + .slather.yml | 5 +++++ .travis.yml | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 .ruby-version create mode 100644 .slather.yml diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000..197c4d5 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.4.0 diff --git a/.slather.yml b/.slather.yml new file mode 100644 index 0000000..ca51681 --- /dev/null +++ b/.slather.yml @@ -0,0 +1,5 @@ +coverage_service: coveralls +xcodeproj: BluemixObjectStorage.xcodeproj +scheme: BluemixObjectStorage +ignore: + - Tests/* diff --git a/.travis.yml b/.travis.yml index 07c4dc9..04e3126 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ script: after_success: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then swift package generate-xcodeproj; - slather setup BluemixObjectStorage.xcodeproj + slather setup BluemixObjectStorage.xcodeproj; xcodebuild -project BluemixObjectStorage.xcodeproj -scheme BluemixObjectStorage build; xcodebuild -project BluemixObjectStorage.xcodeproj -scheme BluemixObjectStorage -enableCodeCoverage YES test; slather coverage --coveralls --binary-basename BluemixObjectStorage.framework -v;