From 70fdc2a11a2ae1e88fabb0c33811c8c42ced157d Mon Sep 17 00:00:00 2001 From: Alex Grebenyuk Date: Fri, 13 Mar 2026 17:43:43 -0400 Subject: [PATCH] Convert WordPressData to SwiftPM target --- Modules/Package.swift | 47 +- .../WordPressData/Blog+Extensions.swift | 0 .../Mapping/ReaderPost+Mapping.swift | 0 .../WordPress.xcdatamodeld/.xccurrentversion | 0 .../WordPress 100.xcdatamodel/contents | 0 .../WordPress 101.xcdatamodel/contents | 0 .../WordPress 102.xcdatamodel/contents | 0 .../WordPress 103.xcdatamodel/contents | 0 .../WordPress 104.xcdatamodel/contents | 0 .../WordPress 105.xcdatamodel/contents | 0 .../WordPress 106.xcdatamodel/contents | 0 .../WordPress 107.xcdatamodel/contents | 0 .../WordPress 108.xcdatamodel/contents | 0 .../WordPress 109.xcdatamodel/contents | 0 .../WordPress 110.xcdatamodel/contents | 0 .../WordPress 111.xcdatamodel/contents | 0 .../WordPress 112.xcdatamodel/contents | 0 .../WordPress 113.xcdatamodel/contents | 0 .../WordPress 114.xcdatamodel/contents | 0 .../WordPress 115.xcdatamodel/contents | 0 .../WordPress 116.xcdatamodel/contents | 0 .../WordPress 117.xcdatamodel/contents | 0 .../WordPress 118.xcdatamodel/contents | 0 .../WordPress 119.xcdatamodel/contents | 0 .../WordPress 120.xcdatamodel/contents | 0 .../WordPress 121.xcdatamodel/contents | 0 .../WordPress 122.xcdatamodel/contents | 0 .../WordPress 123.xcdatamodel/contents | 0 .../WordPress 124.xcdatamodel/contents | 0 .../WordPress 125.xcdatamodel/contents | 0 .../WordPress 126.xcdatamodel/contents | 0 .../WordPress 127.xcdatamodel/contents | 0 .../WordPress 128.xcdatamodel/contents | 0 .../WordPress 129.xcdatamodel/contents | 0 .../WordPress 130.xcdatamodel/contents | 0 .../WordPress 131.xcdatamodel/contents | 0 .../WordPress 132.xcdatamodel/contents | 0 .../WordPress 133.xcdatamodel/contents | 0 .../WordPress 134.xcdatamodel/contents | 0 .../WordPress 135.xcdatamodel/contents | 0 .../WordPress 136.xcdatamodel/contents | 0 .../WordPress 137.xcdatamodel/contents | 0 .../WordPress 138.xcdatamodel/contents | 0 .../WordPress 139.xcdatamodel/contents | 0 .../WordPress 140.xcdatamodel/contents | 0 .../WordPress 141.xcdatamodel/contents | 0 .../WordPress 142.xcdatamodel/contents | 0 .../WordPress 143.xcdatamodel/contents | 0 .../WordPress 144.xcdatamodel/contents | 0 .../WordPress 145.xcdatamodel/contents | 0 .../WordPress 146.xcdatamodel/contents | 0 .../WordPress 147.xcdatamodel/contents | 0 .../WordPress 148.xcdatamodel/contents | 0 .../WordPress 149.xcdatamodel/contents | 0 .../WordPress 150.xcdatamodel/contents | 0 .../WordPress 151.xcdatamodel/contents | 0 .../WordPress 152.xcdatamodel/contents | 0 .../WordPress 153.xcdatamodel/contents | 0 .../WordPress 154.xcdatamodel/contents | 0 .../WordPress 155.xcdatamodel/contents | 0 .../WordPress 156.xcdatamodel/contents | 0 .../WordPress 157.xcdatamodel/contents | 0 .../WordPress 158.xcdatamodel/contents | 2 +- .../Swift/AbstractPost+Autosave.swift | 0 .../Swift/AbstractPost+Blaze.swift | 0 .../AbstractPost+CoreDataProperties.swift | 0 .../Swift/AbstractPost+Local.swift | 0 .../Swift/AbstractPost+Searchable.swift | 0 .../AbstractPost+fixLocalMediaURLs.swift | 0 .../WordPressData/Swift/AbstractPost.swift | 0 .../WordPressData/Swift/AppEnvironment.swift | 0 .../WordPressData/Swift/Array+Page.swift | 0 .../Swift/AuthKeyMigration.swift | 0 .../Swift/BasePost+CoreDataProperties.swift | 0 .../Swift/BasePost+PostContentProvider.swift | 0 .../WordPressData/Swift/BasePost.swift | 0 ...ckEditorSettingElement+CoreDataClass.swift | 0 ...torSettingElement+CoreDataProperties.swift | 0 .../BlockEditorSettings+CoreDataClass.swift | 0 ...ockEditorSettings+CoreDataProperties.swift | 0 .../WordPressData/Swift/BlockedAuthor.swift | 0 .../WordPressData/Swift/BlockedSite.swift | 0 .../Swift/Blog+BlogAuthors.swift | 0 .../Swift/Blog+Capabilities.swift | 0 .../WordPressData/Swift/Blog+Creation.swift | 0 .../WordPressData/Swift/Blog+Features.swift | 0 .../Swift/Blog+HomepageSettings.swift | 0 .../WordPressData/Swift/Blog+Jetpack.swift | 0 .../WordPressData/Swift/Blog+Lookup.swift | 0 .../WordPressData/Swift/Blog+Options.swift | 0 .../WordPressData/Swift/Blog+Plans.swift | 0 .../WordPressData/Swift/Blog+Post.swift | 0 .../WordPressData/Swift/Blog+Quota.swift | 0 .../WordPressData/Swift/Blog+SelfHosted.swift | 0 .../WordPressData/Swift/Blog+Swift.swift | 0 .../Swift/Blog+WordPressComRestAPI.swift | 0 .../Sources}/WordPressData/Swift/Blog.swift | 0 .../WordPressData/Swift/BlogAuthor.swift | 0 .../WordPressData/Swift/BlogQuery.swift | 0 .../WordPressData/Swift/BlogSettings.swift | 0 .../Swift/BloggingPrompt+CoreDataClass.swift | 0 .../BloggingPrompt+CoreDataProperties.swift | 0 .../Swift/BloggingPromptRemoteObject.swift | 0 ...BloggingPromptSettings+CoreDataClass.swift | 0 ...ingPromptSettings+CoreDataProperties.swift | 0 ...ptSettingsReminderDays+CoreDataClass.swift | 0 ...tingsReminderDays+CoreDataProperties.swift | 0 .../Swift/BloggingPromptsAttribution.swift | 0 .../Swift/Bundle+WordPressData.swift | 3 +- .../Swift/Comment+CoreDataClass.swift | 0 .../Swift/Comment+CoreDataProperties.swift | 0 .../Swift/ContextManager+ErrorHandling.swift | 0 .../WordPressData/Swift/ContextManager.swift | 0 .../WordPressData/Swift/CoreDataHelper.swift | 0 .../Swift/CoreDataIterativeMigrator.swift | 0 .../WordPressData/Swift/CoreDataStack.swift | 0 .../Swift/CoreDataStackSwift.swift | 0 .../Swift/DiffAbstractValue.swift | 0 .../Swift/DiffContentValue.swift | 0 .../WordPressData/Swift/DiffTitleValue.swift | 0 .../Sources}/WordPressData/Swift/Domain.swift | 2 +- .../WordPressData/Swift/GravatarProfile.swift | 0 .../Swift/InviteLinks+CoreDataClass.swift | 0 .../InviteLinks+CoreDataProperties.swift | 0 .../WordPressData/Swift/JetpackState.swift | 0 .../Swift/LikeUser+CoreDataClass.swift | 0 .../Swift/LikeUser+CoreDataProperties.swift | 0 .../LikeUserPreferredBlog+CoreDataClass.swift | 0 ...UserPreferredBlog+CoreDataProperties.swift | 0 ...edAccountSettings+CoreDataProperties.swift | 0 .../Swift/ManagedAccountSettings.swift | 0 .../ManagedPerson+CoreDataProperties.swift | 0 .../WordPressData/Swift/ManagedPerson.swift | 0 .../WordPressData/Swift/Media+Blog.swift | 0 .../Sources}/WordPressData/Swift/Media.swift | 0 .../Swift/MediaFileManager.swift | 0 .../Swift/Menu+CoreDataProperties.swift | 0 .../Sources}/WordPressData/Swift/Menu.swift | 0 .../Swift/MenuItem+CoreDataProperties.swift | 0 .../WordPressData/Swift/MenuItem.swift | 0 .../WordPressData/Swift/MenuLocation.swift | 0 .../Swift/NSManagedObject+Lookup.swift | 0 .../WordPressData/Swift/NSManagedObject.swift | 0 .../WordPressData/Swift/Notification.swift | 0 .../Swift/NullBlogPropertySanitizer.swift | 0 .../Swift/Page+CoreDataProperties.swift | 0 .../Sources}/WordPressData/Swift/Page.swift | 0 .../PageTemplateCategory+CoreDataClass.swift | 0 ...eTemplateCategory+CoreDataProperties.swift | 0 .../PageTemplateLayout+CoreDataClass.swift | 0 ...ageTemplateLayout+CoreDataProperties.swift | 0 .../Sources}/WordPressData/Swift/Plan.swift | 0 .../WordPressData/Swift/PlanFeature.swift | 0 .../WordPressData/Swift/PlanGroup.swift | 0 .../Swift/Post+CoreDataProperties.swift | 0 .../Sources}/WordPressData/Swift/Post.swift | 0 .../Swift/PostCategory+CoreDataClass.swift | 0 .../PostCategory+CoreDataProperties.swift | 0 .../Swift/PostCategory+Creation.swift | 0 .../Swift/PostCategory+Lookup.swift | 0 .../WordPressData/Swift/PostMetadata.swift | 0 .../Swift/PostMetadataContainer.swift | 2 +- .../Swift/PostServiceRemoteFactory.swift | 0 .../Swift/PostTag+CoreDataClass.swift | 0 .../Swift/PostTag+CoreDataProperties.swift | 0 .../Swift/PostType+CoreDataClass.swift | 0 .../Swift/PostType+CoreDataProperties.swift | 0 .../WordPressData/Swift/PostVisibility.swift | 0 .../Swift/PublicizeConnection.swift | 0 .../Swift/PublicizeInfo+CoreDataClass.swift | 0 .../PublicizeInfo+CoreDataProperties.swift | 0 .../Swift/PublicizeService.swift | 0 .../Swift/ReaderAbstractTopic+Lookup.swift | 0 .../Swift/ReaderAbstractTopic.swift | 0 .../Swift/ReaderCard+CoreDataClass.swift | 0 .../Swift/ReaderCard+CoreDataProperties.swift | 0 .../Swift/ReaderCrossPostMeta.swift | 0 .../Swift/ReaderDefaultTopic.swift | 0 .../WordPressData/Swift/ReaderGapMarker.swift | 0 .../WordPressData/Swift/ReaderListTopic.swift | 0 .../Swift/ReaderPost+CoreDataProperties.swift | 0 .../WordPressData/Swift/ReaderPost.swift | 4 +- .../Swift/ReaderSearchTopic.swift | 0 .../Swift/ReaderSiteInfoSubscriptions.swift | 0 .../Swift/ReaderSiteTopic+Lookup.swift | 0 .../WordPressData/Swift/ReaderSiteTopic.swift | 0 .../WordPressData/Swift/ReaderTagTopic.swift | 0 .../WordPressData/Swift/ReaderTeamTopic.swift | 0 .../WordPressData/Swift/Revision.swift | 0 .../Swift/RevisionDiff+CoreData.swift | 0 .../WordPressData/Swift/RevisionDiff.swift | 0 .../Sources}/WordPressData/Swift/Role.swift | 0 .../Swift/SearchIdentifierGenerator.swift | 0 .../Swift/SearchableActivityConvertable.swift | 0 .../Swift/SearchableItemConvertable.swift | 0 .../Swift/SharedDataIssueSolver.swift | 0 .../Swift/SharingButton+Lookup.swift | 0 .../WordPressData/Swift/SharingButton.swift | 0 .../WordPressData/Swift/SiteInformation.swift | 0 .../Swift/SiteOrganizationType.swift | 0 .../Swift/SiteSuggestion+CoreDataClass.swift | 0 .../SiteSuggestion+CoreDataProperties.swift | 0 .../WordPressData/Swift/SiteTaxonomy.swift | 0 .../SourcePostAttribution+CoreDataClass.swift | 0 ...cePostAttribution+CoreDataProperties.swift | 0 .../WordPressData/Swift/Suggestion.swift | 0 .../Swift/TaggedManagedObjectID.swift | 0 .../Swift/Theme+CoreDataProperties.swift | 0 .../WordPressData/Swift/Theme+Swift.swift | 0 .../Sources}/WordPressData/Swift/Theme.swift | 0 .../WordPressData/Swift/ThemeIdHelper.swift | 0 .../WordPressData/Swift/UserSettings.swift | 0 .../Swift/UserSuggestion+Comparable.swift | 0 .../Swift/UserSuggestion+CoreDataClass.swift | 0 .../UserSuggestion+CoreDataProperties.swift | 0 .../Swift/WPAccount+Lookup.swift | 0 .../Swift/WPAccount+RestApi.swift | 0 .../WordPressData/Swift/WPAccount.swift | 0 .../Swift/WordPressComRestApi+Defaults.swift | 0 .../Swift/WordPressOrgRestApi+WordPress.swift | 0 .../WordPressData/WordPressDataDummy.swift | 0 .../XcodeTarget_WordPressData/Empty.swift | 3 - .../Empty.swift | 3 - .../XcodeTarget_WordPressKit/Empty.swift | 3 - .../XcodeTarget_WordPressKitTests/Empty.swift | 3 - .../Tests}/WordPressDataTests/BlogTests.swift | 0 .../ContextManagerTests.swift | 0 .../CoreDataHelperTests.swift | 0 .../CoreDataMigrationTests.swift | 0 .../Helpers/BlogBuilder.swift | 0 .../Helpers/ContextManager+Testing.swift | 0 .../Helpers/CoreDataTestCase.swift | 0 .../Helpers/MockAuthKeyMigration.swift | 0 .../Helpers/MockKeychainService.swift | 0 .../Helpers/NSError+TestHelpers.swift | 0 .../Helpers/PostBuilder.swift | 0 .../Helpers/WPAccount+Fixture.swift | 0 .../Mapping/ReaderPostMappingTests.swift | 0 .../WordPressDataTests/MediaTests.swift | 0 .../PostMetadataContainerTests.swift | 0 .../PostMetadataTests.swift | 0 .../WordPressDataTests/ReaderPostTests.swift | 0 .../TaggedManagedObjectIDTests.swift | 0 .../WordPressDataTests/WPAccountTests.swift | 0 .../WordPressDataTests.swift | 0 .../WordPressUnitTests.xctestplan | 61 +- .../WordPressDataTests.xctestplan | 24 - WordPress/WordPress.xcodeproj/project.pbxproj | 558 ------------------ .../xcschemes/WordPressData.xcscheme | 72 --- 249 files changed, 62 insertions(+), 725 deletions(-) rename {Sources => Modules/Sources}/WordPressData/Blog+Extensions.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Mapping/ReaderPost+Mapping.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/.xccurrentversion (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 100.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 101.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 102.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 103.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 104.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 105.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 106.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 107.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 108.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 109.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 110.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 111.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 112.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 113.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 114.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 115.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 116.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 117.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 118.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 119.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 120.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 121.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 122.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 123.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 124.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 125.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 126.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 127.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 128.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 129.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 130.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 131.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 132.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 133.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 134.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 135.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 136.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 137.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 138.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 139.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 140.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 141.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 142.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 143.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 144.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 145.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 146.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 147.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 148.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 149.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 150.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 151.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 152.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 153.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 154.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 155.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 156.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 157.xcdatamodel/contents (100%) rename {Sources => Modules/Sources}/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 158.xcdatamodel/contents (99%) rename {Sources => Modules/Sources}/WordPressData/Swift/AbstractPost+Autosave.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/AbstractPost+Blaze.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/AbstractPost+CoreDataProperties.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/AbstractPost+Local.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/AbstractPost+Searchable.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/AbstractPost+fixLocalMediaURLs.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/AbstractPost.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/AppEnvironment.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/Array+Page.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/AuthKeyMigration.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/BasePost+CoreDataProperties.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/BasePost+PostContentProvider.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/BasePost.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/BlockEditorSettingElement+CoreDataClass.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/BlockEditorSettingElement+CoreDataProperties.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/BlockEditorSettings+CoreDataClass.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/BlockEditorSettings+CoreDataProperties.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/BlockedAuthor.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/BlockedSite.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/Blog+BlogAuthors.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/Blog+Capabilities.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/Blog+Creation.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/Blog+Features.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/Blog+HomepageSettings.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/Blog+Jetpack.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/Blog+Lookup.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/Blog+Options.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/Blog+Plans.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/Blog+Post.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/Blog+Quota.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/Blog+SelfHosted.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/Blog+Swift.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/Blog+WordPressComRestAPI.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/Blog.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/BlogAuthor.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/BlogQuery.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/BlogSettings.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/BloggingPrompt+CoreDataClass.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/BloggingPrompt+CoreDataProperties.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/BloggingPromptRemoteObject.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/BloggingPromptSettings+CoreDataClass.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/BloggingPromptSettings+CoreDataProperties.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/BloggingPromptSettingsReminderDays+CoreDataClass.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/BloggingPromptSettingsReminderDays+CoreDataProperties.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/BloggingPromptsAttribution.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/Bundle+WordPressData.swift (68%) rename {Sources => Modules/Sources}/WordPressData/Swift/Comment+CoreDataClass.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/Comment+CoreDataProperties.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/ContextManager+ErrorHandling.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/ContextManager.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/CoreDataHelper.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/CoreDataIterativeMigrator.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/CoreDataStack.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/CoreDataStackSwift.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/DiffAbstractValue.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/DiffContentValue.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/DiffTitleValue.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/Domain.swift (98%) rename {Sources => Modules/Sources}/WordPressData/Swift/GravatarProfile.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/InviteLinks+CoreDataClass.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/InviteLinks+CoreDataProperties.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/JetpackState.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/LikeUser+CoreDataClass.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/LikeUser+CoreDataProperties.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/LikeUserPreferredBlog+CoreDataClass.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/LikeUserPreferredBlog+CoreDataProperties.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/ManagedAccountSettings+CoreDataProperties.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/ManagedAccountSettings.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/ManagedPerson+CoreDataProperties.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/ManagedPerson.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/Media+Blog.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/Media.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/MediaFileManager.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/Menu+CoreDataProperties.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/Menu.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/MenuItem+CoreDataProperties.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/MenuItem.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/MenuLocation.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/NSManagedObject+Lookup.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/NSManagedObject.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/Notification.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/NullBlogPropertySanitizer.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/Page+CoreDataProperties.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/Page.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/PageTemplateCategory+CoreDataClass.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/PageTemplateCategory+CoreDataProperties.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/PageTemplateLayout+CoreDataClass.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/PageTemplateLayout+CoreDataProperties.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/Plan.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/PlanFeature.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/PlanGroup.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/Post+CoreDataProperties.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/Post.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/PostCategory+CoreDataClass.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/PostCategory+CoreDataProperties.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/PostCategory+Creation.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/PostCategory+Lookup.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/PostMetadata.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/PostMetadataContainer.swift (98%) rename {Sources => Modules/Sources}/WordPressData/Swift/PostServiceRemoteFactory.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/PostTag+CoreDataClass.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/PostTag+CoreDataProperties.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/PostType+CoreDataClass.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/PostType+CoreDataProperties.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/PostVisibility.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/PublicizeConnection.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/PublicizeInfo+CoreDataClass.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/PublicizeInfo+CoreDataProperties.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/PublicizeService.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/ReaderAbstractTopic+Lookup.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/ReaderAbstractTopic.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/ReaderCard+CoreDataClass.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/ReaderCard+CoreDataProperties.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/ReaderCrossPostMeta.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/ReaderDefaultTopic.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/ReaderGapMarker.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/ReaderListTopic.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/ReaderPost+CoreDataProperties.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/ReaderPost.swift (97%) rename {Sources => Modules/Sources}/WordPressData/Swift/ReaderSearchTopic.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/ReaderSiteInfoSubscriptions.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/ReaderSiteTopic+Lookup.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/ReaderSiteTopic.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/ReaderTagTopic.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/ReaderTeamTopic.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/Revision.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/RevisionDiff+CoreData.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/RevisionDiff.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/Role.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/SearchIdentifierGenerator.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/SearchableActivityConvertable.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/SearchableItemConvertable.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/SharedDataIssueSolver.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/SharingButton+Lookup.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/SharingButton.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/SiteInformation.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/SiteOrganizationType.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/SiteSuggestion+CoreDataClass.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/SiteSuggestion+CoreDataProperties.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/SiteTaxonomy.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/SourcePostAttribution+CoreDataClass.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/SourcePostAttribution+CoreDataProperties.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/Suggestion.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/TaggedManagedObjectID.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/Theme+CoreDataProperties.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/Theme+Swift.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/Theme.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/ThemeIdHelper.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/UserSettings.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/UserSuggestion+Comparable.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/UserSuggestion+CoreDataClass.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/UserSuggestion+CoreDataProperties.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/WPAccount+Lookup.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/WPAccount+RestApi.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/WPAccount.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/WordPressComRestApi+Defaults.swift (100%) rename {Sources => Modules/Sources}/WordPressData/Swift/WordPressOrgRestApi+WordPress.swift (100%) rename {Sources => Modules/Sources}/WordPressData/WordPressDataDummy.swift (100%) delete mode 100644 Modules/Sources/XcodeSupport/XcodeTarget_WordPressData/Empty.swift delete mode 100644 Modules/Sources/XcodeSupport/XcodeTarget_WordPressDataTests/Empty.swift delete mode 100644 Modules/Sources/XcodeSupport/XcodeTarget_WordPressKit/Empty.swift delete mode 100644 Modules/Sources/XcodeSupport/XcodeTarget_WordPressKitTests/Empty.swift rename {Tests => Modules/Tests}/WordPressDataTests/BlogTests.swift (100%) rename {Tests => Modules/Tests}/WordPressDataTests/ContextManagerTests.swift (100%) rename {Tests => Modules/Tests}/WordPressDataTests/CoreDataHelperTests.swift (100%) rename {Tests => Modules/Tests}/WordPressDataTests/CoreDataMigrationTests.swift (100%) rename {Tests => Modules/Tests}/WordPressDataTests/Helpers/BlogBuilder.swift (100%) rename {Tests => Modules/Tests}/WordPressDataTests/Helpers/ContextManager+Testing.swift (100%) rename {Tests => Modules/Tests}/WordPressDataTests/Helpers/CoreDataTestCase.swift (100%) rename {Tests => Modules/Tests}/WordPressDataTests/Helpers/MockAuthKeyMigration.swift (100%) rename {Tests => Modules/Tests}/WordPressDataTests/Helpers/MockKeychainService.swift (100%) rename {Tests => Modules/Tests}/WordPressDataTests/Helpers/NSError+TestHelpers.swift (100%) rename {Tests => Modules/Tests}/WordPressDataTests/Helpers/PostBuilder.swift (100%) rename {Tests => Modules/Tests}/WordPressDataTests/Helpers/WPAccount+Fixture.swift (100%) rename {Tests => Modules/Tests}/WordPressDataTests/Mapping/ReaderPostMappingTests.swift (100%) rename {Tests => Modules/Tests}/WordPressDataTests/MediaTests.swift (100%) rename {Tests => Modules/Tests}/WordPressDataTests/PostMetadataContainerTests.swift (100%) rename {Tests => Modules/Tests}/WordPressDataTests/PostMetadataTests.swift (100%) rename {Tests => Modules/Tests}/WordPressDataTests/ReaderPostTests.swift (100%) rename {Tests => Modules/Tests}/WordPressDataTests/TaggedManagedObjectIDTests.swift (100%) rename {Tests => Modules/Tests}/WordPressDataTests/WPAccountTests.swift (100%) rename {Tests => Modules/Tests}/WordPressDataTests/WordPressDataTests.swift (100%) delete mode 100644 Tests/WordPressDataTests/WordPressDataTests.xctestplan delete mode 100644 WordPress/WordPress.xcodeproj/xcshareddata/xcschemes/WordPressData.xcscheme diff --git a/Modules/Package.swift b/Modules/Package.swift index 6451df1b519d..7a2ad9485f89 100644 --- a/Modules/Package.swift +++ b/Modules/Package.swift @@ -24,6 +24,7 @@ let package = Package( .library(name: "WordPressReader", targets: ["WordPressReader"]), .library(name: "WordPressCore", targets: ["WordPressCore"]), .library(name: "WordPressCoreProtocols", targets: ["WordPressCoreProtocols"]), + .library(name: "WordPressData", targets: ["WordPressData"]), ], dependencies: [ .package(url: "https://github.com/airbnb/lottie-ios", from: "4.4.0"), @@ -164,6 +165,24 @@ let package = Package( // This package should never have dependencies – it exists to expose protocols implemented in WordPressCore // to UI code, because `wordpress-rs` doesn't work nicely with previews. ]), + .target( + name: "WordPressData", + dependencies: [ + "BuildSettingsKit", + "FormattableContentKit", + "SFHFKeychainUtils", + "WordPressShared", + "WordPressKit", + .product(name: "CocoaLumberjack", package: "CocoaLumberjack"), + .product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"), + .product(name: "Gravatar", package: "Gravatar-SDK-iOS"), + .product(name: "NSObject-SafeExpectations", package: "NSObject-SafeExpectations"), + .product(name: "NSURL-IDN", package: "NSURL-IDN"), + .product(name: "WordPressAPI", package: "wordpress-rs"), + ], + resources: [.process("Resources")], + swiftSettings: [.swiftLanguageMode(.v5)] + ), .target(name: "WordPressIntelligence", dependencies: [ "WordPressShared", .product(name: "SwiftSoup", package: "SwiftSoup"), @@ -260,6 +279,7 @@ let package = Package( .testTarget(name: "WordPressSharedTests", dependencies: [.target(name: "WordPressShared")], swiftSettings: [.swiftLanguageMode(.v5)]), .testTarget(name: "WordPressSharedObjCTests", dependencies: [.target(name: "WordPressShared"), .target(name: "WordPressTesting")], swiftSettings: [.swiftLanguageMode(.v5)]), .testTarget(name: "WordPressUIUnitTests", dependencies: [.target(name: "WordPressUI")], swiftSettings: [.swiftLanguageMode(.v5)]), + .testTarget(name: "WordPressDataTests", dependencies: [.target(name: "WordPressData")], swiftSettings: [.swiftLanguageMode(.v5)]), .testTarget(name: "WordPressCoreTests", dependencies: [.target(name: "WordPressCore")]), .testTarget(name: "WordPressIntelligenceTests", dependencies: [.target(name: "WordPressIntelligence")]), .testTarget(name: "WordPressReaderTests", dependencies: [.target(name: "WordPressReader")]) @@ -286,9 +306,6 @@ enum XcodeSupport { .library(name: "XcodeTarget_App", targets: ["XcodeTarget_App"]), .library(name: "XcodeTarget_Keystone", targets: ["XcodeTarget_Keystone"]), .library(name: "XcodeTarget_WordPressTests", targets: ["XcodeTarget_WordPressTests"]), - .library(name: "XcodeTarget_WordPressKitTests", targets: ["XcodeTarget_WordPressKitTests"]), - .library(name: "XcodeTarget_WordPressData", targets: ["XcodeTarget_WordPressData"]), - .library(name: "XcodeTarget_WordPressDataTests", targets: ["XcodeTarget_WordPressDataTests"]), .library(name: "XcodeTarget_WordPressAuthentificator", targets: ["XcodeTarget_WordPressAuthentificator"]), .library(name: "XcodeTarget_WordPressAuthentificatorTests", targets: ["XcodeTarget_WordPressAuthentificatorTests"]), .library(name: "XcodeTarget_ShareExtension", targets: ["XcodeTarget_ShareExtension"]), @@ -360,6 +377,7 @@ enum XcodeSupport { "SFHFKeychainUtils", "ShareExtensionCore", "Support", + "WordPressData", "WordPressFlux", "WordPressIntelligence", "WordPressShared", @@ -423,13 +441,6 @@ enum XcodeSupport { .product(name: "NSURL-IDN", package: "NSURL-IDN"), .product(name: "WordPressAPI", package: "wordpress-rs"), ]), - .xcodeTarget("XcodeTarget_WordPressKitTests", dependencies: testDependencies + [ - "wpxmlrpc", - "WordPressKit", - ]), - .xcodeTarget("XcodeTarget_WordPressDataTests", dependencies: [ - "WordPressKit", - ]), .xcodeTarget("XcodeTarget_WordPressAuthentificator", dependencies: wordPresAuthentificatorDependencies), .xcodeTarget("XcodeTarget_WordPressAuthentificatorTests", dependencies: wordPresAuthentificatorDependencies + testDependencies), .xcodeTarget("XcodeTarget_ShareExtension", dependencies: shareAndDraftExtensionsDependencies), @@ -493,22 +504,6 @@ enum XcodeSupport { .xcodeTarget("XcodeTarget_UITests", dependencies: [ "UITestsFoundation", ]), - .xcodeTarget( - "XcodeTarget_WordPressData", - dependencies: [ - "BuildSettingsKit", - "FormattableContentKit", - "SFHFKeychainUtils", - "WordPressShared", - "WordPressKit", - .product(name: "CocoaLumberjack", package: "CocoaLumberjack"), - .product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"), - .product(name: "Gravatar", package: "Gravatar-SDK-iOS"), - .product(name: "NSObject-SafeExpectations", package: "NSObject-SafeExpectations"), - .product(name: "NSURL-IDN", package: "NSURL-IDN"), - .product(name: "WordPressAPI", package: "wordpress-rs"), - ] - ), ] } } diff --git a/Sources/WordPressData/Blog+Extensions.swift b/Modules/Sources/WordPressData/Blog+Extensions.swift similarity index 100% rename from Sources/WordPressData/Blog+Extensions.swift rename to Modules/Sources/WordPressData/Blog+Extensions.swift diff --git a/Sources/WordPressData/Mapping/ReaderPost+Mapping.swift b/Modules/Sources/WordPressData/Mapping/ReaderPost+Mapping.swift similarity index 100% rename from Sources/WordPressData/Mapping/ReaderPost+Mapping.swift rename to Modules/Sources/WordPressData/Mapping/ReaderPost+Mapping.swift diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/.xccurrentversion b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/.xccurrentversion similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/.xccurrentversion rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/.xccurrentversion diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 100.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 100.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 100.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 100.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 101.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 101.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 101.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 101.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 102.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 102.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 102.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 102.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 103.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 103.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 103.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 103.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 104.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 104.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 104.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 104.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 105.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 105.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 105.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 105.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 106.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 106.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 106.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 106.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 107.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 107.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 107.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 107.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 108.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 108.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 108.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 108.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 109.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 109.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 109.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 109.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 110.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 110.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 110.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 110.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 111.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 111.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 111.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 111.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 112.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 112.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 112.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 112.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 113.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 113.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 113.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 113.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 114.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 114.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 114.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 114.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 115.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 115.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 115.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 115.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 116.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 116.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 116.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 116.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 117.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 117.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 117.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 117.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 118.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 118.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 118.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 118.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 119.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 119.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 119.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 119.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 120.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 120.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 120.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 120.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 121.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 121.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 121.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 121.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 122.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 122.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 122.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 122.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 123.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 123.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 123.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 123.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 124.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 124.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 124.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 124.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 125.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 125.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 125.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 125.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 126.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 126.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 126.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 126.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 127.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 127.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 127.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 127.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 128.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 128.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 128.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 128.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 129.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 129.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 129.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 129.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 130.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 130.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 130.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 130.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 131.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 131.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 131.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 131.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 132.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 132.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 132.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 132.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 133.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 133.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 133.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 133.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 134.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 134.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 134.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 134.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 135.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 135.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 135.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 135.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 136.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 136.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 136.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 136.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 137.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 137.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 137.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 137.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 138.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 138.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 138.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 138.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 139.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 139.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 139.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 139.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 140.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 140.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 140.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 140.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 141.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 141.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 141.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 141.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 142.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 142.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 142.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 142.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 143.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 143.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 143.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 143.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 144.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 144.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 144.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 144.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 145.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 145.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 145.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 145.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 146.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 146.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 146.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 146.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 147.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 147.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 147.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 147.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 148.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 148.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 148.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 148.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 149.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 149.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 149.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 149.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 150.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 150.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 150.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 150.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 151.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 151.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 151.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 151.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 152.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 152.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 152.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 152.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 153.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 153.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 153.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 153.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 154.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 154.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 154.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 154.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 155.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 155.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 155.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 155.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 156.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 156.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 156.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 156.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 157.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 157.xcdatamodel/contents similarity index 100% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 157.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 157.xcdatamodel/contents diff --git a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 158.xcdatamodel/contents b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 158.xcdatamodel/contents similarity index 99% rename from Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 158.xcdatamodel/contents rename to Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 158.xcdatamodel/contents index b247b87f6c8f..e3062c2eb56e 100644 --- a/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 158.xcdatamodel/contents +++ b/Modules/Sources/WordPressData/Resources/WordPress.xcdatamodeld/WordPress 158.xcdatamodel/contents @@ -1,5 +1,5 @@ - + diff --git a/Sources/WordPressData/Swift/AbstractPost+Autosave.swift b/Modules/Sources/WordPressData/Swift/AbstractPost+Autosave.swift similarity index 100% rename from Sources/WordPressData/Swift/AbstractPost+Autosave.swift rename to Modules/Sources/WordPressData/Swift/AbstractPost+Autosave.swift diff --git a/Sources/WordPressData/Swift/AbstractPost+Blaze.swift b/Modules/Sources/WordPressData/Swift/AbstractPost+Blaze.swift similarity index 100% rename from Sources/WordPressData/Swift/AbstractPost+Blaze.swift rename to Modules/Sources/WordPressData/Swift/AbstractPost+Blaze.swift diff --git a/Sources/WordPressData/Swift/AbstractPost+CoreDataProperties.swift b/Modules/Sources/WordPressData/Swift/AbstractPost+CoreDataProperties.swift similarity index 100% rename from Sources/WordPressData/Swift/AbstractPost+CoreDataProperties.swift rename to Modules/Sources/WordPressData/Swift/AbstractPost+CoreDataProperties.swift diff --git a/Sources/WordPressData/Swift/AbstractPost+Local.swift b/Modules/Sources/WordPressData/Swift/AbstractPost+Local.swift similarity index 100% rename from Sources/WordPressData/Swift/AbstractPost+Local.swift rename to Modules/Sources/WordPressData/Swift/AbstractPost+Local.swift diff --git a/Sources/WordPressData/Swift/AbstractPost+Searchable.swift b/Modules/Sources/WordPressData/Swift/AbstractPost+Searchable.swift similarity index 100% rename from Sources/WordPressData/Swift/AbstractPost+Searchable.swift rename to Modules/Sources/WordPressData/Swift/AbstractPost+Searchable.swift diff --git a/Sources/WordPressData/Swift/AbstractPost+fixLocalMediaURLs.swift b/Modules/Sources/WordPressData/Swift/AbstractPost+fixLocalMediaURLs.swift similarity index 100% rename from Sources/WordPressData/Swift/AbstractPost+fixLocalMediaURLs.swift rename to Modules/Sources/WordPressData/Swift/AbstractPost+fixLocalMediaURLs.swift diff --git a/Sources/WordPressData/Swift/AbstractPost.swift b/Modules/Sources/WordPressData/Swift/AbstractPost.swift similarity index 100% rename from Sources/WordPressData/Swift/AbstractPost.swift rename to Modules/Sources/WordPressData/Swift/AbstractPost.swift diff --git a/Sources/WordPressData/Swift/AppEnvironment.swift b/Modules/Sources/WordPressData/Swift/AppEnvironment.swift similarity index 100% rename from Sources/WordPressData/Swift/AppEnvironment.swift rename to Modules/Sources/WordPressData/Swift/AppEnvironment.swift diff --git a/Sources/WordPressData/Swift/Array+Page.swift b/Modules/Sources/WordPressData/Swift/Array+Page.swift similarity index 100% rename from Sources/WordPressData/Swift/Array+Page.swift rename to Modules/Sources/WordPressData/Swift/Array+Page.swift diff --git a/Sources/WordPressData/Swift/AuthKeyMigration.swift b/Modules/Sources/WordPressData/Swift/AuthKeyMigration.swift similarity index 100% rename from Sources/WordPressData/Swift/AuthKeyMigration.swift rename to Modules/Sources/WordPressData/Swift/AuthKeyMigration.swift diff --git a/Sources/WordPressData/Swift/BasePost+CoreDataProperties.swift b/Modules/Sources/WordPressData/Swift/BasePost+CoreDataProperties.swift similarity index 100% rename from Sources/WordPressData/Swift/BasePost+CoreDataProperties.swift rename to Modules/Sources/WordPressData/Swift/BasePost+CoreDataProperties.swift diff --git a/Sources/WordPressData/Swift/BasePost+PostContentProvider.swift b/Modules/Sources/WordPressData/Swift/BasePost+PostContentProvider.swift similarity index 100% rename from Sources/WordPressData/Swift/BasePost+PostContentProvider.swift rename to Modules/Sources/WordPressData/Swift/BasePost+PostContentProvider.swift diff --git a/Sources/WordPressData/Swift/BasePost.swift b/Modules/Sources/WordPressData/Swift/BasePost.swift similarity index 100% rename from Sources/WordPressData/Swift/BasePost.swift rename to Modules/Sources/WordPressData/Swift/BasePost.swift diff --git a/Sources/WordPressData/Swift/BlockEditorSettingElement+CoreDataClass.swift b/Modules/Sources/WordPressData/Swift/BlockEditorSettingElement+CoreDataClass.swift similarity index 100% rename from Sources/WordPressData/Swift/BlockEditorSettingElement+CoreDataClass.swift rename to Modules/Sources/WordPressData/Swift/BlockEditorSettingElement+CoreDataClass.swift diff --git a/Sources/WordPressData/Swift/BlockEditorSettingElement+CoreDataProperties.swift b/Modules/Sources/WordPressData/Swift/BlockEditorSettingElement+CoreDataProperties.swift similarity index 100% rename from Sources/WordPressData/Swift/BlockEditorSettingElement+CoreDataProperties.swift rename to Modules/Sources/WordPressData/Swift/BlockEditorSettingElement+CoreDataProperties.swift diff --git a/Sources/WordPressData/Swift/BlockEditorSettings+CoreDataClass.swift b/Modules/Sources/WordPressData/Swift/BlockEditorSettings+CoreDataClass.swift similarity index 100% rename from Sources/WordPressData/Swift/BlockEditorSettings+CoreDataClass.swift rename to Modules/Sources/WordPressData/Swift/BlockEditorSettings+CoreDataClass.swift diff --git a/Sources/WordPressData/Swift/BlockEditorSettings+CoreDataProperties.swift b/Modules/Sources/WordPressData/Swift/BlockEditorSettings+CoreDataProperties.swift similarity index 100% rename from Sources/WordPressData/Swift/BlockEditorSettings+CoreDataProperties.swift rename to Modules/Sources/WordPressData/Swift/BlockEditorSettings+CoreDataProperties.swift diff --git a/Sources/WordPressData/Swift/BlockedAuthor.swift b/Modules/Sources/WordPressData/Swift/BlockedAuthor.swift similarity index 100% rename from Sources/WordPressData/Swift/BlockedAuthor.swift rename to Modules/Sources/WordPressData/Swift/BlockedAuthor.swift diff --git a/Sources/WordPressData/Swift/BlockedSite.swift b/Modules/Sources/WordPressData/Swift/BlockedSite.swift similarity index 100% rename from Sources/WordPressData/Swift/BlockedSite.swift rename to Modules/Sources/WordPressData/Swift/BlockedSite.swift diff --git a/Sources/WordPressData/Swift/Blog+BlogAuthors.swift b/Modules/Sources/WordPressData/Swift/Blog+BlogAuthors.swift similarity index 100% rename from Sources/WordPressData/Swift/Blog+BlogAuthors.swift rename to Modules/Sources/WordPressData/Swift/Blog+BlogAuthors.swift diff --git a/Sources/WordPressData/Swift/Blog+Capabilities.swift b/Modules/Sources/WordPressData/Swift/Blog+Capabilities.swift similarity index 100% rename from Sources/WordPressData/Swift/Blog+Capabilities.swift rename to Modules/Sources/WordPressData/Swift/Blog+Capabilities.swift diff --git a/Sources/WordPressData/Swift/Blog+Creation.swift b/Modules/Sources/WordPressData/Swift/Blog+Creation.swift similarity index 100% rename from Sources/WordPressData/Swift/Blog+Creation.swift rename to Modules/Sources/WordPressData/Swift/Blog+Creation.swift diff --git a/Sources/WordPressData/Swift/Blog+Features.swift b/Modules/Sources/WordPressData/Swift/Blog+Features.swift similarity index 100% rename from Sources/WordPressData/Swift/Blog+Features.swift rename to Modules/Sources/WordPressData/Swift/Blog+Features.swift diff --git a/Sources/WordPressData/Swift/Blog+HomepageSettings.swift b/Modules/Sources/WordPressData/Swift/Blog+HomepageSettings.swift similarity index 100% rename from Sources/WordPressData/Swift/Blog+HomepageSettings.swift rename to Modules/Sources/WordPressData/Swift/Blog+HomepageSettings.swift diff --git a/Sources/WordPressData/Swift/Blog+Jetpack.swift b/Modules/Sources/WordPressData/Swift/Blog+Jetpack.swift similarity index 100% rename from Sources/WordPressData/Swift/Blog+Jetpack.swift rename to Modules/Sources/WordPressData/Swift/Blog+Jetpack.swift diff --git a/Sources/WordPressData/Swift/Blog+Lookup.swift b/Modules/Sources/WordPressData/Swift/Blog+Lookup.swift similarity index 100% rename from Sources/WordPressData/Swift/Blog+Lookup.swift rename to Modules/Sources/WordPressData/Swift/Blog+Lookup.swift diff --git a/Sources/WordPressData/Swift/Blog+Options.swift b/Modules/Sources/WordPressData/Swift/Blog+Options.swift similarity index 100% rename from Sources/WordPressData/Swift/Blog+Options.swift rename to Modules/Sources/WordPressData/Swift/Blog+Options.swift diff --git a/Sources/WordPressData/Swift/Blog+Plans.swift b/Modules/Sources/WordPressData/Swift/Blog+Plans.swift similarity index 100% rename from Sources/WordPressData/Swift/Blog+Plans.swift rename to Modules/Sources/WordPressData/Swift/Blog+Plans.swift diff --git a/Sources/WordPressData/Swift/Blog+Post.swift b/Modules/Sources/WordPressData/Swift/Blog+Post.swift similarity index 100% rename from Sources/WordPressData/Swift/Blog+Post.swift rename to Modules/Sources/WordPressData/Swift/Blog+Post.swift diff --git a/Sources/WordPressData/Swift/Blog+Quota.swift b/Modules/Sources/WordPressData/Swift/Blog+Quota.swift similarity index 100% rename from Sources/WordPressData/Swift/Blog+Quota.swift rename to Modules/Sources/WordPressData/Swift/Blog+Quota.swift diff --git a/Sources/WordPressData/Swift/Blog+SelfHosted.swift b/Modules/Sources/WordPressData/Swift/Blog+SelfHosted.swift similarity index 100% rename from Sources/WordPressData/Swift/Blog+SelfHosted.swift rename to Modules/Sources/WordPressData/Swift/Blog+SelfHosted.swift diff --git a/Sources/WordPressData/Swift/Blog+Swift.swift b/Modules/Sources/WordPressData/Swift/Blog+Swift.swift similarity index 100% rename from Sources/WordPressData/Swift/Blog+Swift.swift rename to Modules/Sources/WordPressData/Swift/Blog+Swift.swift diff --git a/Sources/WordPressData/Swift/Blog+WordPressComRestAPI.swift b/Modules/Sources/WordPressData/Swift/Blog+WordPressComRestAPI.swift similarity index 100% rename from Sources/WordPressData/Swift/Blog+WordPressComRestAPI.swift rename to Modules/Sources/WordPressData/Swift/Blog+WordPressComRestAPI.swift diff --git a/Sources/WordPressData/Swift/Blog.swift b/Modules/Sources/WordPressData/Swift/Blog.swift similarity index 100% rename from Sources/WordPressData/Swift/Blog.swift rename to Modules/Sources/WordPressData/Swift/Blog.swift diff --git a/Sources/WordPressData/Swift/BlogAuthor.swift b/Modules/Sources/WordPressData/Swift/BlogAuthor.swift similarity index 100% rename from Sources/WordPressData/Swift/BlogAuthor.swift rename to Modules/Sources/WordPressData/Swift/BlogAuthor.swift diff --git a/Sources/WordPressData/Swift/BlogQuery.swift b/Modules/Sources/WordPressData/Swift/BlogQuery.swift similarity index 100% rename from Sources/WordPressData/Swift/BlogQuery.swift rename to Modules/Sources/WordPressData/Swift/BlogQuery.swift diff --git a/Sources/WordPressData/Swift/BlogSettings.swift b/Modules/Sources/WordPressData/Swift/BlogSettings.swift similarity index 100% rename from Sources/WordPressData/Swift/BlogSettings.swift rename to Modules/Sources/WordPressData/Swift/BlogSettings.swift diff --git a/Sources/WordPressData/Swift/BloggingPrompt+CoreDataClass.swift b/Modules/Sources/WordPressData/Swift/BloggingPrompt+CoreDataClass.swift similarity index 100% rename from Sources/WordPressData/Swift/BloggingPrompt+CoreDataClass.swift rename to Modules/Sources/WordPressData/Swift/BloggingPrompt+CoreDataClass.swift diff --git a/Sources/WordPressData/Swift/BloggingPrompt+CoreDataProperties.swift b/Modules/Sources/WordPressData/Swift/BloggingPrompt+CoreDataProperties.swift similarity index 100% rename from Sources/WordPressData/Swift/BloggingPrompt+CoreDataProperties.swift rename to Modules/Sources/WordPressData/Swift/BloggingPrompt+CoreDataProperties.swift diff --git a/Sources/WordPressData/Swift/BloggingPromptRemoteObject.swift b/Modules/Sources/WordPressData/Swift/BloggingPromptRemoteObject.swift similarity index 100% rename from Sources/WordPressData/Swift/BloggingPromptRemoteObject.swift rename to Modules/Sources/WordPressData/Swift/BloggingPromptRemoteObject.swift diff --git a/Sources/WordPressData/Swift/BloggingPromptSettings+CoreDataClass.swift b/Modules/Sources/WordPressData/Swift/BloggingPromptSettings+CoreDataClass.swift similarity index 100% rename from Sources/WordPressData/Swift/BloggingPromptSettings+CoreDataClass.swift rename to Modules/Sources/WordPressData/Swift/BloggingPromptSettings+CoreDataClass.swift diff --git a/Sources/WordPressData/Swift/BloggingPromptSettings+CoreDataProperties.swift b/Modules/Sources/WordPressData/Swift/BloggingPromptSettings+CoreDataProperties.swift similarity index 100% rename from Sources/WordPressData/Swift/BloggingPromptSettings+CoreDataProperties.swift rename to Modules/Sources/WordPressData/Swift/BloggingPromptSettings+CoreDataProperties.swift diff --git a/Sources/WordPressData/Swift/BloggingPromptSettingsReminderDays+CoreDataClass.swift b/Modules/Sources/WordPressData/Swift/BloggingPromptSettingsReminderDays+CoreDataClass.swift similarity index 100% rename from Sources/WordPressData/Swift/BloggingPromptSettingsReminderDays+CoreDataClass.swift rename to Modules/Sources/WordPressData/Swift/BloggingPromptSettingsReminderDays+CoreDataClass.swift diff --git a/Sources/WordPressData/Swift/BloggingPromptSettingsReminderDays+CoreDataProperties.swift b/Modules/Sources/WordPressData/Swift/BloggingPromptSettingsReminderDays+CoreDataProperties.swift similarity index 100% rename from Sources/WordPressData/Swift/BloggingPromptSettingsReminderDays+CoreDataProperties.swift rename to Modules/Sources/WordPressData/Swift/BloggingPromptSettingsReminderDays+CoreDataProperties.swift diff --git a/Sources/WordPressData/Swift/BloggingPromptsAttribution.swift b/Modules/Sources/WordPressData/Swift/BloggingPromptsAttribution.swift similarity index 100% rename from Sources/WordPressData/Swift/BloggingPromptsAttribution.swift rename to Modules/Sources/WordPressData/Swift/BloggingPromptsAttribution.swift diff --git a/Sources/WordPressData/Swift/Bundle+WordPressData.swift b/Modules/Sources/WordPressData/Swift/Bundle+WordPressData.swift similarity index 68% rename from Sources/WordPressData/Swift/Bundle+WordPressData.swift rename to Modules/Sources/WordPressData/Swift/Bundle+WordPressData.swift index c0824c128d2a..4aac842fc5e3 100644 --- a/Sources/WordPressData/Swift/Bundle+WordPressData.swift +++ b/Modules/Sources/WordPressData/Swift/Bundle+WordPressData.swift @@ -2,7 +2,8 @@ import Foundation extension Bundle { @objc public class var wordPressData: Bundle { - Bundle(for: BundleToken.self) + Bundle.module +// Bundle(for: BundleToken.self) } } diff --git a/Sources/WordPressData/Swift/Comment+CoreDataClass.swift b/Modules/Sources/WordPressData/Swift/Comment+CoreDataClass.swift similarity index 100% rename from Sources/WordPressData/Swift/Comment+CoreDataClass.swift rename to Modules/Sources/WordPressData/Swift/Comment+CoreDataClass.swift diff --git a/Sources/WordPressData/Swift/Comment+CoreDataProperties.swift b/Modules/Sources/WordPressData/Swift/Comment+CoreDataProperties.swift similarity index 100% rename from Sources/WordPressData/Swift/Comment+CoreDataProperties.swift rename to Modules/Sources/WordPressData/Swift/Comment+CoreDataProperties.swift diff --git a/Sources/WordPressData/Swift/ContextManager+ErrorHandling.swift b/Modules/Sources/WordPressData/Swift/ContextManager+ErrorHandling.swift similarity index 100% rename from Sources/WordPressData/Swift/ContextManager+ErrorHandling.swift rename to Modules/Sources/WordPressData/Swift/ContextManager+ErrorHandling.swift diff --git a/Sources/WordPressData/Swift/ContextManager.swift b/Modules/Sources/WordPressData/Swift/ContextManager.swift similarity index 100% rename from Sources/WordPressData/Swift/ContextManager.swift rename to Modules/Sources/WordPressData/Swift/ContextManager.swift diff --git a/Sources/WordPressData/Swift/CoreDataHelper.swift b/Modules/Sources/WordPressData/Swift/CoreDataHelper.swift similarity index 100% rename from Sources/WordPressData/Swift/CoreDataHelper.swift rename to Modules/Sources/WordPressData/Swift/CoreDataHelper.swift diff --git a/Sources/WordPressData/Swift/CoreDataIterativeMigrator.swift b/Modules/Sources/WordPressData/Swift/CoreDataIterativeMigrator.swift similarity index 100% rename from Sources/WordPressData/Swift/CoreDataIterativeMigrator.swift rename to Modules/Sources/WordPressData/Swift/CoreDataIterativeMigrator.swift diff --git a/Sources/WordPressData/Swift/CoreDataStack.swift b/Modules/Sources/WordPressData/Swift/CoreDataStack.swift similarity index 100% rename from Sources/WordPressData/Swift/CoreDataStack.swift rename to Modules/Sources/WordPressData/Swift/CoreDataStack.swift diff --git a/Sources/WordPressData/Swift/CoreDataStackSwift.swift b/Modules/Sources/WordPressData/Swift/CoreDataStackSwift.swift similarity index 100% rename from Sources/WordPressData/Swift/CoreDataStackSwift.swift rename to Modules/Sources/WordPressData/Swift/CoreDataStackSwift.swift diff --git a/Sources/WordPressData/Swift/DiffAbstractValue.swift b/Modules/Sources/WordPressData/Swift/DiffAbstractValue.swift similarity index 100% rename from Sources/WordPressData/Swift/DiffAbstractValue.swift rename to Modules/Sources/WordPressData/Swift/DiffAbstractValue.swift diff --git a/Sources/WordPressData/Swift/DiffContentValue.swift b/Modules/Sources/WordPressData/Swift/DiffContentValue.swift similarity index 100% rename from Sources/WordPressData/Swift/DiffContentValue.swift rename to Modules/Sources/WordPressData/Swift/DiffContentValue.swift diff --git a/Sources/WordPressData/Swift/DiffTitleValue.swift b/Modules/Sources/WordPressData/Swift/DiffTitleValue.swift similarity index 100% rename from Sources/WordPressData/Swift/DiffTitleValue.swift rename to Modules/Sources/WordPressData/Swift/DiffTitleValue.swift diff --git a/Sources/WordPressData/Swift/Domain.swift b/Modules/Sources/WordPressData/Swift/Domain.swift similarity index 98% rename from Sources/WordPressData/Swift/Domain.swift rename to Modules/Sources/WordPressData/Swift/Domain.swift index 3b1b5a648aee..954088b2b826 100644 --- a/Sources/WordPressData/Swift/Domain.swift +++ b/Modules/Sources/WordPressData/Swift/Domain.swift @@ -64,7 +64,7 @@ public class ManagedDomain: NSManagedObject { } } -extension Domain: @retroactive Equatable {} +extension Domain: Equatable {} public func ==(lhs: Domain, rhs: Domain) -> Bool { return lhs.domainName == rhs.domainName && diff --git a/Sources/WordPressData/Swift/GravatarProfile.swift b/Modules/Sources/WordPressData/Swift/GravatarProfile.swift similarity index 100% rename from Sources/WordPressData/Swift/GravatarProfile.swift rename to Modules/Sources/WordPressData/Swift/GravatarProfile.swift diff --git a/Sources/WordPressData/Swift/InviteLinks+CoreDataClass.swift b/Modules/Sources/WordPressData/Swift/InviteLinks+CoreDataClass.swift similarity index 100% rename from Sources/WordPressData/Swift/InviteLinks+CoreDataClass.swift rename to Modules/Sources/WordPressData/Swift/InviteLinks+CoreDataClass.swift diff --git a/Sources/WordPressData/Swift/InviteLinks+CoreDataProperties.swift b/Modules/Sources/WordPressData/Swift/InviteLinks+CoreDataProperties.swift similarity index 100% rename from Sources/WordPressData/Swift/InviteLinks+CoreDataProperties.swift rename to Modules/Sources/WordPressData/Swift/InviteLinks+CoreDataProperties.swift diff --git a/Sources/WordPressData/Swift/JetpackState.swift b/Modules/Sources/WordPressData/Swift/JetpackState.swift similarity index 100% rename from Sources/WordPressData/Swift/JetpackState.swift rename to Modules/Sources/WordPressData/Swift/JetpackState.swift diff --git a/Sources/WordPressData/Swift/LikeUser+CoreDataClass.swift b/Modules/Sources/WordPressData/Swift/LikeUser+CoreDataClass.swift similarity index 100% rename from Sources/WordPressData/Swift/LikeUser+CoreDataClass.swift rename to Modules/Sources/WordPressData/Swift/LikeUser+CoreDataClass.swift diff --git a/Sources/WordPressData/Swift/LikeUser+CoreDataProperties.swift b/Modules/Sources/WordPressData/Swift/LikeUser+CoreDataProperties.swift similarity index 100% rename from Sources/WordPressData/Swift/LikeUser+CoreDataProperties.swift rename to Modules/Sources/WordPressData/Swift/LikeUser+CoreDataProperties.swift diff --git a/Sources/WordPressData/Swift/LikeUserPreferredBlog+CoreDataClass.swift b/Modules/Sources/WordPressData/Swift/LikeUserPreferredBlog+CoreDataClass.swift similarity index 100% rename from Sources/WordPressData/Swift/LikeUserPreferredBlog+CoreDataClass.swift rename to Modules/Sources/WordPressData/Swift/LikeUserPreferredBlog+CoreDataClass.swift diff --git a/Sources/WordPressData/Swift/LikeUserPreferredBlog+CoreDataProperties.swift b/Modules/Sources/WordPressData/Swift/LikeUserPreferredBlog+CoreDataProperties.swift similarity index 100% rename from Sources/WordPressData/Swift/LikeUserPreferredBlog+CoreDataProperties.swift rename to Modules/Sources/WordPressData/Swift/LikeUserPreferredBlog+CoreDataProperties.swift diff --git a/Sources/WordPressData/Swift/ManagedAccountSettings+CoreDataProperties.swift b/Modules/Sources/WordPressData/Swift/ManagedAccountSettings+CoreDataProperties.swift similarity index 100% rename from Sources/WordPressData/Swift/ManagedAccountSettings+CoreDataProperties.swift rename to Modules/Sources/WordPressData/Swift/ManagedAccountSettings+CoreDataProperties.swift diff --git a/Sources/WordPressData/Swift/ManagedAccountSettings.swift b/Modules/Sources/WordPressData/Swift/ManagedAccountSettings.swift similarity index 100% rename from Sources/WordPressData/Swift/ManagedAccountSettings.swift rename to Modules/Sources/WordPressData/Swift/ManagedAccountSettings.swift diff --git a/Sources/WordPressData/Swift/ManagedPerson+CoreDataProperties.swift b/Modules/Sources/WordPressData/Swift/ManagedPerson+CoreDataProperties.swift similarity index 100% rename from Sources/WordPressData/Swift/ManagedPerson+CoreDataProperties.swift rename to Modules/Sources/WordPressData/Swift/ManagedPerson+CoreDataProperties.swift diff --git a/Sources/WordPressData/Swift/ManagedPerson.swift b/Modules/Sources/WordPressData/Swift/ManagedPerson.swift similarity index 100% rename from Sources/WordPressData/Swift/ManagedPerson.swift rename to Modules/Sources/WordPressData/Swift/ManagedPerson.swift diff --git a/Sources/WordPressData/Swift/Media+Blog.swift b/Modules/Sources/WordPressData/Swift/Media+Blog.swift similarity index 100% rename from Sources/WordPressData/Swift/Media+Blog.swift rename to Modules/Sources/WordPressData/Swift/Media+Blog.swift diff --git a/Sources/WordPressData/Swift/Media.swift b/Modules/Sources/WordPressData/Swift/Media.swift similarity index 100% rename from Sources/WordPressData/Swift/Media.swift rename to Modules/Sources/WordPressData/Swift/Media.swift diff --git a/Sources/WordPressData/Swift/MediaFileManager.swift b/Modules/Sources/WordPressData/Swift/MediaFileManager.swift similarity index 100% rename from Sources/WordPressData/Swift/MediaFileManager.swift rename to Modules/Sources/WordPressData/Swift/MediaFileManager.swift diff --git a/Sources/WordPressData/Swift/Menu+CoreDataProperties.swift b/Modules/Sources/WordPressData/Swift/Menu+CoreDataProperties.swift similarity index 100% rename from Sources/WordPressData/Swift/Menu+CoreDataProperties.swift rename to Modules/Sources/WordPressData/Swift/Menu+CoreDataProperties.swift diff --git a/Sources/WordPressData/Swift/Menu.swift b/Modules/Sources/WordPressData/Swift/Menu.swift similarity index 100% rename from Sources/WordPressData/Swift/Menu.swift rename to Modules/Sources/WordPressData/Swift/Menu.swift diff --git a/Sources/WordPressData/Swift/MenuItem+CoreDataProperties.swift b/Modules/Sources/WordPressData/Swift/MenuItem+CoreDataProperties.swift similarity index 100% rename from Sources/WordPressData/Swift/MenuItem+CoreDataProperties.swift rename to Modules/Sources/WordPressData/Swift/MenuItem+CoreDataProperties.swift diff --git a/Sources/WordPressData/Swift/MenuItem.swift b/Modules/Sources/WordPressData/Swift/MenuItem.swift similarity index 100% rename from Sources/WordPressData/Swift/MenuItem.swift rename to Modules/Sources/WordPressData/Swift/MenuItem.swift diff --git a/Sources/WordPressData/Swift/MenuLocation.swift b/Modules/Sources/WordPressData/Swift/MenuLocation.swift similarity index 100% rename from Sources/WordPressData/Swift/MenuLocation.swift rename to Modules/Sources/WordPressData/Swift/MenuLocation.swift diff --git a/Sources/WordPressData/Swift/NSManagedObject+Lookup.swift b/Modules/Sources/WordPressData/Swift/NSManagedObject+Lookup.swift similarity index 100% rename from Sources/WordPressData/Swift/NSManagedObject+Lookup.swift rename to Modules/Sources/WordPressData/Swift/NSManagedObject+Lookup.swift diff --git a/Sources/WordPressData/Swift/NSManagedObject.swift b/Modules/Sources/WordPressData/Swift/NSManagedObject.swift similarity index 100% rename from Sources/WordPressData/Swift/NSManagedObject.swift rename to Modules/Sources/WordPressData/Swift/NSManagedObject.swift diff --git a/Sources/WordPressData/Swift/Notification.swift b/Modules/Sources/WordPressData/Swift/Notification.swift similarity index 100% rename from Sources/WordPressData/Swift/Notification.swift rename to Modules/Sources/WordPressData/Swift/Notification.swift diff --git a/Sources/WordPressData/Swift/NullBlogPropertySanitizer.swift b/Modules/Sources/WordPressData/Swift/NullBlogPropertySanitizer.swift similarity index 100% rename from Sources/WordPressData/Swift/NullBlogPropertySanitizer.swift rename to Modules/Sources/WordPressData/Swift/NullBlogPropertySanitizer.swift diff --git a/Sources/WordPressData/Swift/Page+CoreDataProperties.swift b/Modules/Sources/WordPressData/Swift/Page+CoreDataProperties.swift similarity index 100% rename from Sources/WordPressData/Swift/Page+CoreDataProperties.swift rename to Modules/Sources/WordPressData/Swift/Page+CoreDataProperties.swift diff --git a/Sources/WordPressData/Swift/Page.swift b/Modules/Sources/WordPressData/Swift/Page.swift similarity index 100% rename from Sources/WordPressData/Swift/Page.swift rename to Modules/Sources/WordPressData/Swift/Page.swift diff --git a/Sources/WordPressData/Swift/PageTemplateCategory+CoreDataClass.swift b/Modules/Sources/WordPressData/Swift/PageTemplateCategory+CoreDataClass.swift similarity index 100% rename from Sources/WordPressData/Swift/PageTemplateCategory+CoreDataClass.swift rename to Modules/Sources/WordPressData/Swift/PageTemplateCategory+CoreDataClass.swift diff --git a/Sources/WordPressData/Swift/PageTemplateCategory+CoreDataProperties.swift b/Modules/Sources/WordPressData/Swift/PageTemplateCategory+CoreDataProperties.swift similarity index 100% rename from Sources/WordPressData/Swift/PageTemplateCategory+CoreDataProperties.swift rename to Modules/Sources/WordPressData/Swift/PageTemplateCategory+CoreDataProperties.swift diff --git a/Sources/WordPressData/Swift/PageTemplateLayout+CoreDataClass.swift b/Modules/Sources/WordPressData/Swift/PageTemplateLayout+CoreDataClass.swift similarity index 100% rename from Sources/WordPressData/Swift/PageTemplateLayout+CoreDataClass.swift rename to Modules/Sources/WordPressData/Swift/PageTemplateLayout+CoreDataClass.swift diff --git a/Sources/WordPressData/Swift/PageTemplateLayout+CoreDataProperties.swift b/Modules/Sources/WordPressData/Swift/PageTemplateLayout+CoreDataProperties.swift similarity index 100% rename from Sources/WordPressData/Swift/PageTemplateLayout+CoreDataProperties.swift rename to Modules/Sources/WordPressData/Swift/PageTemplateLayout+CoreDataProperties.swift diff --git a/Sources/WordPressData/Swift/Plan.swift b/Modules/Sources/WordPressData/Swift/Plan.swift similarity index 100% rename from Sources/WordPressData/Swift/Plan.swift rename to Modules/Sources/WordPressData/Swift/Plan.swift diff --git a/Sources/WordPressData/Swift/PlanFeature.swift b/Modules/Sources/WordPressData/Swift/PlanFeature.swift similarity index 100% rename from Sources/WordPressData/Swift/PlanFeature.swift rename to Modules/Sources/WordPressData/Swift/PlanFeature.swift diff --git a/Sources/WordPressData/Swift/PlanGroup.swift b/Modules/Sources/WordPressData/Swift/PlanGroup.swift similarity index 100% rename from Sources/WordPressData/Swift/PlanGroup.swift rename to Modules/Sources/WordPressData/Swift/PlanGroup.swift diff --git a/Sources/WordPressData/Swift/Post+CoreDataProperties.swift b/Modules/Sources/WordPressData/Swift/Post+CoreDataProperties.swift similarity index 100% rename from Sources/WordPressData/Swift/Post+CoreDataProperties.swift rename to Modules/Sources/WordPressData/Swift/Post+CoreDataProperties.swift diff --git a/Sources/WordPressData/Swift/Post.swift b/Modules/Sources/WordPressData/Swift/Post.swift similarity index 100% rename from Sources/WordPressData/Swift/Post.swift rename to Modules/Sources/WordPressData/Swift/Post.swift diff --git a/Sources/WordPressData/Swift/PostCategory+CoreDataClass.swift b/Modules/Sources/WordPressData/Swift/PostCategory+CoreDataClass.swift similarity index 100% rename from Sources/WordPressData/Swift/PostCategory+CoreDataClass.swift rename to Modules/Sources/WordPressData/Swift/PostCategory+CoreDataClass.swift diff --git a/Sources/WordPressData/Swift/PostCategory+CoreDataProperties.swift b/Modules/Sources/WordPressData/Swift/PostCategory+CoreDataProperties.swift similarity index 100% rename from Sources/WordPressData/Swift/PostCategory+CoreDataProperties.swift rename to Modules/Sources/WordPressData/Swift/PostCategory+CoreDataProperties.swift diff --git a/Sources/WordPressData/Swift/PostCategory+Creation.swift b/Modules/Sources/WordPressData/Swift/PostCategory+Creation.swift similarity index 100% rename from Sources/WordPressData/Swift/PostCategory+Creation.swift rename to Modules/Sources/WordPressData/Swift/PostCategory+Creation.swift diff --git a/Sources/WordPressData/Swift/PostCategory+Lookup.swift b/Modules/Sources/WordPressData/Swift/PostCategory+Lookup.swift similarity index 100% rename from Sources/WordPressData/Swift/PostCategory+Lookup.swift rename to Modules/Sources/WordPressData/Swift/PostCategory+Lookup.swift diff --git a/Sources/WordPressData/Swift/PostMetadata.swift b/Modules/Sources/WordPressData/Swift/PostMetadata.swift similarity index 100% rename from Sources/WordPressData/Swift/PostMetadata.swift rename to Modules/Sources/WordPressData/Swift/PostMetadata.swift diff --git a/Sources/WordPressData/Swift/PostMetadataContainer.swift b/Modules/Sources/WordPressData/Swift/PostMetadataContainer.swift similarity index 98% rename from Sources/WordPressData/Swift/PostMetadataContainer.swift rename to Modules/Sources/WordPressData/Swift/PostMetadataContainer.swift index c817d4660f1e..eecd8c9ffdcf 100644 --- a/Sources/WordPressData/Swift/PostMetadataContainer.swift +++ b/Modules/Sources/WordPressData/Swift/PostMetadataContainer.swift @@ -29,7 +29,7 @@ import WordPressShared /// ] /// ``` public struct PostMetadataContainer { - public struct Key: ExpressibleByStringLiteral, Hashable { + public struct Key: ExpressibleByStringLiteral, Hashable, Sendable { public let rawValue: String public init(rawValue: String) { diff --git a/Sources/WordPressData/Swift/PostServiceRemoteFactory.swift b/Modules/Sources/WordPressData/Swift/PostServiceRemoteFactory.swift similarity index 100% rename from Sources/WordPressData/Swift/PostServiceRemoteFactory.swift rename to Modules/Sources/WordPressData/Swift/PostServiceRemoteFactory.swift diff --git a/Sources/WordPressData/Swift/PostTag+CoreDataClass.swift b/Modules/Sources/WordPressData/Swift/PostTag+CoreDataClass.swift similarity index 100% rename from Sources/WordPressData/Swift/PostTag+CoreDataClass.swift rename to Modules/Sources/WordPressData/Swift/PostTag+CoreDataClass.swift diff --git a/Sources/WordPressData/Swift/PostTag+CoreDataProperties.swift b/Modules/Sources/WordPressData/Swift/PostTag+CoreDataProperties.swift similarity index 100% rename from Sources/WordPressData/Swift/PostTag+CoreDataProperties.swift rename to Modules/Sources/WordPressData/Swift/PostTag+CoreDataProperties.swift diff --git a/Sources/WordPressData/Swift/PostType+CoreDataClass.swift b/Modules/Sources/WordPressData/Swift/PostType+CoreDataClass.swift similarity index 100% rename from Sources/WordPressData/Swift/PostType+CoreDataClass.swift rename to Modules/Sources/WordPressData/Swift/PostType+CoreDataClass.swift diff --git a/Sources/WordPressData/Swift/PostType+CoreDataProperties.swift b/Modules/Sources/WordPressData/Swift/PostType+CoreDataProperties.swift similarity index 100% rename from Sources/WordPressData/Swift/PostType+CoreDataProperties.swift rename to Modules/Sources/WordPressData/Swift/PostType+CoreDataProperties.swift diff --git a/Sources/WordPressData/Swift/PostVisibility.swift b/Modules/Sources/WordPressData/Swift/PostVisibility.swift similarity index 100% rename from Sources/WordPressData/Swift/PostVisibility.swift rename to Modules/Sources/WordPressData/Swift/PostVisibility.swift diff --git a/Sources/WordPressData/Swift/PublicizeConnection.swift b/Modules/Sources/WordPressData/Swift/PublicizeConnection.swift similarity index 100% rename from Sources/WordPressData/Swift/PublicizeConnection.swift rename to Modules/Sources/WordPressData/Swift/PublicizeConnection.swift diff --git a/Sources/WordPressData/Swift/PublicizeInfo+CoreDataClass.swift b/Modules/Sources/WordPressData/Swift/PublicizeInfo+CoreDataClass.swift similarity index 100% rename from Sources/WordPressData/Swift/PublicizeInfo+CoreDataClass.swift rename to Modules/Sources/WordPressData/Swift/PublicizeInfo+CoreDataClass.swift diff --git a/Sources/WordPressData/Swift/PublicizeInfo+CoreDataProperties.swift b/Modules/Sources/WordPressData/Swift/PublicizeInfo+CoreDataProperties.swift similarity index 100% rename from Sources/WordPressData/Swift/PublicizeInfo+CoreDataProperties.swift rename to Modules/Sources/WordPressData/Swift/PublicizeInfo+CoreDataProperties.swift diff --git a/Sources/WordPressData/Swift/PublicizeService.swift b/Modules/Sources/WordPressData/Swift/PublicizeService.swift similarity index 100% rename from Sources/WordPressData/Swift/PublicizeService.swift rename to Modules/Sources/WordPressData/Swift/PublicizeService.swift diff --git a/Sources/WordPressData/Swift/ReaderAbstractTopic+Lookup.swift b/Modules/Sources/WordPressData/Swift/ReaderAbstractTopic+Lookup.swift similarity index 100% rename from Sources/WordPressData/Swift/ReaderAbstractTopic+Lookup.swift rename to Modules/Sources/WordPressData/Swift/ReaderAbstractTopic+Lookup.swift diff --git a/Sources/WordPressData/Swift/ReaderAbstractTopic.swift b/Modules/Sources/WordPressData/Swift/ReaderAbstractTopic.swift similarity index 100% rename from Sources/WordPressData/Swift/ReaderAbstractTopic.swift rename to Modules/Sources/WordPressData/Swift/ReaderAbstractTopic.swift diff --git a/Sources/WordPressData/Swift/ReaderCard+CoreDataClass.swift b/Modules/Sources/WordPressData/Swift/ReaderCard+CoreDataClass.swift similarity index 100% rename from Sources/WordPressData/Swift/ReaderCard+CoreDataClass.swift rename to Modules/Sources/WordPressData/Swift/ReaderCard+CoreDataClass.swift diff --git a/Sources/WordPressData/Swift/ReaderCard+CoreDataProperties.swift b/Modules/Sources/WordPressData/Swift/ReaderCard+CoreDataProperties.swift similarity index 100% rename from Sources/WordPressData/Swift/ReaderCard+CoreDataProperties.swift rename to Modules/Sources/WordPressData/Swift/ReaderCard+CoreDataProperties.swift diff --git a/Sources/WordPressData/Swift/ReaderCrossPostMeta.swift b/Modules/Sources/WordPressData/Swift/ReaderCrossPostMeta.swift similarity index 100% rename from Sources/WordPressData/Swift/ReaderCrossPostMeta.swift rename to Modules/Sources/WordPressData/Swift/ReaderCrossPostMeta.swift diff --git a/Sources/WordPressData/Swift/ReaderDefaultTopic.swift b/Modules/Sources/WordPressData/Swift/ReaderDefaultTopic.swift similarity index 100% rename from Sources/WordPressData/Swift/ReaderDefaultTopic.swift rename to Modules/Sources/WordPressData/Swift/ReaderDefaultTopic.swift diff --git a/Sources/WordPressData/Swift/ReaderGapMarker.swift b/Modules/Sources/WordPressData/Swift/ReaderGapMarker.swift similarity index 100% rename from Sources/WordPressData/Swift/ReaderGapMarker.swift rename to Modules/Sources/WordPressData/Swift/ReaderGapMarker.swift diff --git a/Sources/WordPressData/Swift/ReaderListTopic.swift b/Modules/Sources/WordPressData/Swift/ReaderListTopic.swift similarity index 100% rename from Sources/WordPressData/Swift/ReaderListTopic.swift rename to Modules/Sources/WordPressData/Swift/ReaderListTopic.swift diff --git a/Sources/WordPressData/Swift/ReaderPost+CoreDataProperties.swift b/Modules/Sources/WordPressData/Swift/ReaderPost+CoreDataProperties.swift similarity index 100% rename from Sources/WordPressData/Swift/ReaderPost+CoreDataProperties.swift rename to Modules/Sources/WordPressData/Swift/ReaderPost+CoreDataProperties.swift diff --git a/Sources/WordPressData/Swift/ReaderPost.swift b/Modules/Sources/WordPressData/Swift/ReaderPost.swift similarity index 97% rename from Sources/WordPressData/Swift/ReaderPost.swift rename to Modules/Sources/WordPressData/Swift/ReaderPost.swift index 610d33ac26a6..52d6c6fec556 100644 --- a/Sources/WordPressData/Swift/ReaderPost.swift +++ b/Modules/Sources/WordPressData/Swift/ReaderPost.swift @@ -51,8 +51,8 @@ extension ReaderPost { extension ReaderPost { public func blogNameForDisplay() -> String? { - if let blogName, !blogName.isEmpty { - return blogName.replacing(/\s+/, with: " ") + if let blogName, !blogName.isEmpty, let regex = try? Regex(#"\s+"#) { + return blogName.replacing(regex, with: " ") } return URL(string: blogURL ?? "")?.host } diff --git a/Sources/WordPressData/Swift/ReaderSearchTopic.swift b/Modules/Sources/WordPressData/Swift/ReaderSearchTopic.swift similarity index 100% rename from Sources/WordPressData/Swift/ReaderSearchTopic.swift rename to Modules/Sources/WordPressData/Swift/ReaderSearchTopic.swift diff --git a/Sources/WordPressData/Swift/ReaderSiteInfoSubscriptions.swift b/Modules/Sources/WordPressData/Swift/ReaderSiteInfoSubscriptions.swift similarity index 100% rename from Sources/WordPressData/Swift/ReaderSiteInfoSubscriptions.swift rename to Modules/Sources/WordPressData/Swift/ReaderSiteInfoSubscriptions.swift diff --git a/Sources/WordPressData/Swift/ReaderSiteTopic+Lookup.swift b/Modules/Sources/WordPressData/Swift/ReaderSiteTopic+Lookup.swift similarity index 100% rename from Sources/WordPressData/Swift/ReaderSiteTopic+Lookup.swift rename to Modules/Sources/WordPressData/Swift/ReaderSiteTopic+Lookup.swift diff --git a/Sources/WordPressData/Swift/ReaderSiteTopic.swift b/Modules/Sources/WordPressData/Swift/ReaderSiteTopic.swift similarity index 100% rename from Sources/WordPressData/Swift/ReaderSiteTopic.swift rename to Modules/Sources/WordPressData/Swift/ReaderSiteTopic.swift diff --git a/Sources/WordPressData/Swift/ReaderTagTopic.swift b/Modules/Sources/WordPressData/Swift/ReaderTagTopic.swift similarity index 100% rename from Sources/WordPressData/Swift/ReaderTagTopic.swift rename to Modules/Sources/WordPressData/Swift/ReaderTagTopic.swift diff --git a/Sources/WordPressData/Swift/ReaderTeamTopic.swift b/Modules/Sources/WordPressData/Swift/ReaderTeamTopic.swift similarity index 100% rename from Sources/WordPressData/Swift/ReaderTeamTopic.swift rename to Modules/Sources/WordPressData/Swift/ReaderTeamTopic.swift diff --git a/Sources/WordPressData/Swift/Revision.swift b/Modules/Sources/WordPressData/Swift/Revision.swift similarity index 100% rename from Sources/WordPressData/Swift/Revision.swift rename to Modules/Sources/WordPressData/Swift/Revision.swift diff --git a/Sources/WordPressData/Swift/RevisionDiff+CoreData.swift b/Modules/Sources/WordPressData/Swift/RevisionDiff+CoreData.swift similarity index 100% rename from Sources/WordPressData/Swift/RevisionDiff+CoreData.swift rename to Modules/Sources/WordPressData/Swift/RevisionDiff+CoreData.swift diff --git a/Sources/WordPressData/Swift/RevisionDiff.swift b/Modules/Sources/WordPressData/Swift/RevisionDiff.swift similarity index 100% rename from Sources/WordPressData/Swift/RevisionDiff.swift rename to Modules/Sources/WordPressData/Swift/RevisionDiff.swift diff --git a/Sources/WordPressData/Swift/Role.swift b/Modules/Sources/WordPressData/Swift/Role.swift similarity index 100% rename from Sources/WordPressData/Swift/Role.swift rename to Modules/Sources/WordPressData/Swift/Role.swift diff --git a/Sources/WordPressData/Swift/SearchIdentifierGenerator.swift b/Modules/Sources/WordPressData/Swift/SearchIdentifierGenerator.swift similarity index 100% rename from Sources/WordPressData/Swift/SearchIdentifierGenerator.swift rename to Modules/Sources/WordPressData/Swift/SearchIdentifierGenerator.swift diff --git a/Sources/WordPressData/Swift/SearchableActivityConvertable.swift b/Modules/Sources/WordPressData/Swift/SearchableActivityConvertable.swift similarity index 100% rename from Sources/WordPressData/Swift/SearchableActivityConvertable.swift rename to Modules/Sources/WordPressData/Swift/SearchableActivityConvertable.swift diff --git a/Sources/WordPressData/Swift/SearchableItemConvertable.swift b/Modules/Sources/WordPressData/Swift/SearchableItemConvertable.swift similarity index 100% rename from Sources/WordPressData/Swift/SearchableItemConvertable.swift rename to Modules/Sources/WordPressData/Swift/SearchableItemConvertable.swift diff --git a/Sources/WordPressData/Swift/SharedDataIssueSolver.swift b/Modules/Sources/WordPressData/Swift/SharedDataIssueSolver.swift similarity index 100% rename from Sources/WordPressData/Swift/SharedDataIssueSolver.swift rename to Modules/Sources/WordPressData/Swift/SharedDataIssueSolver.swift diff --git a/Sources/WordPressData/Swift/SharingButton+Lookup.swift b/Modules/Sources/WordPressData/Swift/SharingButton+Lookup.swift similarity index 100% rename from Sources/WordPressData/Swift/SharingButton+Lookup.swift rename to Modules/Sources/WordPressData/Swift/SharingButton+Lookup.swift diff --git a/Sources/WordPressData/Swift/SharingButton.swift b/Modules/Sources/WordPressData/Swift/SharingButton.swift similarity index 100% rename from Sources/WordPressData/Swift/SharingButton.swift rename to Modules/Sources/WordPressData/Swift/SharingButton.swift diff --git a/Sources/WordPressData/Swift/SiteInformation.swift b/Modules/Sources/WordPressData/Swift/SiteInformation.swift similarity index 100% rename from Sources/WordPressData/Swift/SiteInformation.swift rename to Modules/Sources/WordPressData/Swift/SiteInformation.swift diff --git a/Sources/WordPressData/Swift/SiteOrganizationType.swift b/Modules/Sources/WordPressData/Swift/SiteOrganizationType.swift similarity index 100% rename from Sources/WordPressData/Swift/SiteOrganizationType.swift rename to Modules/Sources/WordPressData/Swift/SiteOrganizationType.swift diff --git a/Sources/WordPressData/Swift/SiteSuggestion+CoreDataClass.swift b/Modules/Sources/WordPressData/Swift/SiteSuggestion+CoreDataClass.swift similarity index 100% rename from Sources/WordPressData/Swift/SiteSuggestion+CoreDataClass.swift rename to Modules/Sources/WordPressData/Swift/SiteSuggestion+CoreDataClass.swift diff --git a/Sources/WordPressData/Swift/SiteSuggestion+CoreDataProperties.swift b/Modules/Sources/WordPressData/Swift/SiteSuggestion+CoreDataProperties.swift similarity index 100% rename from Sources/WordPressData/Swift/SiteSuggestion+CoreDataProperties.swift rename to Modules/Sources/WordPressData/Swift/SiteSuggestion+CoreDataProperties.swift diff --git a/Sources/WordPressData/Swift/SiteTaxonomy.swift b/Modules/Sources/WordPressData/Swift/SiteTaxonomy.swift similarity index 100% rename from Sources/WordPressData/Swift/SiteTaxonomy.swift rename to Modules/Sources/WordPressData/Swift/SiteTaxonomy.swift diff --git a/Sources/WordPressData/Swift/SourcePostAttribution+CoreDataClass.swift b/Modules/Sources/WordPressData/Swift/SourcePostAttribution+CoreDataClass.swift similarity index 100% rename from Sources/WordPressData/Swift/SourcePostAttribution+CoreDataClass.swift rename to Modules/Sources/WordPressData/Swift/SourcePostAttribution+CoreDataClass.swift diff --git a/Sources/WordPressData/Swift/SourcePostAttribution+CoreDataProperties.swift b/Modules/Sources/WordPressData/Swift/SourcePostAttribution+CoreDataProperties.swift similarity index 100% rename from Sources/WordPressData/Swift/SourcePostAttribution+CoreDataProperties.swift rename to Modules/Sources/WordPressData/Swift/SourcePostAttribution+CoreDataProperties.swift diff --git a/Sources/WordPressData/Swift/Suggestion.swift b/Modules/Sources/WordPressData/Swift/Suggestion.swift similarity index 100% rename from Sources/WordPressData/Swift/Suggestion.swift rename to Modules/Sources/WordPressData/Swift/Suggestion.swift diff --git a/Sources/WordPressData/Swift/TaggedManagedObjectID.swift b/Modules/Sources/WordPressData/Swift/TaggedManagedObjectID.swift similarity index 100% rename from Sources/WordPressData/Swift/TaggedManagedObjectID.swift rename to Modules/Sources/WordPressData/Swift/TaggedManagedObjectID.swift diff --git a/Sources/WordPressData/Swift/Theme+CoreDataProperties.swift b/Modules/Sources/WordPressData/Swift/Theme+CoreDataProperties.swift similarity index 100% rename from Sources/WordPressData/Swift/Theme+CoreDataProperties.swift rename to Modules/Sources/WordPressData/Swift/Theme+CoreDataProperties.swift diff --git a/Sources/WordPressData/Swift/Theme+Swift.swift b/Modules/Sources/WordPressData/Swift/Theme+Swift.swift similarity index 100% rename from Sources/WordPressData/Swift/Theme+Swift.swift rename to Modules/Sources/WordPressData/Swift/Theme+Swift.swift diff --git a/Sources/WordPressData/Swift/Theme.swift b/Modules/Sources/WordPressData/Swift/Theme.swift similarity index 100% rename from Sources/WordPressData/Swift/Theme.swift rename to Modules/Sources/WordPressData/Swift/Theme.swift diff --git a/Sources/WordPressData/Swift/ThemeIdHelper.swift b/Modules/Sources/WordPressData/Swift/ThemeIdHelper.swift similarity index 100% rename from Sources/WordPressData/Swift/ThemeIdHelper.swift rename to Modules/Sources/WordPressData/Swift/ThemeIdHelper.swift diff --git a/Sources/WordPressData/Swift/UserSettings.swift b/Modules/Sources/WordPressData/Swift/UserSettings.swift similarity index 100% rename from Sources/WordPressData/Swift/UserSettings.swift rename to Modules/Sources/WordPressData/Swift/UserSettings.swift diff --git a/Sources/WordPressData/Swift/UserSuggestion+Comparable.swift b/Modules/Sources/WordPressData/Swift/UserSuggestion+Comparable.swift similarity index 100% rename from Sources/WordPressData/Swift/UserSuggestion+Comparable.swift rename to Modules/Sources/WordPressData/Swift/UserSuggestion+Comparable.swift diff --git a/Sources/WordPressData/Swift/UserSuggestion+CoreDataClass.swift b/Modules/Sources/WordPressData/Swift/UserSuggestion+CoreDataClass.swift similarity index 100% rename from Sources/WordPressData/Swift/UserSuggestion+CoreDataClass.swift rename to Modules/Sources/WordPressData/Swift/UserSuggestion+CoreDataClass.swift diff --git a/Sources/WordPressData/Swift/UserSuggestion+CoreDataProperties.swift b/Modules/Sources/WordPressData/Swift/UserSuggestion+CoreDataProperties.swift similarity index 100% rename from Sources/WordPressData/Swift/UserSuggestion+CoreDataProperties.swift rename to Modules/Sources/WordPressData/Swift/UserSuggestion+CoreDataProperties.swift diff --git a/Sources/WordPressData/Swift/WPAccount+Lookup.swift b/Modules/Sources/WordPressData/Swift/WPAccount+Lookup.swift similarity index 100% rename from Sources/WordPressData/Swift/WPAccount+Lookup.swift rename to Modules/Sources/WordPressData/Swift/WPAccount+Lookup.swift diff --git a/Sources/WordPressData/Swift/WPAccount+RestApi.swift b/Modules/Sources/WordPressData/Swift/WPAccount+RestApi.swift similarity index 100% rename from Sources/WordPressData/Swift/WPAccount+RestApi.swift rename to Modules/Sources/WordPressData/Swift/WPAccount+RestApi.swift diff --git a/Sources/WordPressData/Swift/WPAccount.swift b/Modules/Sources/WordPressData/Swift/WPAccount.swift similarity index 100% rename from Sources/WordPressData/Swift/WPAccount.swift rename to Modules/Sources/WordPressData/Swift/WPAccount.swift diff --git a/Sources/WordPressData/Swift/WordPressComRestApi+Defaults.swift b/Modules/Sources/WordPressData/Swift/WordPressComRestApi+Defaults.swift similarity index 100% rename from Sources/WordPressData/Swift/WordPressComRestApi+Defaults.swift rename to Modules/Sources/WordPressData/Swift/WordPressComRestApi+Defaults.swift diff --git a/Sources/WordPressData/Swift/WordPressOrgRestApi+WordPress.swift b/Modules/Sources/WordPressData/Swift/WordPressOrgRestApi+WordPress.swift similarity index 100% rename from Sources/WordPressData/Swift/WordPressOrgRestApi+WordPress.swift rename to Modules/Sources/WordPressData/Swift/WordPressOrgRestApi+WordPress.swift diff --git a/Sources/WordPressData/WordPressDataDummy.swift b/Modules/Sources/WordPressData/WordPressDataDummy.swift similarity index 100% rename from Sources/WordPressData/WordPressDataDummy.swift rename to Modules/Sources/WordPressData/WordPressDataDummy.swift diff --git a/Modules/Sources/XcodeSupport/XcodeTarget_WordPressData/Empty.swift b/Modules/Sources/XcodeSupport/XcodeTarget_WordPressData/Empty.swift deleted file mode 100644 index 41fadb0ed76f..000000000000 --- a/Modules/Sources/XcodeSupport/XcodeTarget_WordPressData/Empty.swift +++ /dev/null @@ -1,3 +0,0 @@ -import Foundation - -public struct __Empty {} diff --git a/Modules/Sources/XcodeSupport/XcodeTarget_WordPressDataTests/Empty.swift b/Modules/Sources/XcodeSupport/XcodeTarget_WordPressDataTests/Empty.swift deleted file mode 100644 index 41fadb0ed76f..000000000000 --- a/Modules/Sources/XcodeSupport/XcodeTarget_WordPressDataTests/Empty.swift +++ /dev/null @@ -1,3 +0,0 @@ -import Foundation - -public struct __Empty {} diff --git a/Modules/Sources/XcodeSupport/XcodeTarget_WordPressKit/Empty.swift b/Modules/Sources/XcodeSupport/XcodeTarget_WordPressKit/Empty.swift deleted file mode 100644 index 41fadb0ed76f..000000000000 --- a/Modules/Sources/XcodeSupport/XcodeTarget_WordPressKit/Empty.swift +++ /dev/null @@ -1,3 +0,0 @@ -import Foundation - -public struct __Empty {} diff --git a/Modules/Sources/XcodeSupport/XcodeTarget_WordPressKitTests/Empty.swift b/Modules/Sources/XcodeSupport/XcodeTarget_WordPressKitTests/Empty.swift deleted file mode 100644 index 41fadb0ed76f..000000000000 --- a/Modules/Sources/XcodeSupport/XcodeTarget_WordPressKitTests/Empty.swift +++ /dev/null @@ -1,3 +0,0 @@ -import Foundation - -public struct __Empty {} diff --git a/Tests/WordPressDataTests/BlogTests.swift b/Modules/Tests/WordPressDataTests/BlogTests.swift similarity index 100% rename from Tests/WordPressDataTests/BlogTests.swift rename to Modules/Tests/WordPressDataTests/BlogTests.swift diff --git a/Tests/WordPressDataTests/ContextManagerTests.swift b/Modules/Tests/WordPressDataTests/ContextManagerTests.swift similarity index 100% rename from Tests/WordPressDataTests/ContextManagerTests.swift rename to Modules/Tests/WordPressDataTests/ContextManagerTests.swift diff --git a/Tests/WordPressDataTests/CoreDataHelperTests.swift b/Modules/Tests/WordPressDataTests/CoreDataHelperTests.swift similarity index 100% rename from Tests/WordPressDataTests/CoreDataHelperTests.swift rename to Modules/Tests/WordPressDataTests/CoreDataHelperTests.swift diff --git a/Tests/WordPressDataTests/CoreDataMigrationTests.swift b/Modules/Tests/WordPressDataTests/CoreDataMigrationTests.swift similarity index 100% rename from Tests/WordPressDataTests/CoreDataMigrationTests.swift rename to Modules/Tests/WordPressDataTests/CoreDataMigrationTests.swift diff --git a/Tests/WordPressDataTests/Helpers/BlogBuilder.swift b/Modules/Tests/WordPressDataTests/Helpers/BlogBuilder.swift similarity index 100% rename from Tests/WordPressDataTests/Helpers/BlogBuilder.swift rename to Modules/Tests/WordPressDataTests/Helpers/BlogBuilder.swift diff --git a/Tests/WordPressDataTests/Helpers/ContextManager+Testing.swift b/Modules/Tests/WordPressDataTests/Helpers/ContextManager+Testing.swift similarity index 100% rename from Tests/WordPressDataTests/Helpers/ContextManager+Testing.swift rename to Modules/Tests/WordPressDataTests/Helpers/ContextManager+Testing.swift diff --git a/Tests/WordPressDataTests/Helpers/CoreDataTestCase.swift b/Modules/Tests/WordPressDataTests/Helpers/CoreDataTestCase.swift similarity index 100% rename from Tests/WordPressDataTests/Helpers/CoreDataTestCase.swift rename to Modules/Tests/WordPressDataTests/Helpers/CoreDataTestCase.swift diff --git a/Tests/WordPressDataTests/Helpers/MockAuthKeyMigration.swift b/Modules/Tests/WordPressDataTests/Helpers/MockAuthKeyMigration.swift similarity index 100% rename from Tests/WordPressDataTests/Helpers/MockAuthKeyMigration.swift rename to Modules/Tests/WordPressDataTests/Helpers/MockAuthKeyMigration.swift diff --git a/Tests/WordPressDataTests/Helpers/MockKeychainService.swift b/Modules/Tests/WordPressDataTests/Helpers/MockKeychainService.swift similarity index 100% rename from Tests/WordPressDataTests/Helpers/MockKeychainService.swift rename to Modules/Tests/WordPressDataTests/Helpers/MockKeychainService.swift diff --git a/Tests/WordPressDataTests/Helpers/NSError+TestHelpers.swift b/Modules/Tests/WordPressDataTests/Helpers/NSError+TestHelpers.swift similarity index 100% rename from Tests/WordPressDataTests/Helpers/NSError+TestHelpers.swift rename to Modules/Tests/WordPressDataTests/Helpers/NSError+TestHelpers.swift diff --git a/Tests/WordPressDataTests/Helpers/PostBuilder.swift b/Modules/Tests/WordPressDataTests/Helpers/PostBuilder.swift similarity index 100% rename from Tests/WordPressDataTests/Helpers/PostBuilder.swift rename to Modules/Tests/WordPressDataTests/Helpers/PostBuilder.swift diff --git a/Tests/WordPressDataTests/Helpers/WPAccount+Fixture.swift b/Modules/Tests/WordPressDataTests/Helpers/WPAccount+Fixture.swift similarity index 100% rename from Tests/WordPressDataTests/Helpers/WPAccount+Fixture.swift rename to Modules/Tests/WordPressDataTests/Helpers/WPAccount+Fixture.swift diff --git a/Tests/WordPressDataTests/Mapping/ReaderPostMappingTests.swift b/Modules/Tests/WordPressDataTests/Mapping/ReaderPostMappingTests.swift similarity index 100% rename from Tests/WordPressDataTests/Mapping/ReaderPostMappingTests.swift rename to Modules/Tests/WordPressDataTests/Mapping/ReaderPostMappingTests.swift diff --git a/Tests/WordPressDataTests/MediaTests.swift b/Modules/Tests/WordPressDataTests/MediaTests.swift similarity index 100% rename from Tests/WordPressDataTests/MediaTests.swift rename to Modules/Tests/WordPressDataTests/MediaTests.swift diff --git a/Tests/WordPressDataTests/PostMetadataContainerTests.swift b/Modules/Tests/WordPressDataTests/PostMetadataContainerTests.swift similarity index 100% rename from Tests/WordPressDataTests/PostMetadataContainerTests.swift rename to Modules/Tests/WordPressDataTests/PostMetadataContainerTests.swift diff --git a/Tests/WordPressDataTests/PostMetadataTests.swift b/Modules/Tests/WordPressDataTests/PostMetadataTests.swift similarity index 100% rename from Tests/WordPressDataTests/PostMetadataTests.swift rename to Modules/Tests/WordPressDataTests/PostMetadataTests.swift diff --git a/Tests/WordPressDataTests/ReaderPostTests.swift b/Modules/Tests/WordPressDataTests/ReaderPostTests.swift similarity index 100% rename from Tests/WordPressDataTests/ReaderPostTests.swift rename to Modules/Tests/WordPressDataTests/ReaderPostTests.swift diff --git a/Tests/WordPressDataTests/TaggedManagedObjectIDTests.swift b/Modules/Tests/WordPressDataTests/TaggedManagedObjectIDTests.swift similarity index 100% rename from Tests/WordPressDataTests/TaggedManagedObjectIDTests.swift rename to Modules/Tests/WordPressDataTests/TaggedManagedObjectIDTests.swift diff --git a/Tests/WordPressDataTests/WPAccountTests.swift b/Modules/Tests/WordPressDataTests/WPAccountTests.swift similarity index 100% rename from Tests/WordPressDataTests/WPAccountTests.swift rename to Modules/Tests/WordPressDataTests/WPAccountTests.swift diff --git a/Tests/WordPressDataTests/WordPressDataTests.swift b/Modules/Tests/WordPressDataTests/WordPressDataTests.swift similarity index 100% rename from Tests/WordPressDataTests/WordPressDataTests.swift rename to Modules/Tests/WordPressDataTests/WordPressDataTests.swift diff --git a/Tests/KeystoneTests/WordPressUnitTests.xctestplan b/Tests/KeystoneTests/WordPressUnitTests.xctestplan index f61cbd8bffac..a8ac3f5853bc 100644 --- a/Tests/KeystoneTests/WordPressUnitTests.xctestplan +++ b/Tests/KeystoneTests/WordPressUnitTests.xctestplan @@ -34,85 +34,92 @@ { "target" : { "containerPath" : "container:WordPress.xcodeproj", - "identifier" : "4AD953BA2C21451700D0EEFA", - "name" : "WordPressAuthenticatorTests" + "identifier" : "4A8280FC2E5FE9B60037E180", + "name" : "WordPressKitTests" } }, { "target" : { - "containerPath" : "container:..\/Modules", - "identifier" : "DesignSystemTests", - "name" : "DesignSystemTests" + "containerPath" : "container:WordPress.xcodeproj", + "identifier" : "E16AB92914D978240047A2E5", + "name" : "WordPressTest" } }, { "target" : { "containerPath" : "container:..\/Modules", - "identifier" : "WordPressSharedTests", - "name" : "WordPressSharedTests" + "identifier" : "JetpackStatsWidgetsCoreTests", + "name" : "JetpackStatsWidgetsCoreTests" } }, { "target" : { "containerPath" : "container:..\/Modules", - "identifier" : "JetpackStatsWidgetsCoreTests", - "name" : "JetpackStatsWidgetsCoreTests" + "identifier" : "WordPressSharedObjCTests", + "name" : "WordPressSharedObjCTests" } }, { "target" : { - "containerPath" : "container:..\/Modules", - "identifier" : "WordPressCoreTests", - "name" : "WordPressCoreTests" + "containerPath" : "container:", + "identifier" : "WordPressDataTests", + "name" : "WordPressDataTests" } }, { "target" : { "containerPath" : "container:..\/Modules", - "identifier" : "WordPressUIUnitTests", - "name" : "WordPressUIUnitTests" + "identifier" : "WordPressFluxTests", + "name" : "WordPressFluxTests" } }, { "target" : { "containerPath" : "container:WordPress.xcodeproj", - "identifier" : "E16AB92914D978240047A2E5", - "name" : "WordPressTest" + "identifier" : "4AD953BA2C21451700D0EEFA", + "name" : "WordPressAuthenticatorTests" } }, { "target" : { "containerPath" : "container:..\/Modules", - "identifier" : "JetpackStatsTests", - "name" : "JetpackStatsTests" + "identifier" : "WordPressUIUnitTests", + "name" : "WordPressUIUnitTests" } }, { "target" : { "containerPath" : "container:..\/Modules", - "identifier" : "AsyncImageKitTests", - "name" : "AsyncImageKitTests" + "identifier" : "DesignSystemTests", + "name" : "DesignSystemTests" } }, { "target" : { "containerPath" : "container:..\/Modules", - "identifier" : "WordPressSharedObjCTests", - "name" : "WordPressSharedObjCTests" + "identifier" : "JetpackStatsTests", + "name" : "JetpackStatsTests" } }, { "target" : { "containerPath" : "container:..\/Modules", - "identifier" : "WordPressFluxTests", - "name" : "WordPressFluxTests" + "identifier" : "WordPressSharedTests", + "name" : "WordPressSharedTests" } }, { "target" : { - "containerPath" : "container:WordPress.xcodeproj", - "identifier" : "4A8280FC2E5FE9B60037E180", - "name" : "WordPressKitTests" + "containerPath" : "container:..\/Modules", + "identifier" : "WordPressCoreTests", + "name" : "WordPressCoreTests" + } + }, + { + "target" : { + "containerPath" : "container:..\/Modules", + "identifier" : "AsyncImageKitTests", + "name" : "AsyncImageKitTests" } } ], diff --git a/Tests/WordPressDataTests/WordPressDataTests.xctestplan b/Tests/WordPressDataTests/WordPressDataTests.xctestplan deleted file mode 100644 index e9e4cb7b5528..000000000000 --- a/Tests/WordPressDataTests/WordPressDataTests.xctestplan +++ /dev/null @@ -1,24 +0,0 @@ -{ - "configurations" : [ - { - "id" : "4A78A2D0-FB06-481E-B333-C1BA9A78D4FE", - "name" : "Configuration 1", - "options" : { - - } - } - ], - "defaultOptions" : { - "testTimeoutsEnabled" : true - }, - "testTargets" : [ - { - "target" : { - "containerPath" : "container:WordPress.xcodeproj", - "identifier" : "3F7AE0BB2D9B30A200AB4892", - "name" : "WordPressDataTests" - } - } - ], - "version" : 1 -} diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj index dba8648d51e3..ff59cd38f3b3 100644 --- a/WordPress/WordPress.xcodeproj/project.pbxproj +++ b/WordPress/WordPress.xcodeproj/project.pbxproj @@ -44,14 +44,11 @@ 01281E9C2A051EEA00464F8F /* MySiteTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01281E9B2A051EEA00464F8F /* MySiteTests.swift */; }; 01281E9D2A051EEA00464F8F /* MySiteTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01281E9B2A051EEA00464F8F /* MySiteTests.swift */; }; 099D768327D14B8E00F77EDE /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 099D768127D14B8E00F77EDE /* InfoPlist.strings */; }; - 0C128FEA2D9ECE6200C69EBA /* WordPressData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F7AE0B52D9B30A100AB4892 /* WordPressData.framework */; }; 0C2155A62C39A24D00EFE2C0 /* XcodeTarget_UITests in Frameworks */ = {isa = PBXBuildFile; productRef = 0C2155A52C39A24D00EFE2C0 /* XcodeTarget_UITests */; }; 0C2155A82C39A25400EFE2C0 /* XcodeTarget_UITests in Frameworks */ = {isa = PBXBuildFile; productRef = 0C2155A72C39A25400EFE2C0 /* XcodeTarget_UITests */; }; 0C235BD22C3862D400D0E163 /* XcodeTarget_WordPressTests in Frameworks */ = {isa = PBXBuildFile; productRef = 0C235BD12C3862D400D0E163 /* XcodeTarget_WordPressTests */; }; 0C28A01C2DAD7CFD00F81F20 /* XcodeTarget_App in Frameworks */ = {isa = PBXBuildFile; productRef = 0C28A01B2DAD7CFD00F81F20 /* XcodeTarget_App */; }; 0C28A0222DAD7EF600F81F20 /* XcodeTarget_Keystone in Frameworks */ = {isa = PBXBuildFile; productRef = 0C28A0212DAD7EF600F81F20 /* XcodeTarget_Keystone */; }; - 0C28C6392DAD830F00F81F20 /* WordPressData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F7AE0B52D9B30A100AB4892 /* WordPressData.framework */; }; - 0C28C63A2DAD830F00F81F20 /* WordPressData.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3F7AE0B52D9B30A100AB4892 /* WordPressData.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 0C3858202CA74DC7004880ED /* AppSettingsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C38581F2CA74DC7004880ED /* AppSettingsTests.swift */; }; 0C3858212CA74DC7004880ED /* AppSettingsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C38581F2CA74DC7004880ED /* AppSettingsTests.swift */; }; 0C4CE8492C2F418000B9EEAC /* AppImages.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 433840C622C2BA5B00CB13F8 /* AppImages.xcassets */; }; @@ -90,8 +87,6 @@ 0CCA995E2DAD76E00048F0A9 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = E1D91454134A853D0089019C /* Localizable.strings */; }; 0CECA92B2E043CEC00F4EE83 /* XcodeTarget_App in Frameworks */ = {isa = PBXBuildFile; productRef = 0CECA92A2E043CEC00F4EE83 /* XcodeTarget_App */; }; 0CECA92D2E043D0200F4EE83 /* XcodeTarget_App in Frameworks */ = {isa = PBXBuildFile; productRef = 0CECA92C2E043D0200F4EE83 /* XcodeTarget_App */; }; - 0CECA92E2E043D2800F4EE83 /* WordPressData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F7AE0B52D9B30A100AB4892 /* WordPressData.framework */; }; - 0CECA92F2E043D2800F4EE83 /* WordPressData.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3F7AE0B52D9B30A100AB4892 /* WordPressData.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 0CECA9332E043D3700F4EE83 /* WordPressAuthenticator.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4AD953B42C21451700D0EEFA /* WordPressAuthenticator.framework */; }; 0CECA9342E043D3700F4EE83 /* WordPressAuthenticator.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4AD953B42C21451700D0EEFA /* WordPressAuthenticator.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 0CED2AD92D95BB46003015CF /* Gutenberg.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F60D3902D2C4BA3008ACD86 /* Gutenberg.xcframework */; }; @@ -108,11 +103,6 @@ 24E55D4F2CC9A5CD008D071D /* ImagePlayground.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 24E55D4D2CC9A5C8008D071D /* ImagePlayground.framework */; }; 296890780FE971DC00770264 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 296890770FE971DC00770264 /* Security.framework */; }; 374CB16215B93C0800DD0EBC /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 374CB16115B93C0800DD0EBC /* AudioToolbox.framework */; }; - 3F0F25A62D9BDB5800CD05D6 /* XcodeTarget_WordPressData in Frameworks */ = {isa = PBXBuildFile; productRef = 3F0F25A52D9BDB5800CD05D6 /* XcodeTarget_WordPressData */; }; - 3F0FD9FC2D9B92F700CD05D6 /* WordPressData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F7AE0B52D9B30A100AB4892 /* WordPressData.framework */; }; - 3F0FD9FD2D9B92F700CD05D6 /* WordPressData.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3F7AE0B52D9B30A100AB4892 /* WordPressData.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 3F0FDA002D9B930100CD05D6 /* WordPressData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F7AE0B52D9B30A100AB4892 /* WordPressData.framework */; }; - 3F0FDA012D9B930100CD05D6 /* WordPressData.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3F7AE0B52D9B30A100AB4892 /* WordPressData.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 3F1A64F62DA7A4B300786B92 /* Secrets.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24351253264DCA08009BB2B6 /* Secrets.swift */; }; 3F1AFCC22DA3AAEA00786B92 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F1AFCC12DA3AAE900786B92 /* WebKit.framework */; }; 3F2F856326FAF612000FCDA5 /* EditorGutenbergTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC2BB0CF228ACF710034F9AB /* EditorGutenbergTests.swift */; }; @@ -137,9 +127,6 @@ 3F60D39B2D2C4BA4008ACD86 /* hermes.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3F60D3922D2C4BA3008ACD86 /* hermes.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 3F60D39C2D2C4BA4008ACD86 /* yoga.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F60D3932D2C4BA4008ACD86 /* yoga.xcframework */; }; 3F60D39D2D2C4BA4008ACD86 /* yoga.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3F60D3932D2C4BA4008ACD86 /* yoga.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 3F7874622DA360840052F1BF /* WordPressData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F7AE0B52D9B30A100AB4892 /* WordPressData.framework */; }; - 3F7AE0BD2D9B30A200AB4892 /* WordPressData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F7AE0B52D9B30A100AB4892 /* WordPressData.framework */; }; - 3F7AE0E12D9B30A200AB4892 /* XcodeTarget_WordPressDataTests in Frameworks */ = {isa = PBXBuildFile; productRef = 3F7AE0E02D9B30A200AB4892 /* XcodeTarget_WordPressDataTests */; }; 433840C722C2BA5B00CB13F8 /* AppImages.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 433840C622C2BA5B00CB13F8 /* AppImages.xcassets */; }; 433840C822C2BA6300CB13F8 /* AppImages.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 433840C622C2BA5B00CB13F8 /* AppImages.xcassets */; }; 433840C922C2BA6400CB13F8 /* AppImages.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 433840C622C2BA5B00CB13F8 /* AppImages.xcassets */; }; @@ -319,20 +306,6 @@ remoteGlobalIDString = 0107E13828FE9DB200DE87DB; remoteInfo = JetpackIntents; }; - 0C128FEC2D9ECE6200C69EBA /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; - proxyType = 1; - remoteGlobalIDString = 3F7AE0B42D9B30A100AB4892; - remoteInfo = WordPressData; - }; - 0C28C63B2DAD830F00F81F20 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; - proxyType = 1; - remoteGlobalIDString = 3F7AE0B42D9B30A100AB4892; - remoteInfo = WordPressData; - }; 0C3313C42E0439A9000C3760 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; @@ -354,13 +327,6 @@ remoteGlobalIDString = 4AD953B32C21451700D0EEFA; remoteInfo = WordPressAuthenticator; }; - 0CECA9302E043D2800F4EE83 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; - proxyType = 1; - remoteGlobalIDString = 3F7AE0B42D9B30A100AB4892; - remoteInfo = WordPressData; - }; 0CECA9352E043D3700F4EE83 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; @@ -375,20 +341,6 @@ remoteGlobalIDString = 4AD953B32C21451700D0EEFA; remoteInfo = WordPressAuthenticator; }; - 3F0FD9FE2D9B92F700CD05D6 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; - proxyType = 1; - remoteGlobalIDString = 3F7AE0B42D9B30A100AB4892; - remoteInfo = WordPressData; - }; - 3F0FDA022D9B930100CD05D6 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; - proxyType = 1; - remoteGlobalIDString = 3F7AE0B42D9B30A100AB4892; - remoteInfo = WordPressData; - }; 3F47AC4F2A72074300208F0D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; @@ -403,13 +355,6 @@ remoteGlobalIDString = 3F47AC482A7206BE00208F0D; remoteInfo = ConfigureSimulatorForUITesting; }; - 3F7AE0BE2D9B30A200AB4892 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; - proxyType = 1; - remoteGlobalIDString = 3F7AE0B42D9B30A100AB4892; - remoteInfo = WordPressData; - }; 3FCFFAFD2994A949002840C9 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; @@ -564,7 +509,6 @@ 0C5A8A772D9B22F100C25301 /* hermes.xcframework in Embed Frameworks */, 0C5A8A852D9B22F100C25301 /* yoga.xcframework in Embed Frameworks */, 0C5A8A7D2D9B22F100C25301 /* React.xcframework in Embed Frameworks */, - 0C28C63A2DAD830F00F81F20 /* WordPressData.framework in Embed Frameworks */, 0C5A8A7F2D9B22F100C25301 /* RNTAztecView.xcframework in Embed Frameworks */, ); name = "Embed Frameworks"; @@ -657,7 +601,6 @@ dstSubfolderSpec = 10; files = ( 0CECA9342E043D3700F4EE83 /* WordPressAuthenticator.framework in Embed Frameworks */, - 0CECA92F2E043D2800F4EE83 /* WordPressData.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -683,7 +626,6 @@ 3F60D3992D2C4BA4008ACD86 /* RNTAztecView.xcframework in Embed Frameworks */, 4AD953C82C21451700D0EEFA /* WordPressAuthenticator.framework in Embed Frameworks */, 3F60D3952D2C4BA4008ACD86 /* React.xcframework in Embed Frameworks */, - 3F0FD9FD2D9B92F700CD05D6 /* WordPressData.framework in Embed Frameworks */, 3F60D39B2D2C4BA4008ACD86 /* hermes.xcframework in Embed Frameworks */, 3F60D39D2D2C4BA4008ACD86 /* yoga.xcframework in Embed Frameworks */, ); @@ -700,7 +642,6 @@ 3F608F822D2D1A9E008ACD86 /* hermes.xcframework in Embed Frameworks */, 3F608F802D2D1A9E008ACD86 /* Gutenberg.xcframework in Embed Frameworks */, 3F608F842D2D1A9E008ACD86 /* React.xcframework in Embed Frameworks */, - 3F0FDA012D9B930100CD05D6 /* WordPressData.framework in Embed Frameworks */, 3F608F862D2D1A9E008ACD86 /* RNTAztecView.xcframework in Embed Frameworks */, 3F608F882D2D1A9E008ACD86 /* yoga.xcframework in Embed Frameworks */, ); @@ -852,8 +793,6 @@ 3F60D3912D2C4BA3008ACD86 /* RNTAztecView.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = RNTAztecView.xcframework; path = Frameworks/RNTAztecView.xcframework; sourceTree = ""; }; 3F60D3922D2C4BA3008ACD86 /* hermes.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = hermes.xcframework; path = Frameworks/hermes.xcframework; sourceTree = ""; }; 3F60D3932D2C4BA4008ACD86 /* yoga.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = yoga.xcframework; path = Frameworks/yoga.xcframework; sourceTree = ""; }; - 3F7AE0B52D9B30A100AB4892 /* WordPressData.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WordPressData.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 3F7AE0BC2D9B30A200AB4892 /* WordPressDataTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = WordPressDataTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 3F9DD3F62CC214BF00DF1760 /* Common.debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Common.debug.xcconfig; sourceTree = ""; }; 3F9DD3F72CC2188400DF1760 /* Common.alpha.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Common.alpha.xcconfig; sourceTree = ""; }; 3FA640652670CEFE0064401E /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Platforms/iPhoneOS.platform/Developer/Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; @@ -1335,16 +1274,6 @@ path = Classes; sourceTree = ""; }; - 3F7AE0B62D9B30A100AB4892 /* WordPressData */ = { - isa = PBXFileSystemSynchronizedRootGroup; - path = WordPressData; - sourceTree = ""; - }; - 3F7AE0C22D9B30A200AB4892 /* WordPressDataTests */ = { - isa = PBXFileSystemSynchronizedRootGroup; - path = WordPressDataTests; - sourceTree = ""; - }; 4A8280FE2E5FE9B60037E180 /* WordPressKitTests */ = { isa = PBXFileSystemSynchronizedRootGroup; exceptions = ( @@ -1378,7 +1307,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 0CECA92E2E043D2800F4EE83 /* WordPressData.framework in Frameworks */, 0CECA92B2E043CEC00F4EE83 /* XcodeTarget_App in Frameworks */, 0CECA9332E043D3700F4EE83 /* WordPressAuthenticator.framework in Frameworks */, ); @@ -1403,7 +1331,6 @@ 0C5A8A762D9B22F100C25301 /* hermes.xcframework in Frameworks */, 0C5A8A842D9B22F100C25301 /* yoga.xcframework in Frameworks */, 0C5A8A7C2D9B22F100C25301 /* React.xcframework in Frameworks */, - 0C28C6392DAD830F00F81F20 /* WordPressData.framework in Frameworks */, 0C5A8A7E2D9B22F100C25301 /* RNTAztecView.xcframework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1418,7 +1345,6 @@ 0CED2AE52D95BB46003015CF /* yoga.xcframework in Frameworks */, 3F1AFCC22DA3AAEA00786B92 /* WebKit.framework in Frameworks */, 0CED2ADD2D95BB46003015CF /* React.xcframework in Frameworks */, - 0C128FEA2D9ECE6200C69EBA /* WordPressData.framework in Frameworks */, 0CED2ADF2D95BB46003015CF /* RNTAztecView.xcframework in Frameworks */, 0C28A0222DAD7EF600F81F20 /* XcodeTarget_Keystone in Frameworks */, ); @@ -1450,7 +1376,6 @@ E10B3652158F2D3F00419A93 /* QuartzCore.framework in Frameworks */, 3F60D3942D2C4BA4008ACD86 /* React.xcframework in Frameworks */, 3F60D3982D2C4BA4008ACD86 /* RNTAztecView.xcframework in Frameworks */, - 3F0FD9FC2D9B92F700CD05D6 /* WordPressData.framework in Frameworks */, E1A386CB14DB063800954CF8 /* MediaPlayer.framework in Frameworks */, E1A386CA14DB05F700954CF8 /* CoreMedia.framework in Frameworks */, 3F60D3962D2C4BA4008ACD86 /* Gutenberg.xcframework in Frameworks */, @@ -1469,23 +1394,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 3F7AE0B22D9B30A100AB4892 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 3F0F25A62D9BDB5800CD05D6 /* XcodeTarget_WordPressData in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 3F7AE0B92D9B30A200AB4892 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 3F7AE0BD2D9B30A200AB4892 /* WordPressData.framework in Frameworks */, - 3F7AE0E12D9B30A200AB4892 /* XcodeTarget_WordPressDataTests in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 4A8280FA2E5FE9B60037E180 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -1571,7 +1479,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 3F7874622DA360840052F1BF /* WordPressData.framework in Frameworks */, 0C235BD22C3862D400D0E163 /* XcodeTarget_WordPressTests in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1615,7 +1522,6 @@ FABB26322602FC2C00C8785C /* Security.framework in Frameworks */, FABB26332602FC2C00C8785C /* MapKit.framework in Frameworks */, FABB26342602FC2C00C8785C /* CoreLocation.framework in Frameworks */, - 3F0FDA002D9B930100CD05D6 /* WordPressData.framework in Frameworks */, 0C6AC61C2C364A6600BF7600 /* XcodeTarget_App in Frameworks */, FABB26362602FC2C00C8785C /* CoreData.framework in Frameworks */, FABB26372602FC2C00C8785C /* CFNetwork.framework in Frameworks */, @@ -1663,7 +1569,6 @@ 0C73A9BD2DAEDFDE00CC0F3A /* KeystoneTests */, 0C3313C62E0439A9000C3760 /* MiniatureTests */, 0C5A1A042D9B080900C25301 /* WordPressAuthenticatorTests */, - 3F7AE0C22D9B30A200AB4892 /* WordPressDataTests */, 4A8280FE2E5FE9B60037E180 /* WordPressKitTests */, ); name = Tests; @@ -1679,7 +1584,6 @@ 0C5C46FE2D98397A00F2CD55 /* Keystone */, 0C3313B82E0439A8000C3760 /* Miniature */, 0C238F782D9ADF0200981631 /* WordPressAuthenticator */, - 3F7AE0B62D9B30A100AB4892 /* WordPressData */, 0C3E79892DB164B3000C7072 /* JetpackStatsWidgets */, ); name = Sources; @@ -1708,8 +1612,6 @@ 4AD953BB2C21451700D0EEFA /* WordPressAuthenticatorTests.xctest */, 0CED01702D95B897003015CF /* WordPress.framework */, 0C5A3F8C2D9B1E3700C25301 /* Reader.app */, - 3F7AE0B52D9B30A100AB4892 /* WordPressData.framework */, - 3F7AE0BC2D9B30A200AB4892 /* WordPressDataTests.xctest */, 0C3313B72E0439A8000C3760 /* Miniature.app */, 0C3313C32E0439A9000C3760 /* MiniatureTests.xctest */, 4A8280FD2E5FE9B60037E180 /* WordPressKitTests.xctest */, @@ -2136,13 +2038,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 3F7AE0B02D9B30A100AB4892 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 4AD953AF2C21451700D0EEFA /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -2212,7 +2107,6 @@ buildRules = ( ); dependencies = ( - 0CECA9312E043D2800F4EE83 /* PBXTargetDependency */, 0CECA9362E043D3700F4EE83 /* PBXTargetDependency */, ); fileSystemSynchronizedGroups = ( @@ -2265,7 +2159,6 @@ dependencies = ( 0C5A8A7B2D9B22F100C25301 /* PBXTargetDependency */, 0C5A8A832D9B22F100C25301 /* PBXTargetDependency */, - 0C28C63C2DAD830F00F81F20 /* PBXTargetDependency */, ); fileSystemSynchronizedGroups = ( 0C5A3FAB2D9B1EF400C25301 /* Reader */, @@ -2293,7 +2186,6 @@ ); dependencies = ( 0CED2AE42D95BB46003015CF /* PBXTargetDependency */, - 0C128FED2D9ECE6200C69EBA /* PBXTargetDependency */, ); fileSystemSynchronizedGroups = ( 0C5C46FE2D98397A00F2CD55 /* Keystone */, @@ -2329,7 +2221,6 @@ 7457667B202B558C00F42E40 /* PBXTargetDependency */, 7358E6BE210BD318002323EB /* PBXTargetDependency */, 4AD953C62C21451700D0EEFA /* PBXTargetDependency */, - 3F0FD9FF2D9B92F700CD05D6 /* PBXTargetDependency */, ); fileSystemSynchronizedGroups = ( 0C3C98902DA04EF9009F3BFB /* WordPress */, @@ -2345,54 +2236,6 @@ productReference = 1D6058910D05DD3D006BFB54 /* WordPress.app */; productType = "com.apple.product-type.application"; }; - 3F7AE0B42D9B30A100AB4892 /* WordPressData */ = { - isa = PBXNativeTarget; - buildConfigurationList = 3F7AE0D12D9B30A200AB4892 /* Build configuration list for PBXNativeTarget "WordPressData" */; - buildPhases = ( - 3F7AE0B02D9B30A100AB4892 /* Headers */, - 3F7AE0B12D9B30A100AB4892 /* Sources */, - 3F7AE0B22D9B30A100AB4892 /* Frameworks */, - 3F7AE0B32D9B30A100AB4892 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - fileSystemSynchronizedGroups = ( - 3F7AE0B62D9B30A100AB4892 /* WordPressData */, - ); - name = WordPressData; - packageProductDependencies = ( - 3F0F25A52D9BDB5800CD05D6 /* XcodeTarget_WordPressData */, - ); - productName = WordPressData; - productReference = 3F7AE0B52D9B30A100AB4892 /* WordPressData.framework */; - productType = "com.apple.product-type.framework"; - }; - 3F7AE0BB2D9B30A200AB4892 /* WordPressDataTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 3F7AE0D22D9B30A200AB4892 /* Build configuration list for PBXNativeTarget "WordPressDataTests" */; - buildPhases = ( - 3F7AE0B82D9B30A200AB4892 /* Sources */, - 3F7AE0B92D9B30A200AB4892 /* Frameworks */, - 3F7AE0BA2D9B30A200AB4892 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 3F7AE0BF2D9B30A200AB4892 /* PBXTargetDependency */, - ); - fileSystemSynchronizedGroups = ( - 3F7AE0C22D9B30A200AB4892 /* WordPressDataTests */, - ); - name = WordPressDataTests; - packageProductDependencies = ( - 3F7AE0E02D9B30A200AB4892 /* XcodeTarget_WordPressDataTests */, - ); - productName = WordPressDataTests; - productReference = 3F7AE0BC2D9B30A200AB4892 /* WordPressDataTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; 4A8280FC2E5FE9B60037E180 /* WordPressKitTests */ = { isa = PBXNativeTarget; buildConfigurationList = 4A8281062E5FE9B70037E180 /* Build configuration list for PBXNativeTarget "WordPressKitTests" */; @@ -2700,7 +2543,6 @@ 8096219028E55F8600940A5D /* PBXTargetDependency */, 80F6D05F28EE88FC00953C1A /* PBXTargetDependency */, 4AD9555D2C21716A00D0EEFA /* PBXTargetDependency */, - 3F0FDA032D9B930100CD05D6 /* PBXTargetDependency */, ); fileSystemSynchronizedGroups = ( 0C3C988F2DA04EEF009F3BFB /* Jetpack */, @@ -2803,13 +2645,6 @@ 3F47AC482A7206BE00208F0D = { CreatedOnToolsVersion = 14.3.1; }; - 3F7AE0B42D9B30A100AB4892 = { - CreatedOnToolsVersion = 16.2; - LastSwiftMigration = 1620; - }; - 3F7AE0BB2D9B30A200AB4892 = { - CreatedOnToolsVersion = 16.2; - }; 4A8280FC2E5FE9B60037E180 = { CreatedOnToolsVersion = 16.4; TestTargetID = 1D6058900D05DD3D006BFB54; @@ -2955,8 +2790,6 @@ 4AD953B32C21451700D0EEFA /* WordPressAuthenticator */, 4AD953BA2C21451700D0EEFA /* WordPressAuthenticatorTests */, 0CED016F2D95B897003015CF /* Keystone */, - 3F7AE0B42D9B30A100AB4892 /* WordPressData */, - 3F7AE0BB2D9B30A200AB4892 /* WordPressDataTests */, 0C3313B62E0439A8000C3760 /* Miniature */, 0C3313C22E0439A9000C3760 /* MiniatureTests */, 4A8280FC2E5FE9B60037E180 /* WordPressKitTests */, @@ -3029,20 +2862,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 3F7AE0B32D9B30A100AB4892 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 3F7AE0BA2D9B30A200AB4892 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 4A8280FB2E5FE9B60037E180 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -3614,20 +3433,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 3F7AE0B12D9B30A100AB4892 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 3F7AE0B82D9B30A200AB4892 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 4A8280F92E5FE9B60037E180 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -3814,16 +3619,6 @@ target = 0107E13828FE9DB200DE87DB /* JetpackIntents */; targetProxy = 0107E15628FEA03800DE87DB /* PBXContainerItemProxy */; }; - 0C128FED2D9ECE6200C69EBA /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 3F7AE0B42D9B30A100AB4892 /* WordPressData */; - targetProxy = 0C128FEC2D9ECE6200C69EBA /* PBXContainerItemProxy */; - }; - 0C28C63C2DAD830F00F81F20 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 3F7AE0B42D9B30A100AB4892 /* WordPressData */; - targetProxy = 0C28C63B2DAD830F00F81F20 /* PBXContainerItemProxy */; - }; 0C3313C52E0439A9000C3760 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 0C3313B62E0439A8000C3760 /* Miniature */; @@ -3839,11 +3634,6 @@ target = 4AD953B32C21451700D0EEFA /* WordPressAuthenticator */; targetProxy = 0C5A8A822D9B22F100C25301 /* PBXContainerItemProxy */; }; - 0CECA9312E043D2800F4EE83 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 3F7AE0B42D9B30A100AB4892 /* WordPressData */; - targetProxy = 0CECA9302E043D2800F4EE83 /* PBXContainerItemProxy */; - }; 0CECA9362E043D3700F4EE83 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 4AD953B32C21451700D0EEFA /* WordPressAuthenticator */; @@ -3854,16 +3644,6 @@ target = 4AD953B32C21451700D0EEFA /* WordPressAuthenticator */; targetProxy = 0CED2AE32D95BB46003015CF /* PBXContainerItemProxy */; }; - 3F0FD9FF2D9B92F700CD05D6 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 3F7AE0B42D9B30A100AB4892 /* WordPressData */; - targetProxy = 3F0FD9FE2D9B92F700CD05D6 /* PBXContainerItemProxy */; - }; - 3F0FDA032D9B930100CD05D6 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 3F7AE0B42D9B30A100AB4892 /* WordPressData */; - targetProxy = 3F0FDA022D9B930100CD05D6 /* PBXContainerItemProxy */; - }; 3F47AC502A72074300208F0D /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 3F47AC482A7206BE00208F0D /* ConfigureSimulatorForUITesting */; @@ -3874,11 +3654,6 @@ target = 3F47AC482A7206BE00208F0D /* ConfigureSimulatorForUITesting */; targetProxy = 3F47AC512A72074800208F0D /* PBXContainerItemProxy */; }; - 3F7AE0BF2D9B30A200AB4892 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 3F7AE0B42D9B30A100AB4892 /* WordPressData */; - targetProxy = 3F7AE0BE2D9B30A200AB4892 /* PBXContainerItemProxy */; - }; 3FCFFAFE2994A949002840C9 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = FFA8E22A1F94E3DE0002170F /* SwiftLint */; @@ -5129,311 +4904,6 @@ }; name = "Release-Alpha"; }; - 3F7AE0CA2D9B30A200AB4892 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 3F9DD3F62CC214BF00DF1760 /* Common.debug.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_IDENTITY = ""; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_USER_SCRIPT_SANDBOXING = YES; - GCC_C_LANGUAGE_STANDARD = gnu17; - GCC_DYNAMIC_NO_PIC = NO; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_TREAT_WARNINGS_AS_ERRORS = NO; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GENERATE_INFOPLIST_FILE = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(BUILT_PRODUCTS_DIR)/$(PRODUCT_NAME).framework/Headers", - ); - INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2025 WordPress. All rights reserved."; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MARKETING_VERSION = 1.0; - MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; - MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20"; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.automattic.WordPressData; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_INSTALL_OBJC_HEADER = YES; - SWIFT_TREAT_WARNINGS_AS_ERRORS = NO; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - WARNING_CFLAGS = ( - "$(inherited)", - "-Wno-quoted-include-in-framework-header", - ); - }; - name = Debug; - }; - 3F7AE0CB2D9B30A200AB4892 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 0C96AC202D92FC17000779B8 /* Common.release.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_IDENTITY = ""; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_USER_SCRIPT_SANDBOXING = YES; - GCC_C_LANGUAGE_STANDARD = gnu17; - GCC_TREAT_WARNINGS_AS_ERRORS = NO; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GENERATE_INFOPLIST_FILE = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(BUILT_PRODUCTS_DIR)/$(PRODUCT_NAME).framework/Headers", - ); - INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2025 WordPress. All rights reserved."; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MARKETING_VERSION = 1.0; - MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; - MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20"; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.automattic.WordPressData; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SKIP_INSTALL = YES; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_INSTALL_OBJC_HEADER = YES; - SWIFT_TREAT_WARNINGS_AS_ERRORS = NO; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - WARNING_CFLAGS = ( - "$(inherited)", - "-Wno-quoted-include-in-framework-header", - ); - }; - name = Release; - }; - 3F7AE0CC2D9B30A200AB4892 /* Release-Alpha */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 3F9DD3F72CC2188400DF1760 /* Common.alpha.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_IDENTITY = ""; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_USER_SCRIPT_SANDBOXING = YES; - GCC_C_LANGUAGE_STANDARD = gnu17; - GCC_TREAT_WARNINGS_AS_ERRORS = NO; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GENERATE_INFOPLIST_FILE = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(BUILT_PRODUCTS_DIR)/$(PRODUCT_NAME).framework/Headers", - ); - INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2025 WordPress. All rights reserved."; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MARKETING_VERSION = 1.0; - MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; - MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20"; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.automattic.WordPressData; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SKIP_INSTALL = YES; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_INSTALL_OBJC_HEADER = YES; - SWIFT_TREAT_WARNINGS_AS_ERRORS = NO; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - WARNING_CFLAGS = ( - "$(inherited)", - "-Wno-quoted-include-in-framework-header", - ); - }; - name = "Release-Alpha"; - }; - 3F7AE0CD2D9B30A200AB4892 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 3F9DD3F62CC214BF00DF1760 /* Common.debug.xcconfig */; - buildSettings = { - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_STYLE = Automatic; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - GCC_C_LANGUAGE_STANDARD = gnu17; - GCC_DYNAMIC_NO_PIC = NO; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GENERATE_INFOPLIST_FILE = YES; - LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MARKETING_VERSION = 1.0; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.automattic.WordPressDataTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; - SWIFT_EMIT_LOC_STRINGS = NO; - SWIFT_TREAT_WARNINGS_AS_ERRORS = NO; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 3F7AE0CE2D9B30A200AB4892 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 0C96AC202D92FC17000779B8 /* Common.release.xcconfig */; - buildSettings = { - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_IDENTITY = "Apple Distribution: Automattic, Inc. (PZYM8XX95Q)"; - CODE_SIGN_STYLE = Automatic; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - ENABLE_NS_ASSERTIONS = NO; - GCC_C_LANGUAGE_STANDARD = gnu17; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GENERATE_INFOPLIST_FILE = YES; - LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MARKETING_VERSION = 1.0; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.automattic.WordPressDataTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_EMIT_LOC_STRINGS = NO; - SWIFT_TREAT_WARNINGS_AS_ERRORS = NO; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; - 3F7AE0CF2D9B30A200AB4892 /* Release-Alpha */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 3F9DD3F72CC2188400DF1760 /* Common.alpha.xcconfig */; - buildSettings = { - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_IDENTITY = "iPhone Distribution: Automattic, Inc."; - CODE_SIGN_STYLE = Automatic; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - ENABLE_NS_ASSERTIONS = NO; - GCC_C_LANGUAGE_STANDARD = gnu17; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GENERATE_INFOPLIST_FILE = YES; - LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MARKETING_VERSION = 1.0; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.automattic.WordPressDataTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_EMIT_LOC_STRINGS = NO; - SWIFT_TREAT_WARNINGS_AS_ERRORS = NO; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = "Release-Alpha"; - }; 4A8281032E5FE9B60037E180 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = F14B5F70208E648200439554 /* WordPress.debug.xcconfig */; @@ -7768,26 +7238,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 3F7AE0D12D9B30A200AB4892 /* Build configuration list for PBXNativeTarget "WordPressData" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 3F7AE0CA2D9B30A200AB4892 /* Debug */, - 3F7AE0CB2D9B30A200AB4892 /* Release */, - 3F7AE0CC2D9B30A200AB4892 /* Release-Alpha */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 3F7AE0D22D9B30A200AB4892 /* Build configuration list for PBXNativeTarget "WordPressDataTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 3F7AE0CD2D9B30A200AB4892 /* Debug */, - 3F7AE0CE2D9B30A200AB4892 /* Release */, - 3F7AE0CF2D9B30A200AB4892 /* Release-Alpha */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 4A8281062E5FE9B70037E180 /* Build configuration list for PBXNativeTarget "WordPressKitTests" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -8045,14 +7495,6 @@ isa = XCSwiftPackageProductDependency; productName = XcodeTarget_WordPressAuthentificatorTests; }; - 3F0F25A52D9BDB5800CD05D6 /* XcodeTarget_WordPressData */ = { - isa = XCSwiftPackageProductDependency; - productName = XcodeTarget_WordPressData; - }; - 3F7AE0E02D9B30A200AB4892 /* XcodeTarget_WordPressDataTests */ = { - isa = XCSwiftPackageProductDependency; - productName = XcodeTarget_WordPressDataTests; - }; 4A8284AF2E5FECB00037E180 /* XcodeTarget_WordPressKitTests */ = { isa = XCSwiftPackageProductDependency; productName = XcodeTarget_WordPressKitTests; diff --git a/WordPress/WordPress.xcodeproj/xcshareddata/xcschemes/WordPressData.xcscheme b/WordPress/WordPress.xcodeproj/xcshareddata/xcschemes/WordPressData.xcscheme deleted file mode 100644 index bec5735c0283..000000000000 --- a/WordPress/WordPress.xcodeproj/xcshareddata/xcschemes/WordPressData.xcscheme +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - -