Use Swift Package Manager's folder structure

CHANGELOG.md

@@ -38,7 +38,7 @@ _None._
 
 ### New Features
 
-_None._
+- Add Swift Package Manager support [#120]
 
 ### Bug Fixes
 

Package.swift

@@ -9,54 +9,23 @@ let package = Package(
         .library(
             name: "WordPressUI",
             targets: [
-                "WordPressUIGravatar",
-                "WordPressUIGravatarObjC",
-                "WordPressUIObjCCategories",
+                "WordPressUIObjC",
                 "WordPressUI",
             ]
         )
     ],
     dependencies: [],
     targets: [
-        .target(
-            name: "WordPressUIGravatar",
-            path: "WordPressUI/Extensions/Gravatar",
-            sources: ["Gravatar.swift"]
-        ),
-        .target(
-            name: "WordPressUIGravatarObjC",
-            path: "WordPressUI/Extensions/Gravatar",
-            exclude: ["Gravatar.swift"],
-            publicHeadersPath: "."
-        ),
-        .target(
-            name: "WordPressUIObjCCategories",
-            path: "WordPressUI/Categories",
-            publicHeadersPath: "."
-        ),
+        .target(name: "WordPressUIObjC"),
         .target(
             name: "WordPressUI",
             dependencies: [
-                .target(name: "WordPressUIGravatar"),
-                .target(name: "WordPressUIGravatarObjC"),
-                .target(name: "WordPressUIObjCCategories"),
-            ],
-            path: "WordPressUI",
-            exclude: [
-                "WordPressUI.h",
-                "Extensions/Gravatar",
-                "Categories"
-            ],
-            resources: [
-                .process("Resources"),
-                .process("FancyAlert/FancyAlerts.storyboard")
+                .target(name: "WordPressUIObjC"),
             ]
         ),
         .testTarget(
             name: "WordPressUITests",
-            dependencies: [.target(name: "WordPressUI")],
-            path: "WordPressUITests",
-            exclude: ["Info.plist"]
+            dependencies: [.target(name: "WordPressUI")]
         ),
     ]
 )

WordPressUI/Extensions/UIImageView+Gravatar.swift → Sources/WordPressUI/Extensions/UIImageView+Gravatar.swift

@@ -2,8 +2,7 @@ import Foundation
 import UIKit
 
 #if SWIFT_PACKAGE
-import WordPressUIGravatar
-import WordPressUIGravatarObjC
+import WordPressUIObjC
 #endif
 
 /// Wrapper class used to ensure removeObserver is called

WordPressUI/Extensions/UIImageView+Networking.swift → Sources/WordPressUI/Extensions/UIImageView+Networking.swift

@@ -2,7 +2,7 @@ import Foundation
 import UIKit
 
 #if SWIFT_PACKAGE
-import WordPressUIObjCCategories
+import WordPressUIObjC
 #endif
 
 public extension UIImageView {

Sources/WordPressUI/Tools/Exports.swift

@@ -0,0 +1,3 @@
+#if SWIFT_PACKAGE
+@_exported import WordPressUIObjC
+#endif

Sources/WordPressUIObjC/include/NSString+Gravatar.h

@@ -0,0 +1 @@
+../Extensions/NSString+Gravatar.h

Sources/WordPressUIObjC/include/UIColor+Helpers.h

@@ -0,0 +1 @@
+../Categories/UIColor+Helpers.h

Sources/WordPressUIObjC/include/UIImage+Resize.h

@@ -0,0 +1 @@
+../Categories/UIImage+Resize.h

Sources/WordPressUIObjC/include/UIImage+Util.h

@@ -0,0 +1 @@
+../Categories/UIImage+Util.h

Sources/WordPressUIObjC/include/UILabel+SuggestSize.h

@@ -0,0 +1 @@
+../Categories/UILabel+SuggestSize.h

WordPressUI.podspec

@@ -17,16 +17,15 @@ Pod::Spec.new do |s|
   s.swift_version = '5.0'
 
   s.source        = { git: 'https://github.com/wordpress-mobile/WordPressUI-iOS.git', tag: s.version.to_s }
-  s.source_files  = 'WordPressUI/**/*.{h,m,swift}'
+  s.source_files  = 'Sources/WordPressUI/**/*.{h,m,swift}', 'Sources/WordPressUIObjC/**/*.{h,m,swift}'
   s.resource_bundles = {
     WordPressUIResources: [
-      'WordPressUI/Resources/*.{xcassets}',
-      'WordPressUI/**/*.{storyboard}'
+      'Sources/WordPressUI/Resources/*.{xcassets,storyboard}'
     ]
   }
-  s.header_dir = 'WordPressUI'
+  s.public_header_files = 'Sources/WordPressUIObjC/include'
 
   s.test_spec do |test|
-    test.source_files = ['WordPressUITests/**/*.{swift,h,m}']
+    test.source_files = ['Tests/WordPressUITests/**/*.{swift,h,m}']
   end
 end