diff --git a/apps/desktop/macos/desktop.xcodeproj/project.pbxproj b/apps/desktop/macos/desktop.xcodeproj/project.pbxproj index 23cde569958..87186dccff0 100644 --- a/apps/desktop/macos/desktop.xcodeproj/project.pbxproj +++ b/apps/desktop/macos/desktop.xcodeproj/project.pbxproj @@ -7,48 +7,13 @@ objects = { /* Begin PBXBuildFile section */ - E1DF712A2B342E2800F29026 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1DF71292B342E2800F29026 /* AppDelegate.swift */; }; - E1DF712C2B342E2800F29026 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1DF712B2B342E2800F29026 /* ViewController.swift */; }; - E1DF712E2B342E2900F29026 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E1DF712D2B342E2900F29026 /* Assets.xcassets */; }; - E1DF71312B342E2900F29026 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E1DF712F2B342E2900F29026 /* Main.storyboard */; }; E1DF713F2B342F6900F29026 /* AuthenticationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E1DF713E2B342F6900F29026 /* AuthenticationServices.framework */; }; E1DF71422B342F6900F29026 /* CredentialProviderViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1DF71412B342F6900F29026 /* CredentialProviderViewController.swift */; }; E1DF71452B342F6900F29026 /* CredentialProviderViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E1DF71432B342F6900F29026 /* CredentialProviderViewController.xib */; }; - E1DF714A2B342F6900F29026 /* .appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = E1DF713C2B342F6900F29026 /* .appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - E1DF71482B342F6900F29026 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = E1DF711E2B342E2800F29026 /* Project object */; - proxyType = 1; - remoteGlobalIDString = E1DF713B2B342F6900F29026; - remoteInfo = "autofill-extension"; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXCopyFilesBuildPhase section */ - E1DF714B2B342F6900F29026 /* Embed Foundation Extensions */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 13; - files = ( - E1DF714A2B342F6900F29026 /* .appex in Embed Foundation Extensions */, - ); - name = "Embed Foundation Extensions"; - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - /* Begin PBXFileReference section */ - E1DF71262B342E2800F29026 /* desktop.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = desktop.app; sourceTree = BUILT_PRODUCTS_DIR; }; - E1DF71292B342E2800F29026 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - E1DF712B2B342E2800F29026 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; - E1DF712D2B342E2900F29026 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - E1DF71302B342E2900F29026 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - E1DF71322B342E2900F29026 /* desktop.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = desktop.entitlements; sourceTree = ""; }; - E1DF713C2B342F6900F29026 /* .appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = .appex; sourceTree = BUILT_PRODUCTS_DIR; }; + E1DF713C2B342F6900F29026 /* autofill-extension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "autofill-extension.appex"; sourceTree = BUILT_PRODUCTS_DIR; }; E1DF713E2B342F6900F29026 /* AuthenticationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AuthenticationServices.framework; path = System/Library/Frameworks/AuthenticationServices.framework; sourceTree = SDKROOT; }; E1DF71412B342F6900F29026 /* CredentialProviderViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CredentialProviderViewController.swift; sourceTree = ""; }; E1DF71442B342F6900F29026 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/CredentialProviderViewController.xib; sourceTree = ""; }; @@ -57,13 +22,6 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - E1DF71232B342E2800F29026 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; E1DF71392B342F6900F29026 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -78,7 +36,6 @@ E1DF711D2B342E2800F29026 = { isa = PBXGroup; children = ( - E1DF71282B342E2800F29026 /* desktop */, E1DF71402B342F6900F29026 /* autofill-extension */, E1DF713D2B342F6900F29026 /* Frameworks */, E1DF71272B342E2800F29026 /* Products */, @@ -88,24 +45,11 @@ E1DF71272B342E2800F29026 /* Products */ = { isa = PBXGroup; children = ( - E1DF71262B342E2800F29026 /* desktop.app */, - E1DF713C2B342F6900F29026 /* .appex */, + E1DF713C2B342F6900F29026 /* autofill-extension.appex */, ); name = Products; sourceTree = ""; }; - E1DF71282B342E2800F29026 /* desktop */ = { - isa = PBXGroup; - children = ( - E1DF71292B342E2800F29026 /* AppDelegate.swift */, - E1DF712B2B342E2800F29026 /* ViewController.swift */, - E1DF712D2B342E2900F29026 /* Assets.xcassets */, - E1DF712F2B342E2900F29026 /* Main.storyboard */, - E1DF71322B342E2900F29026 /* desktop.entitlements */, - ); - path = desktop; - sourceTree = ""; - }; E1DF713D2B342F6900F29026 /* Frameworks */ = { isa = PBXGroup; children = ( @@ -128,25 +72,6 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - E1DF71252B342E2800F29026 /* desktop */ = { - isa = PBXNativeTarget; - buildConfigurationList = E1DF71352B342E2900F29026 /* Build configuration list for PBXNativeTarget "desktop" */; - buildPhases = ( - E1DF71222B342E2800F29026 /* Sources */, - E1DF71232B342E2800F29026 /* Frameworks */, - E1DF71242B342E2800F29026 /* Resources */, - E1DF714B2B342F6900F29026 /* Embed Foundation Extensions */, - ); - buildRules = ( - ); - dependencies = ( - E1DF71492B342F6900F29026 /* PBXTargetDependency */, - ); - name = desktop; - productName = desktop; - productReference = E1DF71262B342E2800F29026 /* desktop.app */; - productType = "com.apple.product-type.application"; - }; E1DF713B2B342F6900F29026 /* autofill-extension */ = { isa = PBXNativeTarget; buildConfigurationList = E1DF714E2B342F6900F29026 /* Build configuration list for PBXNativeTarget "autofill-extension" */; @@ -161,7 +86,7 @@ ); name = "autofill-extension"; productName = "autofill-extension"; - productReference = E1DF713C2B342F6900F29026 /* .appex */; + productReference = E1DF713C2B342F6900F29026 /* autofill-extension.appex */; productType = "com.apple.product-type.app-extension"; }; /* End PBXNativeTarget section */ @@ -174,9 +99,6 @@ LastSwiftUpdateCheck = 1510; LastUpgradeCheck = 1510; TargetAttributes = { - E1DF71252B342E2800F29026 = { - CreatedOnToolsVersion = 15.1; - }; E1DF713B2B342F6900F29026 = { CreatedOnToolsVersion = 15.1; }; @@ -195,22 +117,12 @@ projectDirPath = ""; projectRoot = ""; targets = ( - E1DF71252B342E2800F29026 /* desktop */, E1DF713B2B342F6900F29026 /* autofill-extension */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - E1DF71242B342E2800F29026 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - E1DF712E2B342E2900F29026 /* Assets.xcassets in Resources */, - E1DF71312B342E2900F29026 /* Main.storyboard in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; E1DF713A2B342F6900F29026 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -222,15 +134,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - E1DF71222B342E2800F29026 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - E1DF712C2B342E2800F29026 /* ViewController.swift in Sources */, - E1DF712A2B342E2800F29026 /* AppDelegate.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; E1DF71382B342F6900F29026 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -241,23 +144,7 @@ }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - E1DF71492B342F6900F29026 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = E1DF713B2B342F6900F29026 /* autofill-extension */; - targetProxy = E1DF71482B342F6900F29026 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin PBXVariantGroup section */ - E1DF712F2B342E2900F29026 /* Main.storyboard */ = { - isa = PBXVariantGroup; - children = ( - E1DF71302B342E2900F29026 /* Base */, - ); - name = Main.storyboard; - sourceTree = ""; - }; E1DF71432B342F6900F29026 /* CredentialProviderViewController.xib */ = { isa = PBXVariantGroup; children = ( @@ -387,62 +274,6 @@ }; name = Release; }; - E1DF71362B342E2900F29026 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_ENTITLEMENTS = desktop/desktop.entitlements; - CODE_SIGN_STYLE = Automatic; - COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = LTZ2PFU5D6; - ENABLE_HARDENED_RUNTIME = YES; - GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_KEY_NSHumanReadableCopyright = ""; - INFOPLIST_KEY_NSMainStoryboardFile = Main; - INFOPLIST_KEY_NSPrincipalClass = NSApplication; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - ); - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.bitwarden.desktop; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; - }; - name = Debug; - }; - E1DF71372B342E2900F29026 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_ENTITLEMENTS = desktop/desktop.entitlements; - CODE_SIGN_STYLE = Automatic; - COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = LTZ2PFU5D6; - ENABLE_HARDENED_RUNTIME = YES; - GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_KEY_NSHumanReadableCopyright = ""; - INFOPLIST_KEY_NSMainStoryboardFile = Main; - INFOPLIST_KEY_NSPrincipalClass = NSApplication; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - ); - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.bitwarden.desktop; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; - }; - name = Release; - }; E1DF714C2B342F6900F29026 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -511,15 +342,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - E1DF71352B342E2900F29026 /* Build configuration list for PBXNativeTarget "desktop" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - E1DF71362B342E2900F29026 /* Debug */, - E1DF71372B342E2900F29026 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; E1DF714E2B342F6900F29026 /* Build configuration list for PBXNativeTarget "autofill-extension" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/apps/desktop/macos/desktop.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/apps/desktop/macos/desktop.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000000..18d981003d6 --- /dev/null +++ b/apps/desktop/macos/desktop.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/apps/desktop/macos/desktop.xcodeproj/project.xcworkspace/xcuserdata/andreas.xcuserdatad/UserInterfaceState.xcuserstate b/apps/desktop/macos/desktop.xcodeproj/project.xcworkspace/xcuserdata/andreas.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 00000000000..93eabd043f4 Binary files /dev/null and b/apps/desktop/macos/desktop.xcodeproj/project.xcworkspace/xcuserdata/andreas.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/apps/desktop/macos/desktop.xcodeproj/xcuserdata/andreas.xcuserdatad/xcschemes/xcschememanagement.plist b/apps/desktop/macos/desktop.xcodeproj/xcuserdata/andreas.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 00000000000..0d09b855fd6 --- /dev/null +++ b/apps/desktop/macos/desktop.xcodeproj/xcuserdata/andreas.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,19 @@ + + + + + SchemeUserState + + autofill-extension.xcscheme_^#shared#^_ + + orderHint + 1 + + desktop.xcscheme_^#shared#^_ + + orderHint + 0 + + + + diff --git a/apps/desktop/macos/desktop/AppDelegate.swift b/apps/desktop/macos/desktop/AppDelegate.swift deleted file mode 100644 index 192bc0e65ba..00000000000 --- a/apps/desktop/macos/desktop/AppDelegate.swift +++ /dev/null @@ -1,30 +0,0 @@ -// -// AppDelegate.swift -// desktop -// -// Created by Andreas Coroiu on 2023-12-21. -// - -import Cocoa - -@main -class AppDelegate: NSObject, NSApplicationDelegate { - - - - - func applicationDidFinishLaunching(_ aNotification: Notification) { - // Insert code here to initialize your application - } - - func applicationWillTerminate(_ aNotification: Notification) { - // Insert code here to tear down your application - } - - func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool { - return true - } - - -} - diff --git a/apps/desktop/macos/desktop/Assets.xcassets/AccentColor.colorset/Contents.json b/apps/desktop/macos/desktop/Assets.xcassets/AccentColor.colorset/Contents.json deleted file mode 100644 index 0afb3cf0eec..00000000000 --- a/apps/desktop/macos/desktop/Assets.xcassets/AccentColor.colorset/Contents.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "colors": [ - { - "idiom": "universal" - } - ], - "info": { - "author": "xcode", - "version": 1 - } -} diff --git a/apps/desktop/macos/desktop/Assets.xcassets/AppIcon.appiconset/Contents.json b/apps/desktop/macos/desktop/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 3d50046ea59..00000000000 --- a/apps/desktop/macos/desktop/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "images": [ - { - "idiom": "mac", - "scale": "1x", - "size": "16x16" - }, - { - "idiom": "mac", - "scale": "2x", - "size": "16x16" - }, - { - "idiom": "mac", - "scale": "1x", - "size": "32x32" - }, - { - "idiom": "mac", - "scale": "2x", - "size": "32x32" - }, - { - "idiom": "mac", - "scale": "1x", - "size": "128x128" - }, - { - "idiom": "mac", - "scale": "2x", - "size": "128x128" - }, - { - "idiom": "mac", - "scale": "1x", - "size": "256x256" - }, - { - "idiom": "mac", - "scale": "2x", - "size": "256x256" - }, - { - "idiom": "mac", - "scale": "1x", - "size": "512x512" - }, - { - "idiom": "mac", - "scale": "2x", - "size": "512x512" - } - ], - "info": { - "author": "xcode", - "version": 1 - } -} diff --git a/apps/desktop/macos/desktop/Assets.xcassets/Contents.json b/apps/desktop/macos/desktop/Assets.xcassets/Contents.json deleted file mode 100644 index 74d6a722cf3..00000000000 --- a/apps/desktop/macos/desktop/Assets.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info": { - "author": "xcode", - "version": 1 - } -} diff --git a/apps/desktop/macos/desktop/Base.lproj/Main.storyboard b/apps/desktop/macos/desktop/Base.lproj/Main.storyboard deleted file mode 100644 index 10c32c44e0f..00000000000 --- a/apps/desktop/macos/desktop/Base.lproj/Main.storyboard +++ /dev/null @@ -1,717 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Default - - - - - - - Left to Right - - - - - - - Right to Left - - - - - - - - - - - Default - - - - - - - Left to Right - - - - - - - Right to Left - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/apps/desktop/macos/desktop/ViewController.swift b/apps/desktop/macos/desktop/ViewController.swift deleted file mode 100644 index e531d3fc059..00000000000 --- a/apps/desktop/macos/desktop/ViewController.swift +++ /dev/null @@ -1,26 +0,0 @@ -// -// ViewController.swift -// desktop -// -// Created by Andreas Coroiu on 2023-12-21. -// - -import Cocoa - -class ViewController: NSViewController { - - override func viewDidLoad() { - super.viewDidLoad() - - // Do any additional setup after loading the view. - } - - override var representedObject: Any? { - didSet { - // Update the view, if already loaded. - } - } - - -} - diff --git a/apps/desktop/macos/desktop/desktop.entitlements b/apps/desktop/macos/desktop/desktop.entitlements deleted file mode 100644 index e95d458e460..00000000000 --- a/apps/desktop/macos/desktop/desktop.entitlements +++ /dev/null @@ -1,12 +0,0 @@ - - - - - com.apple.developer.authentication-services.autofill-credential-provider - - com.apple.security.app-sandbox - - com.apple.security.files.user-selected.read-only - - -