Skip to content

Commit

Permalink
Merge branch 'release/v3.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Hout committed Jan 23, 2016
2 parents ceae3c2 + 442d435 commit 365a374
Show file tree
Hide file tree
Showing 64 changed files with 9,789 additions and 3,469 deletions.
104 changes: 104 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,107 @@ DerivedData
MoneyNetwork.xcodeproj/xcuserdata
#Breakpoints_v2.xcbkptlist
xcschememanagement.plist
Pods/Manifest.lock
Pods/Headers/Private/Nimble/DSL.h
Pods/Headers/Private/Nimble/Nimble.h
Pods/Headers/Private/Nimble/NMBExceptionCapture.h
Pods/Headers/Private/Quick/NSString+QCKSelectorName.h
Pods/Headers/Private/Quick/QCKDSL.h
Pods/Headers/Private/Quick/Quick.h
Pods/Headers/Private/Quick/QuickConfiguration.h
Pods/Headers/Private/Quick/QuickSpec.h
Pods/Headers/Private/Quick/World+DSL.h
Pods/Headers/Private/Quick/World.h
Pods/Nimble/LICENSE.md
Pods/Nimble/README.md
Pods/Nimble/Nimble/DSL+Wait.swift
Pods/Nimble/Nimble/DSL.swift
Pods/Nimble/Nimble/Expectation.swift
Pods/Nimble/Nimble/Expression.swift
Pods/Nimble/Nimble/FailureMessage.swift
Pods/Nimble/Nimble/Nimble.h
Pods/Nimble/Nimble/ObjCExpectation.swift
Pods/Nimble/Nimble/Adapters/AdapterProtocols.swift
Pods/Nimble/Nimble/Adapters/AssertionDispatcher.swift
Pods/Nimble/Nimble/Adapters/AssertionRecorder.swift
Pods/Nimble/Nimble/Adapters/NimbleXCTestHandler.swift
Pods/Nimble/Nimble/Matchers/AllPass.swift
Pods/Nimble/Nimble/Matchers/BeAKindOf.swift
Pods/Nimble/Nimble/Matchers/BeAnInstanceOf.swift
Pods/Nimble/Nimble/Matchers/BeCloseTo.swift
Pods/Nimble/Nimble/Matchers/BeEmpty.swift
Pods/Nimble/Nimble/Matchers/BeginWith.swift
Pods/Nimble/Nimble/Matchers/BeGreaterThan.swift
Pods/Nimble/Nimble/Matchers/BeGreaterThanOrEqualTo.swift
Pods/Nimble/Nimble/Matchers/BeIdenticalTo.swift
Pods/Nimble/Nimble/Matchers/BeLessThan.swift
Pods/Nimble/Nimble/Matchers/BeLessThanOrEqual.swift
Pods/Nimble/Nimble/Matchers/BeLogical.swift
Pods/Nimble/Nimble/Matchers/BeNil.swift
Pods/Nimble/Nimble/Matchers/Contain.swift
Pods/Nimble/Nimble/Matchers/EndWith.swift
Pods/Nimble/Nimble/Matchers/Equal.swift
Pods/Nimble/Nimble/Matchers/HaveCount.swift
Pods/Nimble/Nimble/Matchers/Match.swift
Pods/Nimble/Nimble/Matchers/MatcherProtocols.swift
Pods/Nimble/Nimble/Matchers/RaisesException.swift
Pods/Nimble/Nimble/Matchers/ThrowError.swift
Pods/Nimble/Nimble/objc/DSL.h
Pods/Nimble/Nimble/objc/DSL.m
Pods/Nimble/Nimble/objc/NMBExceptionCapture.h
Pods/Nimble/Nimble/objc/NMBExceptionCapture.m
Pods/Nimble/Nimble/Utils/Functional.swift
Pods/Nimble/Nimble/Utils/Poll.swift
Pods/Nimble/Nimble/Utils/SourceLocation.swift
Pods/Nimble/Nimble/Utils/Stringers.swift
Pods/Nimble/Nimble/Wrappers/AsyncMatcherWrapper.swift
Pods/Nimble/Nimble/Wrappers/MatcherFunc.swift
Pods/Nimble/Nimble/Wrappers/ObjCMatcher.swift
Pods/Pods.xcodeproj/project.pbxproj
Pods/Quick/LICENSE
Pods/Quick/README.md
Pods/Quick/Quick/Callsite.swift
Pods/Quick/Quick/Example.swift
Pods/Quick/Quick/ExampleGroup.swift
Pods/Quick/Quick/ExampleMetadata.swift
Pods/Quick/Quick/Filter.swift
Pods/Quick/Quick/NSString+QCKSelectorName.h
Pods/Quick/Quick/NSString+QCKSelectorName.m
Pods/Quick/Quick/Quick.h
Pods/Quick/Quick/QuickSpec.h
Pods/Quick/Quick/QuickSpec.m
Pods/Quick/Quick/World.h
Pods/Quick/Quick/World.swift
Pods/Quick/Quick/Configuration/Configuration.swift
Pods/Quick/Quick/Configuration/QuickConfiguration.h
Pods/Quick/Quick/Configuration/QuickConfiguration.m
Pods/Quick/Quick/DSL/DSL.swift
Pods/Quick/Quick/DSL/QCKDSL.h
Pods/Quick/Quick/DSL/QCKDSL.m
Pods/Quick/Quick/DSL/World+DSL.h
Pods/Quick/Quick/DSL/World+DSL.swift
Pods/Quick/Quick/Hooks/Closures.swift
Pods/Quick/Quick/Hooks/ExampleHooks.swift
Pods/Quick/Quick/Hooks/SuiteHooks.swift
Pods/Target Support Files/Nimble/Info.plist
Pods/Target Support Files/Nimble/Nimble-dummy.m
Pods/Target Support Files/Nimble/Nimble-prefix.pch
Pods/Target Support Files/Nimble/Nimble-umbrella.h
Pods/Target Support Files/Nimble/Nimble.modulemap
Pods/Target Support Files/Nimble/Nimble.xcconfig
Pods/Target Support Files/Pods/Info.plist
Pods/Target Support Files/Pods/Pods-acknowledgements.markdown
Pods/Target Support Files/Pods/Pods-acknowledgements.plist
Pods/Target Support Files/Pods/Pods-dummy.m
Pods/Target Support Files/Pods/Pods-frameworks.sh
Pods/Target Support Files/Pods/Pods-resources.sh
Pods/Target Support Files/Pods/Pods-umbrella.h
Pods/Target Support Files/Pods/Pods.debug.xcconfig
Pods/Target Support Files/Pods/Pods.modulemap
Pods/Target Support Files/Pods/Pods.release.xcconfig
Pods/Target Support Files/Quick/Info.plist
Pods/Target Support Files/Quick/Quick-dummy.m
Pods/Target Support Files/Quick/Quick-prefix.pch
Pods/Target Support Files/Quick/Quick-umbrella.h
Pods/Target Support Files/Quick/Quick.modulemap
Pods/Target Support Files/Quick/Quick.xcconfig
32 changes: 16 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
sudo: required
osx_image: xcode7.1
language: swift
# .travis.yml

before_install:

- export LANG=en_US.UTF-8
- env
- locale
- gem install cocoapods --quiet
- pod --version
- pod setup --silent
- pod repo update --silent
# references:
# * http://www.objc.io/issue-6/travis-ci.html
# * https://github.com/supermarin/xcpretty#usage

osx_image: xcode7.2
language: objective-c
cache: cocoapods
before_install:
- export LANG=en_US.UTF-8
- env
- locale
- gem install cocoapods xcpretty # Since Travis is not always on latest version
- pod --version
- pod update
script:

- pod lib lint

- xctool -project SwiftDate.xcodeproj -scheme 'SwiftDate'
- set -o pipefail && xcodebuild test -workspace SwiftDate.xcworkspace -scheme SwiftDateTests -configuration Debug -destination "platform=iOS Simulator,name=iPhone 5s,OS=9.0" -destination "platform=iOS Simulator,name=iPhone 6s plus,OS=9.2" ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES | xcpretty -c
- pod lib lint
Loading

0 comments on commit 365a374

Please sign in to comment.