Add Carthage compatibility - generate framework as dynamic

kodlian · Dec 28, 2018 · 74de13b · 74de13b
1 parent f9c1e0f
commit 74de13b
Show file tree

Hide file tree

Showing 43 changed files with 832 additions and 141 deletions.
diff --git a/Cartfile b/Cartfile
@@ -0,0 +1 @@
+binary "https://code.videolan.org/videolan/VLCKit/raw/master/Packaging/TVVLCKit.json"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -0,0 +1 @@
+binary "https://code.videolan.org/videolan/VLCKit/raw/master/Packaging/TVVLCKit.json" "3.2.0"
diff --git a/Demo/Demo/AppDelegate.swift → Demo/AppDelegate.swift b/Demo/Demo/AppDelegate.swift → Demo/AppDelegate.swift
diff --git a/...stacklayer/Content.imageset/Contents.json → ...stacklayer/Content.imageset/Contents.json b/...stacklayer/Content.imageset/Contents.json → ...stacklayer/Content.imageset/Contents.json
diff --git a/...estack/Back.imagestacklayer/Contents.json → ...estack/Back.imagestacklayer/Contents.json b/...estack/Back.imagestacklayer/Contents.json → ...estack/Back.imagestacklayer/Contents.json
diff --git a/...Icon - App Store.imagestack/Contents.json → ...Icon - App Store.imagestack/Contents.json b/...Icon - App Store.imagestack/Contents.json → ...Icon - App Store.imagestack/Contents.json
diff --git a/...stacklayer/Content.imageset/Contents.json → ...stacklayer/Content.imageset/Contents.json b/...stacklayer/Content.imageset/Contents.json → ...stacklayer/Content.imageset/Contents.json
diff --git a/...stack/Front.imagestacklayer/Contents.json → ...stack/Front.imagestacklayer/Contents.json b/...stack/Front.imagestacklayer/Contents.json → ...stack/Front.imagestacklayer/Contents.json
diff --git a/...stacklayer/Content.imageset/Contents.json → ...stacklayer/Content.imageset/Contents.json b/...stacklayer/Content.imageset/Contents.json → ...stacklayer/Content.imageset/Contents.json
diff --git a/...tack/Middle.imagestacklayer/Contents.json → ...tack/Middle.imagestacklayer/Contents.json b/...tack/Middle.imagestacklayer/Contents.json → ...tack/Middle.imagestacklayer/Contents.json
diff --git a/...p Shelf Image Wide.imageset/Contents.json → ...stacklayer/Content.imageset/Contents.json b/...p Shelf Image Wide.imageset/Contents.json → ...stacklayer/Content.imageset/Contents.json
@@ -3,6 +3,10 @@
     {
       "idiom" : "tv",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
     }
   ],
   "info" : {

diff --git a/...estack/Back.imagestacklayer/Contents.json → ...estack/Back.imagestacklayer/Contents.json b/...estack/Back.imagestacklayer/Contents.json → ...estack/Back.imagestacklayer/Contents.json
diff --git a/...dassets/App Icon.imagestack/Contents.json → ...dassets/App Icon.imagestack/Contents.json b/...dassets/App Icon.imagestack/Contents.json → ...dassets/App Icon.imagestack/Contents.json
diff --git a/...stacklayer/Content.imageset/Contents.json → ...stacklayer/Content.imageset/Contents.json b/...stacklayer/Content.imageset/Contents.json → ...stacklayer/Content.imageset/Contents.json
@@ -3,6 +3,10 @@
     {
       "idiom" : "tv",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
     }
   ],
   "info" : {

diff --git a/...stack/Front.imagestacklayer/Contents.json → ...stack/Front.imagestacklayer/Contents.json b/...stack/Front.imagestacklayer/Contents.json → ...stack/Front.imagestacklayer/Contents.json
diff --git a/...stacklayer/Content.imageset/Contents.json → ...stacklayer/Content.imageset/Contents.json b/...stacklayer/Content.imageset/Contents.json → ...stacklayer/Content.imageset/Contents.json
@@ -3,6 +3,10 @@
     {
       "idiom" : "tv",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
     }
   ],
   "info" : {

diff --git a/...tack/Middle.imagestacklayer/Contents.json → ...tack/Middle.imagestacklayer/Contents.json b/...tack/Middle.imagestacklayer/Contents.json → ...tack/Middle.imagestacklayer/Contents.json
diff --git a/...Top Shelf Image.brandassets/Contents.json → ...Top Shelf Image.brandassets/Contents.json b/...Top Shelf Image.brandassets/Contents.json → ...Top Shelf Image.brandassets/Contents.json
diff --git a/...stacklayer/Content.imageset/Contents.json → ...p Shelf Image Wide.imageset/Contents.json b/...stacklayer/Content.imageset/Contents.json → ...p Shelf Image Wide.imageset/Contents.json
@@ -3,6 +3,10 @@
     {
       "idiom" : "tv",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
     }
   ],
   "info" : {

diff --git a/...ts.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image.imageset/Contents.json b/...ts.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image.imageset/Contents.json
@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "idiom" : "tv",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Demo/Demo/Assets.xcassets/Contents.json → Demo/Assets.xcassets/Contents.json b/Demo/Demo/Assets.xcassets/Contents.json → Demo/Assets.xcassets/Contents.json
diff --git a/...ets/LaunchImage.launchimage/Contents.json → ...ets/LaunchImage.launchimage/Contents.json b/...ets/LaunchImage.launchimage/Contents.json → ...ets/LaunchImage.launchimage/Contents.json
@@ -1,5 +1,12 @@
 {
   "images" : [
+    {
+      "orientation" : "landscape",
+      "idiom" : "tv",
+      "extent" : "full-screen",
+      "minimum-system-version" : "11.0",
+      "scale" : "2x"
+    },
     {
       "orientation" : "landscape",
       "idiom" : "tv",

diff --git a/Demo/Demo/Base.lproj/Main.storyboard → Demo/Base.lproj/Main.storyboard b/Demo/Demo/Base.lproj/Main.storyboard → Demo/Base.lproj/Main.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder.AppleTV.Storyboard" version="3.0" toolsVersion="13771" targetRuntime="AppleTV" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder.AppleTV.Storyboard" version="3.0" toolsVersion="14113" targetRuntime="AppleTV" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
     <device id="appleTV" orientation="landscape">
         <adaptation id="light"/>
     </device>
     <dependencies>
         <deployment identifier="tvOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -43,7 +43,7 @@
         <!--TVVLCPlayer-->
         <scene sceneID="yMc-ke-CCV">
             <objects>
-                <viewControllerPlaceholder storyboardName="TVVLCPlayer" bundleIdentifier="org.cocoapods.TVVLCPlayer" id="uf1-k1-INg" sceneMemberID="viewController"/>
+                <viewControllerPlaceholder storyboardName="TVVLCPlayer" bundleIdentifier="com.kodlian.TVVLCPlayer" id="uf1-k1-INg" sceneMemberID="viewController"/>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="e7K-7q-6VG" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="914" y="215"/>

diff --git a/Demo/Demo.xcodeproj/project.pbxproj b/Demo/Demo.xcodeproj/project.pbxproj
@@ -11,7 +11,6 @@
 		3F36E1D8204AA89500478CE2 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F36E1D7204AA89500478CE2 /* ViewController.swift */; };
 		3F36E1DB204AA89500478CE2 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3F36E1D9204AA89500478CE2 /* Main.storyboard */; };
 		3F36E1DD204AA89500478CE2 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3F36E1DC204AA89500478CE2 /* Assets.xcassets */; };
-		532D87B9F0EADDBB98505A13 /* Pods_Demo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 99F4585E029E55F99C3190D6 /* Pods_Demo.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -21,17 +20,13 @@
 		3F36E1DA204AA89500478CE2 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		3F36E1DC204AA89500478CE2 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		3F36E1DE204AA89500478CE2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		8F2F64E83996329C3B3FF1B5 /* Pods-Demo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Demo.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Demo/Pods-Demo.debug.xcconfig"; sourceTree = "<group>"; };
-		99F4585E029E55F99C3190D6 /* Pods_Demo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Demo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		CC243AEB308A4486980E5F82 /* Pods-Demo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Demo.release.xcconfig"; path = "Pods/Target Support Files/Pods-Demo/Pods-Demo.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		3F36E1CF204AA89500478CE2 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				532D87B9F0EADDBB98505A13 /* Pods_Demo.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -43,7 +38,6 @@
 			children = (
 				3F36E1D4204AA89500478CE2 /* Demo */,
 				3F36E1D3204AA89500478CE2 /* Products */,
-				F863C5489DC7D6F5AD7B356E /* Pods */,
 				4E90FFDA0864BCC620E176FA /* Frameworks */,
 			);
 			sourceTree = "<group>";
@@ -71,33 +65,20 @@
 		4E90FFDA0864BCC620E176FA /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				99F4585E029E55F99C3190D6 /* Pods_Demo.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		F863C5489DC7D6F5AD7B356E /* Pods */ = {
-			isa = PBXGroup;
-			children = (
-				8F2F64E83996329C3B3FF1B5 /* Pods-Demo.debug.xcconfig */,
-				CC243AEB308A4486980E5F82 /* Pods-Demo.release.xcconfig */,
-			);
-			name = Pods;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
 		3F36E1D1204AA89500478CE2 /* Demo */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 3F36E1E1204AA89500478CE2 /* Build configuration list for PBXNativeTarget "Demo" */;
 			buildPhases = (
-				9C3CD9F39E23A182CB75328C /* [CP] Check Pods Manifest.lock */,
 				3F36E1CE204AA89500478CE2 /* Sources */,
 				3F36E1CF204AA89500478CE2 /* Frameworks */,
 				3F36E1D0204AA89500478CE2 /* Resources */,
-				E4E1DE44DD5557986A83E9B9 /* [CP] Embed Pods Frameworks */,
-				77263F5BB7AFDDFE40A29109 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -154,62 +135,6 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
-/* Begin PBXShellScriptBuildPhase section */
-		77263F5BB7AFDDFE40A29109 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-Demo/Pods-Demo-resources.sh",
-				"${PODS_ROOT}/../../Resources/TVVLCPlayer.storyboard",
-				"${PODS_CONFIGURATION_BUILD_DIR}/TVVLCPlayer/TVVLCPlayer.bundle",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TVVLCPlayer.storyboardc",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TVVLCPlayer.bundle",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Demo/Pods-Demo-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		9C3CD9F39E23A182CB75328C /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Demo-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
-		E4E1DE44DD5557986A83E9B9 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Demo/Pods-Demo-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-/* End PBXShellScriptBuildPhase section */
-
 /* Begin PBXSourcesBuildPhase section */
 		3F36E1CE204AA89500478CE2 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -341,7 +266,6 @@
 		};
 		3F36E1E2204AA89500478CE2 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 8F2F64E83996329C3B3FF1B5 /* Pods-Demo.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
@@ -358,7 +282,6 @@
 		};
 		3F36E1E3204AA89500478CE2 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = CC243AEB308A4486980E5F82 /* Pods-Demo.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;

diff --git a/Demo/Demo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Demo/Demo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?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>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Demo/Demo.xcworkspace/contents.xcworkspacedata b/Demo/Demo.xcworkspace/contents.xcworkspacedata
diff --git a/...ts.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image.imageset/Contents.json b/...ts.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image.imageset/Contents.json
diff --git a/Demo/Demo/Info.plist → Demo/Info.plist b/Demo/Demo/Info.plist → Demo/Info.plist
diff --git a/Demo/Podfile b/Demo/Podfile
diff --git a/Demo/Podfile.lock b/Demo/Podfile.lock
diff --git a/Demo/Demo/ViewController.swift → Demo/ViewController.swift b/Demo/Demo/ViewController.swift → Demo/ViewController.swift
@@ -8,6 +8,7 @@
 
 import UIKit
 import TVVLCPlayer
+import TVVLCKit
 
 class ViewController: UIViewController {
     let demoVideoURL = URL(string: "https://upload.wikimedia.org/wikipedia/commons/8/88/Big_Buck_Bunny_alt.webm")!

diff --git a/Modules/module.modulemap b/Modules/module.modulemap
@@ -0,0 +1,6 @@
+framework module TVVLCKit {
+  umbrella header "TVVLCKit.h"
+
+  export *
+  module * { export * }
+}
diff --git a/Sources/RemoteActionPositionController.swift b/Sources/RemoteActionPositionController.swift
@@ -17,23 +17,16 @@ protocol RemoteActionPositionControllerDelegate {
 
 // MARK: - SurfaceRemotePositionController
 class RemoteActionPositionController: NSObject, PositionController {
-
-
     enum Location {
         case left, center, right
     }
 
-
-
     @objc
     enum Action: Int {
         case fastForward, rewind, jumpForward, jumpBackward, reset, pause
 
         var images: (left: UIImage?, right: UIImage?) {
-            guard let url = Bundle.main.url(forResource: "TVVLCPlayer", withExtension: "bundle"),
-                let bundle = Bundle(url: url) else {
-                fatalError()
-            }
+            let bundle = Bundle(for: RemoteActionPositionController.self)
 
             switch self {
             case .fastForward:

diff --git a/Sources/ScrubbingPositionController.swift b/Sources/ScrubbingPositionController.swift
@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import TVVLCKit
 
 // MARK: Delegate
 @objc

diff --git a/Sources/TVVLCPlayer-Bridging-Header.h b/Sources/TVVLCPlayer-Bridging-Header.h
@@ -6,4 +6,4 @@
 //  Copyright © 2018 Jérémy Marchand. All rights reserved.
 //
 
-#import <TVVLCKit/TVVLCKit.h>
+//#import <TVVLCKit/TVVLCKit.h>
diff --git a/Sources/VLC+addition.swift b/Sources/VLC+addition.swift
@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import TVVLCKit
 
 extension VLCMediaPlayer {
     var totalTime: VLCTime? {

diff --git a/Sources/VLCPlayerViewController.swift b/Sources/VLCPlayerViewController.swift
@@ -8,6 +8,7 @@
 
 import UIKit
 import GameController
+import TVVLCKit
 
 public class VLCPlayerViewController: UIViewController {
     public static func instantiate(media: VLCMedia) -> VLCPlayerViewController {