Skip to content

Commit

Permalink
Updated to Swift 4.2 / Xcode 10 and fixed an issue with Live TV channels
Browse files Browse the repository at this point in the history
  • Loading branch information
4np committed Oct 21, 2018
1 parent dd4bc5a commit 178d4b3
Show file tree
Hide file tree
Showing 40 changed files with 1,035 additions and 1,570 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: objective-c
os: osx
osx_image: xcode9.4
osx_image: xcode10
env:
global:
- NSUnbufferedIO=YES
Expand All @@ -15,4 +15,4 @@ script:
- xcpretty -v
- swiftlint version
- swiftlint
- xcodebuild -workspace "TVGemist.xcworkspace" -scheme "TVGemist" -sdk "appletvsimulator11.4" -destination "platform=tvOS Simulator,OS=11.0,name=Apple TV 1080p" -configuration Release clean build ONLY_ACTIVE_ARCH=NO CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO RUN_CLANG_STATIC_ANALYZER=YES|xcpretty -c
- xcodebuild -workspace "TVGemist.xcworkspace" -scheme "TVGemist" -sdk "appletvsimulator12.0" -destination "platform=tvOS Simulator,OS=11.0,name=Apple TV 1080p" -configuration Release clean build ONLY_ACTIVE_ARCH=NO CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO RUN_CLANG_STATIC_ANALYZER=YES|xcpretty -c
4 changes: 2 additions & 2 deletions INSTALLATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ Unfortunately the app cannot be distributed in the AppStore as the NPO does not
## Prerequisites:

- an Apple TV 4th or 5th generation (the ones that have an AppStore)
- run tvOS 10 or 11
- run tvOS 12
- a recent Apple Computer running macOS 10.11.x El Capitan or higher
- a (free) Apple Developer account (signup here)

_Note: as of summer 2016 Apple has reduced the free Developer account provisioning from 90 days to a mere 7 days. This means when you are using a free Apple Developer Account the application will expire every 7 days after which you need to re-deploy the app (make sure to keep your bundle identifier the same for your favorites to stick). The premium Apple Developer Accounts do not have a time based limitation and deployed apps will continue to work during the lifetime of your subscription._

## 1. Xcode

Make sure you have [Xcode 9.3](https://itunes.apple.com/nl/app/xcode/id497799835) ([alternative link](https://developer.apple.com/download/more/)) installed. Continue with the following steps when you have finished installing ```Xcode``` as the next steps require a finished installation.
Make sure you have [Xcode 10](https://itunes.apple.com/nl/app/xcode/id497799835) ([alternative link](https://developer.apple.com/download/more/)) installed. Continue with the following steps when you have finished installing ```Xcode``` as the next steps require a finished installation.

## 2. Download the project

Expand Down
10 changes: 5 additions & 5 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@ abstract_target 'TVGemistAbstract' do
pod 'SwiftLint'

target 'TVGemist' do
platform :tvos, '11.0'
platform :tvos, '12.0'

#pod 'NPOKit', :path => '../NPOKit'
#pod 'GHKit', :path => '../GHKit'

pod 'NPOKit', :git => 'https://github.com/4np/NPOKit.git', :tag => '0.0.9'
pod 'GHKit', :git => 'https://github.com/4np/GHKit.git', :tag => '0.0.3'
pod 'NPOKit', :git => 'https://github.com/4np/NPOKit.git', :tag => '1.0.0'
pod 'GHKit', :git => 'https://github.com/4np/GHKit.git', :tag => '0.0.4'
end

post_install do |installer|
installer.pods_project.targets.each do |target|
print "Setting #{target}'s SWIFT_VERSION to 4.1.2\n"
print "Setting #{target}'s SWIFT_VERSION to 4.2.0\n"
target.build_configurations.each do |config|
config.build_settings['SWIFT_VERSION'] = '4.1.2'
config.build_settings['SWIFT_VERSION'] = '4.2.0'
end
end
end
Expand Down
40 changes: 20 additions & 20 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
PODS:
- GHKit (0.0.3):
- GHKit/Core (= 0.0.3)
- GHKit/Core (0.0.3)
- NPOKit (0.0.9)
- GHKit (0.0.4):
- GHKit/Core (= 0.0.4)
- GHKit/Core (0.0.4)
- NPOKit (1.0.0)
- ObjcExceptionBridging (1.0.1):
- ObjcExceptionBridging/ObjcExceptionBridging (= 1.0.1)
- ObjcExceptionBridging/ObjcExceptionBridging (1.0.1)
- SwiftLint (0.26.0)
- XCGLogger (6.0.4):
- XCGLogger/Core (= 6.0.4)
- XCGLogger/Core (6.0.4):
- SwiftLint (0.27.0)
- XCGLogger (6.1.0):
- XCGLogger/Core (= 6.1.0)
- XCGLogger/Core (6.1.0):
- ObjcExceptionBridging

DEPENDENCIES:
- GHKit (from `https://github.com/4np/GHKit.git`, tag `0.0.3`)
- NPOKit (from `https://github.com/4np/NPOKit.git`, tag `0.0.9`)
- GHKit (from `https://github.com/4np/GHKit.git`, tag `0.0.4`)
- NPOKit (from `https://github.com/4np/NPOKit.git`, tag `1.0.0`)
- SwiftLint
- XCGLogger

Expand All @@ -27,26 +27,26 @@ SPEC REPOS:
EXTERNAL SOURCES:
GHKit:
:git: https://github.com/4np/GHKit.git
:tag: 0.0.3
:tag: 0.0.4
NPOKit:
:git: https://github.com/4np/NPOKit.git
:tag: 0.0.9
:tag: 1.0.0

CHECKOUT OPTIONS:
GHKit:
:git: https://github.com/4np/GHKit.git
:tag: 0.0.3
:tag: 0.0.4
NPOKit:
:git: https://github.com/4np/NPOKit.git
:tag: 0.0.9
:tag: 1.0.0

SPEC CHECKSUMS:
GHKit: 581d518e05fdae0a10ea296cb5ff2dd90649da17
NPOKit: 302eb863d758d2f395ee4f5e138e848819ba5458
GHKit: 36b8c1b53a43d612be7f71e24bd82548993e6491
NPOKit: 258ef16b199db356e149bcb7b6a809b47ae116c1
ObjcExceptionBridging: c30e00eb3700467e695faeea30e26e18bd445001
SwiftLint: f6b83e8d95ee1e91e11932d843af4fdcbf3fc764
XCGLogger: 4fc1bc0bdd5828cb8dc8da7a843536cda1bea8f3
SwiftLint: 3207c1faa2240bf8973b191820a116113cd11073
XCGLogger: 7f7f43f15dfe3a305fa1342b7dc29af656289abd

PODFILE CHECKSUM: 625128dd5835f831307226f6a4fac69d7cba9d52
PODFILE CHECKSUM: 349465ff848db93be0f44ea0647d4774a3df73e6

COCOAPODS: 1.5.3
COCOAPODS: 1.6.0.beta.1
2 changes: 1 addition & 1 deletion Pods/GHKit/Sources/GHKit/GHKit.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions Pods/Local Podspecs/GHKit.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions Pods/Local Podspecs/NPOKit.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 20 additions & 20 deletions Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Pods/NPOKit/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Pods/NPOKit/Sources/NPOKit/NPOKit.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 178d4b3

Please sign in to comment.