diff --git a/WordPressUI/Info.plist b/Sources/Supporting Files/Info.plist similarity index 100% rename from WordPressUI/Info.plist rename to Sources/Supporting Files/Info.plist diff --git a/WordPressUI/Extensions/Gravatar/NSString+Gravatar.h b/Sources/WordPressUI-Objective-C/NSString+Gravatar.h similarity index 100% rename from WordPressUI/Extensions/Gravatar/NSString+Gravatar.h rename to Sources/WordPressUI-Objective-C/NSString+Gravatar.h diff --git a/WordPressUI/Extensions/Gravatar/NSString+Gravatar.m b/Sources/WordPressUI-Objective-C/NSString+Gravatar.m similarity index 100% rename from WordPressUI/Extensions/Gravatar/NSString+Gravatar.m rename to Sources/WordPressUI-Objective-C/NSString+Gravatar.m diff --git a/WordPressUI/Categories/UIColor+Helpers.h b/Sources/WordPressUI-Objective-C/UIColor+Helpers.h similarity index 100% rename from WordPressUI/Categories/UIColor+Helpers.h rename to Sources/WordPressUI-Objective-C/UIColor+Helpers.h diff --git a/WordPressUI/Categories/UIColor+Helpers.m b/Sources/WordPressUI-Objective-C/UIColor+Helpers.m similarity index 100% rename from WordPressUI/Categories/UIColor+Helpers.m rename to Sources/WordPressUI-Objective-C/UIColor+Helpers.m diff --git a/WordPressUI/Categories/UIImage+Resize.h b/Sources/WordPressUI-Objective-C/UIImage+Resize.h similarity index 100% rename from WordPressUI/Categories/UIImage+Resize.h rename to Sources/WordPressUI-Objective-C/UIImage+Resize.h diff --git a/WordPressUI/Categories/UIImage+Resize.m b/Sources/WordPressUI-Objective-C/UIImage+Resize.m similarity index 100% rename from WordPressUI/Categories/UIImage+Resize.m rename to Sources/WordPressUI-Objective-C/UIImage+Resize.m diff --git a/WordPressUI/Categories/UIImage+Util.h b/Sources/WordPressUI-Objective-C/UIImage+Util.h similarity index 100% rename from WordPressUI/Categories/UIImage+Util.h rename to Sources/WordPressUI-Objective-C/UIImage+Util.h diff --git a/WordPressUI/Categories/UIImage+Util.m b/Sources/WordPressUI-Objective-C/UIImage+Util.m similarity index 100% rename from WordPressUI/Categories/UIImage+Util.m rename to Sources/WordPressUI-Objective-C/UIImage+Util.m diff --git a/WordPressUI/Categories/UILabel+SuggestSize.h b/Sources/WordPressUI-Objective-C/UILabel+SuggestSize.h similarity index 100% rename from WordPressUI/Categories/UILabel+SuggestSize.h rename to Sources/WordPressUI-Objective-C/UILabel+SuggestSize.h diff --git a/WordPressUI/Categories/UILabel+SuggestSize.m b/Sources/WordPressUI-Objective-C/UILabel+SuggestSize.m similarity index 100% rename from WordPressUI/Categories/UILabel+SuggestSize.m rename to Sources/WordPressUI-Objective-C/UILabel+SuggestSize.m diff --git a/WordPressUI/BottomSheet/BottomSheetAnimationController.swift b/Sources/WordPressUI/BottomSheet/BottomSheetAnimationController.swift similarity index 100% rename from WordPressUI/BottomSheet/BottomSheetAnimationController.swift rename to Sources/WordPressUI/BottomSheet/BottomSheetAnimationController.swift diff --git a/WordPressUI/BottomSheet/BottomSheetViewController.swift b/Sources/WordPressUI/BottomSheet/BottomSheetViewController.swift similarity index 100% rename from WordPressUI/BottomSheet/BottomSheetViewController.swift rename to Sources/WordPressUI/BottomSheet/BottomSheetViewController.swift diff --git a/WordPressUI/BottomSheet/DrawerPresentationController.swift b/Sources/WordPressUI/BottomSheet/DrawerPresentationController.swift similarity index 100% rename from WordPressUI/BottomSheet/DrawerPresentationController.swift rename to Sources/WordPressUI/BottomSheet/DrawerPresentationController.swift diff --git a/WordPressUI/BottomSheet/GripButton.swift b/Sources/WordPressUI/BottomSheet/GripButton.swift similarity index 100% rename from WordPressUI/BottomSheet/GripButton.swift rename to Sources/WordPressUI/BottomSheet/GripButton.swift diff --git a/WordPressUI/Constants/UIKitConstants.swift b/Sources/WordPressUI/Constants/UIKitConstants.swift similarity index 100% rename from WordPressUI/Constants/UIKitConstants.swift rename to Sources/WordPressUI/Constants/UIKitConstants.swift diff --git a/WordPressUI/Extensions/BlockEvents/UIBarButtonItem+BlockEvents.swift b/Sources/WordPressUI/Extensions/BlockEvents/UIBarButtonItem+BlockEvents.swift similarity index 100% rename from WordPressUI/Extensions/BlockEvents/UIBarButtonItem+BlockEvents.swift rename to Sources/WordPressUI/Extensions/BlockEvents/UIBarButtonItem+BlockEvents.swift diff --git a/WordPressUI/Extensions/BlockEvents/UIControl+BlockEvents.swift b/Sources/WordPressUI/Extensions/BlockEvents/UIControl+BlockEvents.swift similarity index 100% rename from WordPressUI/Extensions/BlockEvents/UIControl+BlockEvents.swift rename to Sources/WordPressUI/Extensions/BlockEvents/UIControl+BlockEvents.swift diff --git a/WordPressUI/Extensions/BlockEvents/UIGestureRecognizer+BlockEvents.swift b/Sources/WordPressUI/Extensions/BlockEvents/UIGestureRecognizer+BlockEvents.swift similarity index 100% rename from WordPressUI/Extensions/BlockEvents/UIGestureRecognizer+BlockEvents.swift rename to Sources/WordPressUI/Extensions/BlockEvents/UIGestureRecognizer+BlockEvents.swift diff --git a/WordPressUI/Extensions/CGAffineTransform+Helpers.swift b/Sources/WordPressUI/Extensions/CGAffineTransform+Helpers.swift similarity index 100% rename from WordPressUI/Extensions/CGAffineTransform+Helpers.swift rename to Sources/WordPressUI/Extensions/CGAffineTransform+Helpers.swift diff --git a/WordPressUI/Extensions/Gravatar/Gravatar.swift b/Sources/WordPressUI/Extensions/Gravatar/Gravatar.swift similarity index 100% rename from WordPressUI/Extensions/Gravatar/Gravatar.swift rename to Sources/WordPressUI/Extensions/Gravatar/Gravatar.swift diff --git a/WordPressUI/Extensions/NSBundle+ResourceBundle.swift b/Sources/WordPressUI/Extensions/NSBundle+ResourceBundle.swift similarity index 100% rename from WordPressUI/Extensions/NSBundle+ResourceBundle.swift rename to Sources/WordPressUI/Extensions/NSBundle+ResourceBundle.swift diff --git a/WordPressUI/Extensions/NSMutableAttributedString+Helpers.swift b/Sources/WordPressUI/Extensions/NSMutableAttributedString+Helpers.swift similarity index 100% rename from WordPressUI/Extensions/NSMutableAttributedString+Helpers.swift rename to Sources/WordPressUI/Extensions/NSMutableAttributedString+Helpers.swift diff --git a/WordPressUI/Extensions/UIAlertController+Helpers.swift b/Sources/WordPressUI/Extensions/UIAlertController+Helpers.swift similarity index 100% rename from WordPressUI/Extensions/UIAlertController+Helpers.swift rename to Sources/WordPressUI/Extensions/UIAlertController+Helpers.swift diff --git a/WordPressUI/Extensions/UIControl+Helpers.swift b/Sources/WordPressUI/Extensions/UIControl+Helpers.swift similarity index 100% rename from WordPressUI/Extensions/UIControl+Helpers.swift rename to Sources/WordPressUI/Extensions/UIControl+Helpers.swift diff --git a/WordPressUI/Extensions/UIDevice+Helpers.swift b/Sources/WordPressUI/Extensions/UIDevice+Helpers.swift similarity index 100% rename from WordPressUI/Extensions/UIDevice+Helpers.swift rename to Sources/WordPressUI/Extensions/UIDevice+Helpers.swift diff --git a/WordPressUI/Extensions/UIImage+Assets.swift b/Sources/WordPressUI/Extensions/UIImage+Assets.swift similarity index 100% rename from WordPressUI/Extensions/UIImage+Assets.swift rename to Sources/WordPressUI/Extensions/UIImage+Assets.swift diff --git a/WordPressUI/Extensions/UIImage+Crop.swift b/Sources/WordPressUI/Extensions/UIImage+Crop.swift similarity index 100% rename from WordPressUI/Extensions/UIImage+Crop.swift rename to Sources/WordPressUI/Extensions/UIImage+Crop.swift diff --git a/WordPressUI/Extensions/UIImage+Rotation.swift b/Sources/WordPressUI/Extensions/UIImage+Rotation.swift similarity index 100% rename from WordPressUI/Extensions/UIImage+Rotation.swift rename to Sources/WordPressUI/Extensions/UIImage+Rotation.swift diff --git a/WordPressUI/Extensions/UIImage+Tint.swift b/Sources/WordPressUI/Extensions/UIImage+Tint.swift similarity index 100% rename from WordPressUI/Extensions/UIImage+Tint.swift rename to Sources/WordPressUI/Extensions/UIImage+Tint.swift diff --git a/WordPressUI/Extensions/UIImageView+Blavatar.swift b/Sources/WordPressUI/Extensions/UIImageView+Blavatar.swift similarity index 100% rename from WordPressUI/Extensions/UIImageView+Blavatar.swift rename to Sources/WordPressUI/Extensions/UIImageView+Blavatar.swift diff --git a/WordPressUI/Extensions/UIImageView+Gravatar.swift b/Sources/WordPressUI/Extensions/UIImageView+Gravatar.swift similarity index 100% rename from WordPressUI/Extensions/UIImageView+Gravatar.swift rename to Sources/WordPressUI/Extensions/UIImageView+Gravatar.swift diff --git a/WordPressUI/Extensions/UIImageView+Networking.swift b/Sources/WordPressUI/Extensions/UIImageView+Networking.swift similarity index 100% rename from WordPressUI/Extensions/UIImageView+Networking.swift rename to Sources/WordPressUI/Extensions/UIImageView+Networking.swift diff --git a/WordPressUI/Extensions/UITableView+Helpers.swift b/Sources/WordPressUI/Extensions/UITableView+Helpers.swift similarity index 100% rename from WordPressUI/Extensions/UITableView+Helpers.swift rename to Sources/WordPressUI/Extensions/UITableView+Helpers.swift diff --git a/WordPressUI/Extensions/UITableViewController+Helpers.swift b/Sources/WordPressUI/Extensions/UITableViewController+Helpers.swift similarity index 100% rename from WordPressUI/Extensions/UITableViewController+Helpers.swift rename to Sources/WordPressUI/Extensions/UITableViewController+Helpers.swift diff --git a/WordPressUI/Extensions/UITextField+TextHelper.swift b/Sources/WordPressUI/Extensions/UITextField+TextHelper.swift similarity index 100% rename from WordPressUI/Extensions/UITextField+TextHelper.swift rename to Sources/WordPressUI/Extensions/UITextField+TextHelper.swift diff --git a/WordPressUI/Extensions/UIView+Animations.swift b/Sources/WordPressUI/Extensions/UIView+Animations.swift similarity index 100% rename from WordPressUI/Extensions/UIView+Animations.swift rename to Sources/WordPressUI/Extensions/UIView+Animations.swift diff --git a/WordPressUI/Extensions/UIView+Helpers.swift b/Sources/WordPressUI/Extensions/UIView+Helpers.swift similarity index 100% rename from WordPressUI/Extensions/UIView+Helpers.swift rename to Sources/WordPressUI/Extensions/UIView+Helpers.swift diff --git a/WordPressUI/Extensions/UIViewController+ChildViewController.swift b/Sources/WordPressUI/Extensions/UIViewController+ChildViewController.swift similarity index 100% rename from WordPressUI/Extensions/UIViewController+ChildViewController.swift rename to Sources/WordPressUI/Extensions/UIViewController+ChildViewController.swift diff --git a/WordPressUI/Extensions/UIViewController+Helpers.swift b/Sources/WordPressUI/Extensions/UIViewController+Helpers.swift similarity index 100% rename from WordPressUI/Extensions/UIViewController+Helpers.swift rename to Sources/WordPressUI/Extensions/UIViewController+Helpers.swift diff --git a/WordPressUI/Extensions/UIWindow+Helpers.swift b/Sources/WordPressUI/Extensions/UIWindow+Helpers.swift similarity index 100% rename from WordPressUI/Extensions/UIWindow+Helpers.swift rename to Sources/WordPressUI/Extensions/UIWindow+Helpers.swift diff --git a/WordPressUI/FancyAlert/FancyAlertPresentationController.swift b/Sources/WordPressUI/FancyAlert/FancyAlertPresentationController.swift similarity index 100% rename from WordPressUI/FancyAlert/FancyAlertPresentationController.swift rename to Sources/WordPressUI/FancyAlert/FancyAlertPresentationController.swift diff --git a/WordPressUI/FancyAlert/FancyAlertView.swift b/Sources/WordPressUI/FancyAlert/FancyAlertView.swift similarity index 100% rename from WordPressUI/FancyAlert/FancyAlertView.swift rename to Sources/WordPressUI/FancyAlert/FancyAlertView.swift diff --git a/WordPressUI/FancyAlert/FancyAlertViewController.swift b/Sources/WordPressUI/FancyAlert/FancyAlertViewController.swift similarity index 100% rename from WordPressUI/FancyAlert/FancyAlertViewController.swift rename to Sources/WordPressUI/FancyAlert/FancyAlertViewController.swift diff --git a/WordPressUI/FancyAlert/FancyAlerts.storyboard b/Sources/WordPressUI/FancyAlert/FancyAlerts.storyboard similarity index 100% rename from WordPressUI/FancyAlert/FancyAlerts.storyboard rename to Sources/WordPressUI/FancyAlert/FancyAlerts.storyboard diff --git a/WordPressUI/FancyAlert/FancyButton.swift b/Sources/WordPressUI/FancyAlert/FancyButton.swift similarity index 100% rename from WordPressUI/FancyAlert/FancyButton.swift rename to Sources/WordPressUI/FancyAlert/FancyButton.swift diff --git a/WordPressUI/FlingableView/FlingableViewHandler.swift b/Sources/WordPressUI/FlingableView/FlingableViewHandler.swift similarity index 100% rename from WordPressUI/FlingableView/FlingableViewHandler.swift rename to Sources/WordPressUI/FlingableView/FlingableViewHandler.swift diff --git a/WordPressUI/Ghosts/GhostOptions.swift b/Sources/WordPressUI/Ghosts/GhostOptions.swift similarity index 100% rename from WordPressUI/Ghosts/GhostOptions.swift rename to Sources/WordPressUI/Ghosts/GhostOptions.swift diff --git a/WordPressUI/Ghosts/GhostStyle.swift b/Sources/WordPressUI/Ghosts/GhostStyle.swift similarity index 100% rename from WordPressUI/Ghosts/GhostStyle.swift rename to Sources/WordPressUI/Ghosts/GhostStyle.swift diff --git a/WordPressUI/Ghosts/GhostableView.swift b/Sources/WordPressUI/Ghosts/GhostableView.swift similarity index 100% rename from WordPressUI/Ghosts/GhostableView.swift rename to Sources/WordPressUI/Ghosts/GhostableView.swift diff --git a/WordPressUI/Ghosts/Internal/GhostAnimation.swift b/Sources/WordPressUI/Ghosts/Internal/GhostAnimation.swift similarity index 100% rename from WordPressUI/Ghosts/Internal/GhostAnimation.swift rename to Sources/WordPressUI/Ghosts/Internal/GhostAnimation.swift diff --git a/WordPressUI/Ghosts/Internal/GhostCollectionViewHandler.swift b/Sources/WordPressUI/Ghosts/Internal/GhostCollectionViewHandler.swift similarity index 100% rename from WordPressUI/Ghosts/Internal/GhostCollectionViewHandler.swift rename to Sources/WordPressUI/Ghosts/Internal/GhostCollectionViewHandler.swift diff --git a/WordPressUI/Ghosts/Internal/GhostLayer.swift b/Sources/WordPressUI/Ghosts/Internal/GhostLayer.swift similarity index 100% rename from WordPressUI/Ghosts/Internal/GhostLayer.swift rename to Sources/WordPressUI/Ghosts/Internal/GhostLayer.swift diff --git a/WordPressUI/Ghosts/Internal/GhostTableViewHandler.swift b/Sources/WordPressUI/Ghosts/Internal/GhostTableViewHandler.swift similarity index 100% rename from WordPressUI/Ghosts/Internal/GhostTableViewHandler.swift rename to Sources/WordPressUI/Ghosts/Internal/GhostTableViewHandler.swift diff --git a/WordPressUI/Ghosts/Internal/UIView+InnerGhost.swift b/Sources/WordPressUI/Ghosts/Internal/UIView+InnerGhost.swift similarity index 100% rename from WordPressUI/Ghosts/Internal/UIView+InnerGhost.swift rename to Sources/WordPressUI/Ghosts/Internal/UIView+InnerGhost.swift diff --git a/WordPressUI/Ghosts/UICollectionView+Ghost.swift b/Sources/WordPressUI/Ghosts/UICollectionView+Ghost.swift similarity index 100% rename from WordPressUI/Ghosts/UICollectionView+Ghost.swift rename to Sources/WordPressUI/Ghosts/UICollectionView+Ghost.swift diff --git a/WordPressUI/Ghosts/UITableView+Ghost.swift b/Sources/WordPressUI/Ghosts/UITableView+Ghost.swift similarity index 100% rename from WordPressUI/Ghosts/UITableView+Ghost.swift rename to Sources/WordPressUI/Ghosts/UITableView+Ghost.swift diff --git a/WordPressUI/Ghosts/UIView+Ghost.swift b/Sources/WordPressUI/Ghosts/UIView+Ghost.swift similarity index 100% rename from WordPressUI/Ghosts/UIView+Ghost.swift rename to Sources/WordPressUI/Ghosts/UIView+Ghost.swift diff --git a/WordPressUI/Resources/Assets.xcassets/Contents.json b/Sources/WordPressUI/Resources/Assets.xcassets/Contents.json similarity index 100% rename from WordPressUI/Resources/Assets.xcassets/Contents.json rename to Sources/WordPressUI/Resources/Assets.xcassets/Contents.json diff --git a/WordPressUI/Resources/Assets.xcassets/blavatar.imageset/Contents.json b/Sources/WordPressUI/Resources/Assets.xcassets/blavatar.imageset/Contents.json similarity index 100% rename from WordPressUI/Resources/Assets.xcassets/blavatar.imageset/Contents.json rename to Sources/WordPressUI/Resources/Assets.xcassets/blavatar.imageset/Contents.json diff --git a/WordPressUI/Resources/Assets.xcassets/blavatar.imageset/blavatar-default.pdf b/Sources/WordPressUI/Resources/Assets.xcassets/blavatar.imageset/blavatar-default.pdf similarity index 100% rename from WordPressUI/Resources/Assets.xcassets/blavatar.imageset/blavatar-default.pdf rename to Sources/WordPressUI/Resources/Assets.xcassets/blavatar.imageset/blavatar-default.pdf diff --git a/WordPressUI/Resources/Assets.xcassets/gravatar.imageset/Contents.json b/Sources/WordPressUI/Resources/Assets.xcassets/gravatar.imageset/Contents.json similarity index 100% rename from WordPressUI/Resources/Assets.xcassets/gravatar.imageset/Contents.json rename to Sources/WordPressUI/Resources/Assets.xcassets/gravatar.imageset/Contents.json diff --git a/WordPressUI/Resources/Assets.xcassets/gravatar.imageset/gravatar.pdf b/Sources/WordPressUI/Resources/Assets.xcassets/gravatar.imageset/gravatar.pdf similarity index 100% rename from WordPressUI/Resources/Assets.xcassets/gravatar.imageset/gravatar.pdf rename to Sources/WordPressUI/Resources/Assets.xcassets/gravatar.imageset/gravatar.pdf diff --git a/WordPressUI/Resources/Assets.xcassets/icon-url-field.imageset/Contents.json b/Sources/WordPressUI/Resources/Assets.xcassets/icon-url-field.imageset/Contents.json similarity index 100% rename from WordPressUI/Resources/Assets.xcassets/icon-url-field.imageset/Contents.json rename to Sources/WordPressUI/Resources/Assets.xcassets/icon-url-field.imageset/Contents.json diff --git a/WordPressUI/Resources/Assets.xcassets/icon-url-field.imageset/icon-url-field.pdf b/Sources/WordPressUI/Resources/Assets.xcassets/icon-url-field.imageset/icon-url-field.pdf similarity index 100% rename from WordPressUI/Resources/Assets.xcassets/icon-url-field.imageset/icon-url-field.pdf rename to Sources/WordPressUI/Resources/Assets.xcassets/icon-url-field.imageset/icon-url-field.pdf diff --git a/WordPressUI/Tools/GradientView.swift b/Sources/WordPressUI/Tools/GradientView.swift similarity index 100% rename from WordPressUI/Tools/GradientView.swift rename to Sources/WordPressUI/Tools/GradientView.swift diff --git a/WordPressUI/Tools/RotationAwareNavigationViewController.swift b/Sources/WordPressUI/Tools/RotationAwareNavigationViewController.swift similarity index 100% rename from WordPressUI/Tools/RotationAwareNavigationViewController.swift rename to Sources/WordPressUI/Tools/RotationAwareNavigationViewController.swift diff --git a/WordPressUI/WordPressUI.h b/Sources/WordPressUI/WordPressUI.h similarity index 100% rename from WordPressUI/WordPressUI.h rename to Sources/WordPressUI/WordPressUI.h diff --git a/WordPressUITests/BottomSheet/BottomSheetViewControllerTests.swift b/Tests/BottomSheet/BottomSheetViewControllerTests.swift similarity index 100% rename from WordPressUITests/BottomSheet/BottomSheetViewControllerTests.swift rename to Tests/BottomSheet/BottomSheetViewControllerTests.swift diff --git a/WordPressUITests/Extensions/GravatarTest.swift b/Tests/Extensions/GravatarTest.swift similarity index 100% rename from WordPressUITests/Extensions/GravatarTest.swift rename to Tests/Extensions/GravatarTest.swift diff --git a/WordPressUITests/Extensions/UIColorHelpersTests.swift b/Tests/Extensions/UIColorHelpersTests.swift similarity index 100% rename from WordPressUITests/Extensions/UIColorHelpersTests.swift rename to Tests/Extensions/UIColorHelpersTests.swift diff --git a/WordPressUITests/Extensions/UIView+AutoLayoutHelperTests.swift b/Tests/Extensions/UIView+AutoLayoutHelperTests.swift similarity index 100% rename from WordPressUITests/Extensions/UIView+AutoLayoutHelperTests.swift rename to Tests/Extensions/UIView+AutoLayoutHelperTests.swift diff --git a/WordPressUITests/Extensions/UIView+ChangeLayoutMarginsTests.swift b/Tests/Extensions/UIView+ChangeLayoutMarginsTests.swift similarity index 100% rename from WordPressUITests/Extensions/UIView+ChangeLayoutMarginsTests.swift rename to Tests/Extensions/UIView+ChangeLayoutMarginsTests.swift diff --git a/WordPressUITests/Extensions/UIViewControllerHelperTest.swift b/Tests/Extensions/UIViewControllerHelperTest.swift similarity index 100% rename from WordPressUITests/Extensions/UIViewControllerHelperTest.swift rename to Tests/Extensions/UIViewControllerHelperTest.swift diff --git a/WordPressUITests/Ghosts/UITableView+GhostTests.swift b/Tests/Ghosts/UITableView+GhostTests.swift similarity index 100% rename from WordPressUITests/Ghosts/UITableView+GhostTests.swift rename to Tests/Ghosts/UITableView+GhostTests.swift diff --git a/WordPressUITests/Ghosts/UIView+GhostTests.swift b/Tests/Ghosts/UIView+GhostTests.swift similarity index 100% rename from WordPressUITests/Ghosts/UIView+GhostTests.swift rename to Tests/Ghosts/UIView+GhostTests.swift diff --git a/WordPressUITests/Info.plist b/Tests/Info.plist similarity index 100% rename from WordPressUITests/Info.plist rename to Tests/Info.plist diff --git a/WordPressUI.podspec b/WordPressUI.podspec index 4007952..b75314b 100644 --- a/WordPressUI.podspec +++ b/WordPressUI.podspec @@ -17,11 +17,11 @@ 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/**/*.{h,m,swift}' s.resource_bundles = { WordPressUIResources: [ - 'WordPressUI/Resources/*.{xcassets}', - 'WordPressUI/**/*.{storyboard}' + 'Sources/Resources/*.{xcassets}', + 'Sources/**/*.{storyboard}' ] } s.header_dir = 'WordPressUI' diff --git a/WordPressUI.xcodeproj/project.pbxproj b/WordPressUI.xcodeproj/project.pbxproj index d19de2e..f8ca6c8 100644 --- a/WordPressUI.xcodeproj/project.pbxproj +++ b/WordPressUI.xcodeproj/project.pbxproj @@ -189,6 +189,69 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 3FC095F42834C1E200C8477D /* Sources */ = { + isa = PBXGroup; + children = ( + 3FC095F72834C76C00C8477D /* Supporting Files */, + 3FC095F62834C74B00C8477D /* WordPressUI */, + 3FC095FA2834FFBA00C8477D /* WordPressUI-Objective-C */, + ); + path = Sources; + sourceTree = ""; + }; + 3FC095F52834C29100C8477D /* Tests */ = { + isa = PBXGroup; + children = ( + 8B91476F2451CBEB0028B0AE /* BottomSheet */, + 57BC0C6B228DF1BA00C1F070 /* Ghosts */, + B529F287202C855B00895D88 /* Extensions */, + B59DCB6C202B146D00BEBD8A /* Info.plist */, + ); + path = Tests; + sourceTree = ""; + }; + 3FC095F62834C74B00C8477D /* WordPressUI */ = { + isa = PBXGroup; + children = ( + 8B5100D0244F6C0200672D74 /* BottomSheet */, + B534CB3521398609000D5F8D /* Ghosts */, + B592B4482064296500FF568E /* FancyAlert */, + B518D76B20742ADB00F05DB4 /* FlingableView */, + B5A787CB202B2AA6007874FB /* Categories */, + B5A787F3202B3587007874FB /* Constants */, + B5A78799202B1A93007874FB /* Extensions */, + B5393FE8206D7047007BF9D4 /* Tools */, + B58C4EC8207C594300E32E4D /* Resources */, + B59DCB5F202B146D00BEBD8A /* WordPressUI.h */, + ); + path = WordPressUI; + sourceTree = ""; + }; + 3FC095F72834C76C00C8477D /* Supporting Files */ = { + isa = PBXGroup; + children = ( + B59DCB60202B146D00BEBD8A /* Info.plist */, + ); + path = "Supporting Files"; + sourceTree = ""; + }; + 3FC095FA2834FFBA00C8477D /* WordPressUI-Objective-C */ = { + isa = PBXGroup; + children = ( + B58C4EC0207C570000E32E4D /* NSString+Gravatar.h */, + B58C4EC1207C570000E32E4D /* NSString+Gravatar.m */, + B5A787CD202B2AA6007874FB /* UIColor+Helpers.h */, + B5A787D1202B2AA6007874FB /* UIColor+Helpers.m */, + B5A787CF202B2AA6007874FB /* UIImage+Resize.h */, + B5A787D5202B2AA6007874FB /* UIImage+Resize.m */, + B5A787CC202B2AA6007874FB /* UIImage+Util.h */, + B5A787D2202B2AA6007874FB /* UIImage+Util.m */, + B5C82AE22077C01B00DB2E78 /* UILabel+SuggestSize.h */, + B5C82AE42077C02100DB2E78 /* UILabel+SuggestSize.m */, + ); + path = "WordPressUI-Objective-C"; + sourceTree = ""; + }; 43067E29203C8CA4001DD610 /* BlockEvents */ = { isa = PBXGroup; children = ( @@ -286,8 +349,6 @@ isa = PBXGroup; children = ( B58C4EBF207C570000E32E4D /* Gravatar.swift */, - B58C4EC0207C570000E32E4D /* NSString+Gravatar.h */, - B58C4EC1207C570000E32E4D /* NSString+Gravatar.m */, ); path = Gravatar; sourceTree = ""; @@ -316,8 +377,8 @@ isa = PBXGroup; children = ( FF20AD1620B76A2300082398 /* WordPressUI.podspec */, - B59DCB5E202B146D00BEBD8A /* WordPressUI */, - B59DCB69202B146D00BEBD8A /* WordPressUITests */, + 3FC095F42834C1E200C8477D /* Sources */, + 3FC095F52834C29100C8477D /* Tests */, B59DCB5D202B146D00BEBD8A /* Products */, B5A78796202B1A58007874FB /* Frameworks */, ); @@ -332,35 +393,6 @@ name = Products; sourceTree = ""; }; - B59DCB5E202B146D00BEBD8A /* WordPressUI */ = { - isa = PBXGroup; - children = ( - 8B5100D0244F6C0200672D74 /* BottomSheet */, - B534CB3521398609000D5F8D /* Ghosts */, - B592B4482064296500FF568E /* FancyAlert */, - B518D76B20742ADB00F05DB4 /* FlingableView */, - B5A787CB202B2AA6007874FB /* Categories */, - B5A787F3202B3587007874FB /* Constants */, - B5A78799202B1A93007874FB /* Extensions */, - B5393FE8206D7047007BF9D4 /* Tools */, - B58C4EC8207C594300E32E4D /* Resources */, - B59DCB5F202B146D00BEBD8A /* WordPressUI.h */, - B59DCB60202B146D00BEBD8A /* Info.plist */, - ); - path = WordPressUI; - sourceTree = ""; - }; - B59DCB69202B146D00BEBD8A /* WordPressUITests */ = { - isa = PBXGroup; - children = ( - 8B91476F2451CBEB0028B0AE /* BottomSheet */, - 57BC0C6B228DF1BA00C1F070 /* Ghosts */, - B529F287202C855B00895D88 /* Extensions */, - B59DCB6C202B146D00BEBD8A /* Info.plist */, - ); - path = WordPressUITests; - sourceTree = ""; - }; B5A78796202B1A58007874FB /* Frameworks */ = { isa = PBXGroup; children = ( @@ -402,14 +434,6 @@ B5A787CB202B2AA6007874FB /* Categories */ = { isa = PBXGroup; children = ( - B5A787CD202B2AA6007874FB /* UIColor+Helpers.h */, - B5A787D1202B2AA6007874FB /* UIColor+Helpers.m */, - B5A787CF202B2AA6007874FB /* UIImage+Resize.h */, - B5A787D5202B2AA6007874FB /* UIImage+Resize.m */, - B5A787CC202B2AA6007874FB /* UIImage+Util.h */, - B5A787D2202B2AA6007874FB /* UIImage+Util.m */, - B5C82AE22077C01B00DB2E78 /* UILabel+SuggestSize.h */, - B5C82AE42077C02100DB2E78 /* UILabel+SuggestSize.m */, ); path = Categories; sourceTree = ""; @@ -691,7 +715,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = WordPressUI/Info.plist; + INFOPLIST_FILE = "Sources/Supporting Files/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -709,7 +733,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = PZYM8XX95Q; - INFOPLIST_FILE = WordPressUITests/Info.plist; + INFOPLIST_FILE = Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.automattic.WordPressUITests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -785,7 +809,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = WordPressUI/Info.plist; + INFOPLIST_FILE = "Sources/Supporting Files/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -803,7 +827,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = PZYM8XX95Q; - INFOPLIST_FILE = WordPressUITests/Info.plist; + INFOPLIST_FILE = Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.automattic.WordPressUITests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -942,7 +966,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = WordPressUI/Info.plist; + INFOPLIST_FILE = "Sources/Supporting Files/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -965,7 +989,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = WordPressUI/Info.plist; + INFOPLIST_FILE = "Sources/Supporting Files/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -983,7 +1007,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = PZYM8XX95Q; - INFOPLIST_FILE = WordPressUITests/Info.plist; + INFOPLIST_FILE = Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.automattic.WordPressUITests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -998,7 +1022,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = PZYM8XX95Q; - INFOPLIST_FILE = WordPressUITests/Info.plist; + INFOPLIST_FILE = Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.automattic.WordPressUITests; PRODUCT_NAME = "$(TARGET_NAME)";