Skip to content

Commit

Permalink
Adding macOS target. Prep for 1.0.4 release. Minor README edits.
Browse files Browse the repository at this point in the history
  • Loading branch information
dcoufal committed May 2, 2018
1 parent ece6d71 commit 2ff0f63
Show file tree
Hide file tree
Showing 8 changed files with 705 additions and 17 deletions.
11 changes: 3 additions & 8 deletions .travis.yml
Expand Up @@ -8,19 +8,14 @@ env:
- PROJECT="mamba.xcodeproj"
- IOS_SCHEME="mamba"
- TVOS_SCHEME="mambaTVOS"
- OSX_SCHEME="mambaMacOS"
- IOS_SDK=iphonesimulator11.0
- TVOS_SDK=appletvsimulator11.0
- OSX_SDK=macosx10.13
matrix:
#- DESTINATION="OS=9.3,name=iPhone 6" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES"
#- DESTINATION="OS=9.3,name=iPad Air" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES"

#- DESTINATION="OS=10.1,name=iPhone 7" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES"
#- DESTINATION="OS=10.2,name=iPad Air 2" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES"

- DESTINATION="OS=11.1,name=iPhone X" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES"
#- DESTINATION="OS=11.1,name=iPad Pro (10.5-inch)" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES"

- DESTINATION="OS=11.1,name=Apple TV 4K" SDK="$TVOS_SDK" SCHEME="$TVOS_SCHEME" RUN_TESTS="YES"
- DESTINATION="arch=x86_64" SDK="$OSX_SDK" SCHEME="$OSX_SCHEME" RUN_TESTS="YES"

script:
- set -o pipefail
Expand Down
8 changes: 4 additions & 4 deletions README.md
Expand Up @@ -9,7 +9,7 @@
Mamba
===

Mamba is a Swift iOS and tvOS framework to parse, validate and write [HTTP Live Streaming (HLS)](https://tools.ietf.org/html/draft-pantos-http-live-streaming-23) data.
Mamba is a Swift iOS, tvOS and macOS framework to parse, validate and write [HTTP Live Streaming (HLS)](https://tools.ietf.org/html/draft-pantos-http-live-streaming-23) data.

This framework is used in Comcast applications to parse, validate, edit and write HLS playlists to deliver video to millions of customers. It was written by the [Comcast VIPER](https://stackoverflow.com/jobs/companies/comcast-viper) Player Platform team.

Expand All @@ -23,7 +23,7 @@ _Mamba Project Goals:_

* XCode 9+
* Swift 3+ (written in Swift 4)
* iOS 9+ _or_ tvOS 10+
* iOS 9+ _or_ tvOS 10+ _or_ macOS 10.13+

## Usage

Expand All @@ -35,7 +35,7 @@ Create an `HLSParser`.
let parser = HLSParser()
```

Parse your HLS playlist using the parser. Here's the callback version:
Parse your HLS playlist using the parser. Here's the asynchronous version:

```swift
let myPlaylistData: Data = ... // source of HLS data
Expand All @@ -51,7 +51,7 @@ parser.parse(playlistData: myPlaylistData,
})
```

And here's the inline version:
And here's the synchronous version:

```swift
let playlist: HLSPlaylist
Expand Down
3 changes: 2 additions & 1 deletion mamba.podspec
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "mamba"
s.version = "1.0.3"
s.version = "1.0.4"
s.license = { :type => 'Apache License, Version 2.0',
:text => <<-LICENSE
Copyright 2017 Comcast Cable Communications Management, LLC
Expand All @@ -21,6 +21,7 @@ s.author = "Comcast"

s.ios.deployment_target = '9.0'
s.tvos.deployment_target = '10.0'
s.osx.deployment_target = '10.13'

s.source = { :git => "https://github.com/Comcast/mamba.git", :tag => "#{s.version}" }
s.source_files = 'mambaSharedFramework/**/*.{h,m,swift,c}'
Expand Down
633 changes: 630 additions & 3 deletions mamba.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion mamba/Info.plist
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0.3</string>
<string>1.0.4</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
Expand Down
37 changes: 37 additions & 0 deletions mambaMacOS/Info.plist
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0.4</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2018 Comcast Corporation.
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License. All rights reserved.</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>
22 changes: 22 additions & 0 deletions mambaMacOSTests/Info.plist
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>1</string>
</dict>
</plist>
6 changes: 6 additions & 0 deletions mambaSharedFramework/mamba.h
Expand Up @@ -17,7 +17,13 @@
// limitations under the License.
//

#import "Availability.h"

#ifdef __MAC_OS_X_VERSION_MAX_ALLOWED
#import <Cocoa/Cocoa.h>
#else
#import <UIKit/UIKit.h>
#endif

//! Project version number for mamba.
FOUNDATION_EXPORT double mambaVersionNumber;
Expand Down

0 comments on commit 2ff0f63

Please sign in to comment.