From 3c66a11d32b7068a824833942871d96c38356368 Mon Sep 17 00:00:00 2001 From: Dave Weston Date: Mon, 18 May 2015 11:53:47 -0700 Subject: [PATCH 1/4] Add Travis-CI support --- .travis.yml | 16 ++++ Example Project/Podfile | 2 +- Example Project/Podfile.lock | 34 +++---- .../xcshareddata/xcschemes/SampleApp.xcscheme | 88 +++++++++++++++++++ 4 files changed, 122 insertions(+), 18 deletions(-) create mode 100644 .travis.yml create mode 100644 Example Project/ios-oauth-demo.xcodeproj/xcshareddata/xcschemes/SampleApp.xcscheme diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..2a62d44 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,16 @@ +# references: +# * http://www.objc.io/issue-6/travis-ci.html +# * https://github.com/supermarin/xcpretty#usage + +git: + language: objective-c + cache: cocoapods + podfile: Example\ Project/Podfile + before_install: + - gem install cocoapods # Since Travis is not always on latest version + - pod install --project-directory=Example\ Project + install: + - gem install xcpretty --no-rdoc --no-ri --no-document --quiet + script: + - set -o pipefail && xcodebuild test -workspace Example\ Project/ios-oauth-demo.xcworkspace -scheme SampleApp -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO | xcpretty -c + - pod lib lint --quick diff --git a/Example Project/Podfile b/Example Project/Podfile index 5c2af79..cd2f549 100644 --- a/Example Project/Podfile +++ b/Example Project/Podfile @@ -2,7 +2,7 @@ platform :ios, '7.0' target 'SampleApp' do -pod 'YammerSDK', "~> 1.0" +pod 'YammerSDK', :path => '../' end diff --git a/Example Project/Podfile.lock b/Example Project/Podfile.lock index fb8fd8c..3636211 100644 --- a/Example Project/Podfile.lock +++ b/Example Project/Podfile.lock @@ -1,27 +1,27 @@ PODS: - - AFNetworking (2.5.3): - - AFNetworking/NSURLConnection (= 2.5.3) - - AFNetworking/NSURLSession (= 2.5.3) - - AFNetworking/Reachability (= 2.5.3) - - AFNetworking/Security (= 2.5.3) - - AFNetworking/Serialization (= 2.5.3) - - AFNetworking/UIKit (= 2.5.3) - - AFNetworking/NSURLConnection (2.5.3): + - AFNetworking (2.5.4): + - AFNetworking/NSURLConnection (= 2.5.4) + - AFNetworking/NSURLSession (= 2.5.4) + - AFNetworking/Reachability (= 2.5.4) + - AFNetworking/Security (= 2.5.4) + - AFNetworking/Serialization (= 2.5.4) + - AFNetworking/UIKit (= 2.5.4) + - AFNetworking/NSURLConnection (2.5.4): - AFNetworking/Reachability - AFNetworking/Security - AFNetworking/Serialization - - AFNetworking/NSURLSession (2.5.3): + - AFNetworking/NSURLSession (2.5.4): - AFNetworking/Reachability - AFNetworking/Security - AFNetworking/Serialization - - AFNetworking/Reachability (2.5.3) - - AFNetworking/Security (2.5.3) - - AFNetworking/Serialization (2.5.3) - - AFNetworking/UIKit (2.5.3): + - AFNetworking/Reachability (2.5.4) + - AFNetworking/Security (2.5.4) + - AFNetworking/Serialization (2.5.4) + - AFNetworking/UIKit (2.5.4): - AFNetworking/NSURLConnection - AFNetworking/NSURLSession - PDKeychainBindingsController (0.0.1) - - YammerSDK (1.0): + - YammerSDK (1.1): - AFNetworking (~> 2.0) - PDKeychainBindingsController @@ -33,8 +33,8 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - AFNetworking: e1d86c2a96bb5d2e7408da36149806706ee122fe + AFNetworking: 05edc0ac4c4c8cf57bcf4b84be5b0744b6d8e71e PDKeychainBindingsController: fa8cb3cf99f2ea9240d61066ed0549f34e2cec3c - YammerSDK: cb0dd14c060d47824049b88326d59277df6289b1 + YammerSDK: 5541b79206f82d9aa1942d376a41116d3fa08032 -COCOAPODS: 0.37.0 +COCOAPODS: 0.37.1 diff --git a/Example Project/ios-oauth-demo.xcodeproj/xcshareddata/xcschemes/SampleApp.xcscheme b/Example Project/ios-oauth-demo.xcodeproj/xcshareddata/xcschemes/SampleApp.xcscheme new file mode 100644 index 0000000..84e2fb0 --- /dev/null +++ b/Example Project/ios-oauth-demo.xcodeproj/xcshareddata/xcschemes/SampleApp.xcscheme @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 68f7769d7785ed30eb78f6ea3f6697b09490f385 Mon Sep 17 00:00:00 2001 From: Dave Weston Date: Mon, 18 May 2015 12:03:07 -0700 Subject: [PATCH 2/4] Fix YAML --- .travis.yml | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2a62d44..4a17f37 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,15 +2,14 @@ # * http://www.objc.io/issue-6/travis-ci.html # * https://github.com/supermarin/xcpretty#usage -git: - language: objective-c - cache: cocoapods - podfile: Example\ Project/Podfile - before_install: - - gem install cocoapods # Since Travis is not always on latest version - - pod install --project-directory=Example\ Project - install: - - gem install xcpretty --no-rdoc --no-ri --no-document --quiet - script: - - set -o pipefail && xcodebuild test -workspace Example\ Project/ios-oauth-demo.xcworkspace -scheme SampleApp -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO | xcpretty -c - - pod lib lint --quick +language: objective-c +cache: cocoapods +podfile: Example\ Project/Podfile +before_install: +- gem install cocoapods # Since Travis is not always on latest version +- pod install --project-directory=Example\ Project +install: +- gem install xcpretty --no-rdoc --no-ri --no-document --quiet +script: +- set -o pipefail && xcodebuild test -workspace Example\ Project/ios-oauth-demo.xcworkspace -scheme SampleApp -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO | xcpretty -c +- pod lib lint --quick From 36c0e844c4a865a1119d2dd765eaebacf7e9e1a1 Mon Sep 17 00:00:00 2001 From: Dave Weston Date: Mon, 18 May 2015 12:09:15 -0700 Subject: [PATCH 3/4] Use `build` action as we don't have tests yet. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4a17f37..faed2b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,5 +11,5 @@ before_install: install: - gem install xcpretty --no-rdoc --no-ri --no-document --quiet script: -- set -o pipefail && xcodebuild test -workspace Example\ Project/ios-oauth-demo.xcworkspace -scheme SampleApp -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO | xcpretty -c +- set -o pipefail && xcodebuild build -workspace Example\ Project/ios-oauth-demo.xcworkspace -scheme SampleApp -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO | xcpretty -c - pod lib lint --quick From ec3647737a99de02588290a22a3d78579214afa0 Mon Sep 17 00:00:00 2001 From: Dave Weston Date: Mon, 18 May 2015 12:22:31 -0700 Subject: [PATCH 4/4] Update README to add travis badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8719f75..cc43a53 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ Yammer SDK and Sample iOS Application ================================= +[![CI status](http://img.shields.io/travis/yammer/ios-yammer-sdk.svg?style=flat)](https://travis-ci.org/yammer/ios-yammer-sdk) Introduction ------------