Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
Anton Aleksandrov committed Feb 27, 2017
2 parents 8b06867 + 17c71db commit e18d620
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 11 deletions.
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.4.0
5 changes: 5 additions & 0 deletions .slather.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
coverage_service: coveralls
xcodeproj: BluemixObjectStorage.xcodeproj
scheme: BluemixObjectStorage
ignore:
- Tests/*
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.1
3.0.2
16 changes: 14 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -23,10 +23,22 @@ 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:
- swift build --clean # clean built artifacts if present
- 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
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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)
]
)
9 changes: 2 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit e18d620

Please sign in to comment.