change: SPM Supported

Cabbage.xcodeproj/xcshareddata/xcschemes/Cabbage.xcscheme

@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
             ReferencedContainer = "container:Cabbage.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -52,6 +50,7 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       stopOnEveryThreadSanitizerIssue = "YES"
+      migratedStopOnEveryIssue = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
@@ -64,8 +63,6 @@
             ReferencedContainer = "container:Cabbage.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

Package.swift

@@ -0,0 +1,25 @@
+// swift-tools-version:5.1
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "Cabbage",
+    products: [
+        // Products define the executables and libraries produced by a package, and make them visible to other packages.
+        .library(
+            name: "Cabbage",
+            targets: ["Cabbage"]),
+    ],
+    dependencies: [
+        // Dependencies declare other packages that this package depends on.
+        // .package(url: /* package url */, from: "1.0.0"),
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
+        // Targets can depend on other targets in this package, and on products in packages which this package depends on.
+        .target(
+            name: "Cabbage",
+            dependencies: ["AVFoundation", "CoreGraphics", "CoreMedia", "CoreImage", "Accelerate"]),
+    ]
+)

Sources/Cabbage/AVAssetReaderImageResource.swift

@@ -0,0 +1 @@
+../../Cabbage/Sources/Track/Resource/AVAssetReaderImageResource.swift

Sources/Cabbage/AVAssetReverseImageResource.swift

@@ -0,0 +1 @@
+../../Cabbage/Sources/Track/Resource/AVAssetReverseImageResource.swift

Sources/Cabbage/AVAssetTrackResource.swift

@@ -0,0 +1 @@
+../../Cabbage/Sources/Track/Resource/AVAssetTrackResource.swift

Sources/Cabbage/AudioMixer.swift

@@ -0,0 +1 @@
+../../Cabbage/Sources/Core/Audio/AudioMixer.swift

Sources/Cabbage/AudioProcessingChain.swift

@@ -0,0 +1 @@
+../../Cabbage/Sources/Core/Audio/AudioProcessingChain.swift

Sources/Cabbage/AudioProcessingTapHolder.swift

@@ -0,0 +1 @@
+../../Cabbage/Sources/Core/Audio/AudioProcessingTapHolder.swift

Sources/Cabbage/AudioTransition.swift

@@ -0,0 +1 @@
+../../Cabbage/Sources/Core/Model/AudioTransition.swift

Sources/Cabbage/CGMathFunctions.swift

@@ -0,0 +1 @@
+../../Cabbage/Sources/Uitl/CGMathFunctions.swift

Sources/Cabbage/CMTimeExtensition.swift

@@ -0,0 +1 @@
+../../Cabbage/Sources/Uitl/CMTimeExtensition.swift

Sources/Cabbage/CompositionGenerator.swift

@@ -0,0 +1 @@
+../../Cabbage/Sources/Core/CompositionGenerator.swift

Sources/Cabbage/CompositionProvider.swift

@@ -0,0 +1 @@
+../../Cabbage/Sources/Core/Model/CompositionProvider.swift

Sources/Cabbage/CoreImageExtension.swift

@@ -0,0 +1 @@
+../../Cabbage/Sources/Uitl/CoreImageExtension.swift

Sources/Cabbage/ImageCompositionGroupProvider.swift

@@ -0,0 +1 @@
+../../Cabbage/Sources/Track/ImageCompositionGroupProvider.swift

Sources/Cabbage/ImageGeneratorExtension.swift

@@ -0,0 +1 @@
+../../Cabbage/Sources/Uitl/ImageGeneratorExtension.swift

Sources/Cabbage/ImageOverlayItem.swift

@@ -0,0 +1 @@
+../../Cabbage/Sources/Track/ImageOverlayItem.swift

Sources/Cabbage/ImageResource.swift

@@ -0,0 +1 @@
+../../Cabbage/Sources/Track/Resource/ImageResource.swift

Sources/Cabbage/KeyframeVideoConfiguration.swift

@@ -0,0 +1 @@
+../../Cabbage/Sources/Track/Configuration/KeyframeVideoConfiguration.swift

Sources/Cabbage/Log.swift

@@ -0,0 +1 @@
+../../Cabbage/Sources/Uitl/Log.swift

Sources/Cabbage/PHAssetImageResource.swift

@@ -0,0 +1 @@
+../../Cabbage/Sources/Track/Resource/PHAssetImageResource.swift

Sources/Cabbage/PHAssetLivePhotoResource.swift

@@ -0,0 +1 @@
+../../Cabbage/Sources/Track/Resource/PHAssetLivePhotoResource.swift

Sources/Cabbage/PHAssetTrackResource.swift

@@ -0,0 +1 @@
+../../Cabbage/Sources/Track/Resource/PHAssetTrackResource.swift

Sources/Cabbage/Resource.swift

@@ -0,0 +1 @@
+../../Cabbage/Sources/Track/Resource/Resource.swift

Sources/Cabbage/TimeRangeExtension.swift

@@ -0,0 +1 @@
+../../Cabbage/Sources/Uitl/TimeRangeExtension.swift

Sources/Cabbage/Timeline.swift

@@ -0,0 +1 @@
+../../Cabbage/Sources/Core/Model/Timeline.swift

Sources/Cabbage/TimingFunctionFactory.swift

@@ -0,0 +1 @@
+../../Cabbage/Sources/Uitl/TimingFunctionFactory.swift

Sources/Cabbage/TrackConfiguration.swift

@@ -0,0 +1 @@
+../../Cabbage/Sources/Track/Configuration/TrackConfiguration.swift

Sources/Cabbage/TrackItem.swift

@@ -0,0 +1 @@
+../../Cabbage/Sources/Track/TrackItem.swift

Sources/Cabbage/VideoCompositionInstruction.swift

@@ -0,0 +1 @@
+../../Cabbage/Sources/Core/Video/VideoCompositionInstruction.swift

Sources/Cabbage/VideoCompositor.swift

@@ -0,0 +1 @@
+../../Cabbage/Sources/Core/Video/VideoCompositor.swift

Sources/Cabbage/VideoTransition.swift

@@ -0,0 +1 @@
+../../Cabbage/Sources/Core/Model/VideoTransition.swift

scripts/package-spm.swift

@@ -0,0 +1,101 @@
+#!/usr/bin/swift
+//
+//  package-spm.swift
+//  scripts
+//
+//  Created by Krunoslav Zaher on 12/26/15.
+//  Copyright © 2015 Krunoslav Zaher. All rights reserved.
+//
+
+import Foundation
+
+/**
+ This script packages normal Rx* structure into `Sources` directory.
+
+ * creates and updates links to normal project structure
+ * builds unit tests `main.swift`
+
+ Unfortunately, Swift support for Linux, libdispatch and package manager are still quite unstable,
+ so certain class of unit tests is excluded for now.
+
+ */
+
+// It is kind of ironic that we need to additionally package for package manager :/
+
+let fileManager = FileManager.default
+
+let allowedExtensions = [
+    ".swift",
+    ".h",
+    ".m",
+    ".c",
+]
+
+func isExtensionAllowed(_ path: String) -> Bool {
+    return (allowedExtensions.map { path.hasSuffix($0) }).reduce(false) { $0 || $1 }
+}
+
+func checkExtension(_ path: String) throws {
+    if !isExtensionAllowed(path) {
+        throw NSError(domain: "Security", code: -1, userInfo: ["path" : path])
+    }
+}
+
+func packageRelativePath(_ paths: [String], targetDirName: String, excluded: [String] = []) throws {
+    let targetPath = "Sources/\(targetDirName)"
+
+    print("Checking " + targetPath)
+
+    for file in try fileManager.contentsOfDirectory(atPath: targetPath).sorted { $0 < $1 }  {
+        if file != "include" && file != ".DS_Store" {
+            print("Checking extension \(file)")
+            try checkExtension(file)
+
+            print("Cleaning \(file)")
+            try fileManager.removeItem(atPath: "\(targetPath)/\(file)")
+        }
+    }
+
+    for sourcePath in paths {
+        var isDirectory: ObjCBool = false
+        print("loop sourcePath: \(sourcePath)")
+        fileManager.fileExists(atPath: sourcePath, isDirectory: &isDirectory)
+
+        let files: [String] = isDirectory.boolValue ? fileManager.subpaths(atPath: sourcePath)!
+            : [sourcePath]
+
+        for file in files {
+            if !isExtensionAllowed(file) {
+                print("Skipping \(file)")
+                continue
+            }
+
+            if excluded.contains(file) {
+                print("Skipping \(file)")
+                continue
+            }
+
+            let fileRelativePath = isDirectory.boolValue ? "\(sourcePath)/\(file)" : file
+
+            let destinationURL = NSURL(string: "../../\(fileRelativePath)")!
+
+            let fileName = (file as NSString).lastPathComponent
+            let atURL = NSURL(string: "file:///\(fileManager.currentDirectoryPath)/\(targetPath)/\(fileName)")!
+
+            if fileName.hasSuffix(".h") {
+                let sourcePath = NSURL(string: "file:///" + fileManager.currentDirectoryPath + "/" + sourcePath + "/" + file)!
+                //throw NSError(domain: sourcePath.description, code: -1, userInfo: nil)
+                try fileManager.copyItem(at: sourcePath as URL, to: atURL as URL)
+            }
+            else {
+                print("Linking \(fileName) [\(atURL)] -> \(destinationURL)")
+                try fileManager.createSymbolicLink(at: atURL as URL, withDestinationURL: destinationURL as URL)
+            }
+        }
+    }
+}
+
+
+try packageRelativePath([
+    "Cabbage/Sources"
+], targetDirName: "Cabbage")