Merge pull request #146 from Comcast/add-spm-support

Mamba 2.0 SPM Support

Author: rmigneco

Package.swift

@@ -0,0 +1,71 @@
+// swift-tools-version:5.3
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+//
+//  Package.swift
+//  mamba
+//
+//  Copyright © 2020 Comcast Cable Communications Management, LLC
+//  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.
+//
+
+import PackageDescription
+
+let package = Package(
+    name: "mamba",
+    products: [
+        .library(
+            name: "mamba",
+            targets: ["mamba"]
+        )
+    ],
+    targets: [
+        .target(
+            name: "mamba",
+            dependencies: [.target(name: "HLSObjectiveC")],
+            path: "mambaSharedFramework",
+            exclude: [
+                "HLS ObjectiveC",
+                "PlaylistParserError",
+                "mamba.h"
+            ],
+            resources: [
+                .process("Resources")
+            ]
+        ),
+        .target(
+            name: "PlaylistParserError",
+            path: "mambaSharedFramework/PlaylistParserError"
+        ),
+        .target(
+            name: "HLSObjectiveC",
+            dependencies: ["PlaylistParserError"],
+            path: "mambaSharedFramework/HLS ObjectiveC",
+            exclude: [
+                "PrototypeRapidParseArray.include",
+                "RapidParser_LookingForEForEXTINFState_ParseArray.include",
+                "RapidParser_LookingForEForEXTState_ParseArray.include",
+                "RapidParser_LookingForHashForEXTINFState_ParseArray.include",
+                "RapidParser_LookingForHashForEXTState_ParseArray.include",
+                "RapidParser_LookingForIForEXTINFState_ParseArray.include",
+                "RapidParser_LookingForNewlineForEXTINFState_ParseArray.include",
+                "RapidParser_LookingForNewLineForEXTState_ParseArray.include",
+                "RapidParser_LookingForNewLineForHashState_ParseArray.include",
+                "RapidParser_LookingForNForEXTINFState_ParseArray.include",
+                "RapidParser_LookingForTForEXTINFState_ParseArray.include",
+                "RapidParser_LookingForXForEXTINFState_ParseArray.include",
+                "RapidParser_LookingForXForEXTState_ParseArray.include",
+                "RapidParser_ScanningState_ParseArray.include",
+            ]
+        )
+    ]
+)

mamba.xcodeproj/project.pbxproj

@@ -25,12 +25,22 @@ public enum FrameworkInfo {
     /// returns the version of the mamba framework
     public static var version: String {
 
+        /// When exporting a framework on SPM, there is no way to access the info dictionary, so the version should be provided differently
+        #if SWIFT_PACKAGE
+        guard let versionFilePathUrl = Bundle.module.url(forResource: "version", withExtension: "txt"),
+              let version = try? String(contentsOf: versionFilePathUrl, encoding: .utf8)
+                .trimmingCharacters(in: .whitespacesAndNewlines)
+        else {
+            assertionFailure("Unable to find version string in framework bundle")
+            return "Error: Unable to find version string in framework bundle"
+        }
+        #else
         let bundle = Bundle(for: PlaylistParser.self)
-        
         guard let version = bundle.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String else {
             assertionFailure("Unable to find version string in framework bundle")
             return "Error: Unable to find version string in framework bundle"
         }
+        #endif
 
         return version
     }

mambaSharedFramework/FrameworkInfo.swift

@@ -17,7 +17,7 @@
 //  limitations under the License.
 //
 
-#import <mamba/mamba.h>
+#import "MambaStringRef.h"
 
 @interface MambaStringRefFactory : MambaStringRef
 

mambaSharedFramework/Utils/String Util/CMTimeMakeFromString.c renamed to mambaSharedFramework/HLS ObjectiveC/CMTimeMakeFromString.c

@@ -17,7 +17,7 @@
 //  limitations under the License.
 //
 
-#import <mamba/mamba.h>
+#import "MambaStringRef.h"
 
 @interface MambaStringRef_ConcreteNSData : MambaStringRef
 

mambaSharedFramework/Rapid Parser/MambaStringRef/MambaStringRef.m renamed to mambaSharedFramework/HLS ObjectiveC/MambaStringRef.m

@@ -17,7 +17,7 @@
 //  limitations under the License.
 //
 
-#import <mamba/mamba.h>
+#import "MambaStringRef.h"
 
 @interface MambaStringRef_ConcreteNSString : MambaStringRef