Skip to content

Commit

Permalink
update support min version OS 15 (#79)
Browse files Browse the repository at this point in the history
* update support min version OS 15

* Update PR.yml

* fix podspec file

* Update ci.yml

* Update release.yml
  • Loading branch information
imberezin authored May 22, 2024
1 parent 4bba846 commit a300a6f
Show file tree
Hide file tree
Showing 6 changed files with 62 additions and 63 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/PR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,13 @@ concurrency:
jobs:
build:
environment: PR
runs-on: macos-latest
runs-on: macos-13

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Updating Cocoapods
run: gem install cocoapods

- name: Updating CocoaPods repo
run: pod repo update
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,13 @@ concurrency:

jobs:
build:
runs-on: macos-latest
runs-on: macOS-13

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Updating Cocoapods
run: gem install cocoapods

- name: Updating CocoaPods repo
run: pod repo update
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ on:
jobs:

TAGGING:
runs-on: macos-latest
runs-on: macos-13
environment: Tag
outputs:
output1: ${{ steps.tagging.outputs.tag }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Switching Podspec to release mode
run: |
Expand All @@ -24,13 +24,16 @@ jobs:
GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} sh .github/tag.sh
PODS_PUSH:
runs-on: macos-latest
runs-on: macos-13
environment: CocoaPods
needs: TAGGING

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: git pull

- name: Updating Cocoapods
run: gem install cocoapods

- name: Updating CocoaPods repo
run: pod repo update
Expand Down
77 changes: 31 additions & 46 deletions KalturaPlayer.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -5,124 +5,109 @@ suffix = '.0000' # Dev mode
Pod::Spec.new do |s|

s.name = 'KalturaPlayer'
s.version = '4.9.0' + suffix
s.version = '4.9.1' + suffix
s.summary = 'KalturaPlayer -- Kaltura Player for iOS and tvOS'
s.homepage = 'https://github.com/kaltura/kaltura-player-ios'
s.license = { :type => 'AGPLv3', :file => 'LICENSE' }
s.author = { 'Kaltura' => '[email protected]' }
s.source = { :git => 'https://github.com/kaltura/kaltura-player-ios.git', :tag => 'v' + s.version.to_s }
s.swift_version = '5.0'

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

s.subspec 'Interceptor' do |sp|
sp.source_files = 'Sources/Interceptor/*'

sp.dependency 'PlayKit', '~> 3.28'
sp.dependency 'PlayKit', '~> 3.30'
end

s.xcconfig = {
### The following is required for Xcode 12 (https://stackoverflow.com/questions/63607158/xcode-12-building-for-ios-simulator-but-linking-in-object-file-built-for-ios)
'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64'
}
# Fix pod lint error: could not find module for target 'arm64-apple-ios-simulator'
# This error indicates that a pod dependency in your project doesn't have a compiled version for the arm64 architecture of the iOS simulator.
# This is because Apple Silicon Macs (M1, M2, etc.) use arm64 architecture, while Intel Macs use x86_64.
# see: https://stackoverflow.com/a/63955114/1571228
s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }


################################################################

s.subspec 'Core' do |sp|
sp.ios.deployment_target = '10.0'
sp.tvos.deployment_target = '10.0'
sp.ios.deployment_target = '15.0'
sp.tvos.deployment_target = '15.0'

sp.source_files = 'Sources/*', 'Sources/Basic/*', 'Sources/Playlist/*'

sp.dependency 'KalturaPlayer/Interceptor'
end

s.subspec 'OTT' do |sp|
s.subspec 'OTT' do |sp|
sp.source_files = 'Sources/OTT/*', 'Sources/Common'
sp.resources = 'Sources/OTT/*.xcdatamodeld'

sp.dependency 'KalturaPlayer/Core'
sp.dependency 'PlayKitProviders', '~> 1.18'
sp.dependency 'PlayKitKava', '~> 1.10'
sp.dependency 'PlayKitProviders', '~> 1.19'
sp.dependency 'PlayKitKava', '~> 1.11'
end

s.subspec 'OVP' do |sp|
sp.source_files = 'Sources/OVP/*', 'Sources/Common'
sp.resources = 'Sources/OVP/*.xcdatamodeld'

sp.dependency 'KalturaPlayer/Core'
sp.dependency 'PlayKitProviders', '~> 1.18'
sp.dependency 'PlayKitKava', '~> 1.10'
sp.dependency 'PlayKitProviders', '~> 1.19'
sp.dependency 'PlayKitKava', '~> 1.11'
end

################################################################

### Offline Supported only in iOS ###
################################################################

s.subspec 'Offline' do |sp|
sp.ios.deployment_target = '10.0'
sp.ios.deployment_target = '15.0'

sp.source_files = 'Sources/Offline/*', 'Sources/*', 'Sources/Basic/*', 'Sources/Interceptor/*', 'Sources/Playlist/*'

sp.dependency 'DownloadToGo', '~> 3.18'
sp.dependency 'PlayKit', '~> 3.28'

sp.xcconfig = {
### The following is required for Xcode 12 (https://stackoverflow.com/questions/63607158/xcode-12-building-for-ios-simulator-but-linking-in-object-file-built-for-ios)
'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64'
}

sp.dependency 'DownloadToGo', '~> 3.20.0'
sp.dependency 'PlayKit', '~> 3.30'
end

s.subspec 'Offline_OTT' do |sp|
sp.ios.deployment_target = '10.0'
s.subspec 'Offline_OTT' do |sp|
sp.ios.deployment_target = '15.0'

sp.source_files = 'Sources/Offline/OTT/*', 'Sources/OTT/*', 'Sources/Common'
sp.resources = 'Sources/OTT/*.xcdatamodeld'

sp.dependency 'KalturaPlayer/Offline'
sp.dependency 'PlayKitProviders', '~> 1.18'
sp.dependency 'PlayKitKava', '~> 1.10'

sp.xcconfig = {
### The following is required for Xcode 12 (https://stackoverflow.com/questions/63607158/xcode-12-building-for-ios-simulator-but-linking-in-object-file-built-for-ios)
'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64'
}

sp.dependency 'PlayKitProviders', '~> 1.19'
sp.dependency 'PlayKitKava', '~> 1.11'
end

s.subspec 'Offline_OVP' do |sp|
sp.ios.deployment_target = '10.0'
sp.ios.deployment_target = '15.0'

sp.source_files = 'Sources/Offline/OVP/*', 'Sources/OVP/*', 'Sources/Common'
sp.resources = 'Sources/OVP/*.xcdatamodeld'

sp.dependency 'KalturaPlayer/Offline'
sp.dependency 'PlayKitProviders', '~> 1.18'
sp.dependency 'PlayKitKava', '~> 1.10'

sp.xcconfig = {
### The following is required for Xcode 12 (https://stackoverflow.com/questions/63607158/xcode-12-building-for-ios-simulator-but-linking-in-object-file-built-for-ios)
'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64'
}

sp.dependency 'PlayKitProviders', '~> 1.19'
sp.dependency 'PlayKitKava', '~> 1.11'
end

################################################################
### UI for iOS ###
################################################################

s.subspec 'UI' do |sp|
sp.ios.deployment_target = '10.0'
sp.ios.deployment_target = '15.0'

sp.source_files = 'Sources/UI/*'
sp.resources = [ 'Sources/UI/Assets/*']

sp.dependency 'KalturaPlayer/Core'

end

################################################################

s.default_subspec = 'Core'
Expand Down
2 changes: 1 addition & 1 deletion iOSTestApp/Podfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Uncomment the next line to define a global platform for your project
platform :ios, '10.0'
platform :ios, '15.0'

target 'iOSTestApp' do
# Comment the next line if you don't want to use dynamic frameworks
Expand Down
21 changes: 13 additions & 8 deletions iOSTestApp/iOSTestApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 51;
objectVersion = 54;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -175,8 +175,9 @@
D205382E2435D85E000A2008 /* Project object */ = {
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = YES;
LastSwiftUpdateCheck = 1130;
LastUpgradeCheck = 1130;
LastUpgradeCheck = 1520;
ORGANIZATIONNAME = "Kaltura Inc.";
TargetAttributes = {
D20538352435D85E000A2008 = {
Expand Down Expand Up @@ -365,6 +366,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand All @@ -375,6 +377,7 @@
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
Expand All @@ -389,7 +392,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
Expand Down Expand Up @@ -425,6 +428,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand All @@ -435,6 +439,7 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand All @@ -443,7 +448,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = iphoneos;
Expand All @@ -461,7 +466,7 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = X8RDCFJK95;
INFOPLIST_FILE = iOSTestApp/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -481,7 +486,7 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = X8RDCFJK95;
INFOPLIST_FILE = iOSTestApp/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -502,7 +507,7 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = X8RDCFJK95;
INFOPLIST_FILE = iOSTestAppTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.2;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -525,7 +530,7 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = X8RDCFJK95;
INFOPLIST_FILE = iOSTestAppTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.2;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down

0 comments on commit a300a6f

Please sign in to comment.