Skip to content

Commit

Permalink
update player to support minimum version 15 (#478)
Browse files Browse the repository at this point in the history
* update player to support minimum version 15

* Update pr.yml - update release test destination ios version and devices

* update newAccessLogEntryNotification notification name (need
  • Loading branch information
imberezin authored May 8, 2024
1 parent 12606da commit c742d9e
Show file tree
Hide file tree
Showing 19 changed files with 39 additions and 39 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ concurrency:
jobs:
build:
name: "CocoaPods linting"
runs-on: macOS-12
runs-on: macOS-13

steps:
- uses: actions/checkout@v3
Expand All @@ -35,20 +35,20 @@ jobs:

SPM:
name: "Build SPM"
runs-on: macOS-12
runs-on: macOS-13

strategy:
fail-fast: false
matrix:
include:
- destination: "OS=16.2,name=iPhone 14 Pro"
- destination: "OS=17.2,name=iPhone 15"
name: "iOS"
scheme: "PlayKit-Package"
- destination: "OS=16.0,name=Apple TV"
- destination: "OS=17.2,name=Apple TV"
name: "tvOS"
scheme: "PlayKit-Package"
steps:
- uses: actions/checkout@v3
- name: ${{ matrix.name }}
run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -scheme "${{ matrix.scheme }}" -destination "${{ matrix.destination }}" clean test | xcpretty
run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild docbuild -scheme "${{ matrix.scheme }}" -destination "${{ matrix.destination }}" clean test | xcpretty

2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
fail-fast: false
matrix:
include:
- destination: "OS=17.0,name=iPhone 14 Pro"
- destination: "OS=17.2,name=iPhone 15"
name: "iOS"
scheme: "PlayKit-Package"
- destination: "OS=17.0,name=Apple TV"
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,26 @@ jobs:
SPM:
name: "Build SPM"
environment: Tag
runs-on: macOS-12
runs-on: macos-latest

strategy:
fail-fast: false
matrix:
include:
- destination: "OS=16.2,name=iPhone 14 Pro"
- destination: "OS=17.2,name=iPhone 15"
name: "iOS"
scheme: "PlayKit-Package"
- destination: "OS=16.0,name=Apple TV"
- destination: "OS=17.2,name=Apple TV"
name: "tvOS"
scheme: "PlayKit-Package"
steps:
- uses: actions/checkout@v3
- name: ${{ matrix.name }}
run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -scheme "${{ matrix.scheme }}" -destination "${{ matrix.destination }}" clean test | xcpretty
run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild docbuild -scheme "${{ matrix.scheme }}" -destination "${{ matrix.destination }}" clean test | xcpretty

TAGGING:
name: "Add Git Tag"
runs-on: macOS-12
runs-on: macos-latest
environment: Tag
needs: SPM

Expand All @@ -48,7 +48,7 @@ jobs:
PODS_PUSH:
name: "CocoaPods push"
runs-on: macOS-12
runs-on: macos-latest
environment: CocoaPods
needs: TAGGING

Expand Down
2 changes: 1 addition & 1 deletion Classes/FairPlayDRM/FPSContentKeySessionDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// ===================================================================================================

import AVFoundation
import SwiftyJSON
import kSwiftyJSON

#if os(iOS)
@available(iOS 10.3, *)
Expand Down
2 changes: 1 addition & 1 deletion Classes/FairPlayDRM/FPSLicenseHelper.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

import Foundation
import AVFoundation
import SwiftyJSON
import kSwiftyJSON

import PlayKitUtils

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ extension AVPlayerEngine {
NotificationCenter.default.addObserver(self, selector: #selector(self.didFailToPlayToEndTime(_:)), name: .AVPlayerItemFailedToPlayToEndTime, object: self.currentItem)
NotificationCenter.default.addObserver(self, selector: #selector(self.didPlayToEndTime(_:)), name: .AVPlayerItemDidPlayToEndTime, object: self.currentItem)
NotificationCenter.default.addObserver(self, selector: #selector(self.onAccessLogEntryNotification), name: .AVPlayerItemNewAccessLogEntry, object: self.currentItem)
NotificationCenter.default.addObserver(self, selector: #selector(self.onErrorLogEntryNotification), name: .AVPlayerItemNewErrorLogEntry, object: self.currentItem)
NotificationCenter.default.addObserver(self, selector: #selector(self.onErrorLogEntryNotification), name: AVPlayerItem.newAccessLogEntryNotification, object: self.currentItem)
NotificationCenter.default.addObserver(self, selector: #selector(self.onPlaybackStalledNotification), name: .AVPlayerItemPlaybackStalled, object: self.currentItem)
NotificationCenter.default.addObserver(self, selector: #selector(self.timebaseChanged), name: Notification.Name(kCMTimebaseNotification_EffectiveRateChanged as String), object: nil)
}
Expand Down
2 changes: 1 addition & 1 deletion Classes/Player/Media/PKMediaEntry.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// ===================================================================================================

import UIKit
import SwiftyJSON
import kSwiftyJSON

@objc public enum MediaType: Int, CustomStringConvertible {
case dvrLive
Expand Down
2 changes: 1 addition & 1 deletion Classes/Player/Media/PKMediaSource.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// ===================================================================================================

import Foundation
import SwiftyJSON
import kSwiftyJSON

fileprivate let idKey: String = "id"
fileprivate let contentUrlKey: String = "url"
Expand Down
2 changes: 1 addition & 1 deletion Classes/Player/Playlist/PKPlaylist.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//

import Foundation
import SwiftyJSON
import kSwiftyJSON

fileprivate let idKey = "id"
fileprivate let nameKey = "name"
Expand Down
2 changes: 1 addition & 1 deletion Classes/Providers/Mock/MockMediaProvider.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// ===================================================================================================

import UIKit
import SwiftyJSON
import kSwiftyJSON

@objc public class MockMediaEntryProvider: NSObject, MediaEntryProvider {

Expand Down
2 changes: 1 addition & 1 deletion Example/Tests/Analytics/OTTAnalyticsPluginTest.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import Foundation
import Quick
import Nimble
import SwiftyJSON
import kSwiftyJSON
import CoreMedia
@testable import PlayKit

Expand Down
2 changes: 1 addition & 1 deletion Example/Tests/Basic/MessageBusTest.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

import XCTest
import PlayKit
import SwiftyJSON
import kSwiftyJSON
import AVFoundation

class MessageBusTest: XCTestCase {
Expand Down
2 changes: 1 addition & 1 deletion Example/Tests/Basic/PlayerControllerTest.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

import XCTest
import PlayKit
import SwiftyJSON
import kSwiftyJSON
import CoreMedia

//Unit test to check the player controller
Expand Down
2 changes: 1 addition & 1 deletion Example/Tests/Basic/PlayerCreator.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import XCTest
import Foundation
import Quick
import SwiftyJSON
import kSwiftyJSON
@testable import PlayKit

enum PlayerCreationError: Error {
Expand Down
2 changes: 1 addition & 1 deletion Example/Tests/Basic/TracksTest.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

import XCTest
import PlayKit
import SwiftyJSON
import kSwiftyJSON

class TracksTest: XCTestCase {
var player : Player!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import UIKit
import XCTest
import PlayKit
import SwiftyJSON
import kSwiftyJSON

class MockMediaProviderTest: XCTestCase {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import Quick
import Nimble
@testable import PlayKit
@testable import KalturaNetKit
import SwiftyJSON
import kSwiftyJSON

class KalturaRequestBuilderTest: QuickSpec {

Expand Down
10 changes: 5 additions & 5 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@ let package = Package(
.library(name: "AnalyticsCommon",
targets: ["AnalyticsCommon"])],
dependencies: [
.package(url: "https://github.com/SwiftyJSON/SwiftyJSON.git", .upToNextMajor(from: "5.0.0")),
.package(url: "https://github.com/DaveWoodCom/XCGLogger.git", .upToNextMajor(from: "7.0.0")),
.package(url: "https://github.com/imberezin/kSwiftyJSON.git", .upToNextMajor(from: "5.0.8")),
.package(url: "https://github.com/DaveWoodCom/XCGLogger.git", .upToNextMajor(from: "7.1.5")),
.package(name: "PlayKitUtils",
url: "https://github.com/kaltura/playkit-ios-utils.git",
.upToNextMinor(from: "0.5.1")),
.upToNextMinor(from: "0.7.0")),
.package(name: "KalturaNetKit",
url: "https://github.com/kaltura/netkit-ios.git",
.upToNextMinor(from: "1.6.1")),
.upToNextMinor(from: "1.7.0")),
.package(url: "https://github.com/Quick/Quick.git", .upToNextMajor(from: "5.0.0")),
.package(url: "https://github.com/Quick/Nimble.git", .upToNextMajor(from: "9.0.0")),
],
targets: [.target(name: "PlayKit",
dependencies:
[
"SwiftyJSON",
"kSwiftyJSON",
"XCGLogger",
.product(name: "PlayKitUtils", package: "PlayKitUtils"),
.product(name: "KalturaNetKit", package: "KalturaNetKit"),
Expand Down
16 changes: 8 additions & 8 deletions PlayKit.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,27 @@ suffix = '.0000' # Dev mode
Pod::Spec.new do |s|

s.name = 'PlayKit'
s.version = '3.28.0' + suffix
s.version = '3.30.0' + suffix
s.summary = 'PlayKit: Kaltura Mobile Player SDK - iOS'
s.homepage = 'https://github.com/kaltura/playkit-ios'
s.license = { :type => 'AGPLv3', :text => 'AGPLv3' }
s.author = { 'Kaltura' => 'community@kaltura.com' }
s.source = { :git => 'https://github.com/kaltura/playkit-ios.git', :tag => 'v' + s.version.to_s }
s.swift_version = '5.0'

s.ios.deployment_target = '9.0'
s.tvos.deployment_target = '9.0'
s.ios.deployment_target = '15.0'
s.tvos.deployment_target = '15.0'

s.subspec 'Core' do |sp|
sp.source_files = 'Classes/**/*'
sp.dependency 'SwiftyJSON', '5.0.0'
sp.dependency 'XCGLogger', '7.0.0'
sp.dependency 'KalturaNetKit', '~> 1.6.1'
sp.dependency 'PlayKitUtils', '~> 0.5'
sp.dependency 'kSwiftyJSON', '5.0.8'
sp.dependency 'XCGLogger', '7.1.5'
sp.dependency 'KalturaNetKit', '~> 1.7.0'
sp.dependency 'PlayKitUtils', '~> 0.7'
end

s.subspec 'WidevineClassic' do |ssp|
ssp.ios.deployment_target = '9.0'
ssp.ios.deployment_target = '15.0'
ssp.source_files = 'Widevine'
ssp.dependency 'PlayKit/Core'
#ssp.dependency 'PlayKitWV'
Expand Down

0 comments on commit c742d9e

Please sign in to comment.