Merge pull request #10 from Igor-Palaguta/Carthage_Support

Carthage support
Igor-Palaguta · Apr 15, 2020 · d0d23c8 · d0d23c8
2 parents 5b9555f + 0c01e41
commit d0d23c8
Show file tree

Hide file tree

Showing 36 changed files with 1,485 additions and 818 deletions.
diff --git a/.gitignore b/.gitignore
@@ -27,6 +27,8 @@ Packages
 # Bundler
 .bundle
 
+# Carthage
+Carthage
+
 # Cocoapods
-Pods/
-Example/YoutubeEngine.xcworkspace
+Pods
diff --git a/.swiftformat b/.swiftformat
@@ -1,5 +1,5 @@
 # file options
---exclude Example/Pods,.build,.swiftpm,.git,.swiftpm
+--exclude Carthage,.build,.swiftpm,.git,.swiftpm
 
 # format options
 --indent 4

diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -98,7 +98,8 @@ excluded:
   - .git
   - .build
   - .swiftpm
-  - Example/Pods
+  - Pods
+  - Carthage
 
 custom_rules:
   tabs:

diff --git a/Cartfile b/Cartfile
@@ -0,0 +1 @@
+github "ReactiveCocoa/ReactiveSwift" ~> 6.0
diff --git a/Cartfile.private b/Cartfile.private
@@ -0,0 +1,3 @@
+github "Quick/Nimble" ~> 8.0
+github "AliSoftware/OHHTTPStubs" ~> 9.0
+github "onevcat/Kingfisher" ~> 5.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -0,0 +1,4 @@
+github "AliSoftware/OHHTTPStubs" "9.0.0"
+github "Quick/Nimble" "v8.0.7"
+github "ReactiveCocoa/ReactiveSwift" "6.2.1"
+github "onevcat/Kingfisher" "5.13.4"
diff --git a/Example/YoutubeEngine/AppDelegate.swift → Example/AppDelegate.swift b/Example/YoutubeEngine/AppDelegate.swift → Example/AppDelegate.swift
diff --git a/...YoutubeEngine/Base.lproj/LaunchScreen.xib → Example/Base.lproj/LaunchScreen.xib b/...YoutubeEngine/Base.lproj/LaunchScreen.xib → Example/Base.lproj/LaunchScreen.xib
diff --git a/.../YoutubeEngine/Base.lproj/Main.storyboard → Example/Base.lproj/Main.storyboard b/.../YoutubeEngine/Base.lproj/Main.storyboard → Example/Base.lproj/Main.storyboard
diff --git a/...ple/YoutubeEngine/Cells/ChannelCell.swift → Example/Cells/ChannelCell.swift b/...ple/YoutubeEngine/Cells/ChannelCell.swift → Example/Cells/ChannelCell.swift
@@ -1,5 +1,6 @@
 import Foundation
 import Kingfisher
+import UIKit
 import YoutubeEngine
 
 final class ChannelCell: UITableViewCell {

diff --git a/...le/YoutubeEngine/Cells/PlaylistCell.swift → Example/Cells/PlaylistCell.swift b/...le/YoutubeEngine/Cells/PlaylistCell.swift → Example/Cells/PlaylistCell.swift
@@ -1,5 +1,6 @@
 import Foundation
 import Kingfisher
+import UIKit
 import YoutubeEngine
 
 final class PlaylistCell: UITableViewCell {

diff --git a/...outubeEngine/Cells/PlaylistItemCell.swift → Example/Cells/PlaylistItemCell.swift b/...outubeEngine/Cells/PlaylistItemCell.swift → Example/Cells/PlaylistItemCell.swift
@@ -1,5 +1,6 @@
 import Foundation
 import Kingfisher
+import UIKit
 import YoutubeEngine
 
 final class PlaylistItemCell: UITableViewCell {

diff --git a/Example/YoutubeEngine/Cells/VideoCell.swift → Example/Cells/VideoCell.swift b/Example/YoutubeEngine/Cells/VideoCell.swift → Example/Cells/VideoCell.swift
@@ -15,7 +15,7 @@ final class VideoCell: UITableViewCell {
         didSet {
             // swiftlint:disable:next force_unwrapping
             let snippet = video.snippet!
-            
+
             thumbnailView.kf.setImage(with: ImageResource(downloadURL: snippet.defaultImage.url),
                                       options: [.transition(.fade(0.3))])
 

diff --git a/Example/YoutubeEngine/DisplayItem.swift → Example/DisplayItem.swift b/Example/YoutubeEngine/DisplayItem.swift → Example/DisplayItem.swift
diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
diff --git a/Example/YoutubeEngine/Info.plist → Example/Info.plist b/Example/YoutubeEngine/Info.plist → Example/Info.plist
diff --git a/Example/YoutubeEngine/ItemsProvider.swift → Example/ItemsProvider.swift b/Example/YoutubeEngine/ItemsProvider.swift → Example/ItemsProvider.swift
diff --git a/...e/YoutubeEngine/ItemsViewController.swift → Example/ItemsViewController.swift b/...e/YoutubeEngine/ItemsViewController.swift → Example/ItemsViewController.swift
@@ -109,9 +109,9 @@ final class ItemsViewController: UITableViewController {
             destinationController.title = playlist.snippet!.title
             destinationController.model.mutableProvider.value = AnyItemsProvider { token, limit in
                 let request: PlaylistItemRequest = .itemsFromPlaylist(withID: playlist.id,
-                                                                requiredParts: [.snippet],
-                                                                limit: limit,
-                                                                pageToken: token)
+                                                                      requiredParts: [.snippet],
+                                                                      limit: limit,
+                                                                      pageToken: token)
                 return Engine.defaultEngine
                     .playlistItems(request)
                     .map { page in (page.items.map { .playlistItem($0) }, page.nextPageToken) }

diff --git a/Example/YoutubeEngine/ItemsViewModel.swift → Example/ItemsViewModel.swift b/Example/YoutubeEngine/ItemsViewModel.swift → Example/ItemsViewModel.swift
diff --git a/Example/Podfile b/Example/Podfile
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
diff --git a/Example/YoutubeEngine.xcodeproj/project.pbxproj b/Example/YoutubeEngine.xcodeproj/project.pbxproj
diff --git a/Example/YoutubeEngine.xcworkspace/contents.xcworkspacedata b/Example/YoutubeEngine.xcworkspace/contents.xcworkspacedata
diff --git a/...YoutubeEngine/YoutubeViewController.swift → Example/YoutubeViewController.swift b/...YoutubeEngine/YoutubeViewController.swift → Example/YoutubeViewController.swift
@@ -3,7 +3,7 @@ import UIKit
 import YoutubeEngine
 
 extension Engine {
-    #warning("Generate yout own api key https://developers.google.com/youtube/v3/getting-started")
+    #warning("Generate your own API key https://developers.google.com/youtube/v3/getting-started")
     static let defaultEngine = Engine(
         authorization: .key("AIzaSyBjLH-61v1oTcb_wQUcGAYIHmWSCj19Ss4"),
         isLogEnabled: true

diff --git a/README.md b/README.md
@@ -36,17 +36,17 @@ Supports Swift 5
 
 Cocoapods
 ```ruby
-pod "YoutubeEngine", :git => 'https://github.com/Igor-Palaguta/YoutubeEngine', :tag => '0.6.0'
+pod "YoutubeEngine", :git => 'https://github.com/Igor-Palaguta/YoutubeEngine', :tag => '0.7.0'
 ```
 
 Carthage
 ```ruby
-github "Igor-Palaguta/YoutubeEngine" ~> 0.6.0
+github "Igor-Palaguta/YoutubeEngine" ~> 0.7.0
 ```
 
 SPM
 ```swift
-.package(url: "https://github.com/Igor-Palaguta/YoutubeEngine", .upToNextMinor(from: "0.6.0"))
+.package(url: "https://github.com/Igor-Palaguta/YoutubeEngine", .upToNextMinor(from: "0.7.0"))
 ```
 
 ## Implemented API

diff --git a/Source/YoutubeEngine/Data/Image.swift b/Source/YoutubeEngine/Data/Image.swift
@@ -1,3 +1,4 @@
+import CoreGraphics
 import Foundation
 
 public struct Image: Equatable {

diff --git a/Example/Tests/Info.plist → Tests/Info.plist b/Example/Tests/Info.plist → Tests/Info.plist
diff --git a/YoutubeEngine.podspec b/YoutubeEngine.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'YoutubeEngine'
-  s.version          = '0.5.0'
+  s.version          = '0.7.0'
   s.summary          = 'Swift ReactiveCocoa lib for Youtube api.'
 
   s.description      = <<-DESC