From e9db89a5cb5c112a4feaebeb116badd419b99243 Mon Sep 17 00:00:00 2001 From: Ethan Lipnik Date: Wed, 18 Dec 2019 15:54:37 -0500 Subject: [PATCH 1/5] Added a package.swift file --- Package.swift | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 Package.swift diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..b7e731f --- /dev/null +++ b/Package.swift @@ -0,0 +1,38 @@ +// swift-tools-version:5.0 +// The swift-tools-version declares the minimum version of Swift required to build this package. +import PackageDescription + +let package = Package( + name: "JPVideoPlayer", + platforms: [ + .macOS(.v10_10), + .iOS(.v8), + .tvOS(.v9), + .watchOS(.v2) + ], + products: [ + // Products define the executables and libraries produced by a package, and make them visible to other packages. + .library( + name: "JPVideoPlayer", + targets: ["JPVideoPlayer"]) + ], + 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: "JPVideoPlayer", + dependencies: [], + path: ".", + sources: ["JPVideoPlayer"], + publicHeadersPath: "JPVideoPlayer", + cSettings: [ + .headerSearchPath("JPVideoPlayer"), + .headerSearchPath("JPVideoPlayer") + ] + ) + ] +) From c99a13076fdcc5f79ab09efa14cef5d6f9af1639 Mon Sep 17 00:00:00 2001 From: Ethan Lipnik Date: Wed, 18 Dec 2019 15:57:47 -0500 Subject: [PATCH 2/5] Init package.swift --- .../contents.xcworkspacedata | 7 ++++++ Package.swift | 24 ++++++------------- Sources/JPVideoPlayer/JPVideoPlayer.swift | 3 +++ .../JPVideoPlayerTests.swift | 15 ++++++++++++ .../JPVideoPlayerTests/XCTestManifests.swift | 9 +++++++ Tests/LinuxMain.swift | 7 ++++++ 6 files changed, 48 insertions(+), 17 deletions(-) create mode 100644 .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata create mode 100644 Sources/JPVideoPlayer/JPVideoPlayer.swift create mode 100644 Tests/JPVideoPlayerTests/JPVideoPlayerTests.swift create mode 100644 Tests/JPVideoPlayerTests/XCTestManifests.swift create mode 100644 Tests/LinuxMain.swift diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..919434a --- /dev/null +++ b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/Package.swift b/Package.swift index b7e731f..8540f1b 100644 --- a/Package.swift +++ b/Package.swift @@ -1,20 +1,15 @@ -// swift-tools-version:5.0 +// 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: "JPVideoPlayer", - platforms: [ - .macOS(.v10_10), - .iOS(.v8), - .tvOS(.v9), - .watchOS(.v2) - ], products: [ // Products define the executables and libraries produced by a package, and make them visible to other packages. .library( name: "JPVideoPlayer", - targets: ["JPVideoPlayer"]) + targets: ["JPVideoPlayer"]), ], dependencies: [ // Dependencies declare other packages that this package depends on. @@ -25,14 +20,9 @@ let package = Package( // Targets can depend on other targets in this package, and on products in packages which this package depends on. .target( name: "JPVideoPlayer", - dependencies: [], - path: ".", - sources: ["JPVideoPlayer"], - publicHeadersPath: "JPVideoPlayer", - cSettings: [ - .headerSearchPath("JPVideoPlayer"), - .headerSearchPath("JPVideoPlayer") - ] - ) + dependencies: []), + .testTarget( + name: "JPVideoPlayerTests", + dependencies: ["JPVideoPlayer"]), ] ) diff --git a/Sources/JPVideoPlayer/JPVideoPlayer.swift b/Sources/JPVideoPlayer/JPVideoPlayer.swift new file mode 100644 index 0000000..dbee23f --- /dev/null +++ b/Sources/JPVideoPlayer/JPVideoPlayer.swift @@ -0,0 +1,3 @@ +struct JPVideoPlayer { + var text = "Hello, World!" +} diff --git a/Tests/JPVideoPlayerTests/JPVideoPlayerTests.swift b/Tests/JPVideoPlayerTests/JPVideoPlayerTests.swift new file mode 100644 index 0000000..606beb4 --- /dev/null +++ b/Tests/JPVideoPlayerTests/JPVideoPlayerTests.swift @@ -0,0 +1,15 @@ +import XCTest +@testable import JPVideoPlayer + +final class JPVideoPlayerTests: XCTestCase { + func testExample() { + // This is an example of a functional test case. + // Use XCTAssert and related functions to verify your tests produce the correct + // results. + XCTAssertEqual(JPVideoPlayer().text, "Hello, World!") + } + + static var allTests = [ + ("testExample", testExample), + ] +} diff --git a/Tests/JPVideoPlayerTests/XCTestManifests.swift b/Tests/JPVideoPlayerTests/XCTestManifests.swift new file mode 100644 index 0000000..9559f05 --- /dev/null +++ b/Tests/JPVideoPlayerTests/XCTestManifests.swift @@ -0,0 +1,9 @@ +import XCTest + +#if !canImport(ObjectiveC) +public func allTests() -> [XCTestCaseEntry] { + return [ + testCase(JPVideoPlayerTests.allTests), + ] +} +#endif diff --git a/Tests/LinuxMain.swift b/Tests/LinuxMain.swift new file mode 100644 index 0000000..f5a5736 --- /dev/null +++ b/Tests/LinuxMain.swift @@ -0,0 +1,7 @@ +import XCTest + +import JPVideoPlayerTests + +var tests = [XCTestCaseEntry]() +tests += JPVideoPlayerTests.allTests() +XCTMain(tests) From 311f0c8bec7106064b9a358ca2ea51dec9b4b5a2 Mon Sep 17 00:00:00 2001 From: Ethan Lipnik Date: Wed, 18 Dec 2019 16:04:20 -0500 Subject: [PATCH 3/5] Moved the source files --- Package.swift | 5 +++++ .../JPVideoPlayer}/JPGCDExtensions.h | 0 .../JPVideoPlayer}/JPGCDExtensions.m | 0 .../JPVideoPlayer}/JPMethodInjecting.h | 0 .../JPVideoPlayer}/JPMethodInjecting.m | 0 .../JPVideoPlayer}/JPResourceLoadingRequestTask.h | 0 .../JPVideoPlayer}/JPResourceLoadingRequestTask.m | 0 .../JPVideoPlayer.bundle/jp_videoplayer_blur@2x.png | Bin .../JPVideoPlayer.bundle/jp_videoplayer_blur@3x.png | Bin .../jp_videoplayer_landscape@2x.png | Bin .../jp_videoplayer_landscape@3x.png | Bin .../jp_videoplayer_pause@2x.png | Bin .../jp_videoplayer_pause@3x.png | Bin .../JPVideoPlayer.bundle/jp_videoplayer_play@2x.png | Bin .../JPVideoPlayer.bundle/jp_videoplayer_play@3x.png | Bin .../jp_videoplayer_portrait@2x.png | Bin .../jp_videoplayer_portrait@3x.png | Bin ...p_videoplayer_progress_handler_hightlight@2x.png | Bin ...p_videoplayer_progress_handler_hightlight@3x.png | Bin .../jp_videoplayer_progress_handler_normal@2x.png | Bin .../jp_videoplayer_progress_handler_normal@3x.png | Bin .../JPVideoPlayer}/JPVideoPlayer.h | 0 .../JPVideoPlayer}/JPVideoPlayer.m | 0 Sources/JPVideoPlayer/JPVideoPlayer.swift | 3 --- .../JPVideoPlayer}/JPVideoPlayerCache.h | 0 .../JPVideoPlayer}/JPVideoPlayerCache.m | 0 .../JPVideoPlayer}/JPVideoPlayerCacheFile.h | 0 .../JPVideoPlayer}/JPVideoPlayerCacheFile.m | 0 .../JPVideoPlayer}/JPVideoPlayerCachePath.h | 0 .../JPVideoPlayer}/JPVideoPlayerCachePath.m | 0 .../JPVideoPlayer}/JPVideoPlayerCellProtocol.h | 2 +- .../JPVideoPlayer}/JPVideoPlayerCellProtocol.m | 0 .../JPVideoPlayer}/JPVideoPlayerCompat.h | 0 .../JPVideoPlayer}/JPVideoPlayerCompat.m | 0 .../JPVideoPlayer}/JPVideoPlayerControlViews.h | 0 .../JPVideoPlayer}/JPVideoPlayerControlViews.m | 0 .../JPVideoPlayer}/JPVideoPlayerDownloader.h | 0 .../JPVideoPlayer}/JPVideoPlayerDownloader.m | 0 .../JPVideoPlayer}/JPVideoPlayerKit.h | 0 .../JPVideoPlayer}/JPVideoPlayerManager.h | 0 .../JPVideoPlayer}/JPVideoPlayerManager.m | 0 .../JPVideoPlayer}/JPVideoPlayerProtocol.h | 0 .../JPVideoPlayer}/JPVideoPlayerResourceLoader.h | 0 .../JPVideoPlayer}/JPVideoPlayerResourceLoader.m | 0 .../JPVideoPlayerScrollViewProtocol.h | 0 .../JPVideoPlayerScrollViewProtocol.m | 0 .../JPVideoPlayer}/JPVideoPlayerSupportUtils.h | 0 .../JPVideoPlayer}/JPVideoPlayerSupportUtils.m | 0 .../JPVideoPlayer}/UICollectionView+WebVideoCache.h | 0 .../JPVideoPlayer}/UICollectionView+WebVideoCache.m | 0 .../UICollectionViewCell+WebVideoCache.h | 0 .../UICollectionViewCell+WebVideoCache.m | 0 .../JPVideoPlayer}/UITableView+WebVideoCache.h | 0 .../JPVideoPlayer}/UITableView+WebVideoCache.m | 0 .../JPVideoPlayer}/UITableViewCell+WebVideoCache.h | 0 .../JPVideoPlayer}/UITableViewCell+WebVideoCache.m | 0 .../JPVideoPlayer}/UIView+WebVideoCache.h | 0 .../JPVideoPlayer}/UIView+WebVideoCache.m | 0 Tests/JPVideoPlayerTests/JPVideoPlayerTests.swift | 1 - 59 files changed, 6 insertions(+), 5 deletions(-) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPGCDExtensions.h (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPGCDExtensions.m (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPMethodInjecting.h (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPMethodInjecting.m (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPResourceLoadingRequestTask.h (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPResourceLoadingRequestTask.m (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayer.bundle/jp_videoplayer_blur@2x.png (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayer.bundle/jp_videoplayer_blur@3x.png (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayer.bundle/jp_videoplayer_landscape@2x.png (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayer.bundle/jp_videoplayer_landscape@3x.png (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayer.bundle/jp_videoplayer_pause@2x.png (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayer.bundle/jp_videoplayer_pause@3x.png (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayer.bundle/jp_videoplayer_play@2x.png (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayer.bundle/jp_videoplayer_play@3x.png (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayer.bundle/jp_videoplayer_portrait@2x.png (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayer.bundle/jp_videoplayer_portrait@3x.png (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_hightlight@2x.png (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_hightlight@3x.png (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_normal@2x.png (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_normal@3x.png (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayer.h (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayer.m (100%) delete mode 100644 Sources/JPVideoPlayer/JPVideoPlayer.swift rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayerCache.h (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayerCache.m (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayerCacheFile.h (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayerCacheFile.m (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayerCachePath.h (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayerCachePath.m (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayerCellProtocol.h (98%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayerCellProtocol.m (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayerCompat.h (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayerCompat.m (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayerControlViews.h (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayerControlViews.m (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayerDownloader.h (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayerDownloader.m (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayerKit.h (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayerManager.h (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayerManager.m (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayerProtocol.h (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayerResourceLoader.h (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayerResourceLoader.m (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayerScrollViewProtocol.h (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayerScrollViewProtocol.m (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayerSupportUtils.h (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/JPVideoPlayerSupportUtils.m (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/UICollectionView+WebVideoCache.h (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/UICollectionView+WebVideoCache.m (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/UICollectionViewCell+WebVideoCache.h (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/UICollectionViewCell+WebVideoCache.m (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/UITableView+WebVideoCache.h (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/UITableView+WebVideoCache.m (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/UITableViewCell+WebVideoCache.h (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/UITableViewCell+WebVideoCache.m (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/UIView+WebVideoCache.h (100%) rename {JPVideoPlayer => Sources/JPVideoPlayer}/UIView+WebVideoCache.m (100%) diff --git a/Package.swift b/Package.swift index 8540f1b..e970b52 100644 --- a/Package.swift +++ b/Package.swift @@ -5,6 +5,11 @@ import PackageDescription let package = Package( name: "JPVideoPlayer", + platforms: [ + .iOS(.v8), + .tvOS(.v9), + .watchOS(.v2) + ], products: [ // Products define the executables and libraries produced by a package, and make them visible to other packages. .library( diff --git a/JPVideoPlayer/JPGCDExtensions.h b/Sources/JPVideoPlayer/JPGCDExtensions.h similarity index 100% rename from JPVideoPlayer/JPGCDExtensions.h rename to Sources/JPVideoPlayer/JPGCDExtensions.h diff --git a/JPVideoPlayer/JPGCDExtensions.m b/Sources/JPVideoPlayer/JPGCDExtensions.m similarity index 100% rename from JPVideoPlayer/JPGCDExtensions.m rename to Sources/JPVideoPlayer/JPGCDExtensions.m diff --git a/JPVideoPlayer/JPMethodInjecting.h b/Sources/JPVideoPlayer/JPMethodInjecting.h similarity index 100% rename from JPVideoPlayer/JPMethodInjecting.h rename to Sources/JPVideoPlayer/JPMethodInjecting.h diff --git a/JPVideoPlayer/JPMethodInjecting.m b/Sources/JPVideoPlayer/JPMethodInjecting.m similarity index 100% rename from JPVideoPlayer/JPMethodInjecting.m rename to Sources/JPVideoPlayer/JPMethodInjecting.m diff --git a/JPVideoPlayer/JPResourceLoadingRequestTask.h b/Sources/JPVideoPlayer/JPResourceLoadingRequestTask.h similarity index 100% rename from JPVideoPlayer/JPResourceLoadingRequestTask.h rename to Sources/JPVideoPlayer/JPResourceLoadingRequestTask.h diff --git a/JPVideoPlayer/JPResourceLoadingRequestTask.m b/Sources/JPVideoPlayer/JPResourceLoadingRequestTask.m similarity index 100% rename from JPVideoPlayer/JPResourceLoadingRequestTask.m rename to Sources/JPVideoPlayer/JPResourceLoadingRequestTask.m diff --git a/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_blur@2x.png b/Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_blur@2x.png similarity index 100% rename from JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_blur@2x.png rename to Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_blur@2x.png diff --git a/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_blur@3x.png b/Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_blur@3x.png similarity index 100% rename from JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_blur@3x.png rename to Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_blur@3x.png diff --git a/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_landscape@2x.png b/Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_landscape@2x.png similarity index 100% rename from JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_landscape@2x.png rename to Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_landscape@2x.png diff --git a/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_landscape@3x.png b/Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_landscape@3x.png similarity index 100% rename from JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_landscape@3x.png rename to Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_landscape@3x.png diff --git a/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_pause@2x.png b/Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_pause@2x.png similarity index 100% rename from JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_pause@2x.png rename to Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_pause@2x.png diff --git a/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_pause@3x.png b/Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_pause@3x.png similarity index 100% rename from JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_pause@3x.png rename to Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_pause@3x.png diff --git a/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_play@2x.png b/Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_play@2x.png similarity index 100% rename from JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_play@2x.png rename to Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_play@2x.png diff --git a/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_play@3x.png b/Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_play@3x.png similarity index 100% rename from JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_play@3x.png rename to Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_play@3x.png diff --git a/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_portrait@2x.png b/Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_portrait@2x.png similarity index 100% rename from JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_portrait@2x.png rename to Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_portrait@2x.png diff --git a/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_portrait@3x.png b/Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_portrait@3x.png similarity index 100% rename from JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_portrait@3x.png rename to Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_portrait@3x.png diff --git a/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_hightlight@2x.png b/Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_hightlight@2x.png similarity index 100% rename from JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_hightlight@2x.png rename to Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_hightlight@2x.png diff --git a/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_hightlight@3x.png b/Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_hightlight@3x.png similarity index 100% rename from JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_hightlight@3x.png rename to Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_hightlight@3x.png diff --git a/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_normal@2x.png b/Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_normal@2x.png similarity index 100% rename from JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_normal@2x.png rename to Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_normal@2x.png diff --git a/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_normal@3x.png b/Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_normal@3x.png similarity index 100% rename from JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_normal@3x.png rename to Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_normal@3x.png diff --git a/JPVideoPlayer/JPVideoPlayer.h b/Sources/JPVideoPlayer/JPVideoPlayer.h similarity index 100% rename from JPVideoPlayer/JPVideoPlayer.h rename to Sources/JPVideoPlayer/JPVideoPlayer.h diff --git a/JPVideoPlayer/JPVideoPlayer.m b/Sources/JPVideoPlayer/JPVideoPlayer.m similarity index 100% rename from JPVideoPlayer/JPVideoPlayer.m rename to Sources/JPVideoPlayer/JPVideoPlayer.m diff --git a/Sources/JPVideoPlayer/JPVideoPlayer.swift b/Sources/JPVideoPlayer/JPVideoPlayer.swift deleted file mode 100644 index dbee23f..0000000 --- a/Sources/JPVideoPlayer/JPVideoPlayer.swift +++ /dev/null @@ -1,3 +0,0 @@ -struct JPVideoPlayer { - var text = "Hello, World!" -} diff --git a/JPVideoPlayer/JPVideoPlayerCache.h b/Sources/JPVideoPlayer/JPVideoPlayerCache.h similarity index 100% rename from JPVideoPlayer/JPVideoPlayerCache.h rename to Sources/JPVideoPlayer/JPVideoPlayerCache.h diff --git a/JPVideoPlayer/JPVideoPlayerCache.m b/Sources/JPVideoPlayer/JPVideoPlayerCache.m similarity index 100% rename from JPVideoPlayer/JPVideoPlayerCache.m rename to Sources/JPVideoPlayer/JPVideoPlayerCache.m diff --git a/JPVideoPlayer/JPVideoPlayerCacheFile.h b/Sources/JPVideoPlayer/JPVideoPlayerCacheFile.h similarity index 100% rename from JPVideoPlayer/JPVideoPlayerCacheFile.h rename to Sources/JPVideoPlayer/JPVideoPlayerCacheFile.h diff --git a/JPVideoPlayer/JPVideoPlayerCacheFile.m b/Sources/JPVideoPlayer/JPVideoPlayerCacheFile.m similarity index 100% rename from JPVideoPlayer/JPVideoPlayerCacheFile.m rename to Sources/JPVideoPlayer/JPVideoPlayerCacheFile.m diff --git a/JPVideoPlayer/JPVideoPlayerCachePath.h b/Sources/JPVideoPlayer/JPVideoPlayerCachePath.h similarity index 100% rename from JPVideoPlayer/JPVideoPlayerCachePath.h rename to Sources/JPVideoPlayer/JPVideoPlayerCachePath.h diff --git a/JPVideoPlayer/JPVideoPlayerCachePath.m b/Sources/JPVideoPlayer/JPVideoPlayerCachePath.m similarity index 100% rename from JPVideoPlayer/JPVideoPlayerCachePath.m rename to Sources/JPVideoPlayer/JPVideoPlayerCachePath.m diff --git a/JPVideoPlayer/JPVideoPlayerCellProtocol.h b/Sources/JPVideoPlayer/JPVideoPlayerCellProtocol.h similarity index 98% rename from JPVideoPlayer/JPVideoPlayerCellProtocol.h rename to Sources/JPVideoPlayer/JPVideoPlayerCellProtocol.h index d378e30..2a3e821 100644 --- a/JPVideoPlayer/JPVideoPlayerCellProtocol.h +++ b/Sources/JPVideoPlayer/JPVideoPlayerCellProtocol.h @@ -45,4 +45,4 @@ NS_ASSUME_NONNULL_BEGIN @end -NS_ASSUME_NONNULL_END \ No newline at end of file +NS_ASSUME_NONNULL_END diff --git a/JPVideoPlayer/JPVideoPlayerCellProtocol.m b/Sources/JPVideoPlayer/JPVideoPlayerCellProtocol.m similarity index 100% rename from JPVideoPlayer/JPVideoPlayerCellProtocol.m rename to Sources/JPVideoPlayer/JPVideoPlayerCellProtocol.m diff --git a/JPVideoPlayer/JPVideoPlayerCompat.h b/Sources/JPVideoPlayer/JPVideoPlayerCompat.h similarity index 100% rename from JPVideoPlayer/JPVideoPlayerCompat.h rename to Sources/JPVideoPlayer/JPVideoPlayerCompat.h diff --git a/JPVideoPlayer/JPVideoPlayerCompat.m b/Sources/JPVideoPlayer/JPVideoPlayerCompat.m similarity index 100% rename from JPVideoPlayer/JPVideoPlayerCompat.m rename to Sources/JPVideoPlayer/JPVideoPlayerCompat.m diff --git a/JPVideoPlayer/JPVideoPlayerControlViews.h b/Sources/JPVideoPlayer/JPVideoPlayerControlViews.h similarity index 100% rename from JPVideoPlayer/JPVideoPlayerControlViews.h rename to Sources/JPVideoPlayer/JPVideoPlayerControlViews.h diff --git a/JPVideoPlayer/JPVideoPlayerControlViews.m b/Sources/JPVideoPlayer/JPVideoPlayerControlViews.m similarity index 100% rename from JPVideoPlayer/JPVideoPlayerControlViews.m rename to Sources/JPVideoPlayer/JPVideoPlayerControlViews.m diff --git a/JPVideoPlayer/JPVideoPlayerDownloader.h b/Sources/JPVideoPlayer/JPVideoPlayerDownloader.h similarity index 100% rename from JPVideoPlayer/JPVideoPlayerDownloader.h rename to Sources/JPVideoPlayer/JPVideoPlayerDownloader.h diff --git a/JPVideoPlayer/JPVideoPlayerDownloader.m b/Sources/JPVideoPlayer/JPVideoPlayerDownloader.m similarity index 100% rename from JPVideoPlayer/JPVideoPlayerDownloader.m rename to Sources/JPVideoPlayer/JPVideoPlayerDownloader.m diff --git a/JPVideoPlayer/JPVideoPlayerKit.h b/Sources/JPVideoPlayer/JPVideoPlayerKit.h similarity index 100% rename from JPVideoPlayer/JPVideoPlayerKit.h rename to Sources/JPVideoPlayer/JPVideoPlayerKit.h diff --git a/JPVideoPlayer/JPVideoPlayerManager.h b/Sources/JPVideoPlayer/JPVideoPlayerManager.h similarity index 100% rename from JPVideoPlayer/JPVideoPlayerManager.h rename to Sources/JPVideoPlayer/JPVideoPlayerManager.h diff --git a/JPVideoPlayer/JPVideoPlayerManager.m b/Sources/JPVideoPlayer/JPVideoPlayerManager.m similarity index 100% rename from JPVideoPlayer/JPVideoPlayerManager.m rename to Sources/JPVideoPlayer/JPVideoPlayerManager.m diff --git a/JPVideoPlayer/JPVideoPlayerProtocol.h b/Sources/JPVideoPlayer/JPVideoPlayerProtocol.h similarity index 100% rename from JPVideoPlayer/JPVideoPlayerProtocol.h rename to Sources/JPVideoPlayer/JPVideoPlayerProtocol.h diff --git a/JPVideoPlayer/JPVideoPlayerResourceLoader.h b/Sources/JPVideoPlayer/JPVideoPlayerResourceLoader.h similarity index 100% rename from JPVideoPlayer/JPVideoPlayerResourceLoader.h rename to Sources/JPVideoPlayer/JPVideoPlayerResourceLoader.h diff --git a/JPVideoPlayer/JPVideoPlayerResourceLoader.m b/Sources/JPVideoPlayer/JPVideoPlayerResourceLoader.m similarity index 100% rename from JPVideoPlayer/JPVideoPlayerResourceLoader.m rename to Sources/JPVideoPlayer/JPVideoPlayerResourceLoader.m diff --git a/JPVideoPlayer/JPVideoPlayerScrollViewProtocol.h b/Sources/JPVideoPlayer/JPVideoPlayerScrollViewProtocol.h similarity index 100% rename from JPVideoPlayer/JPVideoPlayerScrollViewProtocol.h rename to Sources/JPVideoPlayer/JPVideoPlayerScrollViewProtocol.h diff --git a/JPVideoPlayer/JPVideoPlayerScrollViewProtocol.m b/Sources/JPVideoPlayer/JPVideoPlayerScrollViewProtocol.m similarity index 100% rename from JPVideoPlayer/JPVideoPlayerScrollViewProtocol.m rename to Sources/JPVideoPlayer/JPVideoPlayerScrollViewProtocol.m diff --git a/JPVideoPlayer/JPVideoPlayerSupportUtils.h b/Sources/JPVideoPlayer/JPVideoPlayerSupportUtils.h similarity index 100% rename from JPVideoPlayer/JPVideoPlayerSupportUtils.h rename to Sources/JPVideoPlayer/JPVideoPlayerSupportUtils.h diff --git a/JPVideoPlayer/JPVideoPlayerSupportUtils.m b/Sources/JPVideoPlayer/JPVideoPlayerSupportUtils.m similarity index 100% rename from JPVideoPlayer/JPVideoPlayerSupportUtils.m rename to Sources/JPVideoPlayer/JPVideoPlayerSupportUtils.m diff --git a/JPVideoPlayer/UICollectionView+WebVideoCache.h b/Sources/JPVideoPlayer/UICollectionView+WebVideoCache.h similarity index 100% rename from JPVideoPlayer/UICollectionView+WebVideoCache.h rename to Sources/JPVideoPlayer/UICollectionView+WebVideoCache.h diff --git a/JPVideoPlayer/UICollectionView+WebVideoCache.m b/Sources/JPVideoPlayer/UICollectionView+WebVideoCache.m similarity index 100% rename from JPVideoPlayer/UICollectionView+WebVideoCache.m rename to Sources/JPVideoPlayer/UICollectionView+WebVideoCache.m diff --git a/JPVideoPlayer/UICollectionViewCell+WebVideoCache.h b/Sources/JPVideoPlayer/UICollectionViewCell+WebVideoCache.h similarity index 100% rename from JPVideoPlayer/UICollectionViewCell+WebVideoCache.h rename to Sources/JPVideoPlayer/UICollectionViewCell+WebVideoCache.h diff --git a/JPVideoPlayer/UICollectionViewCell+WebVideoCache.m b/Sources/JPVideoPlayer/UICollectionViewCell+WebVideoCache.m similarity index 100% rename from JPVideoPlayer/UICollectionViewCell+WebVideoCache.m rename to Sources/JPVideoPlayer/UICollectionViewCell+WebVideoCache.m diff --git a/JPVideoPlayer/UITableView+WebVideoCache.h b/Sources/JPVideoPlayer/UITableView+WebVideoCache.h similarity index 100% rename from JPVideoPlayer/UITableView+WebVideoCache.h rename to Sources/JPVideoPlayer/UITableView+WebVideoCache.h diff --git a/JPVideoPlayer/UITableView+WebVideoCache.m b/Sources/JPVideoPlayer/UITableView+WebVideoCache.m similarity index 100% rename from JPVideoPlayer/UITableView+WebVideoCache.m rename to Sources/JPVideoPlayer/UITableView+WebVideoCache.m diff --git a/JPVideoPlayer/UITableViewCell+WebVideoCache.h b/Sources/JPVideoPlayer/UITableViewCell+WebVideoCache.h similarity index 100% rename from JPVideoPlayer/UITableViewCell+WebVideoCache.h rename to Sources/JPVideoPlayer/UITableViewCell+WebVideoCache.h diff --git a/JPVideoPlayer/UITableViewCell+WebVideoCache.m b/Sources/JPVideoPlayer/UITableViewCell+WebVideoCache.m similarity index 100% rename from JPVideoPlayer/UITableViewCell+WebVideoCache.m rename to Sources/JPVideoPlayer/UITableViewCell+WebVideoCache.m diff --git a/JPVideoPlayer/UIView+WebVideoCache.h b/Sources/JPVideoPlayer/UIView+WebVideoCache.h similarity index 100% rename from JPVideoPlayer/UIView+WebVideoCache.h rename to Sources/JPVideoPlayer/UIView+WebVideoCache.h diff --git a/JPVideoPlayer/UIView+WebVideoCache.m b/Sources/JPVideoPlayer/UIView+WebVideoCache.m similarity index 100% rename from JPVideoPlayer/UIView+WebVideoCache.m rename to Sources/JPVideoPlayer/UIView+WebVideoCache.m diff --git a/Tests/JPVideoPlayerTests/JPVideoPlayerTests.swift b/Tests/JPVideoPlayerTests/JPVideoPlayerTests.swift index 606beb4..4eef609 100644 --- a/Tests/JPVideoPlayerTests/JPVideoPlayerTests.swift +++ b/Tests/JPVideoPlayerTests/JPVideoPlayerTests.swift @@ -6,7 +6,6 @@ final class JPVideoPlayerTests: XCTestCase { // This is an example of a functional test case. // Use XCTAssert and related functions to verify your tests produce the correct // results. - XCTAssertEqual(JPVideoPlayer().text, "Hello, World!") } static var allTests = [ From c7c72d91ff0804d8ce8a62def7ea9d987bd2ccef Mon Sep 17 00:00:00 2001 From: Ethan Lipnik Date: Wed, 18 Dec 2019 16:20:10 -0500 Subject: [PATCH 4/5] Moved stuff --- Sources/JPVideoPlayer/{ => include}/JPGCDExtensions.h | 0 Sources/JPVideoPlayer/{ => include}/JPMethodInjecting.h | 0 .../JPVideoPlayer/{ => include}/JPResourceLoadingRequestTask.h | 0 Sources/JPVideoPlayer/{ => include}/JPVideoPlayer.h | 0 Sources/JPVideoPlayer/{ => include}/JPVideoPlayerCache.h | 0 Sources/JPVideoPlayer/{ => include}/JPVideoPlayerCacheFile.h | 0 Sources/JPVideoPlayer/{ => include}/JPVideoPlayerCachePath.h | 0 Sources/JPVideoPlayer/{ => include}/JPVideoPlayerCellProtocol.h | 0 Sources/JPVideoPlayer/{ => include}/JPVideoPlayerCompat.h | 0 Sources/JPVideoPlayer/{ => include}/JPVideoPlayerControlViews.h | 0 Sources/JPVideoPlayer/{ => include}/JPVideoPlayerDownloader.h | 0 Sources/JPVideoPlayer/{ => include}/JPVideoPlayerKit.h | 0 Sources/JPVideoPlayer/{ => include}/JPVideoPlayerManager.h | 0 Sources/JPVideoPlayer/{ => include}/JPVideoPlayerProtocol.h | 0 Sources/JPVideoPlayer/{ => include}/JPVideoPlayerResourceLoader.h | 0 .../JPVideoPlayer/{ => include}/JPVideoPlayerScrollViewProtocol.h | 0 Sources/JPVideoPlayer/{ => include}/JPVideoPlayerSupportUtils.h | 0 .../JPVideoPlayer/{ => include}/UICollectionView+WebVideoCache.h | 0 .../{ => include}/UICollectionViewCell+WebVideoCache.h | 0 Sources/JPVideoPlayer/{ => include}/UITableView+WebVideoCache.h | 0 .../JPVideoPlayer/{ => include}/UITableViewCell+WebVideoCache.h | 0 Sources/JPVideoPlayer/{ => include}/UIView+WebVideoCache.h | 0 22 files changed, 0 insertions(+), 0 deletions(-) rename Sources/JPVideoPlayer/{ => include}/JPGCDExtensions.h (100%) rename Sources/JPVideoPlayer/{ => include}/JPMethodInjecting.h (100%) rename Sources/JPVideoPlayer/{ => include}/JPResourceLoadingRequestTask.h (100%) rename Sources/JPVideoPlayer/{ => include}/JPVideoPlayer.h (100%) rename Sources/JPVideoPlayer/{ => include}/JPVideoPlayerCache.h (100%) rename Sources/JPVideoPlayer/{ => include}/JPVideoPlayerCacheFile.h (100%) rename Sources/JPVideoPlayer/{ => include}/JPVideoPlayerCachePath.h (100%) rename Sources/JPVideoPlayer/{ => include}/JPVideoPlayerCellProtocol.h (100%) rename Sources/JPVideoPlayer/{ => include}/JPVideoPlayerCompat.h (100%) rename Sources/JPVideoPlayer/{ => include}/JPVideoPlayerControlViews.h (100%) rename Sources/JPVideoPlayer/{ => include}/JPVideoPlayerDownloader.h (100%) rename Sources/JPVideoPlayer/{ => include}/JPVideoPlayerKit.h (100%) rename Sources/JPVideoPlayer/{ => include}/JPVideoPlayerManager.h (100%) rename Sources/JPVideoPlayer/{ => include}/JPVideoPlayerProtocol.h (100%) rename Sources/JPVideoPlayer/{ => include}/JPVideoPlayerResourceLoader.h (100%) rename Sources/JPVideoPlayer/{ => include}/JPVideoPlayerScrollViewProtocol.h (100%) rename Sources/JPVideoPlayer/{ => include}/JPVideoPlayerSupportUtils.h (100%) rename Sources/JPVideoPlayer/{ => include}/UICollectionView+WebVideoCache.h (100%) rename Sources/JPVideoPlayer/{ => include}/UICollectionViewCell+WebVideoCache.h (100%) rename Sources/JPVideoPlayer/{ => include}/UITableView+WebVideoCache.h (100%) rename Sources/JPVideoPlayer/{ => include}/UITableViewCell+WebVideoCache.h (100%) rename Sources/JPVideoPlayer/{ => include}/UIView+WebVideoCache.h (100%) diff --git a/Sources/JPVideoPlayer/JPGCDExtensions.h b/Sources/JPVideoPlayer/include/JPGCDExtensions.h similarity index 100% rename from Sources/JPVideoPlayer/JPGCDExtensions.h rename to Sources/JPVideoPlayer/include/JPGCDExtensions.h diff --git a/Sources/JPVideoPlayer/JPMethodInjecting.h b/Sources/JPVideoPlayer/include/JPMethodInjecting.h similarity index 100% rename from Sources/JPVideoPlayer/JPMethodInjecting.h rename to Sources/JPVideoPlayer/include/JPMethodInjecting.h diff --git a/Sources/JPVideoPlayer/JPResourceLoadingRequestTask.h b/Sources/JPVideoPlayer/include/JPResourceLoadingRequestTask.h similarity index 100% rename from Sources/JPVideoPlayer/JPResourceLoadingRequestTask.h rename to Sources/JPVideoPlayer/include/JPResourceLoadingRequestTask.h diff --git a/Sources/JPVideoPlayer/JPVideoPlayer.h b/Sources/JPVideoPlayer/include/JPVideoPlayer.h similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayer.h rename to Sources/JPVideoPlayer/include/JPVideoPlayer.h diff --git a/Sources/JPVideoPlayer/JPVideoPlayerCache.h b/Sources/JPVideoPlayer/include/JPVideoPlayerCache.h similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayerCache.h rename to Sources/JPVideoPlayer/include/JPVideoPlayerCache.h diff --git a/Sources/JPVideoPlayer/JPVideoPlayerCacheFile.h b/Sources/JPVideoPlayer/include/JPVideoPlayerCacheFile.h similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayerCacheFile.h rename to Sources/JPVideoPlayer/include/JPVideoPlayerCacheFile.h diff --git a/Sources/JPVideoPlayer/JPVideoPlayerCachePath.h b/Sources/JPVideoPlayer/include/JPVideoPlayerCachePath.h similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayerCachePath.h rename to Sources/JPVideoPlayer/include/JPVideoPlayerCachePath.h diff --git a/Sources/JPVideoPlayer/JPVideoPlayerCellProtocol.h b/Sources/JPVideoPlayer/include/JPVideoPlayerCellProtocol.h similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayerCellProtocol.h rename to Sources/JPVideoPlayer/include/JPVideoPlayerCellProtocol.h diff --git a/Sources/JPVideoPlayer/JPVideoPlayerCompat.h b/Sources/JPVideoPlayer/include/JPVideoPlayerCompat.h similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayerCompat.h rename to Sources/JPVideoPlayer/include/JPVideoPlayerCompat.h diff --git a/Sources/JPVideoPlayer/JPVideoPlayerControlViews.h b/Sources/JPVideoPlayer/include/JPVideoPlayerControlViews.h similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayerControlViews.h rename to Sources/JPVideoPlayer/include/JPVideoPlayerControlViews.h diff --git a/Sources/JPVideoPlayer/JPVideoPlayerDownloader.h b/Sources/JPVideoPlayer/include/JPVideoPlayerDownloader.h similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayerDownloader.h rename to Sources/JPVideoPlayer/include/JPVideoPlayerDownloader.h diff --git a/Sources/JPVideoPlayer/JPVideoPlayerKit.h b/Sources/JPVideoPlayer/include/JPVideoPlayerKit.h similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayerKit.h rename to Sources/JPVideoPlayer/include/JPVideoPlayerKit.h diff --git a/Sources/JPVideoPlayer/JPVideoPlayerManager.h b/Sources/JPVideoPlayer/include/JPVideoPlayerManager.h similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayerManager.h rename to Sources/JPVideoPlayer/include/JPVideoPlayerManager.h diff --git a/Sources/JPVideoPlayer/JPVideoPlayerProtocol.h b/Sources/JPVideoPlayer/include/JPVideoPlayerProtocol.h similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayerProtocol.h rename to Sources/JPVideoPlayer/include/JPVideoPlayerProtocol.h diff --git a/Sources/JPVideoPlayer/JPVideoPlayerResourceLoader.h b/Sources/JPVideoPlayer/include/JPVideoPlayerResourceLoader.h similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayerResourceLoader.h rename to Sources/JPVideoPlayer/include/JPVideoPlayerResourceLoader.h diff --git a/Sources/JPVideoPlayer/JPVideoPlayerScrollViewProtocol.h b/Sources/JPVideoPlayer/include/JPVideoPlayerScrollViewProtocol.h similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayerScrollViewProtocol.h rename to Sources/JPVideoPlayer/include/JPVideoPlayerScrollViewProtocol.h diff --git a/Sources/JPVideoPlayer/JPVideoPlayerSupportUtils.h b/Sources/JPVideoPlayer/include/JPVideoPlayerSupportUtils.h similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayerSupportUtils.h rename to Sources/JPVideoPlayer/include/JPVideoPlayerSupportUtils.h diff --git a/Sources/JPVideoPlayer/UICollectionView+WebVideoCache.h b/Sources/JPVideoPlayer/include/UICollectionView+WebVideoCache.h similarity index 100% rename from Sources/JPVideoPlayer/UICollectionView+WebVideoCache.h rename to Sources/JPVideoPlayer/include/UICollectionView+WebVideoCache.h diff --git a/Sources/JPVideoPlayer/UICollectionViewCell+WebVideoCache.h b/Sources/JPVideoPlayer/include/UICollectionViewCell+WebVideoCache.h similarity index 100% rename from Sources/JPVideoPlayer/UICollectionViewCell+WebVideoCache.h rename to Sources/JPVideoPlayer/include/UICollectionViewCell+WebVideoCache.h diff --git a/Sources/JPVideoPlayer/UITableView+WebVideoCache.h b/Sources/JPVideoPlayer/include/UITableView+WebVideoCache.h similarity index 100% rename from Sources/JPVideoPlayer/UITableView+WebVideoCache.h rename to Sources/JPVideoPlayer/include/UITableView+WebVideoCache.h diff --git a/Sources/JPVideoPlayer/UITableViewCell+WebVideoCache.h b/Sources/JPVideoPlayer/include/UITableViewCell+WebVideoCache.h similarity index 100% rename from Sources/JPVideoPlayer/UITableViewCell+WebVideoCache.h rename to Sources/JPVideoPlayer/include/UITableViewCell+WebVideoCache.h diff --git a/Sources/JPVideoPlayer/UIView+WebVideoCache.h b/Sources/JPVideoPlayer/include/UIView+WebVideoCache.h similarity index 100% rename from Sources/JPVideoPlayer/UIView+WebVideoCache.h rename to Sources/JPVideoPlayer/include/UIView+WebVideoCache.h From e5e6cb4e3cf93a0eae39721789d9f46392831e4d Mon Sep 17 00:00:00 2001 From: Ethan Lipnik Date: Wed, 18 Dec 2019 16:32:26 -0500 Subject: [PATCH 5/5] Changed stuff again for SPM --- Package.swift | 6 +++++- .../include => Core}/JPGCDExtensions.h | 0 Sources/{JPVideoPlayer => Core}/JPGCDExtensions.m | 0 .../include => Core}/JPMethodInjecting.h | 0 Sources/{JPVideoPlayer => Core}/JPMethodInjecting.m | 0 .../include => Core}/JPResourceLoadingRequestTask.h | 0 .../JPResourceLoadingRequestTask.m | 0 .../JPVideoPlayer.bundle/jp_videoplayer_blur@2x.png | Bin .../JPVideoPlayer.bundle/jp_videoplayer_blur@3x.png | Bin .../jp_videoplayer_landscape@2x.png | Bin .../jp_videoplayer_landscape@3x.png | Bin .../jp_videoplayer_pause@2x.png | Bin .../jp_videoplayer_pause@3x.png | Bin .../JPVideoPlayer.bundle/jp_videoplayer_play@2x.png | Bin .../JPVideoPlayer.bundle/jp_videoplayer_play@3x.png | Bin .../jp_videoplayer_portrait@2x.png | Bin .../jp_videoplayer_portrait@3x.png | Bin ...p_videoplayer_progress_handler_hightlight@2x.png | Bin ...p_videoplayer_progress_handler_hightlight@3x.png | Bin .../jp_videoplayer_progress_handler_normal@2x.png | Bin .../jp_videoplayer_progress_handler_normal@3x.png | Bin .../{JPVideoPlayer/include => Core}/JPVideoPlayer.h | 0 Sources/{JPVideoPlayer => Core}/JPVideoPlayer.m | 0 .../include => Core}/JPVideoPlayerCache.h | 0 .../{JPVideoPlayer => Core}/JPVideoPlayerCache.m | 0 .../include => Core}/JPVideoPlayerCacheFile.h | 0 .../JPVideoPlayerCacheFile.m | 0 .../include => Core}/JPVideoPlayerCachePath.h | 0 .../JPVideoPlayerCachePath.m | 0 .../include => Core}/JPVideoPlayerCellProtocol.h | 0 .../JPVideoPlayerCellProtocol.m | 0 .../include => Core}/JPVideoPlayerCompat.h | 0 .../{JPVideoPlayer => Core}/JPVideoPlayerCompat.m | 0 .../include => Core}/JPVideoPlayerControlViews.h | 0 .../JPVideoPlayerControlViews.m | 0 .../include => Core}/JPVideoPlayerDownloader.h | 0 .../JPVideoPlayerDownloader.m | 0 .../include => Core}/JPVideoPlayerKit.h | 0 .../include => Core}/JPVideoPlayerManager.h | 0 .../{JPVideoPlayer => Core}/JPVideoPlayerManager.m | 0 .../include => Core}/JPVideoPlayerProtocol.h | 0 .../include => Core}/JPVideoPlayerResourceLoader.h | 0 .../JPVideoPlayerResourceLoader.m | 0 .../JPVideoPlayerScrollViewProtocol.h | 0 .../JPVideoPlayerScrollViewProtocol.m | 0 .../include => Core}/JPVideoPlayerSupportUtils.h | 0 .../JPVideoPlayerSupportUtils.m | 0 .../UICollectionView+WebVideoCache.h | 0 .../UICollectionView+WebVideoCache.m | 0 .../UICollectionViewCell+WebVideoCache.h | 0 .../UICollectionViewCell+WebVideoCache.m | 0 .../include => Core}/UITableView+WebVideoCache.h | 0 .../UITableView+WebVideoCache.m | 0 .../UITableViewCell+WebVideoCache.h | 0 .../UITableViewCell+WebVideoCache.m | 0 .../include => Core}/UIView+WebVideoCache.h | 0 .../{JPVideoPlayer => Core}/UIView+WebVideoCache.m | 0 57 files changed, 5 insertions(+), 1 deletion(-) rename Sources/{JPVideoPlayer/include => Core}/JPGCDExtensions.h (100%) rename Sources/{JPVideoPlayer => Core}/JPGCDExtensions.m (100%) rename Sources/{JPVideoPlayer/include => Core}/JPMethodInjecting.h (100%) rename Sources/{JPVideoPlayer => Core}/JPMethodInjecting.m (100%) rename Sources/{JPVideoPlayer/include => Core}/JPResourceLoadingRequestTask.h (100%) rename Sources/{JPVideoPlayer => Core}/JPResourceLoadingRequestTask.m (100%) rename Sources/{JPVideoPlayer => Core}/JPVideoPlayer.bundle/jp_videoplayer_blur@2x.png (100%) rename Sources/{JPVideoPlayer => Core}/JPVideoPlayer.bundle/jp_videoplayer_blur@3x.png (100%) rename Sources/{JPVideoPlayer => Core}/JPVideoPlayer.bundle/jp_videoplayer_landscape@2x.png (100%) rename Sources/{JPVideoPlayer => Core}/JPVideoPlayer.bundle/jp_videoplayer_landscape@3x.png (100%) rename Sources/{JPVideoPlayer => Core}/JPVideoPlayer.bundle/jp_videoplayer_pause@2x.png (100%) rename Sources/{JPVideoPlayer => Core}/JPVideoPlayer.bundle/jp_videoplayer_pause@3x.png (100%) rename Sources/{JPVideoPlayer => Core}/JPVideoPlayer.bundle/jp_videoplayer_play@2x.png (100%) rename Sources/{JPVideoPlayer => Core}/JPVideoPlayer.bundle/jp_videoplayer_play@3x.png (100%) rename Sources/{JPVideoPlayer => Core}/JPVideoPlayer.bundle/jp_videoplayer_portrait@2x.png (100%) rename Sources/{JPVideoPlayer => Core}/JPVideoPlayer.bundle/jp_videoplayer_portrait@3x.png (100%) rename Sources/{JPVideoPlayer => Core}/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_hightlight@2x.png (100%) rename Sources/{JPVideoPlayer => Core}/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_hightlight@3x.png (100%) rename Sources/{JPVideoPlayer => Core}/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_normal@2x.png (100%) rename Sources/{JPVideoPlayer => Core}/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_normal@3x.png (100%) rename Sources/{JPVideoPlayer/include => Core}/JPVideoPlayer.h (100%) rename Sources/{JPVideoPlayer => Core}/JPVideoPlayer.m (100%) rename Sources/{JPVideoPlayer/include => Core}/JPVideoPlayerCache.h (100%) rename Sources/{JPVideoPlayer => Core}/JPVideoPlayerCache.m (100%) rename Sources/{JPVideoPlayer/include => Core}/JPVideoPlayerCacheFile.h (100%) rename Sources/{JPVideoPlayer => Core}/JPVideoPlayerCacheFile.m (100%) rename Sources/{JPVideoPlayer/include => Core}/JPVideoPlayerCachePath.h (100%) rename Sources/{JPVideoPlayer => Core}/JPVideoPlayerCachePath.m (100%) rename Sources/{JPVideoPlayer/include => Core}/JPVideoPlayerCellProtocol.h (100%) rename Sources/{JPVideoPlayer => Core}/JPVideoPlayerCellProtocol.m (100%) rename Sources/{JPVideoPlayer/include => Core}/JPVideoPlayerCompat.h (100%) rename Sources/{JPVideoPlayer => Core}/JPVideoPlayerCompat.m (100%) rename Sources/{JPVideoPlayer/include => Core}/JPVideoPlayerControlViews.h (100%) rename Sources/{JPVideoPlayer => Core}/JPVideoPlayerControlViews.m (100%) rename Sources/{JPVideoPlayer/include => Core}/JPVideoPlayerDownloader.h (100%) rename Sources/{JPVideoPlayer => Core}/JPVideoPlayerDownloader.m (100%) rename Sources/{JPVideoPlayer/include => Core}/JPVideoPlayerKit.h (100%) rename Sources/{JPVideoPlayer/include => Core}/JPVideoPlayerManager.h (100%) rename Sources/{JPVideoPlayer => Core}/JPVideoPlayerManager.m (100%) rename Sources/{JPVideoPlayer/include => Core}/JPVideoPlayerProtocol.h (100%) rename Sources/{JPVideoPlayer/include => Core}/JPVideoPlayerResourceLoader.h (100%) rename Sources/{JPVideoPlayer => Core}/JPVideoPlayerResourceLoader.m (100%) rename Sources/{JPVideoPlayer/include => Core}/JPVideoPlayerScrollViewProtocol.h (100%) rename Sources/{JPVideoPlayer => Core}/JPVideoPlayerScrollViewProtocol.m (100%) rename Sources/{JPVideoPlayer/include => Core}/JPVideoPlayerSupportUtils.h (100%) rename Sources/{JPVideoPlayer => Core}/JPVideoPlayerSupportUtils.m (100%) rename Sources/{JPVideoPlayer/include => Core}/UICollectionView+WebVideoCache.h (100%) rename Sources/{JPVideoPlayer => Core}/UICollectionView+WebVideoCache.m (100%) rename Sources/{JPVideoPlayer/include => Core}/UICollectionViewCell+WebVideoCache.h (100%) rename Sources/{JPVideoPlayer => Core}/UICollectionViewCell+WebVideoCache.m (100%) rename Sources/{JPVideoPlayer/include => Core}/UITableView+WebVideoCache.h (100%) rename Sources/{JPVideoPlayer => Core}/UITableView+WebVideoCache.m (100%) rename Sources/{JPVideoPlayer/include => Core}/UITableViewCell+WebVideoCache.h (100%) rename Sources/{JPVideoPlayer => Core}/UITableViewCell+WebVideoCache.m (100%) rename Sources/{JPVideoPlayer/include => Core}/UIView+WebVideoCache.h (100%) rename Sources/{JPVideoPlayer => Core}/UIView+WebVideoCache.m (100%) diff --git a/Package.swift b/Package.swift index e970b52..998f4d0 100644 --- a/Package.swift +++ b/Package.swift @@ -25,7 +25,11 @@ let package = Package( // Targets can depend on other targets in this package, and on products in packages which this package depends on. .target( name: "JPVideoPlayer", - dependencies: []), + dependencies: [], + path: "Sources", + exclude: [], + sources: ["Core"], + publicHeadersPath: "Core"), .testTarget( name: "JPVideoPlayerTests", dependencies: ["JPVideoPlayer"]), diff --git a/Sources/JPVideoPlayer/include/JPGCDExtensions.h b/Sources/Core/JPGCDExtensions.h similarity index 100% rename from Sources/JPVideoPlayer/include/JPGCDExtensions.h rename to Sources/Core/JPGCDExtensions.h diff --git a/Sources/JPVideoPlayer/JPGCDExtensions.m b/Sources/Core/JPGCDExtensions.m similarity index 100% rename from Sources/JPVideoPlayer/JPGCDExtensions.m rename to Sources/Core/JPGCDExtensions.m diff --git a/Sources/JPVideoPlayer/include/JPMethodInjecting.h b/Sources/Core/JPMethodInjecting.h similarity index 100% rename from Sources/JPVideoPlayer/include/JPMethodInjecting.h rename to Sources/Core/JPMethodInjecting.h diff --git a/Sources/JPVideoPlayer/JPMethodInjecting.m b/Sources/Core/JPMethodInjecting.m similarity index 100% rename from Sources/JPVideoPlayer/JPMethodInjecting.m rename to Sources/Core/JPMethodInjecting.m diff --git a/Sources/JPVideoPlayer/include/JPResourceLoadingRequestTask.h b/Sources/Core/JPResourceLoadingRequestTask.h similarity index 100% rename from Sources/JPVideoPlayer/include/JPResourceLoadingRequestTask.h rename to Sources/Core/JPResourceLoadingRequestTask.h diff --git a/Sources/JPVideoPlayer/JPResourceLoadingRequestTask.m b/Sources/Core/JPResourceLoadingRequestTask.m similarity index 100% rename from Sources/JPVideoPlayer/JPResourceLoadingRequestTask.m rename to Sources/Core/JPResourceLoadingRequestTask.m diff --git a/Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_blur@2x.png b/Sources/Core/JPVideoPlayer.bundle/jp_videoplayer_blur@2x.png similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_blur@2x.png rename to Sources/Core/JPVideoPlayer.bundle/jp_videoplayer_blur@2x.png diff --git a/Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_blur@3x.png b/Sources/Core/JPVideoPlayer.bundle/jp_videoplayer_blur@3x.png similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_blur@3x.png rename to Sources/Core/JPVideoPlayer.bundle/jp_videoplayer_blur@3x.png diff --git a/Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_landscape@2x.png b/Sources/Core/JPVideoPlayer.bundle/jp_videoplayer_landscape@2x.png similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_landscape@2x.png rename to Sources/Core/JPVideoPlayer.bundle/jp_videoplayer_landscape@2x.png diff --git a/Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_landscape@3x.png b/Sources/Core/JPVideoPlayer.bundle/jp_videoplayer_landscape@3x.png similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_landscape@3x.png rename to Sources/Core/JPVideoPlayer.bundle/jp_videoplayer_landscape@3x.png diff --git a/Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_pause@2x.png b/Sources/Core/JPVideoPlayer.bundle/jp_videoplayer_pause@2x.png similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_pause@2x.png rename to Sources/Core/JPVideoPlayer.bundle/jp_videoplayer_pause@2x.png diff --git a/Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_pause@3x.png b/Sources/Core/JPVideoPlayer.bundle/jp_videoplayer_pause@3x.png similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_pause@3x.png rename to Sources/Core/JPVideoPlayer.bundle/jp_videoplayer_pause@3x.png diff --git a/Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_play@2x.png b/Sources/Core/JPVideoPlayer.bundle/jp_videoplayer_play@2x.png similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_play@2x.png rename to Sources/Core/JPVideoPlayer.bundle/jp_videoplayer_play@2x.png diff --git a/Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_play@3x.png b/Sources/Core/JPVideoPlayer.bundle/jp_videoplayer_play@3x.png similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_play@3x.png rename to Sources/Core/JPVideoPlayer.bundle/jp_videoplayer_play@3x.png diff --git a/Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_portrait@2x.png b/Sources/Core/JPVideoPlayer.bundle/jp_videoplayer_portrait@2x.png similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_portrait@2x.png rename to Sources/Core/JPVideoPlayer.bundle/jp_videoplayer_portrait@2x.png diff --git a/Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_portrait@3x.png b/Sources/Core/JPVideoPlayer.bundle/jp_videoplayer_portrait@3x.png similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_portrait@3x.png rename to Sources/Core/JPVideoPlayer.bundle/jp_videoplayer_portrait@3x.png diff --git a/Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_hightlight@2x.png b/Sources/Core/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_hightlight@2x.png similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_hightlight@2x.png rename to Sources/Core/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_hightlight@2x.png diff --git a/Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_hightlight@3x.png b/Sources/Core/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_hightlight@3x.png similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_hightlight@3x.png rename to Sources/Core/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_hightlight@3x.png diff --git a/Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_normal@2x.png b/Sources/Core/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_normal@2x.png similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_normal@2x.png rename to Sources/Core/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_normal@2x.png diff --git a/Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_normal@3x.png b/Sources/Core/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_normal@3x.png similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_normal@3x.png rename to Sources/Core/JPVideoPlayer.bundle/jp_videoplayer_progress_handler_normal@3x.png diff --git a/Sources/JPVideoPlayer/include/JPVideoPlayer.h b/Sources/Core/JPVideoPlayer.h similarity index 100% rename from Sources/JPVideoPlayer/include/JPVideoPlayer.h rename to Sources/Core/JPVideoPlayer.h diff --git a/Sources/JPVideoPlayer/JPVideoPlayer.m b/Sources/Core/JPVideoPlayer.m similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayer.m rename to Sources/Core/JPVideoPlayer.m diff --git a/Sources/JPVideoPlayer/include/JPVideoPlayerCache.h b/Sources/Core/JPVideoPlayerCache.h similarity index 100% rename from Sources/JPVideoPlayer/include/JPVideoPlayerCache.h rename to Sources/Core/JPVideoPlayerCache.h diff --git a/Sources/JPVideoPlayer/JPVideoPlayerCache.m b/Sources/Core/JPVideoPlayerCache.m similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayerCache.m rename to Sources/Core/JPVideoPlayerCache.m diff --git a/Sources/JPVideoPlayer/include/JPVideoPlayerCacheFile.h b/Sources/Core/JPVideoPlayerCacheFile.h similarity index 100% rename from Sources/JPVideoPlayer/include/JPVideoPlayerCacheFile.h rename to Sources/Core/JPVideoPlayerCacheFile.h diff --git a/Sources/JPVideoPlayer/JPVideoPlayerCacheFile.m b/Sources/Core/JPVideoPlayerCacheFile.m similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayerCacheFile.m rename to Sources/Core/JPVideoPlayerCacheFile.m diff --git a/Sources/JPVideoPlayer/include/JPVideoPlayerCachePath.h b/Sources/Core/JPVideoPlayerCachePath.h similarity index 100% rename from Sources/JPVideoPlayer/include/JPVideoPlayerCachePath.h rename to Sources/Core/JPVideoPlayerCachePath.h diff --git a/Sources/JPVideoPlayer/JPVideoPlayerCachePath.m b/Sources/Core/JPVideoPlayerCachePath.m similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayerCachePath.m rename to Sources/Core/JPVideoPlayerCachePath.m diff --git a/Sources/JPVideoPlayer/include/JPVideoPlayerCellProtocol.h b/Sources/Core/JPVideoPlayerCellProtocol.h similarity index 100% rename from Sources/JPVideoPlayer/include/JPVideoPlayerCellProtocol.h rename to Sources/Core/JPVideoPlayerCellProtocol.h diff --git a/Sources/JPVideoPlayer/JPVideoPlayerCellProtocol.m b/Sources/Core/JPVideoPlayerCellProtocol.m similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayerCellProtocol.m rename to Sources/Core/JPVideoPlayerCellProtocol.m diff --git a/Sources/JPVideoPlayer/include/JPVideoPlayerCompat.h b/Sources/Core/JPVideoPlayerCompat.h similarity index 100% rename from Sources/JPVideoPlayer/include/JPVideoPlayerCompat.h rename to Sources/Core/JPVideoPlayerCompat.h diff --git a/Sources/JPVideoPlayer/JPVideoPlayerCompat.m b/Sources/Core/JPVideoPlayerCompat.m similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayerCompat.m rename to Sources/Core/JPVideoPlayerCompat.m diff --git a/Sources/JPVideoPlayer/include/JPVideoPlayerControlViews.h b/Sources/Core/JPVideoPlayerControlViews.h similarity index 100% rename from Sources/JPVideoPlayer/include/JPVideoPlayerControlViews.h rename to Sources/Core/JPVideoPlayerControlViews.h diff --git a/Sources/JPVideoPlayer/JPVideoPlayerControlViews.m b/Sources/Core/JPVideoPlayerControlViews.m similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayerControlViews.m rename to Sources/Core/JPVideoPlayerControlViews.m diff --git a/Sources/JPVideoPlayer/include/JPVideoPlayerDownloader.h b/Sources/Core/JPVideoPlayerDownloader.h similarity index 100% rename from Sources/JPVideoPlayer/include/JPVideoPlayerDownloader.h rename to Sources/Core/JPVideoPlayerDownloader.h diff --git a/Sources/JPVideoPlayer/JPVideoPlayerDownloader.m b/Sources/Core/JPVideoPlayerDownloader.m similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayerDownloader.m rename to Sources/Core/JPVideoPlayerDownloader.m diff --git a/Sources/JPVideoPlayer/include/JPVideoPlayerKit.h b/Sources/Core/JPVideoPlayerKit.h similarity index 100% rename from Sources/JPVideoPlayer/include/JPVideoPlayerKit.h rename to Sources/Core/JPVideoPlayerKit.h diff --git a/Sources/JPVideoPlayer/include/JPVideoPlayerManager.h b/Sources/Core/JPVideoPlayerManager.h similarity index 100% rename from Sources/JPVideoPlayer/include/JPVideoPlayerManager.h rename to Sources/Core/JPVideoPlayerManager.h diff --git a/Sources/JPVideoPlayer/JPVideoPlayerManager.m b/Sources/Core/JPVideoPlayerManager.m similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayerManager.m rename to Sources/Core/JPVideoPlayerManager.m diff --git a/Sources/JPVideoPlayer/include/JPVideoPlayerProtocol.h b/Sources/Core/JPVideoPlayerProtocol.h similarity index 100% rename from Sources/JPVideoPlayer/include/JPVideoPlayerProtocol.h rename to Sources/Core/JPVideoPlayerProtocol.h diff --git a/Sources/JPVideoPlayer/include/JPVideoPlayerResourceLoader.h b/Sources/Core/JPVideoPlayerResourceLoader.h similarity index 100% rename from Sources/JPVideoPlayer/include/JPVideoPlayerResourceLoader.h rename to Sources/Core/JPVideoPlayerResourceLoader.h diff --git a/Sources/JPVideoPlayer/JPVideoPlayerResourceLoader.m b/Sources/Core/JPVideoPlayerResourceLoader.m similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayerResourceLoader.m rename to Sources/Core/JPVideoPlayerResourceLoader.m diff --git a/Sources/JPVideoPlayer/include/JPVideoPlayerScrollViewProtocol.h b/Sources/Core/JPVideoPlayerScrollViewProtocol.h similarity index 100% rename from Sources/JPVideoPlayer/include/JPVideoPlayerScrollViewProtocol.h rename to Sources/Core/JPVideoPlayerScrollViewProtocol.h diff --git a/Sources/JPVideoPlayer/JPVideoPlayerScrollViewProtocol.m b/Sources/Core/JPVideoPlayerScrollViewProtocol.m similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayerScrollViewProtocol.m rename to Sources/Core/JPVideoPlayerScrollViewProtocol.m diff --git a/Sources/JPVideoPlayer/include/JPVideoPlayerSupportUtils.h b/Sources/Core/JPVideoPlayerSupportUtils.h similarity index 100% rename from Sources/JPVideoPlayer/include/JPVideoPlayerSupportUtils.h rename to Sources/Core/JPVideoPlayerSupportUtils.h diff --git a/Sources/JPVideoPlayer/JPVideoPlayerSupportUtils.m b/Sources/Core/JPVideoPlayerSupportUtils.m similarity index 100% rename from Sources/JPVideoPlayer/JPVideoPlayerSupportUtils.m rename to Sources/Core/JPVideoPlayerSupportUtils.m diff --git a/Sources/JPVideoPlayer/include/UICollectionView+WebVideoCache.h b/Sources/Core/UICollectionView+WebVideoCache.h similarity index 100% rename from Sources/JPVideoPlayer/include/UICollectionView+WebVideoCache.h rename to Sources/Core/UICollectionView+WebVideoCache.h diff --git a/Sources/JPVideoPlayer/UICollectionView+WebVideoCache.m b/Sources/Core/UICollectionView+WebVideoCache.m similarity index 100% rename from Sources/JPVideoPlayer/UICollectionView+WebVideoCache.m rename to Sources/Core/UICollectionView+WebVideoCache.m diff --git a/Sources/JPVideoPlayer/include/UICollectionViewCell+WebVideoCache.h b/Sources/Core/UICollectionViewCell+WebVideoCache.h similarity index 100% rename from Sources/JPVideoPlayer/include/UICollectionViewCell+WebVideoCache.h rename to Sources/Core/UICollectionViewCell+WebVideoCache.h diff --git a/Sources/JPVideoPlayer/UICollectionViewCell+WebVideoCache.m b/Sources/Core/UICollectionViewCell+WebVideoCache.m similarity index 100% rename from Sources/JPVideoPlayer/UICollectionViewCell+WebVideoCache.m rename to Sources/Core/UICollectionViewCell+WebVideoCache.m diff --git a/Sources/JPVideoPlayer/include/UITableView+WebVideoCache.h b/Sources/Core/UITableView+WebVideoCache.h similarity index 100% rename from Sources/JPVideoPlayer/include/UITableView+WebVideoCache.h rename to Sources/Core/UITableView+WebVideoCache.h diff --git a/Sources/JPVideoPlayer/UITableView+WebVideoCache.m b/Sources/Core/UITableView+WebVideoCache.m similarity index 100% rename from Sources/JPVideoPlayer/UITableView+WebVideoCache.m rename to Sources/Core/UITableView+WebVideoCache.m diff --git a/Sources/JPVideoPlayer/include/UITableViewCell+WebVideoCache.h b/Sources/Core/UITableViewCell+WebVideoCache.h similarity index 100% rename from Sources/JPVideoPlayer/include/UITableViewCell+WebVideoCache.h rename to Sources/Core/UITableViewCell+WebVideoCache.h diff --git a/Sources/JPVideoPlayer/UITableViewCell+WebVideoCache.m b/Sources/Core/UITableViewCell+WebVideoCache.m similarity index 100% rename from Sources/JPVideoPlayer/UITableViewCell+WebVideoCache.m rename to Sources/Core/UITableViewCell+WebVideoCache.m diff --git a/Sources/JPVideoPlayer/include/UIView+WebVideoCache.h b/Sources/Core/UIView+WebVideoCache.h similarity index 100% rename from Sources/JPVideoPlayer/include/UIView+WebVideoCache.h rename to Sources/Core/UIView+WebVideoCache.h diff --git a/Sources/JPVideoPlayer/UIView+WebVideoCache.m b/Sources/Core/UIView+WebVideoCache.m similarity index 100% rename from Sources/JPVideoPlayer/UIView+WebVideoCache.m rename to Sources/Core/UIView+WebVideoCache.m