Package migration WIP

Example/Podfile.lock

@@ -9,7 +9,7 @@ DEPENDENCIES:
   - Yoshi/QAKit (from `../`)
 
 SPEC REPOS:
-  https://github.com/CocoaPods/Specs.git:
+  https://github.com/CocoaPods/specs.git:
     - Instabug
 
 EXTERNAL SOURCES:

Package.swift

@@ -0,0 +1,24 @@
+// swift-tools-version: 5.10
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "Yoshi",
+    products: [
+        // Products define the executables and libraries a package produces, making them visible to other packages.
+        .library(
+            name: "Yoshi",
+            targets: ["Yoshi"]),
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package, defining a module or a test suite.
+        // Targets can depend on other targets in this package and products from dependencies.
+        .target(
+            name: "Yoshi"
+        ),
+        .testTarget(
+            name: "YoshiTests",
+            dependencies: ["Yoshi"]),
+    ]
+)

Yoshi/Yoshi/Menus/Protocols/YoshiMenu/YoshiMenuCellDataSource.swift → Sources/Yoshi/Menus/Protocols/YoshiMenu/YoshiMenuCellDataSource.swift

@@ -6,6 +6,8 @@
 //  Copyright © 2017 Prolific Interactive. All rights reserved.
 //
 
+import UIKit
+
 /// A normal cell data source defining the layout for YoshiMenu's cell.
 /// By default it helps dequeue a system UITableViewCell with the given title, subtitle and the accessoryType.
 public struct YoshiMenuCellDataSource: YoshiReusableCellDataSource {
@@ -14,14 +16,14 @@ public struct YoshiMenuCellDataSource: YoshiReusableCellDataSource {
 
     private let subtitle: String?
 
-    private let accessoryType: UITableViewCellAccessoryType
+    private let accessoryType: UITableViewCell.AccessoryType
 
     /// Initalize the YoshiMenuCellDataSource instance
     ///
     /// - Parameters:
     ///   - title: Main title for the cell
     ///   - subtitle: Subtitle for the cell
-    public init(title: String, subtitle: String?, accessoryType: UITableViewCellAccessoryType = .none) {
+    public init(title: String, subtitle: String?, accessoryType: UITableViewCell.AccessoryType = .none) {
         self.title = title
         self.subtitle = subtitle
         self.accessoryType = accessoryType

Yoshi/Yoshi/Menus/Protocols/YoshiSubmenu/YoshiSubmenu.swift → Sources/Yoshi/Menus/Protocols/YoshiSubmenu/YoshiSubmenu.swift

@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import UIKit
 
 /// A submenu that contains an array of options.
 /// Once selected, Yoshi will push the navigation stack to display these options.

Yoshi/Yoshi/Menus/YoshiDateSelectorMenu/YoshiDateSelectorMenu.swift → Sources/Yoshi/Menus/YoshiDateSelectorMenu/YoshiDateSelectorMenu.swift

@@ -6,6 +6,9 @@
 //  Copyright © 2016 Prolific Interactive. All rights reserved.
 //
 
+import Foundation
+import UIKit
+
 /**
  Protocol for defining a menu option for choosing a date.
  */

Yoshi/Yoshi/Menus/YoshiDateSelectorMenu/YoshiDateSelectorMenuCellDataSource.swift → Sources/Yoshi/Menus/YoshiDateSelectorMenu/YoshiDateSelectorMenuCellDataSource.swift

@@ -6,6 +6,9 @@
 //  Copyright © 2017 Prolific Interactive. All rights reserved.
 //
 
+import Foundation
+import UIKit
+
 /// Cell data source defining the layout for YoshiDateSelectorMenu's cell
 internal struct YoshiDateSelectorMenuCellDataSource: YoshiReusableCellDataSource {
 

Yoshi/Yoshi/Menus/YoshiSingleSelectionMenu/YoshiSingleSelectionMenu.swift → Sources/Yoshi/Menus/YoshiSingleSelectionMenu/YoshiSingleSelectionMenu.swift

@@ -6,14 +6,16 @@
 //  Copyright © 2017 Prolific Interactive. All rights reserved.
 //
 
+import Foundation
+
 /// A tuple with a title and an optional subtitle representing a single selection.
 public typealias YoshiSingleSelection = (title: String, subtitle: String?)
 
 /// A YoshiSubmenu implementation used to host a group of single selection.
 /// Once provided with initial selection and options, Yoshi will maintain the selection and present them in a tableview.
 open class YoshiSingleSelectionMenu: YoshiSubmenu {
 
-    open let title: String
+    public let title: String
 
     open var subtitle: String? {
         return availableSelections[selectedIndex].title

Yoshi/Yoshi/Utility/AppBundleUtility.swift → Sources/Yoshi/Utility/AppBundleUtility.swift

@@ -6,6 +6,9 @@
 //  Copyright © 2016 Prolific Interactive. All rights reserved.
 //
 
+import Foundation
+import UIKit
+
 /// Utility for retrieving items from the App Bundle
 internal class AppBundleUtility: NSObject {
 

Yoshi/Yoshi/Utility/Color.swift → Sources/Yoshi/Utility/Color.swift

@@ -6,6 +6,8 @@
 //  Copyright © 2016 Prolific Interactive. All rights reserved.
 //
 
+import UIKit
+
 /**
  A color object
  */

Yoshi/Yoshi/Utility/Extensions/UIWindowExtension.swift → Sources/Yoshi/Utility/Extensions/UIWindowExtension.swift

@@ -27,7 +27,7 @@ extension UIWindow {
         return 60
     }
 
-    override open func motionBegan(_ motion: UIEventSubtype, with event: UIEvent?) {
+    override open func motionBegan(_ motion: UIEvent.EventSubtype, with event: UIEvent?) {
         Yoshi.motionBegan(motion, withEvent: event)
     }
 

Yoshi/Yoshi/View Controllers/Debug Date Picker View Controller/DebugDatePickerViewController.swift → Sources/Yoshi/View Controllers/Debug Date Picker View Controller/DebugDatePickerViewController.swift

@@ -6,6 +6,8 @@
 //  Copyright © 2015 Prolific Interactive. All rights reserved.
 //
 
+import UIKit
+
 /// The date picker view controller.
 internal class DebugDatePickerViewController: UIViewController {
 

Yoshi/Yoshi/View Controllers/Debug View Controller/DebugViewController.swift → Sources/Yoshi/View Controllers/Debug View Controller/DebugViewController.swift

@@ -6,6 +6,8 @@
 //  Copyright © 2016 Prolific Interactive. All rights reserved.
 //
 
+import UIKit
+
 internal typealias VoidCompletionBlock = () -> Void
 
 /// A debug menu.

Yoshi/Yoshi/Yoshi.swift → Sources/Yoshi/Yoshi.swift

@@ -6,6 +6,9 @@
 //  Copyright © 2015 Prolific Interactive. All rights reserved.
 //
 
+import Foundation
+import UIKit
+
 /// The Debug Menu interface.
 public final class Yoshi {
 
@@ -29,7 +32,7 @@ public final class Yoshi {
      - parameter motion: (UIEventSubtype) the motion captured by the original motionBegan call
      - parameter event:  (UIEvent) the event captured by the original motionBegan call
      */
-    public class func motionBegan(_ motion: UIEventSubtype, withEvent event: UIEvent?) {
+    public class func motionBegan(_ motion: UIEvent.EventSubtype, withEvent event: UIEvent?) {
         guard motion == .motionShake
             && YoshiConfigurationManager.sharedInstance.shouldShow(.shakeMotionGesture) else {
             return

Yoshi/Yoshi/YoshiActionResult.swift → Sources/Yoshi/YoshiActionResult.swift

@@ -6,6 +6,8 @@
 //  Copyright © 2016 Prolific Interactive. All rights reserved.
 //
 
+import UIKit
+
 ///  The result types for a debug menu action.
 ///
 /// - handled: Indicates that the action was handled and nothing else is required.

Yoshi/Yoshi/YoshiConfigurationManager.swift → Sources/Yoshi/YoshiConfigurationManager.swift

@@ -6,6 +6,8 @@
 //  Copyright © 2015 Prolific Interactive. All rights reserved.
 //
 
+import UIKit
+
 /// The configuration manager for the debug menu.
 internal final class YoshiConfigurationManager {
 
@@ -54,7 +56,7 @@ internal final class YoshiConfigurationManager {
         }
 
         let window = UIWindow(frame: UIScreen.main.bounds)
-        window.windowLevel = UIWindowLevelNormal
+        window.windowLevel = UIWindow.Level.normal
 
         // Use a dummy view controller with clear background.
         // This way, we can make the actual view controller we want to present a form sheet on the iPad.

Yoshi/Yoshi/YoshiReusableCellDataSource.swift → Sources/Yoshi/YoshiReusableCellDataSource.swift

@@ -6,6 +6,9 @@
 //  Copyright © 2017 Prolific Interactive. All rights reserved.
 //
 
+import UIKit
+
+
 /// Object helps YoshiGenericMenu define cell's UI when presented in Yoshi.
 public protocol YoshiReusableCellDataSource {
 

Tests/YoshiTests/YoshiTests.swift

@@ -0,0 +1,12 @@
+import XCTest
+@testable import Yoshi
+
+final class YoshiTests: XCTestCase {
+    func testExample() throws {
+        // XCTest Documentation
+        // https://developer.apple.com/documentation/xctest
+
+        // Defining Test Cases and Test Methods
+        // https://developer.apple.com/documentation/xctest/defining_test_cases_and_test_methods
+    }
+}

Yoshi.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "Yoshi"
-  s.version          = "3.0.0-beta.2"
+  s.version          = "3.1.0"
   s.summary          = "A helpful companion for your iOS app."
 
 # This description is used to generate tags and improve search results.
@@ -20,19 +20,19 @@ Pod::Spec.new do |s|
 		       Yoshi is a convenient wrapper around the UI code that is often needed for displaying debug menus. Out of the box, Yoshi provides easy-to-implement date, list and custom menus.
                        DESC
 
-  s.homepage         = "https://github.com/prolificinteractive/Yoshi"
+  s.homepage         = "https://github.com/makeitheady/Yoshi"
   s.screenshots     = "https://raw.githubusercontent.com/prolificinteractive/Yoshi/a6e85e87cbd67f2bb3bfe60157e7b13281d80f20/Images/Yoshi.png", "https://raw.githubusercontent.com/prolificinteractive/Yoshi/c66cdf8dc2ab643fe57996d20d3cd37b8b70ceff/Images/Yoshi_iPad.png"
   s.license          = { :type => 'MIT', :file => 'LICENSE' }
   s.author           = { "Michael Campbell" => "[email protected]" , "Quentin Ribierre" => "[email protected]" , "Kanglei Fang" => "[email protected]" }
-  s.source           = { :git => "https://github.com/prolificinteractive/Yoshi.git", :tag => s.version.to_s }
+  s.source           = { :git => "https://github.com/makeitheady/Yoshi.git", :branch => "chore/swift-package" }
 
-  s.platform     = :ios, '14.0'
+  s.platform     = :ios, '12.0'
   s.requires_arc = true
 
   # Default subspec that contains all shared code files for the library
   # All subspecs must declare this as a dependency.
   s.subspec "Core" do |ss|
-   ss.source_files = "Yoshi/Yoshi/**/*.{swift}"
+   ss.source_files = "Sources/Yoshi/**/*.{swift}"
    ss.resources = 'Yoshi/**/*.{png,jpeg,jpg,storyboard,xib}'
   end
 
@@ -46,7 +46,7 @@ Pod::Spec.new do |s|
 
     # Define a Cocoapods subspec
     s.subspec spec[:name] do |sp|
-      sp.source_files = "Yoshi/#{spec[:name]}/**/*.swift"
+      sp.source_files = "Sources/#{spec[:name]}/**/*.swift"
       sp.dependency "Yoshi/Core"
     end
   end