diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index a5fc22788d..a4ff4758e8 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -23,6 +23,8 @@ BitwardenActionExtension @bitwarden/team-platform-dev BitwardenShareExtension @bitwarden/team-platform-dev BitwardenShared/Core/Platform @bitwarden/team-platform-dev BitwardenShared/UI/Platform @bitwarden/team-platform-dev +GlobalTestHelpers @bitwarden/team-platform-dev +Networking @bitwarden/team-platform-dev # Tools BitwardenShared/Core/Tools @bitwarden/team-tools-dev diff --git a/.swiftlint.yml b/.swiftlint.yml index 4f93d46059..4dc9b206bb 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -37,7 +37,7 @@ opt_in_rules: - yoda_condition excluded: - - BitwardenShared/Application/Support/Generated + - BitwardenShared/UI/Platform/Application/Support/Generated cyclomatic_complexity: ignores_case_statements: true diff --git a/BitwardenShared/Core/Services/Auth/API/AccountAPIService.swift b/BitwardenShared/Core/Auth/Services/API/AccountAPIService.swift similarity index 100% rename from BitwardenShared/Core/Services/Auth/API/AccountAPIService.swift rename to BitwardenShared/Core/Auth/Services/API/AccountAPIService.swift diff --git a/BitwardenShared/Core/Services/Auth/API/AuditAPIService.swift b/BitwardenShared/Core/Auth/Services/API/AuditAPIService.swift similarity index 100% rename from BitwardenShared/Core/Services/Auth/API/AuditAPIService.swift rename to BitwardenShared/Core/Auth/Services/API/AuditAPIService.swift diff --git a/BitwardenShared/Core/Services/Auth/API/AuthAPIService.swift b/BitwardenShared/Core/Auth/Services/API/AuthAPIService.swift similarity index 100% rename from BitwardenShared/Core/Services/Auth/API/AuthAPIService.swift rename to BitwardenShared/Core/Auth/Services/API/AuthAPIService.swift diff --git a/BitwardenShared/Core/Services/Auth/API/DeviceAPIService.swift b/BitwardenShared/Core/Auth/Services/API/DeviceAPIService.swift similarity index 100% rename from BitwardenShared/Core/Services/Auth/API/DeviceAPIService.swift rename to BitwardenShared/Core/Auth/Services/API/DeviceAPIService.swift diff --git a/BitwardenShared/Core/Services/Auth/API/OrganizationAPIService.swift b/BitwardenShared/Core/Auth/Services/API/OrganizationAPIService.swift similarity index 100% rename from BitwardenShared/Core/Services/Auth/API/OrganizationAPIService.swift rename to BitwardenShared/Core/Auth/Services/API/OrganizationAPIService.swift diff --git a/BitwardenShared/Core/Services/Auth/API/OrganizationUserAPIService.swift b/BitwardenShared/Core/Auth/Services/API/OrganizationUserAPIService.swift similarity index 100% rename from BitwardenShared/Core/Services/Auth/API/OrganizationUserAPIService.swift rename to BitwardenShared/Core/Auth/Services/API/OrganizationUserAPIService.swift diff --git a/BitwardenShared/Core/Services/Auth/API/PasswordlessLoginAPIService.swift b/BitwardenShared/Core/Auth/Services/API/PasswordlessLoginAPIService.swift similarity index 100% rename from BitwardenShared/Core/Services/Auth/API/PasswordlessLoginAPIService.swift rename to BitwardenShared/Core/Auth/Services/API/PasswordlessLoginAPIService.swift diff --git a/BitwardenShared/Core/Services/Auth/API/TwoFactorAPIService.swift b/BitwardenShared/Core/Auth/Services/API/TwoFactorAPIService.swift similarity index 100% rename from BitwardenShared/Core/Services/Auth/API/TwoFactorAPIService.swift rename to BitwardenShared/Core/Auth/Services/API/TwoFactorAPIService.swift diff --git a/BitwardenShared/Core/Services/Platform/API/APIService.swift b/BitwardenShared/Core/Platform/Services/API/APIService.swift similarity index 100% rename from BitwardenShared/Core/Services/Platform/API/APIService.swift rename to BitwardenShared/Core/Platform/Services/API/APIService.swift diff --git a/BitwardenShared/Core/Services/Platform/API/APIServiceTests.swift b/BitwardenShared/Core/Platform/Services/API/APIServiceTests.swift similarity index 100% rename from BitwardenShared/Core/Services/Platform/API/APIServiceTests.swift rename to BitwardenShared/Core/Platform/Services/API/APIServiceTests.swift diff --git a/BitwardenShared/Core/Services/Platform/API/ConfigAPIService.swift b/BitwardenShared/Core/Platform/Services/API/ConfigAPIService.swift similarity index 100% rename from BitwardenShared/Core/Services/Platform/API/ConfigAPIService.swift rename to BitwardenShared/Core/Platform/Services/API/ConfigAPIService.swift diff --git a/BitwardenShared/Core/Services/Platform/API/EventAPIService.swift b/BitwardenShared/Core/Platform/Services/API/EventAPIService.swift similarity index 100% rename from BitwardenShared/Core/Services/Platform/API/EventAPIService.swift rename to BitwardenShared/Core/Platform/Services/API/EventAPIService.swift diff --git a/BitwardenShared/Core/Services/Platform/API/TestHelpers/APITestData.swift b/BitwardenShared/Core/Platform/Services/API/TestHelpers/APITestData.swift similarity index 100% rename from BitwardenShared/Core/Services/Platform/API/TestHelpers/APITestData.swift rename to BitwardenShared/Core/Platform/Services/API/TestHelpers/APITestData.swift diff --git a/BitwardenShared/Core/Services/Platform/API/TestHelpers/MockHTTPClient.swift b/BitwardenShared/Core/Platform/Services/API/TestHelpers/MockHTTPClient.swift similarity index 100% rename from BitwardenShared/Core/Services/Platform/API/TestHelpers/MockHTTPClient.swift rename to BitwardenShared/Core/Platform/Services/API/TestHelpers/MockHTTPClient.swift diff --git a/BitwardenShared/Core/Services/Platform/API/TestHelpers/Result+HTTPResponse.swift b/BitwardenShared/Core/Platform/Services/API/TestHelpers/Result+HTTPResponse.swift similarity index 100% rename from BitwardenShared/Core/Services/Platform/API/TestHelpers/Result+HTTPResponse.swift rename to BitwardenShared/Core/Platform/Services/API/TestHelpers/Result+HTTPResponse.swift diff --git a/BitwardenShared/Core/Services/Tools/API/SendAPIService.swift b/BitwardenShared/Core/Tools/Services/API/SendAPIService.swift similarity index 100% rename from BitwardenShared/Core/Services/Tools/API/SendAPIService.swift rename to BitwardenShared/Core/Tools/Services/API/SendAPIService.swift diff --git a/BitwardenShared/Core/Services/Vault/API/AttachmentAPIService.swift b/BitwardenShared/Core/Vault/Services/API/AttachmentAPIService.swift similarity index 100% rename from BitwardenShared/Core/Services/Vault/API/AttachmentAPIService.swift rename to BitwardenShared/Core/Vault/Services/API/AttachmentAPIService.swift diff --git a/BitwardenShared/Core/Services/Vault/API/CipherAPIService.swift b/BitwardenShared/Core/Vault/Services/API/CipherAPIService.swift similarity index 100% rename from BitwardenShared/Core/Services/Vault/API/CipherAPIService.swift rename to BitwardenShared/Core/Vault/Services/API/CipherAPIService.swift diff --git a/BitwardenShared/Core/Services/Vault/API/FolderAPIService.swift b/BitwardenShared/Core/Vault/Services/API/FolderAPIService.swift similarity index 100% rename from BitwardenShared/Core/Services/Vault/API/FolderAPIService.swift rename to BitwardenShared/Core/Vault/Services/API/FolderAPIService.swift diff --git a/BitwardenShared/Core/Services/Vault/API/SyncAPIService.swift b/BitwardenShared/Core/Vault/Services/API/SyncAPIService.swift similarity index 100% rename from BitwardenShared/Core/Services/Vault/API/SyncAPIService.swift rename to BitwardenShared/Core/Vault/Services/API/SyncAPIService.swift diff --git a/BitwardenShared/Application/Appearance/UI.swift b/BitwardenShared/UI/Platform/Application/Appearance/UI.swift similarity index 100% rename from BitwardenShared/Application/Appearance/UI.swift rename to BitwardenShared/UI/Platform/Application/Appearance/UI.swift diff --git a/BitwardenShared/Application/Extensions/UIView.swift b/BitwardenShared/UI/Platform/Application/Extensions/UIView.swift similarity index 100% rename from BitwardenShared/Application/Extensions/UIView.swift rename to BitwardenShared/UI/Platform/Application/Extensions/UIView.swift diff --git a/BitwardenShared/Application/Support/Info.plist b/BitwardenShared/UI/Platform/Application/Support/Info.plist similarity index 100% rename from BitwardenShared/Application/Support/Info.plist rename to BitwardenShared/UI/Platform/Application/Support/Info.plist diff --git a/BitwardenShared/Application/TestHelpers/Support/Info.plist b/BitwardenShared/UI/Platform/Application/TestHelpers/Support/Info.plist similarity index 100% rename from BitwardenShared/Application/TestHelpers/Support/Info.plist rename to BitwardenShared/UI/Platform/Application/TestHelpers/Support/Info.plist diff --git a/BitwardenShared/Application/Utilities/AnyCoordinator.swift b/BitwardenShared/UI/Platform/Application/Utilities/AnyCoordinator.swift similarity index 100% rename from BitwardenShared/Application/Utilities/AnyCoordinator.swift rename to BitwardenShared/UI/Platform/Application/Utilities/AnyCoordinator.swift diff --git a/BitwardenShared/Application/Utilities/Command.swift b/BitwardenShared/UI/Platform/Application/Utilities/Command.swift similarity index 100% rename from BitwardenShared/Application/Utilities/Command.swift rename to BitwardenShared/UI/Platform/Application/Utilities/Command.swift diff --git a/BitwardenShared/Application/Utilities/Coordinator.swift b/BitwardenShared/UI/Platform/Application/Utilities/Coordinator.swift similarity index 100% rename from BitwardenShared/Application/Utilities/Coordinator.swift rename to BitwardenShared/UI/Platform/Application/Utilities/Coordinator.swift diff --git a/BitwardenShared/Application/Utilities/Navigator.swift b/BitwardenShared/UI/Platform/Application/Utilities/Navigator.swift similarity index 100% rename from BitwardenShared/Application/Utilities/Navigator.swift rename to BitwardenShared/UI/Platform/Application/Utilities/Navigator.swift diff --git a/BitwardenShared/Application/Utilities/Processor.swift b/BitwardenShared/UI/Platform/Application/Utilities/Processor.swift similarity index 100% rename from BitwardenShared/Application/Utilities/Processor.swift rename to BitwardenShared/UI/Platform/Application/Utilities/Processor.swift diff --git a/BitwardenShared/Application/Utilities/RootNavigator.swift b/BitwardenShared/UI/Platform/Application/Utilities/RootNavigator.swift similarity index 100% rename from BitwardenShared/Application/Utilities/RootNavigator.swift rename to BitwardenShared/UI/Platform/Application/Utilities/RootNavigator.swift diff --git a/BitwardenShared/Application/Utilities/Route.swift b/BitwardenShared/UI/Platform/Application/Utilities/Route.swift similarity index 100% rename from BitwardenShared/Application/Utilities/Route.swift rename to BitwardenShared/UI/Platform/Application/Utilities/Route.swift diff --git a/BitwardenShared/Application/Utilities/StackNavigator.swift b/BitwardenShared/UI/Platform/Application/Utilities/StackNavigator.swift similarity index 100% rename from BitwardenShared/Application/Utilities/StackNavigator.swift rename to BitwardenShared/UI/Platform/Application/Utilities/StackNavigator.swift diff --git a/BitwardenShared/Application/Utilities/StackNavigatorTests.swift b/BitwardenShared/UI/Platform/Application/Utilities/StackNavigatorTests.swift similarity index 100% rename from BitwardenShared/Application/Utilities/StackNavigatorTests.swift rename to BitwardenShared/UI/Platform/Application/Utilities/StackNavigatorTests.swift diff --git a/BitwardenShared/Application/Utilities/StateProcessor.swift b/BitwardenShared/UI/Platform/Application/Utilities/StateProcessor.swift similarity index 100% rename from BitwardenShared/Application/Utilities/StateProcessor.swift rename to BitwardenShared/UI/Platform/Application/Utilities/StateProcessor.swift diff --git a/BitwardenShared/Application/Utilities/Store.swift b/BitwardenShared/UI/Platform/Application/Utilities/Store.swift similarity index 100% rename from BitwardenShared/Application/Utilities/Store.swift rename to BitwardenShared/UI/Platform/Application/Utilities/Store.swift diff --git a/BitwardenShared/Application/Utilities/StoreTests.swift b/BitwardenShared/UI/Platform/Application/Utilities/StoreTests.swift similarity index 100% rename from BitwardenShared/Application/Utilities/StoreTests.swift rename to BitwardenShared/UI/Platform/Application/Utilities/StoreTests.swift diff --git a/BitwardenShared/Application/Utilities/TabNavigator.swift b/BitwardenShared/UI/Platform/Application/Utilities/TabNavigator.swift similarity index 100% rename from BitwardenShared/Application/Utilities/TabNavigator.swift rename to BitwardenShared/UI/Platform/Application/Utilities/TabNavigator.swift diff --git a/project.yml b/project.yml index fa62816cab..93117673ba 100644 --- a/project.yml +++ b/project.yml @@ -266,7 +266,7 @@ targets: settings: base: APPLICATION_EXTENSION_API_ONLY: true - INFOPLIST_FILE: BitwardenShared/Application/Support/Info.plist + INFOPLIST_FILE: BitwardenShared/UI/Platform/Application/Support/Info.plist sources: - path: BitwardenShared excludes: @@ -281,7 +281,7 @@ targets: base: BUNDLE_LOADER: "$(TEST_HOST)" TEST_HOST: "$(BUILT_PRODUCTS_DIR)/Bitwarden.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Bitwarden" - INFOPLIST_FILE: BitwardenShared/Application/TestHelpers/Support/Info.plist + INFOPLIST_FILE: BitwardenShared/UI/Platform/Application/TestHelpers/Support/Info.plist sources: - path: BitwardenShared includes: diff --git a/swiftgen.yml b/swiftgen.yml index 947948978b..f1f4de33dc 100644 --- a/swiftgen.yml +++ b/swiftgen.yml @@ -1 +1 @@ -output_dir: BitwardenShared/Application/Support/Generated/ +output_dir: BitwardenShared/UI/Platform/Application/Support/Generated/