Skip to content

Commit b8dd881

Browse files
author
Jay Pierce
authored
Merge pull request #105 from Comcast/release/1.5.2
Release/1.5.2
2 parents 4d2ebb7 + 3b1d8d0 commit b8dd881

5 files changed

Lines changed: 25 additions & 21 deletions

File tree

‎mamba.xcodeproj/project.pbxproj‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@
212212
EC1CCD60209A2CF9006B59FF /* HLSValidationIssue.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC7491AF1DD29D5C00AF4E20 /* HLSValidationIssue.swift */; };
213213
EC1CCD61209A2CF9006B59FF /* HLSValueTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC7491B11DD29D5C00AF4E20 /* HLSValueTypes.swift */; };
214214
EC1CCD62209A2CF9006B59FF /* HLSWriter.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC7491B21DD29D5C00AF4E20 /* HLSWriter.swift */; };
215-
EC1CCD63209A2CF9006B59FF /* Mamba.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC9547871E5CC84700962535 /* Mamba.swift */; };
215+
EC1CCD63209A2CF9006B59FF /* FrameworkInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC9547871E5CC84700962535 /* FrameworkInfo.swift */; };
216216
EC318B452265041A00969E2D /* StaticMemoryStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = EC318B432265041A00969E2D /* StaticMemoryStorage.h */; settings = {ATTRIBUTES = (Public, ); }; };
217217
EC318B462265041A00969E2D /* StaticMemoryStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = EC318B432265041A00969E2D /* StaticMemoryStorage.h */; settings = {ATTRIBUTES = (Public, ); }; };
218218
EC318B472265041A00969E2D /* StaticMemoryStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = EC318B432265041A00969E2D /* StaticMemoryStorage.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -448,8 +448,8 @@
448448
EC9547831E5CC82500962535 /* GenericTagWriter.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC9547811E5CC82500962535 /* GenericTagWriter.swift */; };
449449
EC9547851E5CC83C00962535 /* NoOpTagParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC9547841E5CC83C00962535 /* NoOpTagParser.swift */; };
450450
EC9547861E5CC83C00962535 /* NoOpTagParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC9547841E5CC83C00962535 /* NoOpTagParser.swift */; };
451-
EC9547881E5CC84700962535 /* Mamba.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC9547871E5CC84700962535 /* Mamba.swift */; };
452-
EC9547891E5CC84700962535 /* Mamba.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC9547871E5CC84700962535 /* Mamba.swift */; };
451+
EC9547881E5CC84700962535 /* FrameworkInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC9547871E5CC84700962535 /* FrameworkInfo.swift */; };
452+
EC9547891E5CC84700962535 /* FrameworkInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC9547871E5CC84700962535 /* FrameworkInfo.swift */; };
453453
EC95478B1E5CC86300962535 /* EXTINFValidator.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC95478A1E5CC86300962535 /* EXTINFValidator.swift */; };
454454
EC95478C1E5CC86300962535 /* EXTINFValidator.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC95478A1E5CC86300962535 /* EXTINFValidator.swift */; };
455455
EC9826021DD3A113003BCDA5 /* URL+hlsplaylist.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC9826011DD3A113003BCDA5 /* URL+hlsplaylist.swift */; };
@@ -805,7 +805,7 @@
805805
EC95477E1E5CC80800962535 /* HLSStringRef+mamba.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "HLSStringRef+mamba.swift"; sourceTree = "<group>"; };
806806
EC9547811E5CC82500962535 /* GenericTagWriter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GenericTagWriter.swift; sourceTree = "<group>"; };
807807
EC9547841E5CC83C00962535 /* NoOpTagParser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NoOpTagParser.swift; sourceTree = "<group>"; };
808-
EC9547871E5CC84700962535 /* Mamba.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Mamba.swift; sourceTree = "<group>"; };
808+
EC9547871E5CC84700962535 /* FrameworkInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FrameworkInfo.swift; sourceTree = "<group>"; };
809809
EC95478A1E5CC86300962535 /* EXTINFValidator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EXTINFValidator.swift; sourceTree = "<group>"; };
810810
EC9826011DD3A113003BCDA5 /* URL+hlsplaylist.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "URL+hlsplaylist.swift"; sourceTree = "<group>"; };
811811
ECBEF4F01F7AC58A0051078F /* ReadMeUnitTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReadMeUnitTests.swift; sourceTree = "<group>"; };
@@ -1071,7 +1071,7 @@
10711071
EC7491AF1DD29D5C00AF4E20 /* HLSValidationIssue.swift */,
10721072
EC7491B11DD29D5C00AF4E20 /* HLSValueTypes.swift */,
10731073
EC7491B21DD29D5C00AF4E20 /* HLSWriter.swift */,
1074-
EC9547871E5CC84700962535 /* Mamba.swift */,
1074+
EC9547871E5CC84700962535 /* FrameworkInfo.swift */,
10751075
EC1521511DD28536006FB265 /* mamba.h */,
10761076
);
10771077
path = mambaSharedFramework;
@@ -1834,7 +1834,7 @@
18341834
EC7491DC1DD29D9600AF4E20 /* GenericSingleValueTagParser.swift in Sources */,
18351835
EC7491CF1DD29D7C00AF4E20 /* PantosValue.swift in Sources */,
18361836
EC7491CD1DD29D7C00AF4E20 /* PantosTag.swift in Sources */,
1837-
EC9547881E5CC84700962535 /* Mamba.swift in Sources */,
1837+
EC9547881E5CC84700962535 /* FrameworkInfo.swift in Sources */,
18381838
EC7491861DD29CCB00AF4E20 /* GenericDictionaryTagParserHelper.swift in Sources */,
18391839
);
18401840
runOnlyForDeploymentPostprocessing = 0;
@@ -1999,7 +1999,7 @@
19991999
EC7491DD1DD29D9600AF4E20 /* GenericSingleValueTagParser.swift in Sources */,
20002000
EC7491D01DD29D7C00AF4E20 /* PantosValue.swift in Sources */,
20012001
EC7491CE1DD29D7C00AF4E20 /* PantosTag.swift in Sources */,
2002-
EC9547891E5CC84700962535 /* Mamba.swift in Sources */,
2002+
EC9547891E5CC84700962535 /* FrameworkInfo.swift in Sources */,
20032003
EC7491871DD29CCB00AF4E20 /* GenericDictionaryTagParserHelper.swift in Sources */,
20042004
);
20052005
runOnlyForDeploymentPostprocessing = 0;
@@ -2096,7 +2096,7 @@
20962096
EC1CCCF5209A2CF9006B59FF /* HLSPlaylistTimelineTranslator.swift in Sources */,
20972097
6DD0A1AF242F85C800FF7AAE /* EXT_X_DATERANGETagValidator.swift in Sources */,
20982098
EC1CCD58209A2CF9006B59FF /* PantosValue.swift in Sources */,
2099-
EC1CCD63209A2CF9006B59FF /* Mamba.swift in Sources */,
2099+
EC1CCD63209A2CF9006B59FF /* FrameworkInfo.swift in Sources */,
21002100
EC318B4A2265041A00969E2D /* StaticMemoryStorage.m in Sources */,
21012101
EC1CCD44209A2CF9006B59FF /* EXT_X_TARGETDURATIONLengthValidator.swift in Sources */,
21022102
EC1CCD48209A2CF9006B59FF /* HLSPlaylistCardinalityValidator.swift in Sources */,
@@ -2260,6 +2260,7 @@
22602260
EC1521601DD28536006FB265 /* Debug */ = {
22612261
isa = XCBuildConfiguration;
22622262
buildSettings = {
2263+
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
22632264
CLANG_ENABLE_MODULES = YES;
22642265
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
22652266
CLANG_WARN_SUSPICIOUS_MOVES = YES;
@@ -2272,7 +2273,7 @@
22722273
INFOPLIST_FILE = mamba/Info.plist;
22732274
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
22742275
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
2275-
MARKETING_VERSION = 1.5.1;
2276+
MARKETING_VERSION = 1.5.2;
22762277
PRODUCT_BUNDLE_IDENTIFIER = com.comcast.mamba;
22772278
PRODUCT_NAME = "$(TARGET_NAME)";
22782279
SKIP_INSTALL = YES;
@@ -2285,6 +2286,7 @@
22852286
EC1521611DD28536006FB265 /* Release */ = {
22862287
isa = XCBuildConfiguration;
22872288
buildSettings = {
2289+
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
22882290
CLANG_ENABLE_MODULES = YES;
22892291
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
22902292
CLANG_WARN_SUSPICIOUS_MOVES = YES;
@@ -2297,7 +2299,7 @@
22972299
INFOPLIST_FILE = mamba/Info.plist;
22982300
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
22992301
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
2300-
MARKETING_VERSION = 1.5.1;
2302+
MARKETING_VERSION = 1.5.2;
23012303
PRODUCT_BUNDLE_IDENTIFIER = com.comcast.mamba;
23022304
PRODUCT_NAME = "$(TARGET_NAME)";
23032305
SKIP_INSTALL = YES;
@@ -2346,6 +2348,7 @@
23462348
EC15217D1DD2856F006FB265 /* Debug */ = {
23472349
isa = XCBuildConfiguration;
23482350
buildSettings = {
2351+
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
23492352
CLANG_ENABLE_MODULES = YES;
23502353
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
23512354
CLANG_WARN_SUSPICIOUS_MOVES = YES;
@@ -2358,7 +2361,7 @@
23582361
INFOPLIST_FILE = mamba/Info.plist;
23592362
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
23602363
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
2361-
MARKETING_VERSION = 1.5.1;
2364+
MARKETING_VERSION = 1.5.2;
23622365
PRODUCT_BUNDLE_IDENTIFIER = com.comcast.mamba;
23632366
PRODUCT_NAME = mamba;
23642367
SDKROOT = appletvos;
@@ -2376,6 +2379,7 @@
23762379
EC15217E1DD2856F006FB265 /* Release */ = {
23772380
isa = XCBuildConfiguration;
23782381
buildSettings = {
2382+
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
23792383
CLANG_ENABLE_MODULES = YES;
23802384
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
23812385
CLANG_WARN_SUSPICIOUS_MOVES = YES;
@@ -2388,7 +2392,7 @@
23882392
INFOPLIST_FILE = mamba/Info.plist;
23892393
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
23902394
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
2391-
MARKETING_VERSION = 1.5.1;
2395+
MARKETING_VERSION = 1.5.2;
23922396
PRODUCT_BUNDLE_IDENTIFIER = com.comcast.mamba;
23932397
PRODUCT_NAME = mamba;
23942398
SDKROOT = appletvos;
@@ -2448,6 +2452,7 @@
24482452
EC1CCCE8209A2AF8006B59FF /* Debug */ = {
24492453
isa = XCBuildConfiguration;
24502454
buildSettings = {
2455+
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
24512456
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
24522457
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
24532458
CLANG_ENABLE_OBJC_WEAK = YES;
@@ -2466,7 +2471,7 @@
24662471
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
24672472
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
24682473
MACOSX_DEPLOYMENT_TARGET = 10.13;
2469-
MARKETING_VERSION = 1.5.1;
2474+
MARKETING_VERSION = 1.5.2;
24702475
PRODUCT_BUNDLE_IDENTIFIER = com.comcast.mamba;
24712476
PRODUCT_MODULE_NAME = mamba;
24722477
PRODUCT_NAME = mamba;
@@ -2481,6 +2486,7 @@
24812486
EC1CCCE9209A2AF8006B59FF /* Release */ = {
24822487
isa = XCBuildConfiguration;
24832488
buildSettings = {
2489+
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
24842490
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
24852491
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
24862492
CLANG_ENABLE_OBJC_WEAK = YES;
@@ -2499,7 +2505,7 @@
24992505
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
25002506
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
25012507
MACOSX_DEPLOYMENT_TARGET = 10.13;
2502-
MARKETING_VERSION = 1.5.1;
2508+
MARKETING_VERSION = 1.5.2;
25032509
PRODUCT_BUNDLE_IDENTIFIER = com.comcast.mamba;
25042510
PRODUCT_MODULE_NAME = mamba;
25052511
PRODUCT_NAME = mamba;

‎mamba.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5-
<key>BuildSystemType</key>
6-
<string>Original</string>
75
<key>PreviewsEnabled</key>
86
<false/>
97
</dict>

mambaSharedFramework/Mamba.swift renamed to mambaSharedFramework/FrameworkInfo.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// Mamba.swift
2+
// FrameworkInfo.swift
33
// mamba
44
//
55
// Created by David Coufal on 8/2/16.
@@ -19,8 +19,8 @@
1919

2020
import Foundation
2121

22-
/// Base object representing the Mamba framework
23-
public enum Mamba {
22+
/// Provides information about the framework
23+
public enum FrameworkInfo {
2424

2525
/// returns the version of the mamba framework
2626
public static var version: String {

‎mambaSharedFramework/HLSWriter.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public class HLSWriter {
4949
try write(string: identityString, toStream: stream)
5050
}
5151
if !suppressMambaIdentityString {
52-
try write(string: " Generated by Mamba(\(Mamba.version)) Copyright (c) 2017 Comcast Corporation", toStream: stream)
52+
try write(string: " Generated by Mamba(\(FrameworkInfo.version)) Copyright (c) 2017 Comcast Corporation", toStream: stream)
5353
}
5454

5555
// write tags

‎mambaTests/HLSWriterTests.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,5 +150,5 @@ class HLSWriterTests: XCTestCase {
150150
}
151151
}
152152

153-
let standardMambaString = "# Generated by Mamba(\(Mamba.version)) Copyright (c) 2017 Comcast Corporation\n"
153+
let standardMambaString = "# Generated by Mamba(\(FrameworkInfo.version)) Copyright (c) 2017 Comcast Corporation\n"
154154
}

0 commit comments

Comments
 (0)