Update package structure

.github/workflows/checks.yml

@@ -3,7 +3,7 @@ name: Checks
 on: [push]
 
 jobs:
-  build:
+  demo:
     runs-on: macos-latest
 
     steps:
@@ -19,3 +19,33 @@ jobs:
         run: pod install
       - name: Run build
         run: fastlane build_demo_apps
+
+  pod-lint:
+    runs-on: macos-latest
+
+    steps:
+      - uses: maxim-lobanov/[email protected]
+        with:
+          xcode-version: "12.4"
+      - name: webfactory/ssh-agent
+        uses: webfactory/[email protected]
+        with:
+          ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
+      - uses: actions/checkout@v2
+      - name: Lint
+        run: pod lib lint
+
+  # swiftpm:
+  #   runs-on: macos-latest
+
+  #   steps:
+  #     - uses: maxim-lobanov/[email protected]
+  #       with:
+  #         xcode-version: "12.4"
+  #     - name: webfactory/ssh-agent
+  #       uses: webfactory/[email protected]
+  #       with:
+  #         ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
+  #     - uses: actions/checkout@v2
+  #     - name: Build
+  #       run: swift build

Package.resolved

@@ -0,0 +1,34 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "RxSwift",
+        "repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
+        "state": {
+          "branch": null,
+          "revision": "7e01c05f25c025143073eaa3be3532f9375c614b",
+          "version": "6.1.0"
+        }
+      },
+      {
+        "package": "TransitionPatch",
+        "repositoryURL": "https://github.com/muukii/TransitionPatch.git",
+        "state": {
+          "branch": null,
+          "revision": "1f2e5930a68b11dae764ee7ffda14b2b7ffa8fce",
+          "version": "1.0.3"
+        }
+      },
+      {
+        "package": "Verge",
+        "repositoryURL": "https://github.com/VergeGroup/Verge.git",
+        "state": {
+          "branch": null,
+          "revision": "472a0273f6adf67132bb07f52ca4547ede6c9f6c",
+          "version": "8.8.0"
+        }
+      }
+    ]
+  },
+  "version": 1
+}

Package.swift

@@ -0,0 +1,22 @@
+// swift-tools-version:5.3
+import PackageDescription
+
+let package = Package(
+  name: "Pixel",  
+  platforms: [
+    .iOS(.v12)
+  ],
+  products: [
+    .library(name: "PixelEngine", targets: ["PixelEngine"]),
+    .library(name: "PixelEditor", targets: ["PixelEditor"]),
+  ],
+  dependencies: [
+    .package(url: "https://github.com/VergeGroup/Verge.git", from: "8.8.0"),
+    .package(url: "https://github.com/muukii/TransitionPatch.git", from: "1.0.3")
+  ],
+  targets: [
+    .target(name: "PixelEngine", dependencies: ["Verge"], exclude: ["Info.plist"]),
+    .target(name: "PixelEditor", dependencies: ["PixelEngine", "Verge", "TransitionPatch"], exclude: ["Info.plist"]),
+  ],
+  swiftLanguageVersions: [.v5]
+)

Pixel.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -0,0 +1,34 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "RxSwift",
+        "repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
+        "state": {
+          "branch": null,
+          "revision": "7e01c05f25c025143073eaa3be3532f9375c614b",
+          "version": "6.1.0"
+        }
+      },
+      {
+        "package": "TransitionPatch",
+        "repositoryURL": "[email protected]:muukii/TransitionPatch.git",
+        "state": {
+          "branch": null,
+          "revision": "1f2e5930a68b11dae764ee7ffda14b2b7ffa8fce",
+          "version": "1.0.3"
+        }
+      },
+      {
+        "package": "Verge",
+        "repositoryURL": "[email protected]:VergeGroup/Verge.git",
+        "state": {
+          "branch": null,
+          "revision": "472a0273f6adf67132bb07f52ca4547ede6c9f6c",
+          "version": "8.8.0"
+        }
+      }
+    ]
+  },
+  "version": 1
+}

PixelLib.podspec

@@ -0,0 +1,27 @@
+Pod::Spec.new do |s|
+  s.name = "PixelLib"
+  s.version = "2.0.0-beta.1"
+  s.summary = "The image editor and engine using CoreImage"
+
+  s.homepage = "https://github.com/muukii/Pixel"
+  s.license = "MIT"
+  s.author = "muukii"
+  s.source = { :git => "https://github.com/muukii/Pixel.git", :tag => s.version }
+
+  s.swift_version = "5.3"
+  s.module_name = s.name
+  s.requires_arc = true
+  s.ios.deployment_target = "12.0"
+  s.ios.frameworks = ["UIKit", "CoreImage"]
+  s.ios.dependency "Verge", "~> 8.8.0"
+
+  s.subspec "Engine" do |ss|
+    ss.source_files = "Sources/PixelEngine/**/*.swift"
+  end
+
+  s.subspec "Editor" do |ss|
+    ss.source_files = "Sources/PixelEditor/**/*.swift"
+    ss.dependency "PixelLib/Engine"
+    ss.dependency "TransitionPatch"
+  end
+end

Podfile

@@ -1,23 +1,10 @@
 # Uncomment the next line to define a global platform for your project
-platform :ios, "10.0"
-
-target "PixelEngine" do
-  use_frameworks!
-  pod "Verge", git: "[email protected]:VergeGroup/Verge.git", branch: "main"
-end
-
-target "PixelEditor" do
-  use_frameworks!
-  pod "TransitionPatch"
-  pod "Verge", git: "[email protected]:VergeGroup/Verge.git", branch: "main"
-end
+platform :ios, "12.0"
 
 abstract_target 'Demo_Apps' do
 
   use_frameworks!
   pod "Reveal-SDK"
-  pod "Verge", git: "[email protected]:VergeGroup/Verge.git", branch: "main"
-  pod "TransitionPatch"
   pod "SwiftGen"
 
   target "Demo" do

Podfile.lock

@@ -2,48 +2,31 @@ PODS:
   - MosaiqueAssetsPicker (1.2.0)
   - Reveal-SDK (28)
   - SwiftGen (6.4.0)
-  - TransitionPatch (1.0.2)
-  - Verge (8.8.0):
-    - Verge/Store (= 8.8.0)
-  - Verge/ObjcBridge (8.8.0)
-  - Verge/Store (8.8.0):
-    - Verge/ObjcBridge
 
 DEPENDENCIES:
   - "MosaiqueAssetsPicker (from `[email protected]:eure/AssetsPicker.git`)"
   - Reveal-SDK
   - SwiftGen
-  - TransitionPatch
-  - "Verge (from `[email protected]:VergeGroup/Verge.git`, branch `main`)"
 
 SPEC REPOS:
   trunk:
     - Reveal-SDK
     - SwiftGen
-    - TransitionPatch
 
 EXTERNAL SOURCES:
   MosaiqueAssetsPicker:
     :git: "[email protected]:eure/AssetsPicker.git"
-  Verge:
-    :branch: main
-    :git: "[email protected]:VergeGroup/Verge.git"
 
 CHECKOUT OPTIONS:
   MosaiqueAssetsPicker:
     :commit: 93baa57a99be952c51588196d057694f7f28b73e
     :git: "[email protected]:eure/AssetsPicker.git"
-  Verge:
-    :commit: 472a0273f6adf67132bb07f52ca4547ede6c9f6c
-    :git: "[email protected]:VergeGroup/Verge.git"
 
 SPEC CHECKSUMS:
   MosaiqueAssetsPicker: e3d2be37a1a7d91d60f2904347f556fc1811e4d7
   Reveal-SDK: 1a2a678648fc4d277bad71c86d15530424324288
   SwiftGen: 67860cc7c3cfc2ed25b9b74cfd55495fc89f9108
-  TransitionPatch: c02b48b1429255b14ef82b7e411034e0958b9681
-  Verge: 8c03af6abae2835c42e7bba71551593295087219
 
-PODFILE CHECKSUM: 186d0e5dec0e4cacc3a0f0e421b8e5c59ea2d991
+PODFILE CHECKSUM: 9d078b3b06beddd3690aa52067596c2770ff7181
 
 COCOAPODS: 1.10.1

Sources/Demo/DemoCropViewController.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2021 muukii. All rights reserved.
 //
 
-import Foundation
+import UIKit
 import UIKit
 
 import PixelEditor

Sources/Demo/Mocks.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2021 muukii. All rights reserved.
 //
 
-import Foundation
+import UIKit
 import PixelEditor
 import PixelEngine
 

Sources/Demo/SliderViewController.swift

@@ -19,7 +19,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-import Foundation
+import UIKit
 
 import PixelEditor
 

Sources/PixelEditor/Components/Crop/CropView.CropInsideOverlay.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2021 muukii. All rights reserved.
 //
 
-import Foundation
+import UIKit
 import SwiftUI
 
 /// https://havecamerawilltravel.com/lightroom/crop-overlays/

Sources/PixelEditor/Components/Crop/CropView.CropOutsideOverlay.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2021 muukii. All rights reserved.
 //
 
-import Foundation
+import UIKit
 
 extension CropView {
 

Sources/PixelEditor/Components/Crop/CropView._CropScrollView.swift

@@ -19,7 +19,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-import Foundation
+import UIKit
 
 extension CropView {
 

Sources/PixelEditor/Components/Crop/CropView._InteractiveCropGuideView.swift

@@ -19,8 +19,10 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-import Foundation
+import UIKit
+#if !COCOAPODS
 import PixelEngine
+#endif
 
 extension CropView {
   final class _InteractiveCropGuideView: PixelEditorCodeBasedView, UIGestureRecognizerDelegate {