Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add tvOS support #25

Merged
merged 6 commits into from
Jan 15, 2020
Merged

Add tvOS support #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
50cd8d7
add tvOS support
mdyson Nov 26, 2019
d506824
add tvOS to podspec and swift package
mdyson Nov 26, 2019
1d75f1f
add tvOS to top shield
mdyson Nov 26, 2019
f4bfb75
add tvOS tests to the build matrix so tests run
mdyson Nov 26, 2019
65c33ad
fix potentially mismatched dependencies for tvOS tests
mdyson Nov 26, 2019
6aa7431
remove @testable where not necessary and remove unnecessary lines fro…
mdyson Jan 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ before_script:
- swiftlint --strict
matrix:
include:
- env: NAME=Xcode DESTINATION="platform=iOS Simulator,name=iPhone 8"
- env: NAME=Xcode DESTINATION="platform=iOS Simulator,name=iPhone 8" SCHEME="Crossroad"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer to rename to Crossroad-iOS. I'll rename this after merging this.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, great! I will leave this one alone for you to change.

- env: NAME=Xcode DESTINATION="platform=tvOS Simulator,name=Apple TV 4K" SCHEME="Crossroad-tvOS"
script:
- xcodebuild test -project Crossroad.xcodeproj -scheme Crossroad -destination "${DESTINATION}"
- xcodebuild test -project Crossroad.xcodeproj -scheme "${SCHEME}" -destination "${DESTINATION}"
2 changes: 1 addition & 1 deletion Crossroad.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Pod::Spec.new do |s|
s.license = { :type => "MIT", :file => "LICENSE" }
s.author = { "giginet" => "[email protected]" }
s.social_media_url = "http://twitter.com/giginet"
s.platform = :ios, "9.0"
s.platforms = { :ios => "9.0", :tvos => "9.0" }
s.source = { :git => "https://github.com/giginet/Crossroad.git", :tag => "#{s.version}" }
s.source_files = "Sources/Crossroad/**/*.{h,swift}"
s.requires_arc = true
Expand Down
Loading