wordpress-mobile · kean · Jun 28, 2024 · Jun 28, 2024 · Jun 28, 2024 · Jun 28, 2024
diff --git a/.gitignore b/.gitignore
@@ -38,12 +38,12 @@ playground.xcworkspace
 # Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
 # Packages/
 # Package.pins
-# Package.resolved
+Package.resolved
 # *.xcodeproj
 #
 # Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
 # hence it is not needed unless you have added a package configuration file to your project
-# .swiftpm
+.swiftpm
 
 .build/
 

diff --git a/MediaEditor.xcodeproj/project.pbxproj b/MediaEditor.xcodeproj/project.pbxproj
@@ -7,7 +7,10 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		17002A9D245C27400021216C /* MediaEditorDrawing.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 17002A9C245C27400021216C /* MediaEditorDrawing.storyboard */; };
+		0C0754FB2C2EF07B00425DCD /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0C0754F62C2EF07B00425DCD /* Media.xcassets */; };
+		0C0754FC2C2EF07B00425DCD /* MediaEditorDrawing.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0C0754F72C2EF07B00425DCD /* MediaEditorDrawing.storyboard */; };
+		0C0754FD2C2EF07B00425DCD /* MediaEditorFilters.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0C0754F82C2EF07B00425DCD /* MediaEditorFilters.storyboard */; };
+		0C0754FE2C2EF07B00425DCD /* MediaEditorHub.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0C0754F92C2EF07B00425DCD /* MediaEditorHub.storyboard */; };
 		17002A9F245C54160021216C /* MediaEditorAnnotationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17002A9E245C54150021216C /* MediaEditorAnnotationView.swift */; };
 		178126E62460B25300253107 /* MediaEditorDrawingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 178126E52460B25300253107 /* MediaEditorDrawingTests.swift */; };
 		178126E82461A2ED00253107 /* demo-drawing in Resources */ = {isa = PBXBuildFile; fileRef = 178126E72461A2DA00253107 /* demo-drawing */; };
@@ -21,7 +24,6 @@
 		8B05570D23E1F2F300C10787 /* AdditionalCapabilityViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B05570C23E1F2F300C10787 /* AdditionalCapabilityViewController.swift */; };
 		8B05571223E1F73300C10787 /* BrightnessCapability.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8B05571123E1F73300C10787 /* BrightnessCapability.storyboard */; };
 		8B05571423E1F74A00C10787 /* BrightnessCapability.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B05571323E1F74A00C10787 /* BrightnessCapability.swift */; };
-		8B062DCB23E8661400488F80 /* MediaEditorFilters.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8B062DC923E8661400488F80 /* MediaEditorFilters.storyboard */; };
 		8B062DCD23E8663C00488F80 /* UIImage+withSize.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B062DCC23E8663C00488F80 /* UIImage+withSize.swift */; };
 		8B062DD023E87A9400488F80 /* MediaEditorFilterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B062DCF23E87A9400488F80 /* MediaEditorFilterTests.swift */; };
 		8B062DD423E8925100488F80 /* MediaEditorFilterCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B062DD223E8924900488F80 /* MediaEditorFilterCell.swift */; };
@@ -44,8 +46,6 @@
 		8B5046DC23D7CE1600068F66 /* MediaEditorCapability.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B5046CC23D7CE1600068F66 /* MediaEditorCapability.swift */; };
 		8B5046DD23D7CE1600068F66 /* MediaEditorHub.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B5046CD23D7CE1600068F66 /* MediaEditorHub.swift */; };
 		8B5046DE23D7CE1600068F66 /* AsyncImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B5046CE23D7CE1600068F66 /* AsyncImage.swift */; };
-		8B5046DF23D7CE1600068F66 /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8B5046CF23D7CE1600068F66 /* Media.xcassets */; };
-		8B5046E023D7CE1600068F66 /* MediaEditorHub.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8B5046D023D7CE1600068F66 /* MediaEditorHub.storyboard */; };
 		8B5046E123D7CE1600068F66 /* MediaEditorCapabilityCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B5046D123D7CE1600068F66 /* MediaEditorCapabilityCell.swift */; };
 		8B5046E223D7CE1600068F66 /* MediaEditorThumbCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B5046D223D7CE1600068F66 /* MediaEditorThumbCell.swift */; };
 		8B5046E323D7CE1600068F66 /* MediaEditorStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B5046D423D7CE1600068F66 /* MediaEditorStyle.swift */; };
@@ -82,7 +82,10 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		17002A9C245C27400021216C /* MediaEditorDrawing.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = MediaEditorDrawing.storyboard; sourceTree = "<group>"; };
+		0C0754F62C2EF07B00425DCD /* Media.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Media.xcassets; sourceTree = "<group>"; };
+		0C0754F72C2EF07B00425DCD /* MediaEditorDrawing.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = MediaEditorDrawing.storyboard; sourceTree = "<group>"; };
+		0C0754F82C2EF07B00425DCD /* MediaEditorFilters.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = MediaEditorFilters.storyboard; sourceTree = "<group>"; };
+		0C0754F92C2EF07B00425DCD /* MediaEditorHub.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = MediaEditorHub.storyboard; sourceTree = "<group>"; };
 		17002A9E245C54150021216C /* MediaEditorAnnotationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaEditorAnnotationView.swift; sourceTree = "<group>"; };
 		178126E52460B25300253107 /* MediaEditorDrawingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaEditorDrawingTests.swift; sourceTree = "<group>"; };
 		178126E72461A2DA00253107 /* demo-drawing */ = {isa = PBXFileReference; lastKnownFileType = file; path = "demo-drawing"; sourceTree = "<group>"; };
@@ -94,7 +97,6 @@
 		8B05570C23E1F2F300C10787 /* AdditionalCapabilityViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalCapabilityViewController.swift; sourceTree = "<group>"; };
 		8B05571123E1F73300C10787 /* BrightnessCapability.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = BrightnessCapability.storyboard; sourceTree = "<group>"; };
 		8B05571323E1F74A00C10787 /* BrightnessCapability.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrightnessCapability.swift; sourceTree = "<group>"; };
-		8B062DC923E8661400488F80 /* MediaEditorFilters.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = MediaEditorFilters.storyboard; sourceTree = "<group>"; };
 		8B062DCC23E8663C00488F80 /* UIImage+withSize.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIImage+withSize.swift"; sourceTree = "<group>"; };
 		8B062DCF23E87A9400488F80 /* MediaEditorFilterTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaEditorFilterTests.swift; sourceTree = "<group>"; };
 		8B062DD223E8924900488F80 /* MediaEditorFilterCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaEditorFilterCell.swift; sourceTree = "<group>"; };
@@ -120,8 +122,6 @@
 		8B5046CC23D7CE1600068F66 /* MediaEditorCapability.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MediaEditorCapability.swift; sourceTree = "<group>"; };
 		8B5046CD23D7CE1600068F66 /* MediaEditorHub.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MediaEditorHub.swift; sourceTree = "<group>"; };
 		8B5046CE23D7CE1600068F66 /* AsyncImage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AsyncImage.swift; sourceTree = "<group>"; };
-		8B5046CF23D7CE1600068F66 /* Media.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Media.xcassets; sourceTree = "<group>"; };
-		8B5046D023D7CE1600068F66 /* MediaEditorHub.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = MediaEditorHub.storyboard; sourceTree = "<group>"; };
 		8B5046D123D7CE1600068F66 /* MediaEditorCapabilityCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MediaEditorCapabilityCell.swift; sourceTree = "<group>"; };
 		8B5046D223D7CE1600068F66 /* MediaEditorThumbCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MediaEditorThumbCell.swift; sourceTree = "<group>"; };
 		8B5046D423D7CE1600068F66 /* MediaEditorStyle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MediaEditorStyle.swift; sourceTree = "<group>"; };
@@ -164,6 +164,17 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		0C0754FA2C2EF07B00425DCD /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				0C0754F62C2EF07B00425DCD /* Media.xcassets */,
+				0C0754F72C2EF07B00425DCD /* MediaEditorDrawing.storyboard */,
+				0C0754F82C2EF07B00425DCD /* MediaEditorFilters.storyboard */,
+				0C0754F92C2EF07B00425DCD /* MediaEditorHub.storyboard */,
+			);
+			path = Resources;
+			sourceTree = "<group>";
+		};
 		178126E42460B23700253107 /* Drawing */ = {
 			isa = PBXGroup;
 			children = (
@@ -176,7 +187,6 @@
 		17DBA236245B14F5006CD67F /* Drawing */ = {
 			isa = PBXGroup;
 			children = (
-				17002A9C245C27400021216C /* MediaEditorDrawing.storyboard */,
 				17DBA237245B1507006CD67F /* MediaEditorDrawing.swift */,
 				17002A9E245C54150021216C /* MediaEditorAnnotationView.swift */,
 			);
@@ -250,7 +260,6 @@
 			isa = PBXGroup;
 			children = (
 				8B062DD123E8923500488F80 /* Cells */,
-				8B062DC923E8661400488F80 /* MediaEditorFilters.storyboard */,
 				8B062DD523E8936000488F80 /* MediaEditorFilters.swift */,
 			);
 			path = Filters;
@@ -299,11 +308,10 @@
 				8B5046C823D7CE1600068F66 /* Capabilities */,
 				8B5046D323D7CE1600068F66 /* Enums */,
 				8B5046C323D7CE1600068F66 /* Extensions */,
+				0C0754FA2C2EF07B00425DCD /* Resources */,
 				8B5046CE23D7CE1600068F66 /* AsyncImage.swift */,
-				8B5046CF23D7CE1600068F66 /* Media.xcassets */,
 				8B5046C623D7CE1600068F66 /* MediaEditor.swift */,
 				8B5046D123D7CE1600068F66 /* MediaEditorCapabilityCell.swift */,
-				8B5046D023D7CE1600068F66 /* MediaEditorHub.storyboard */,
 				8B5046CD23D7CE1600068F66 /* MediaEditorHub.swift */,
 				8B5046C723D7CE1600068F66 /* MediaEditorImageCell.swift */,
 				8B5046D223D7CE1600068F66 /* MediaEditorThumbCell.swift */,
@@ -541,10 +549,10 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				8B5046E023D7CE1600068F66 /* MediaEditorHub.storyboard in Resources */,
-				8B5046DF23D7CE1600068F66 /* Media.xcassets in Resources */,
-				8B062DCB23E8661400488F80 /* MediaEditorFilters.storyboard in Resources */,
-				17002A9D245C27400021216C /* MediaEditorDrawing.storyboard in Resources */,
+				0C0754FD2C2EF07B00425DCD /* MediaEditorFilters.storyboard in Resources */,
+				0C0754FB2C2EF07B00425DCD /* Media.xcassets in Resources */,
+				0C0754FE2C2EF07B00425DCD /* MediaEditorHub.storyboard in Resources */,
+				0C0754FC2C2EF07B00425DCD /* MediaEditorDrawing.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/Package.swift b/Package.swift
@@ -0,0 +1,23 @@
+// swift-tools-version:5.10
+
+import Foundation
+import PackageDescription
+
+let package = Package(
+    name: "MediaEditor",
+    platforms: [.iOS(.v15)],
+    products: [
+        .library(name: "MediaEditor", targets: ["MediaEditor"])
+    ],
+    dependencies: [
+        .package(url: "https://github.com/TimOliver/TOCropViewController", from: "2.5.3")
+    ],
+    targets: [
+        .target(
+            name: "MediaEditor",
+            dependencies: [
+                .product(name: "CropViewController", package: "TOCropViewController")
+            ],
+            resources: [.process("Resources")])
+    ]
+)
diff --git a/Sources/Capabilities/Drawing/MediaEditorAnnotationView.swift b/Sources/Capabilities/Drawing/MediaEditorAnnotationView.swift
@@ -11,6 +11,7 @@ protocol MediaEditorAnnotationViewUndoObserver: NSObject {
 /// Wrapper view that contains an image view and a PencilKit canvas to allow
 /// drawing on top of the image.
 ///
+@objc(WPMediaEditorAnnotationView)
 @available(iOS 13.0, *)
 class MediaEditorAnnotationView: UIView {
 

diff --git a/Sources/Capabilities/Drawing/MediaEditorDrawing.swift b/Sources/Capabilities/Drawing/MediaEditorDrawing.swift
@@ -1,5 +1,6 @@
 import UIKit
 
+@objc(WPMediaEditorDrawingViewController)
 @available(iOS 13.0, *)
 class MediaEditorDrawing: UIViewController {
 
@@ -20,7 +21,7 @@ class MediaEditorDrawing: UIViewController {
     static func initialize() -> MediaEditorDrawing {
         return UIStoryboard(
             name: "MediaEditorDrawing",
-            bundle: Bundle(for: MediaEditorDrawing.self)
+            bundle: .mediaEditorBundle(for: MediaEditorDrawing.self)
         ).instantiateViewController(withIdentifier: "drawingViewController") as! MediaEditorDrawing
     }
 

diff --git a/Sources/Capabilities/Filters/Cells/MediaEditorFilterCell.swift b/Sources/Capabilities/Filters/Cells/MediaEditorFilterCell.swift
@@ -1,5 +1,6 @@
 import UIKit
 
+@objc(WPMediaEditorFilterCell)
 class MediaEditorFilterCell: UICollectionViewCell {
     @IBOutlet weak var imageView: UIImageView!
     @IBOutlet weak var title: UILabel!

diff --git a/Sources/Capabilities/Filters/MediaEditorFilters.swift b/Sources/Capabilities/Filters/MediaEditorFilters.swift
@@ -5,6 +5,7 @@ struct MediaEditorFilter {
     let ciFilterName: String
 }
 
+@objc(WPMediaEditorFiltersViewController)
 class MediaEditorFilters: UIViewController {
     @IBOutlet weak var imageView: UIImageView!
     @IBOutlet weak var filtersCollectionView: UICollectionView!
@@ -120,7 +121,7 @@ class MediaEditorFilters: UIViewController {
     static func initialize() -> MediaEditorFilters {
         return UIStoryboard(
             name: "MediaEditorFilters",
-            bundle: Bundle(for: MediaEditorFilters.self)
+            bundle: .mediaEditorBundle(for: MediaEditorFilters.self)
         ).instantiateViewController(withIdentifier: "filtersViewController") as! MediaEditorFilters
     }
 

diff --git a/Sources/Extensions/Bundle+mediaEditor.swift b/Sources/Extensions/Bundle+mediaEditor.swift
@@ -2,13 +2,25 @@ import Foundation
 
 extension Bundle {
     @objc public class var mediaEditor: Bundle {
+#if SWIFT_PACKAGE
+        return Bundle.module
+#else
         let defaultBundle = Bundle(for: MediaEditor.self)
         // If installed with CocoaPods, resources will be in MediaEditor.bundle
         if let bundleURL = defaultBundle.resourceURL,
-            let resourceBundle = Bundle(url: bundleURL.appendingPathComponent("MediaEditor.bundle")) {
+           let resourceBundle = Bundle(url: bundleURL.appendingPathComponent("MediaEditor.bundle")) {
             return resourceBundle
         }
         // Otherwise, the default bundle is used for resources
         return defaultBundle
+#endif
+    }
+
+    static func mediaEditorBundle(for type: AnyClass) -> Bundle? {
+#if SWIFT_PACKAGE
+        return Bundle.module
+#else
+        return Bundle(for: type)
+#endif
     }
 }
diff --git a/Sources/MediaEditorCapabilityCell.swift b/Sources/MediaEditorCapabilityCell.swift
@@ -1,5 +1,6 @@
 import UIKit
 
+@objc(WPMediaEditorCapabilityCell)
 class MediaEditorCapabilityCell: UICollectionViewCell {
     @IBOutlet weak var iconButton: UIButton!
 

diff --git a/Sources/MediaEditorHub.swift b/Sources/MediaEditorHub.swift
@@ -1,5 +1,6 @@
 import UIKit
 
+@objc(WPMediaEditorHubViewController)
 public class MediaEditorHub: UIViewController {
 
     @IBOutlet public weak var doneButton: UIButton!
@@ -253,7 +254,7 @@ public class MediaEditorHub: UIViewController {
     }
 
     static func initialize() -> MediaEditorHub {
-        return UIStoryboard(name: "MediaEditorHub", bundle: Bundle(for: MediaEditorHub.self)).instantiateViewController(withIdentifier: "hubViewController") as! MediaEditorHub
+        return UIStoryboard(name: "MediaEditorHub", bundle: .mediaEditorBundle(for: MediaEditorHub.self)).instantiateViewController(withIdentifier: "hubViewController") as! MediaEditorHub
     }
 
     private enum Constants {

diff --git a/Sources/MediaEditorImageCell.swift b/Sources/MediaEditorImageCell.swift
@@ -1,5 +1,6 @@
 import UIKit
 
+@objc(WPMediaEditorImageCell)
 class MediaEditorImageCell: UICollectionViewCell {
     @IBOutlet weak var imageView: UIImageView!
     @IBOutlet weak var errorView: UIView!

diff --git a/Sources/MediaEditorThumbCell.swift b/Sources/MediaEditorThumbCell.swift
@@ -1,5 +1,6 @@
 import UIKit
 
+@objc(WPMediaEditorThumbCell)
 class MediaEditorThumbCell: UICollectionViewCell {
     @IBOutlet weak var thumbImageView: UIImageView!
 

diff --git a/Sources/Media.xcassets/Contents.json → ...es/Resources/Media.xcassets/Contents.json b/Sources/Media.xcassets/Contents.json → ...es/Resources/Media.xcassets/Contents.json
diff --git a/...a.xcassets/filters.imageset/Contents.json → ...a.xcassets/filters.imageset/Contents.json b/...a.xcassets/filters.imageset/Contents.json → ...a.xcassets/filters.imageset/Contents.json
diff --git a/...cassets/filters.imageset/filters-icon.pdf → ...cassets/filters.imageset/filters-icon.pdf b/...cassets/filters.imageset/filters-icon.pdf → ...cassets/filters.imageset/filters-icon.pdf
diff --git a/...ets/gridicons-crop.imageset/Contents.json → ...ets/gridicons-crop.imageset/Contents.json b/...ets/gridicons-crop.imageset/Contents.json → ...ets/gridicons-crop.imageset/Contents.json
diff --git a/...ridicons-crop.imageset/gridicons-crop.pdf → ...ridicons-crop.imageset/gridicons-crop.pdf b/...ridicons-crop.imageset/gridicons-crop.pdf → ...ridicons-crop.imageset/gridicons-crop.pdf
diff --git a/...ts/gridicons-cross.imageset/Contents.json → ...ts/gridicons-cross.imageset/Contents.json b/...ts/gridicons-cross.imageset/Contents.json → ...ts/gridicons-cross.imageset/Contents.json
diff --git a/...dicons-cross.imageset/gridicons-cross.pdf → ...dicons-cross.imageset/gridicons-cross.pdf b/...dicons-cross.imageset/gridicons-cross.pdf → ...dicons-cross.imageset/gridicons-cross.pdf