Skip to content

Commit

Permalink
Merge pull request #49 from CodaFi/scheme-a-little-scheme
Browse files Browse the repository at this point in the history
Add tvOS and watchOS Targets
  • Loading branch information
CodaFi committed Jan 4, 2016
2 parents 7caee18 + f5f4916 commit baeda0d
Show file tree
Hide file tree
Showing 7 changed files with 585 additions and 6 deletions.
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode7.1
osx_image: xcode7.2
env:
- TEST_CONFIG="RELEASE"
- TEST_CONFIG="PODS"
Expand All @@ -8,6 +8,8 @@ before_install: true
install: true
script:
- if [[ "$TEST_CONFIG" == "RELEASE" ]]; then script/cibuild Swiftx Swiftx-iOS ; fi
- if [[ "$TEST_CONFIG" == "RELEASE" ]]; then xcodebuild test -scheme Swiftx-tvOS -destination 'platform=tvOS Simulator,name=Apple TV 1080p' ; fi
- if [[ "$TEST_CONFIG" == "RELEASE" ]]; then xcodebuild build -scheme Swiftx-watchOS -destination 'platform=watchOS Simulator,name=Apple Watch - 42mm' ; fi
- if [[ "$TEST_CONFIG" == "PODS" ]]; then pod lib lint; fi

notifications:
Expand Down
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "typelift/Operadics" "0.1.4"
github "typelift/SwiftCheck" "v0.3.1"
github "typelift/SwiftCheck" "v0.4.4"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/SwiftCheck
5 changes: 3 additions & 2 deletions Swiftx.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "Swiftx"
s.version = "0.3.1"
s.version = "0.3.2"
s.summary = "Functional data types and functions for any project."
s.homepage = "https://github.com/typelift/Swiftx"
s.license = { :type => "MIT", :text => <<-LICENSE
Expand Down Expand Up @@ -33,7 +33,8 @@ Pod::Spec.new do |s|
s.requires_arc = true
s.osx.deployment_target = "10.9"
s.ios.deployment_target = "8.0"
s.framework = "XCTest"
s.tvos.deployment_target = "9.1"
s.watchos.deployment_target = "2.1"
s.source = { :git => "https://github.com/typelift/Swiftx.git", :tag => "v#{s.version}", :submodules => true }
s.source_files = "Swiftx/*.swift", "Carthage/Checkouts/Operadics/*.swift"
end
Expand Down
Loading

0 comments on commit baeda0d

Please sign in to comment.