Skip to content

Commit

Permalink
Readd Cocoapods compatibility with a workaround
Browse files Browse the repository at this point in the history
  • Loading branch information
kodlian committed Dec 28, 2018
1 parent 74de13b commit c05be57
Show file tree
Hide file tree
Showing 9 changed files with 231 additions and 30 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,38 +7,52 @@
objects = {

/* Begin PBXBuildFile section */
3F36E1D6204AA89500478CE2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F36E1D5204AA89500478CE2 /* AppDelegate.swift */; };
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 */; };
3F90150F21D6B4F9001EC588 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3F90150921D6B4F8001EC588 /* Assets.xcassets */; };
3F90151021D6B4F9001EC588 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F90150A21D6B4F8001EC588 /* ViewController.swift */; };
3F90151121D6B4F9001EC588 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F90150B21D6B4F8001EC588 /* AppDelegate.swift */; };
3F90151721D6C155001EC588 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3F90151521D6C155001EC588 /* Main.storyboard */; };
E6CEF29B0B527B8DBBC7F748 /* Pods_Demo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A2B8E2B4C490901BB76207D8 /* Pods_Demo.framework */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
1AA7152B8C21EA0ABEC8792A /* Pods-Demo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Demo.release.xcconfig"; path = "Target Support Files/Pods-Demo/Pods-Demo.release.xcconfig"; sourceTree = "<group>"; };
3F36E1D2204AA89500478CE2 /* Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Demo.app; sourceTree = BUILT_PRODUCTS_DIR; };
3F36E1D5204AA89500478CE2 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
3F36E1D7204AA89500478CE2 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
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>"; };
3F90150921D6B4F8001EC588 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = ../../Demo/Assets.xcassets; sourceTree = "<group>"; };
3F90150A21D6B4F8001EC588 /* ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ViewController.swift; path = ../../Demo/ViewController.swift; sourceTree = "<group>"; };
3F90150B21D6B4F8001EC588 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = ../../Demo/AppDelegate.swift; sourceTree = "<group>"; };
3F90151621D6C155001EC588 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
81DD855FFE971717B27DEC4F /* Pods-Demo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Demo.debug.xcconfig"; path = "Target Support Files/Pods-Demo/Pods-Demo.debug.xcconfig"; sourceTree = "<group>"; };
A2B8E2B4C490901BB76207D8 /* Pods_Demo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Demo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
3F36E1CF204AA89500478CE2 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
E6CEF29B0B527B8DBBC7F748 /* Pods_Demo.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
12EA71010139816FC7C24056 /* Frameworks */ = {
isa = PBXGroup;
children = (
A2B8E2B4C490901BB76207D8 /* Pods_Demo.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
3F36E1C9204AA89500478CE2 = {
isa = PBXGroup;
children = (
3F36E1D4204AA89500478CE2 /* Demo */,
3F36E1D3204AA89500478CE2 /* Products */,
4E90FFDA0864BCC620E176FA /* Frameworks */,
5A5E39488DBA482D21C23AB8 /* Pods */,
12EA71010139816FC7C24056 /* Frameworks */,
);
sourceTree = "<group>";
};
Expand All @@ -53,20 +67,22 @@
3F36E1D4204AA89500478CE2 /* Demo */ = {
isa = PBXGroup;
children = (
3F36E1D5204AA89500478CE2 /* AppDelegate.swift */,
3F36E1D7204AA89500478CE2 /* ViewController.swift */,
3F36E1D9204AA89500478CE2 /* Main.storyboard */,
3F36E1DC204AA89500478CE2 /* Assets.xcassets */,
3F90150B21D6B4F8001EC588 /* AppDelegate.swift */,
3F90150A21D6B4F8001EC588 /* ViewController.swift */,
3F90151521D6C155001EC588 /* Main.storyboard */,
3F90150921D6B4F8001EC588 /* Assets.xcassets */,
3F36E1DE204AA89500478CE2 /* Info.plist */,
);
path = Demo;
sourceTree = "<group>";
};
4E90FFDA0864BCC620E176FA /* Frameworks */ = {
5A5E39488DBA482D21C23AB8 /* Pods */ = {
isa = PBXGroup;
children = (
81DD855FFE971717B27DEC4F /* Pods-Demo.debug.xcconfig */,
1AA7152B8C21EA0ABEC8792A /* Pods-Demo.release.xcconfig */,
);
name = Frameworks;
path = Pods;
sourceTree = "<group>";
};
/* End PBXGroup section */
Expand All @@ -76,9 +92,11 @@
isa = PBXNativeTarget;
buildConfigurationList = 3F36E1E1204AA89500478CE2 /* Build configuration list for PBXNativeTarget "Demo" */;
buildPhases = (
66D833490B4D1A944C733EFC /* [CP] Check Pods Manifest.lock */,
3F36E1CE204AA89500478CE2 /* Sources */,
3F36E1CF204AA89500478CE2 /* Frameworks */,
3F36E1D0204AA89500478CE2 /* Resources */,
A0ED8E062F41304D58BB64D7 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand All @@ -101,6 +119,7 @@
TargetAttributes = {
3F36E1D1204AA89500478CE2 = {
CreatedOnToolsVersion = 9.2;
LastSwiftMigration = 1010;
ProvisioningStyle = Automatic;
};
};
Expand Down Expand Up @@ -128,30 +147,77 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
3F36E1DD204AA89500478CE2 /* Assets.xcassets in Resources */,
3F36E1DB204AA89500478CE2 /* Main.storyboard in Resources */,
3F90150F21D6B4F9001EC588 /* Assets.xcassets in Resources */,
3F90151721D6C155001EC588 /* Main.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
66D833490B4D1A944C733EFC /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
);
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;
};
A0ED8E062F41304D58BB64D7 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Demo/Pods-Demo-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/TVVLCPlayer/TVVLCPlayer.framework",
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
);
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TVVLCPlayer.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Demo/Pods-Demo-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
3F36E1CE204AA89500478CE2 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
3F36E1D8204AA89500478CE2 /* ViewController.swift in Sources */,
3F36E1D6204AA89500478CE2 /* AppDelegate.swift in Sources */,
3F90151121D6B4F9001EC588 /* AppDelegate.swift in Sources */,
3F90151021D6B4F9001EC588 /* ViewController.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXVariantGroup section */
3F36E1D9204AA89500478CE2 /* Main.storyboard */ = {
3F90151521D6C155001EC588 /* Main.storyboard */ = {
isa = PBXVariantGroup;
children = (
3F36E1DA204AA89500478CE2 /* Base */,
3F90151621D6C155001EC588 /* Base */,
);
name = Main.storyboard;
sourceTree = "<group>";
Expand Down Expand Up @@ -266,25 +332,30 @@
};
3F36E1E2204AA89500478CE2 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 81DD855FFE971717B27DEC4F /* Pods-Demo.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = 9DQT98LJ77;
INFOPLIST_FILE = Demo/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.kodlian.Demo;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = 3;
};
name = Debug;
};
3F36E1E3204AA89500478CE2 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 1AA7152B8C21EA0ABEC8792A /* Pods-Demo.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = 9DQT98LJ77;
INFOPLIST_FILE = Demo/Info.plist;
Expand Down
52 changes: 52 additions & 0 deletions Demo Cocoapods/Demo/Base.lproj/Main.storyboard
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder.AppleTV.Storyboard" version="3.0" toolsVersion="14460.31" 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="14460.20"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="tne-QT-ifu">
<objects>
<viewController id="BYZ-38-t0r" customClass="ViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
<viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
<rect key="frame" x="0.0" y="0.0" width="1920" height="1080"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qvq-sP-Fp2">
<rect key="frame" x="884" y="497" width="152" height="86"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<inset key="contentEdgeInsets" minX="40" minY="20" maxX="40" maxY="20"/>
<state key="normal" title="Play"/>
<connections>
<segue destination="uf1-k1-INg" kind="show" id="BIp-80-2Eo"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
<viewLayoutGuide key="safeArea" id="wu6-TO-1qx"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="913" y="-727"/>
</scene>
<!--TVVLCPlayer-->
<scene sceneID="yMc-ke-CCV">
<objects>
<viewControllerPlaceholder storyboardName="TVVLCPlayer" bundleIdentifier="org.cocoapods.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"/>
</scene>
</scenes>
</document>
32 changes: 32 additions & 0 deletions Demo Cocoapods/Demo/Info.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?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>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UIMainStoryboardFile</key>
<string>Main</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>arm64</string>
</array>
<key>UIUserInterfaceStyle</key>
<string>Automatic</string>
</dict>
</plist>
17 changes: 17 additions & 0 deletions Demo Cocoapods/Podfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
platform :tvos, '11.0'
inhibit_all_warnings!

source 'https://github.com/CocoaPods/Specs'

target 'Demo' do
# Comment the next line if you're not using Swift and don't want to use dynamic frameworks
use_frameworks!

# Pods for TVVLCPlayer
pod 'TVVLCPlayer', :path => "../TVVLCPlayer.podspec"
end

pre_install do |installer|
# workaround for https://github.com/CocoaPods/CocoaPods/issues/3289
Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}
end
23 changes: 23 additions & 0 deletions Demo Cocoapods/Podfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
PODS:
- TVVLCKit (3.2.0)
- TVVLCPlayer (1.1.0):
- TVVLCKit

DEPENDENCIES:
- TVVLCPlayer (from `../TVVLCPlayer.podspec`)

SPEC REPOS:
https://github.com/cocoapods/specs.git:
- TVVLCKit

EXTERNAL SOURCES:
TVVLCPlayer:
:path: "../TVVLCPlayer.podspec"

SPEC CHECKSUMS:
TVVLCKit: 8dbd6e0b9cc4dc40676128981823c25dbc1b5afa
TVVLCPlayer: 215eb10d6b7518baa3291ff15c84581bddae28a1

PODFILE CHECKSUM: fd7c0a6c90fad1107927bef955e16087beecd16e

COCOAPODS: 1.6.0.beta.2
12 changes: 11 additions & 1 deletion Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,19 @@ TVVLCPlayer lets you integrate easily a powerfull video player with playback con
- Jump, fast forward and rewind

## Installation
```
# Carthage
github "kodlian/TVVLCPlayer", "~> 1.1.0"
```

```ruby
# CocoaPods
pod "TVVLCPlayer", "~> 1.0.2"
pod "TVVLCPlayer", "~> 1.1.0"

pre_install do |installer|
# workaround for https://github.com/CocoaPods/CocoaPods/issues/3289
Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}
end
```

## Usage
Expand Down
Loading

0 comments on commit c05be57

Please sign in to comment.