From c05be57b574ac79b1de0a3d2620d53a463191652 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Je=CC=81re=CC=81my=20Marchand?= Date: Fri, 28 Dec 2018 21:44:24 +0100 Subject: [PATCH] Readd Cocoapods compatibility with a workaround --- .../Demo.xcodeproj/project.pbxproj | 113 ++++++++++++++---- .../contents.xcworkspacedata | 0 .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../Demo/Base.lproj/Main.storyboard | 52 ++++++++ Demo Cocoapods/Demo/Info.plist | 32 +++++ Demo Cocoapods/Podfile | 17 +++ Demo Cocoapods/Podfile.lock | 23 ++++ Readme.md | 12 +- TVVLCPlayer.podspec | 12 +- 9 files changed, 231 insertions(+), 30 deletions(-) rename {Demo => Demo Cocoapods}/Demo.xcodeproj/project.pbxproj (64%) rename {Demo => Demo Cocoapods}/Demo.xcodeproj/project.xcworkspace/contents.xcworkspacedata (100%) rename {Demo => Demo Cocoapods}/Demo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (100%) create mode 100644 Demo Cocoapods/Demo/Base.lproj/Main.storyboard create mode 100644 Demo Cocoapods/Demo/Info.plist create mode 100644 Demo Cocoapods/Podfile create mode 100644 Demo Cocoapods/Podfile.lock diff --git a/Demo/Demo.xcodeproj/project.pbxproj b/Demo Cocoapods/Demo.xcodeproj/project.pbxproj similarity index 64% rename from Demo/Demo.xcodeproj/project.pbxproj rename to Demo Cocoapods/Demo.xcodeproj/project.pbxproj index 085e82c..49a3922 100644 --- a/Demo/Demo.xcodeproj/project.pbxproj +++ b/Demo Cocoapods/Demo.xcodeproj/project.pbxproj @@ -7,19 +7,23 @@ 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 = ""; }; 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 = ""; }; - 3F36E1D7204AA89500478CE2 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; - 3F36E1DA204AA89500478CE2 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - 3F36E1DC204AA89500478CE2 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 3F36E1DE204AA89500478CE2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 3F90150921D6B4F8001EC588 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = ../../Demo/Assets.xcassets; sourceTree = ""; }; + 3F90150A21D6B4F8001EC588 /* ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ViewController.swift; path = ../../Demo/ViewController.swift; sourceTree = ""; }; + 3F90150B21D6B4F8001EC588 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = ../../Demo/AppDelegate.swift; sourceTree = ""; }; + 3F90151621D6C155001EC588 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 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 = ""; }; + 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 */ @@ -27,18 +31,28 @@ 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 = ""; + }; 3F36E1C9204AA89500478CE2 = { isa = PBXGroup; children = ( 3F36E1D4204AA89500478CE2 /* Demo */, 3F36E1D3204AA89500478CE2 /* Products */, - 4E90FFDA0864BCC620E176FA /* Frameworks */, + 5A5E39488DBA482D21C23AB8 /* Pods */, + 12EA71010139816FC7C24056 /* Frameworks */, ); sourceTree = ""; }; @@ -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 = ""; }; - 4E90FFDA0864BCC620E176FA /* Frameworks */ = { + 5A5E39488DBA482D21C23AB8 /* Pods */ = { isa = PBXGroup; children = ( + 81DD855FFE971717B27DEC4F /* Pods-Demo.debug.xcconfig */, + 1AA7152B8C21EA0ABEC8792A /* Pods-Demo.release.xcconfig */, ); - name = Frameworks; + path = Pods; sourceTree = ""; }; /* End PBXGroup section */ @@ -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 = ( ); @@ -101,6 +119,7 @@ TargetAttributes = { 3F36E1D1204AA89500478CE2 = { CreatedOnToolsVersion = 9.2; + LastSwiftMigration = 1010; ProvisioningStyle = Automatic; }; }; @@ -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 = ""; @@ -266,15 +332,18 @@ }; 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; }; @@ -282,9 +351,11 @@ }; 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; diff --git a/Demo/Demo.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Demo Cocoapods/Demo.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from Demo/Demo.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to Demo Cocoapods/Demo.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/Demo/Demo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Demo Cocoapods/Demo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from Demo/Demo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to Demo Cocoapods/Demo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Demo Cocoapods/Demo/Base.lproj/Main.storyboard b/Demo Cocoapods/Demo/Base.lproj/Main.storyboard new file mode 100644 index 0000000..fe516e9 --- /dev/null +++ b/Demo Cocoapods/Demo/Base.lproj/Main.storyboard @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Demo Cocoapods/Demo/Info.plist b/Demo Cocoapods/Demo/Info.plist new file mode 100644 index 0000000..02942a3 --- /dev/null +++ b/Demo Cocoapods/Demo/Info.plist @@ -0,0 +1,32 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + LSRequiresIPhoneOS + + UIMainStoryboardFile + Main + UIRequiredDeviceCapabilities + + arm64 + + UIUserInterfaceStyle + Automatic + + diff --git a/Demo Cocoapods/Podfile b/Demo Cocoapods/Podfile new file mode 100644 index 0000000..ca0491c --- /dev/null +++ b/Demo Cocoapods/Podfile @@ -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 \ No newline at end of file diff --git a/Demo Cocoapods/Podfile.lock b/Demo Cocoapods/Podfile.lock new file mode 100644 index 0000000..582cddf --- /dev/null +++ b/Demo Cocoapods/Podfile.lock @@ -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 diff --git a/Readme.md b/Readme.md index 38246d4..f29df1e 100644 --- a/Readme.md +++ b/Readme.md @@ -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 diff --git a/TVVLCPlayer.podspec b/TVVLCPlayer.podspec index 80ef2b7..fec1640 100755 --- a/TVVLCPlayer.podspec +++ b/TVVLCPlayer.podspec @@ -1,13 +1,12 @@ Pod::Spec.new do |s| s.name = "TVVLCPlayer" - s.version = "1.0.2" + s.version = "1.1.0" s.summary = "A powerfull video player" s.description = <<-DESC TVVLCPlayer lets you integrate easylily a powerfull video player with playback control views to your tv apps. Based on TVVLCKit, it aims to replace AVPlayerViewController that can read only a limited number of formats. DESC - s.static_framework = true s.homepage = "https://github.com/kodlian/TVVLCPlayer" s.screenshots = "https://raw.githubusercontent.com/kodlian/TVVLCPlayer/master/screenshot.jpg" s.license = 'MIT' @@ -21,10 +20,7 @@ Pod::Spec.new do |s| s.frameworks = 'UIKit' s.dependency 'TVVLCKit' - s.pod_target_xcconfig = { - 'SWIFT_OBJC_BRIDGING_HEADER' => "${PODS_TARGET_SRCROOT}/Sources/TVVLCPlayer-Bridging-Header.h" - } - s.resources = ["Resources/*.storyboard"] - s.resource_bundle = { 'TVVLCPlayer' => [ 'Resources/*.xcassets' ] } - + s.resources = ['Resources/*.storyboard','Resources/*.xcassets'] + s.script_phase = { :name => 'Add modulemaps in VLCKit', :script => 'cp -rf "${PODS_TARGET_SRCROOT}/Modules" "${PODS_ROOT}/TVVLCKit/TVVLCKit.framework/Modules"', :execution_position => :before_compile } + s.preserve_path = "Modules" end