Skip to content

Release/2.1.1 #94

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

Merged
merged 8 commits into from
Aug 5, 2020
Merged

Release/2.1.1 #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f5ca037
Merge pull request #88 from Comcast/release/2.2.0
dcoufal Apr 20, 2020
56a03fd
• Applied workaround for static libs for swift/objc projects suggeste…
Apr 22, 2020
37ecf29
Merge pull request #89 from Angel-Cortez/static-lib-generation-workar…
dcoufal Apr 22, 2020
73956e6
Fixing XCode 11.5 warnings
dcoufal Jun 3, 2020
45e83e0
Merge pull request #91 from Comcast/feature/xcode_11_5_warning_fix
dcoufal Jun 5, 2020
884505e
Update readme with new branch names and updated info
dcoufal Jun 19, 2020
e2caa72
Merge pull request #92 from Comcast/feature/update_readme
dcoufal Jun 19, 2020
d07d5a3
Update to version 2.2.1
dcoufal Aug 5, 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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,6 @@ If you do, for some reason, need to access `PlaylistTag` data beyond the lifetim

--

_Note: We have legacy branches for mamba 1.x at [our master 1.x branch](https://github.com/Comcast/mamba/tree/master_1.x) and [our develop 1.x branch](https://github.com/Comcast/mamba/tree/develop_1.x). However, we are not maintaining that branch actively. Users are welcome to submit pull requests against the 1.x branches or potentially fork if they do not want to move to 2.0_
_Note: We have legacy branches for mamba 1.x at [our main 1.x branch](https://github.com/Comcast/mamba/tree/main_1.x) and [our develop 1.x branch](https://github.com/Comcast/mamba/tree/develop_1.x). We are maintaining that branch, but may stop updating in the near future. Users are welcome to submit pull requests against the 1.x branches or potentially fork if they do not want to move to 2.0_

--
2 changes: 1 addition & 1 deletion mamba.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "mamba"
s.version = "2.2.0"
s.version = "2.2.1"
s.license = { :type => 'Apache License, Version 2.0',
:text => <<-LICENSE
Copyright 2017 Comcast Cable Communications Management, LLC
Expand Down
14 changes: 7 additions & 7 deletions mamba.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1599,7 +1599,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0930;
LastUpgradeCheck = 1100;
LastUpgradeCheck = 1150;
ORGANIZATIONNAME = "Comcast Corporation.\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.";
TargetAttributes = {
EC15214E1DD28536006FB265 = {
Expand Down Expand Up @@ -2324,7 +2324,7 @@
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 2.2.0;
MARKETING_VERSION = 2.2.1;
PRODUCT_BUNDLE_IDENTIFIER = com.comcast.mamba;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand All @@ -2351,7 +2351,7 @@
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 2.2.0;
MARKETING_VERSION = 2.2.1;
PRODUCT_BUNDLE_IDENTIFIER = com.comcast.mamba;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -2415,7 +2415,7 @@
INFOPLIST_FILE = mamba/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 2.2.0;
MARKETING_VERSION = 2.2.1;
PRODUCT_BUNDLE_IDENTIFIER = com.comcast.mamba;
PRODUCT_NAME = mamba;
SDKROOT = appletvos;
Expand Down Expand Up @@ -2445,7 +2445,7 @@
INFOPLIST_FILE = mamba/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 2.2.0;
MARKETING_VERSION = 2.2.1;
PRODUCT_BUNDLE_IDENTIFIER = com.comcast.mamba;
PRODUCT_NAME = mamba;
SDKROOT = appletvos;
Expand Down Expand Up @@ -2523,7 +2523,7 @@
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.13;
MARKETING_VERSION = 2.2.0;
MARKETING_VERSION = 2.2.1;
PRODUCT_BUNDLE_IDENTIFIER = com.comcast.mamba;
PRODUCT_MODULE_NAME = mamba;
PRODUCT_NAME = mamba;
Expand Down Expand Up @@ -2556,7 +2556,7 @@
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.13;
MARKETING_VERSION = 2.2.0;
MARKETING_VERSION = 2.2.1;
PRODUCT_BUNDLE_IDENTIFIER = com.comcast.mamba;
PRODUCT_MODULE_NAME = mamba;
PRODUCT_NAME = mamba;
Expand Down
2 changes: 1 addition & 1 deletion mamba.xcodeproj/xcshareddata/xcschemes/mamba.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1100"
LastUpgradeVersion = "1150"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion mamba.xcodeproj/xcshareddata/xcschemes/mambaMacOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1100"
LastUpgradeVersion = "1150"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion mamba.xcodeproj/xcshareddata/xcschemes/mambaTVOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1100"
LastUpgradeVersion = "1150"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
8 changes: 4 additions & 4 deletions ...SharedFramework/Playlist Models/Playlist Concrete Types/MasterPlaylistStreamSummary.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,13 +288,13 @@ public extension PlaylistStream {
// returns the `StreamType` for this stream if applicable.
var streamType: StreamType? {
switch self {
case .audioMediaStream(_):
case .audioMediaStream(_, _, _, _, _, _):
return .demuxedAudio
case .videoMediaStream(_):
case .videoMediaStream(_, _, _, _, _, _):
return .demuxedVideo
case .subtitlesMediaStream(_):
case .subtitlesMediaStream(_, _, _):
return nil
case .iFrameStream(_):
case .iFrameStream(_, _):
return nil
case .stream(_, _, _, _, _, _, let streamType, _, _):
return streamType
Expand Down
6 changes: 5 additions & 1 deletion mambaSharedFramework/Rapid Parser/RapidParserError.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@
//

#include "RapidParserError.h"
#import <mamba/mamba-Swift.h>
#if __has_include("mamba-Swift.h")
#import "mamba-Swift.h"
#else
#import <mamba/mamba-Swift.h>
#endif

const uint32_t RapidParserErrorMissingTagData = PlaylistParserInternalErrorCodeMissingTagData;

Expand Down
26 changes: 13 additions & 13 deletions mambaTests/MasterPlaylistStreamSummaryTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@ class MasterPlaylistStreamSummaryTests: XCTestCase {
XCTFail("Unexpected mediaIndex: \(mediaIndex)")
}
break
case .videoMediaStream(_):
case .videoMediaStream(_, _, _, _, _, _):
XCTFail("Unexpected video stream")
case .subtitlesMediaStream(_):
case .subtitlesMediaStream(_, _, _):
XCTFail("Unexpected subtitles stream")
case .stream(let streamInfIndex, let locationIndex, let uri, let audioGroupId, let videoGroupId, let captionsGroupId, let streamType, let bandwidth, let resolution):
streamInfCount += 1
Expand Down Expand Up @@ -248,9 +248,9 @@ class MasterPlaylistStreamSummaryTests: XCTestCase {
default:
XCTFail("Unexpected mediaIndex: \(mediaIndex)")
}
case .videoMediaStream(_):
case .videoMediaStream(_, _, _, _, _, _):
XCTFail("Unexpected video stream")
case .subtitlesMediaStream(_):
case .subtitlesMediaStream(_, _, _):
XCTFail("Unexpected subtitles stream")
case .stream(let streamInfIndex, let locationIndex, let uri, let audioGroupId, let videoGroupId, let captionsGroupId, let streamType, let bandwidth, let resolution):
streamInfCount += 1
Expand Down Expand Up @@ -363,7 +363,7 @@ class MasterPlaylistStreamSummaryTests: XCTestCase {

for stream in summary.streams {
switch stream {
case .iFrameStream(_):
case .iFrameStream(_, _):
XCTFail("Unexpected iframe stream")
case .audioMediaStream(let mediaIndex, let uri, let groupId, let name, let language, let associatedLanguage):
audioCount += 1
Expand All @@ -379,9 +379,9 @@ class MasterPlaylistStreamSummaryTests: XCTestCase {
default:
XCTFail("Unexpected mediaIndex: \(mediaIndex)")
}
case .videoMediaStream(_):
case .videoMediaStream(_, _, _, _, _, _):
XCTFail("Unexpected video stream")
case .subtitlesMediaStream(_):
case .subtitlesMediaStream(_, _, _):
XCTFail("Unexpected subtitles stream")
case .stream(let streamInfIndex, let locationIndex, let uri, let audioGroupId, let videoGroupId, let captionsGroupId, let streamType, let bandwidth, let resolution):
streamInfCount += 1
Expand Down Expand Up @@ -486,9 +486,9 @@ class MasterPlaylistStreamSummaryTests: XCTestCase {

for stream in summary.streams {
switch stream {
case .iFrameStream(_):
case .iFrameStream(_, _):
XCTFail("Unexpected iframe stream")
case .audioMediaStream(_):
case .audioMediaStream(_, _, _, _, _, _):
XCTFail("Unexpected audio stream")
case .videoMediaStream(let mediaIndex, let uri, let groupId, let name, let language, let associatedLanguage):
videoCount += 1
Expand Down Expand Up @@ -580,13 +580,13 @@ class MasterPlaylistStreamSummaryTests: XCTestCase {

for stream in summary.streams {
switch stream {
case .iFrameStream(_):
case .iFrameStream(_, _):
XCTFail("Unexpected iframe stream")
case .audioMediaStream(_):
case .audioMediaStream(_, _, _, _, _, _):
XCTFail("Unexpected audio stream")
case .videoMediaStream(_):
case .videoMediaStream(_, _, _, _, _, _):
XCTFail("Unexpected video stream")
case .subtitlesMediaStream(_):
case .subtitlesMediaStream(_, _, _):
XCTFail("Unexpected subtitles stream")
case .stream(let streamInfIndex, let locationIndex, let uri, let audioGroupId, let videoGroupId, let captionsGroupId, let streamType, let bandwidth, let resolution):
streamInfCount += 1
Expand Down