From 3459f91984dd1bf674cd1a2620ecea43026ae01c Mon Sep 17 00:00:00 2001 From: Chen-I Lim Date: Tue, 26 Jan 2021 10:32:36 -0800 Subject: [PATCH] Mac: Product name --- .github/workflows/build-mac.yml | 4 +- Makefile | 8 +- .../project.pbxproj | 92 +++++++++--------- .../contents.xcworkspacedata | 0 .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../xcschemes/Focalboard.xcscheme | 78 +++++++++++++++ .../contents.xcworkspacedata | 2 +- .../xcshareddata/IDEWorkspaceChecks.plist | 0 mac/{Tasks => Focalboard}/AppDelegate.swift | 8 +- .../AccentColor.colorset/Contents.json | 0 .../AppIcon.appiconset/Contents.json | 0 .../tasks app icon-512x512.png | Bin .../AppIcon.appiconset/tasks app icon.png | Bin .../Assets.xcassets/Contents.json | 0 .../AutoSaveWindowController.swift | 8 +- .../Base.lproj/Main.storyboard | 21 ++-- .../Focalboard.entitlements} | 0 mac/{Tasks => Focalboard}/Info.plist | 0 .../Inherit.entitlements | 0 .../ViewController.swift | 8 +- .../Info.plist | 0 .../TasksTests.swift | 8 +- .../Info.plist | 0 .../TasksUITests.swift | 8 +- 24 files changed, 151 insertions(+), 94 deletions(-) rename mac/{Tasks.xcodeproj => Focalboard.xcodeproj}/project.pbxproj (87%) rename mac/{Tasks.xcodeproj => Focalboard.xcodeproj}/project.xcworkspace/contents.xcworkspacedata (100%) rename mac/{Tasks.xcodeproj => Focalboard.xcodeproj}/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (100%) create mode 100644 mac/Focalboard.xcodeproj/xcshareddata/xcschemes/Focalboard.xcscheme rename mac/{Tasks.xcworkspace => Focalboard.xcworkspace}/contents.xcworkspacedata (68%) rename mac/{Tasks.xcworkspace => Focalboard.xcworkspace}/xcshareddata/IDEWorkspaceChecks.plist (100%) rename mac/{Tasks => Focalboard}/AppDelegate.swift (96%) rename mac/{Tasks => Focalboard}/Assets.xcassets/AccentColor.colorset/Contents.json (100%) rename mac/{Tasks => Focalboard}/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename mac/{Tasks => Focalboard}/Assets.xcassets/AppIcon.appiconset/tasks app icon-512x512.png (100%) rename mac/{Tasks => Focalboard}/Assets.xcassets/AppIcon.appiconset/tasks app icon.png (100%) rename mac/{Tasks => Focalboard}/Assets.xcassets/Contents.json (100%) rename mac/{Tasks => Focalboard}/AutoSaveWindowController.swift (75%) rename mac/{Tasks => Focalboard}/Base.lproj/Main.storyboard (98%) rename mac/{Tasks/Tasks.entitlements => Focalboard/Focalboard.entitlements} (100%) rename mac/{Tasks => Focalboard}/Info.plist (100%) rename mac/{Tasks => Focalboard}/Inherit.entitlements (100%) rename mac/{Tasks => Focalboard}/ViewController.swift (97%) rename mac/{TasksTests => FocalboardTests}/Info.plist (100%) rename mac/{TasksTests => FocalboardTests}/TasksTests.swift (87%) rename mac/{TasksUITests => FocalboardUITests}/Info.plist (100%) rename mac/{TasksUITests => FocalboardUITests}/TasksUITests.swift (92%) diff --git a/.github/workflows/build-mac.yml b/.github/workflows/build-mac.yml index 45b0b7b67..d2292a35c 100644 --- a/.github/workflows/build-mac.yml +++ b/.github/workflows/build-mac.yml @@ -38,6 +38,6 @@ jobs: - name: Upload macOS package uses: actions/upload-artifact@v1 with: - name: tasks-mac.zip - path: ${{ github.workspace }}/mac/dist/tasks-mac.zip + name: focalboard-mac.zip + path: ${{ github.workspace }}/mac/dist/focalboard-mac.zip diff --git a/Makefile b/Makefile index 15a04f5a0..ddcbc35f3 100644 --- a/Makefile +++ b/Makefile @@ -114,12 +114,12 @@ mac-app: server-mac webapp cp app-config.json mac/resources/config.json cp -R webapp/pack mac/resources/pack mkdir -p mac/temp - xcodebuild archive -workspace mac/Tasks.xcworkspace -scheme Tasks -archivePath mac/temp/tasks.xcarchive CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED="NO" CODE_SIGNING_ALLOWED="NO" + xcodebuild archive -workspace mac/Focalboard.xcworkspace -scheme Focalboard -archivePath mac/temp/focalboard.xcarchive CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED="NO" CODE_SIGNING_ALLOWED="NO" mkdir -p mac/dist - cp -R mac/temp/tasks.xcarchive/Products/Applications/Tasks.app mac/dist/ - # xcodebuild -exportArchive -archivePath mac/temp/tasks.xcarchive -exportPath mac/dist -exportOptionsPlist mac/export.plist + cp -R mac/temp/focalboard.xcarchive/Products/Applications/Focalboard.app mac/dist/ + # xcodebuild -exportArchive -archivePath mac/temp/focalboard.xcarchive -exportPath mac/dist -exportOptionsPlist mac/export.plist cp build/MIT-COMPILED-LICENSE.md mac/dist - cd mac/dist; zip -r tasks-mac.zip Tasks.app MIT-COMPILED-LICENSE.md + cd mac/dist; zip -r focalboard-mac.zip Focalboard.app MIT-COMPILED-LICENSE.md win-app: server-win webapp rm -rf win/temp diff --git a/mac/Tasks.xcodeproj/project.pbxproj b/mac/Focalboard.xcodeproj/project.pbxproj similarity index 87% rename from mac/Tasks.xcodeproj/project.pbxproj rename to mac/Focalboard.xcodeproj/project.pbxproj index c6e04563c..7cbe1ca28 100644 --- a/mac/Tasks.xcodeproj/project.pbxproj +++ b/mac/Focalboard.xcodeproj/project.pbxproj @@ -35,17 +35,17 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 80D6DEB7252E13CB00AEED9E /* Tasks.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Tasks.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 80D6DEB7252E13CB00AEED9E /* Focalboard.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Focalboard.app; sourceTree = BUILT_PRODUCTS_DIR; }; 80D6DEBA252E13CB00AEED9E /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 80D6DEBC252E13CB00AEED9E /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; 80D6DEBE252E13CD00AEED9E /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 80D6DEC1252E13CD00AEED9E /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 80D6DEC3252E13CD00AEED9E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 80D6DEC4252E13CD00AEED9E /* Tasks.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Tasks.entitlements; sourceTree = ""; }; - 80D6DEC9252E13CD00AEED9E /* TasksTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TasksTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 80D6DEC9252E13CD00AEED9E /* FocalboardTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FocalboardTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 80D6DECD252E13CD00AEED9E /* TasksTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TasksTests.swift; sourceTree = ""; }; 80D6DECF252E13CD00AEED9E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 80D6DED4252E13CD00AEED9E /* TasksUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TasksUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 80D6DED4252E13CD00AEED9E /* FocalboardUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FocalboardUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 80D6DED8252E13CD00AEED9E /* TasksUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TasksUITests.swift; sourceTree = ""; }; 80D6DEDA252E13CD00AEED9E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 80D6DEE9252E15D100AEED9E /* resources */ = {isa = PBXFileReference; lastKnownFileType = folder; path = resources; sourceTree = ""; }; @@ -81,10 +81,10 @@ 80D6DEAE252E13CB00AEED9E = { isa = PBXGroup; children = ( - 80D6DEB9252E13CB00AEED9E /* Tasks */, - 80D6DECC252E13CD00AEED9E /* TasksTests */, + 80D6DEB9252E13CB00AEED9E /* Focalboard */, + 80D6DECC252E13CD00AEED9E /* FocalboardTests */, 80D6DEE9252E15D100AEED9E /* resources */, - 80D6DED7252E13CD00AEED9E /* TasksUITests */, + 80D6DED7252E13CD00AEED9E /* FocalboardUITests */, 80D6DEB8252E13CB00AEED9E /* Products */, ); sourceTree = ""; @@ -92,14 +92,14 @@ 80D6DEB8252E13CB00AEED9E /* Products */ = { isa = PBXGroup; children = ( - 80D6DEB7252E13CB00AEED9E /* Tasks.app */, - 80D6DEC9252E13CD00AEED9E /* TasksTests.xctest */, - 80D6DED4252E13CD00AEED9E /* TasksUITests.xctest */, + 80D6DEB7252E13CB00AEED9E /* Focalboard.app */, + 80D6DEC9252E13CD00AEED9E /* FocalboardTests.xctest */, + 80D6DED4252E13CD00AEED9E /* FocalboardUITests.xctest */, ); name = Products; sourceTree = ""; }; - 80D6DEB9252E13CB00AEED9E /* Tasks */ = { + 80D6DEB9252E13CB00AEED9E /* Focalboard */ = { isa = PBXGroup; children = ( 80D6DEBA252E13CB00AEED9E /* AppDelegate.swift */, @@ -111,33 +111,33 @@ 80D6DEC4252E13CD00AEED9E /* Tasks.entitlements */, 80D6DF1C25324A4F00AEED9E /* Inherit.entitlements */, ); - path = Tasks; + path = Focalboard; sourceTree = ""; }; - 80D6DECC252E13CD00AEED9E /* TasksTests */ = { + 80D6DECC252E13CD00AEED9E /* FocalboardTests */ = { isa = PBXGroup; children = ( 80D6DECD252E13CD00AEED9E /* TasksTests.swift */, 80D6DECF252E13CD00AEED9E /* Info.plist */, ); - path = TasksTests; + path = FocalboardTests; sourceTree = ""; }; - 80D6DED7252E13CD00AEED9E /* TasksUITests */ = { + 80D6DED7252E13CD00AEED9E /* FocalboardUITests */ = { isa = PBXGroup; children = ( 80D6DED8252E13CD00AEED9E /* TasksUITests.swift */, 80D6DEDA252E13CD00AEED9E /* Info.plist */, ); - path = TasksUITests; + path = FocalboardUITests; sourceTree = ""; }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 80D6DEB6252E13CB00AEED9E /* Tasks */ = { + 80D6DEB6252E13CB00AEED9E /* Focalboard */ = { isa = PBXNativeTarget; - buildConfigurationList = 80D6DEDD252E13CD00AEED9E /* Build configuration list for PBXNativeTarget "Tasks" */; + buildConfigurationList = 80D6DEDD252E13CD00AEED9E /* Build configuration list for PBXNativeTarget "Focalboard" */; buildPhases = ( 80D6DEB3252E13CB00AEED9E /* Sources */, 80D6DEB4252E13CB00AEED9E /* Frameworks */, @@ -148,14 +148,14 @@ ); dependencies = ( ); - name = Tasks; + name = Focalboard; productName = Tasks; - productReference = 80D6DEB7252E13CB00AEED9E /* Tasks.app */; + productReference = 80D6DEB7252E13CB00AEED9E /* Focalboard.app */; productType = "com.apple.product-type.application"; }; - 80D6DEC8252E13CD00AEED9E /* TasksTests */ = { + 80D6DEC8252E13CD00AEED9E /* FocalboardTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 80D6DEE0252E13CD00AEED9E /* Build configuration list for PBXNativeTarget "TasksTests" */; + buildConfigurationList = 80D6DEE0252E13CD00AEED9E /* Build configuration list for PBXNativeTarget "FocalboardTests" */; buildPhases = ( 80D6DEC5252E13CD00AEED9E /* Sources */, 80D6DEC6252E13CD00AEED9E /* Frameworks */, @@ -166,14 +166,14 @@ dependencies = ( 80D6DECB252E13CD00AEED9E /* PBXTargetDependency */, ); - name = TasksTests; + name = FocalboardTests; productName = TasksTests; - productReference = 80D6DEC9252E13CD00AEED9E /* TasksTests.xctest */; + productReference = 80D6DEC9252E13CD00AEED9E /* FocalboardTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - 80D6DED3252E13CD00AEED9E /* TasksUITests */ = { + 80D6DED3252E13CD00AEED9E /* FocalboardUITests */ = { isa = PBXNativeTarget; - buildConfigurationList = 80D6DEE3252E13CD00AEED9E /* Build configuration list for PBXNativeTarget "TasksUITests" */; + buildConfigurationList = 80D6DEE3252E13CD00AEED9E /* Build configuration list for PBXNativeTarget "FocalboardUITests" */; buildPhases = ( 80D6DED0252E13CD00AEED9E /* Sources */, 80D6DED1252E13CD00AEED9E /* Frameworks */, @@ -184,9 +184,9 @@ dependencies = ( 80D6DED6252E13CD00AEED9E /* PBXTargetDependency */, ); - name = TasksUITests; + name = FocalboardUITests; productName = TasksUITests; - productReference = 80D6DED4252E13CD00AEED9E /* TasksUITests.xctest */; + productReference = 80D6DED4252E13CD00AEED9E /* FocalboardUITests.xctest */; productType = "com.apple.product-type.bundle.ui-testing"; }; /* End PBXNativeTarget section */ @@ -211,7 +211,7 @@ }; }; }; - buildConfigurationList = 80D6DEB2252E13CB00AEED9E /* Build configuration list for PBXProject "Tasks" */; + buildConfigurationList = 80D6DEB2252E13CB00AEED9E /* Build configuration list for PBXProject "Focalboard" */; compatibilityVersion = "Xcode 9.3"; developmentRegion = en; hasScannedForEncodings = 0; @@ -224,9 +224,9 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 80D6DEB6252E13CB00AEED9E /* Tasks */, - 80D6DEC8252E13CD00AEED9E /* TasksTests */, - 80D6DED3252E13CD00AEED9E /* TasksUITests */, + 80D6DEB6252E13CB00AEED9E /* Focalboard */, + 80D6DEC8252E13CD00AEED9E /* FocalboardTests */, + 80D6DED3252E13CD00AEED9E /* FocalboardUITests */, ); }; /* End PBXProject section */ @@ -274,7 +274,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "# Comment out codesign for now\n# /usr/bin/codesign --force --sign \"$CODE_SIGN_IDENTITY\" -i \"com.mattermost.octoserver\" --entitlement \"$PROJECT_DIR/Tasks/Inherit.entitlements\" \"$BUILD_DIR/$CONFIGURATION/$EXECUTABLE_FOLDER_PATH/../Resources/resources/bin/octoserver\"\n"; + shellScript = "# Comment out codesign for now\n# /usr/bin/codesign --force --sign \"$CODE_SIGN_IDENTITY\" -i \"com.mattermost.octoserver\" --entitlement \"$PROJECT_DIR/Focalboard/Inherit.entitlements\" \"$BUILD_DIR/$CONFIGURATION/$EXECUTABLE_FOLDER_PATH/../Resources/resources/bin/octoserver\"\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -310,12 +310,12 @@ /* Begin PBXTargetDependency section */ 80D6DECB252E13CD00AEED9E /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 80D6DEB6252E13CB00AEED9E /* Tasks */; + target = 80D6DEB6252E13CB00AEED9E /* Focalboard */; targetProxy = 80D6DECA252E13CD00AEED9E /* PBXContainerItemProxy */; }; 80D6DED6252E13CD00AEED9E /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 80D6DEB6252E13CB00AEED9E /* Tasks */; + target = 80D6DEB6252E13CB00AEED9E /* Focalboard */; targetProxy = 80D6DED5252E13CD00AEED9E /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -452,17 +452,17 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_ENTITLEMENTS = Tasks/Tasks.entitlements; + CODE_SIGN_ENTITLEMENTS = Focalboard/Focalboard.entitlements; CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = UQ8HT4Q2XM; ENABLE_HARDENED_RUNTIME = YES; - INFOPLIST_FILE = Tasks/Info.plist; + INFOPLIST_FILE = Focalboard/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.mattermost.Tasks; + PRODUCT_BUNDLE_IDENTIFIER = com.mattermost.Focalboard; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; @@ -474,17 +474,17 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_ENTITLEMENTS = Tasks/Tasks.entitlements; + CODE_SIGN_ENTITLEMENTS = Focalboard/Focalboard.entitlements; CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = UQ8HT4Q2XM; ENABLE_HARDENED_RUNTIME = YES; - INFOPLIST_FILE = Tasks/Info.plist; + INFOPLIST_FILE = Focalboard/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.mattermost.Tasks; + PRODUCT_BUNDLE_IDENTIFIER = com.mattermost.Focalboard; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; @@ -509,7 +509,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.mattermost.TasksTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Tasks.app/Contents/MacOS/Tasks"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Focalboard.app/Contents/MacOS/Focalboard"; }; name = Debug; }; @@ -531,7 +531,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.mattermost.TasksTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Tasks.app/Contents/MacOS/Tasks"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Focalboard.app/Contents/MacOS/Focalboard"; }; name = Release; }; @@ -578,7 +578,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 80D6DEB2252E13CB00AEED9E /* Build configuration list for PBXProject "Tasks" */ = { + 80D6DEB2252E13CB00AEED9E /* Build configuration list for PBXProject "Focalboard" */ = { isa = XCConfigurationList; buildConfigurations = ( 80D6DEDB252E13CD00AEED9E /* Debug */, @@ -587,7 +587,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 80D6DEDD252E13CD00AEED9E /* Build configuration list for PBXNativeTarget "Tasks" */ = { + 80D6DEDD252E13CD00AEED9E /* Build configuration list for PBXNativeTarget "Focalboard" */ = { isa = XCConfigurationList; buildConfigurations = ( 80D6DEDE252E13CD00AEED9E /* Debug */, @@ -596,7 +596,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 80D6DEE0252E13CD00AEED9E /* Build configuration list for PBXNativeTarget "TasksTests" */ = { + 80D6DEE0252E13CD00AEED9E /* Build configuration list for PBXNativeTarget "FocalboardTests" */ = { isa = XCConfigurationList; buildConfigurations = ( 80D6DEE1252E13CD00AEED9E /* Debug */, @@ -605,7 +605,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 80D6DEE3252E13CD00AEED9E /* Build configuration list for PBXNativeTarget "TasksUITests" */ = { + 80D6DEE3252E13CD00AEED9E /* Build configuration list for PBXNativeTarget "FocalboardUITests" */ = { isa = XCConfigurationList; buildConfigurations = ( 80D6DEE4252E13CD00AEED9E /* Debug */, diff --git a/mac/Tasks.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/mac/Focalboard.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from mac/Tasks.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to mac/Focalboard.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/mac/Tasks.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/mac/Focalboard.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from mac/Tasks.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to mac/Focalboard.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/mac/Focalboard.xcodeproj/xcshareddata/xcschemes/Focalboard.xcscheme b/mac/Focalboard.xcodeproj/xcshareddata/xcschemes/Focalboard.xcscheme new file mode 100644 index 000000000..d07fe2d59 --- /dev/null +++ b/mac/Focalboard.xcodeproj/xcshareddata/xcschemes/Focalboard.xcscheme @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mac/Tasks.xcworkspace/contents.xcworkspacedata b/mac/Focalboard.xcworkspace/contents.xcworkspacedata similarity index 68% rename from mac/Tasks.xcworkspace/contents.xcworkspacedata rename to mac/Focalboard.xcworkspace/contents.xcworkspacedata index 3c31341cd..27a72e3f4 100644 --- a/mac/Tasks.xcworkspace/contents.xcworkspacedata +++ b/mac/Focalboard.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "container:Focalboard.xcodeproj"> diff --git a/mac/Tasks.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/mac/Focalboard.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from mac/Tasks.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to mac/Focalboard.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/mac/Tasks/AppDelegate.swift b/mac/Focalboard/AppDelegate.swift similarity index 96% rename from mac/Tasks/AppDelegate.swift rename to mac/Focalboard/AppDelegate.swift index a3e0e97ab..b18d87622 100644 --- a/mac/Tasks/AppDelegate.swift +++ b/mac/Focalboard/AppDelegate.swift @@ -1,9 +1,5 @@ -// -// AppDelegate.swift -// Tasks -// -// Created by Chen-I Lim on 10/7/20. -// +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. import Cocoa diff --git a/mac/Tasks/Assets.xcassets/AccentColor.colorset/Contents.json b/mac/Focalboard/Assets.xcassets/AccentColor.colorset/Contents.json similarity index 100% rename from mac/Tasks/Assets.xcassets/AccentColor.colorset/Contents.json rename to mac/Focalboard/Assets.xcassets/AccentColor.colorset/Contents.json diff --git a/mac/Tasks/Assets.xcassets/AppIcon.appiconset/Contents.json b/mac/Focalboard/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from mac/Tasks/Assets.xcassets/AppIcon.appiconset/Contents.json rename to mac/Focalboard/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/mac/Tasks/Assets.xcassets/AppIcon.appiconset/tasks app icon-512x512.png b/mac/Focalboard/Assets.xcassets/AppIcon.appiconset/tasks app icon-512x512.png similarity index 100% rename from mac/Tasks/Assets.xcassets/AppIcon.appiconset/tasks app icon-512x512.png rename to mac/Focalboard/Assets.xcassets/AppIcon.appiconset/tasks app icon-512x512.png diff --git a/mac/Tasks/Assets.xcassets/AppIcon.appiconset/tasks app icon.png b/mac/Focalboard/Assets.xcassets/AppIcon.appiconset/tasks app icon.png similarity index 100% rename from mac/Tasks/Assets.xcassets/AppIcon.appiconset/tasks app icon.png rename to mac/Focalboard/Assets.xcassets/AppIcon.appiconset/tasks app icon.png diff --git a/mac/Tasks/Assets.xcassets/Contents.json b/mac/Focalboard/Assets.xcassets/Contents.json similarity index 100% rename from mac/Tasks/Assets.xcassets/Contents.json rename to mac/Focalboard/Assets.xcassets/Contents.json diff --git a/mac/Tasks/AutoSaveWindowController.swift b/mac/Focalboard/AutoSaveWindowController.swift similarity index 75% rename from mac/Tasks/AutoSaveWindowController.swift rename to mac/Focalboard/AutoSaveWindowController.swift index f0280590c..7f9ce554b 100644 --- a/mac/Tasks/AutoSaveWindowController.swift +++ b/mac/Focalboard/AutoSaveWindowController.swift @@ -1,9 +1,5 @@ -// -// AutoSaveWindowController.swift -// Tasks -// -// Created by Chen-I Lim on 10/8/20. -// +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. import Cocoa diff --git a/mac/Tasks/Base.lproj/Main.storyboard b/mac/Focalboard/Base.lproj/Main.storyboard similarity index 98% rename from mac/Tasks/Base.lproj/Main.storyboard rename to mac/Focalboard/Base.lproj/Main.storyboard index c6bf61936..69946a449 100644 --- a/mac/Tasks/Base.lproj/Main.storyboard +++ b/mac/Focalboard/Base.lproj/Main.storyboard @@ -1,9 +1,8 @@ - + - - - + + @@ -13,11 +12,11 @@ - + - + - + @@ -31,7 +30,7 @@ - + @@ -49,7 +48,7 @@ - + @@ -667,7 +666,7 @@ - + @@ -691,7 +690,7 @@ - + diff --git a/mac/Tasks/Tasks.entitlements b/mac/Focalboard/Focalboard.entitlements similarity index 100% rename from mac/Tasks/Tasks.entitlements rename to mac/Focalboard/Focalboard.entitlements diff --git a/mac/Tasks/Info.plist b/mac/Focalboard/Info.plist similarity index 100% rename from mac/Tasks/Info.plist rename to mac/Focalboard/Info.plist diff --git a/mac/Tasks/Inherit.entitlements b/mac/Focalboard/Inherit.entitlements similarity index 100% rename from mac/Tasks/Inherit.entitlements rename to mac/Focalboard/Inherit.entitlements diff --git a/mac/Tasks/ViewController.swift b/mac/Focalboard/ViewController.swift similarity index 97% rename from mac/Tasks/ViewController.swift rename to mac/Focalboard/ViewController.swift index 45a5ef0ff..2a00bb934 100644 --- a/mac/Tasks/ViewController.swift +++ b/mac/Focalboard/ViewController.swift @@ -1,9 +1,5 @@ -// -// ViewController.swift -// Tasks -// -// Created by Chen-I Lim on 10/7/20. -// +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. import Cocoa import WebKit diff --git a/mac/TasksTests/Info.plist b/mac/FocalboardTests/Info.plist similarity index 100% rename from mac/TasksTests/Info.plist rename to mac/FocalboardTests/Info.plist diff --git a/mac/TasksTests/TasksTests.swift b/mac/FocalboardTests/TasksTests.swift similarity index 87% rename from mac/TasksTests/TasksTests.swift rename to mac/FocalboardTests/TasksTests.swift index 3163bce49..0f0537bb7 100644 --- a/mac/TasksTests/TasksTests.swift +++ b/mac/FocalboardTests/TasksTests.swift @@ -1,9 +1,5 @@ -// -// TasksTests.swift -// TasksTests -// -// Created by Chen-I Lim on 10/7/20. -// +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. import XCTest @testable import Tasks diff --git a/mac/TasksUITests/Info.plist b/mac/FocalboardUITests/Info.plist similarity index 100% rename from mac/TasksUITests/Info.plist rename to mac/FocalboardUITests/Info.plist diff --git a/mac/TasksUITests/TasksUITests.swift b/mac/FocalboardUITests/TasksUITests.swift similarity index 92% rename from mac/TasksUITests/TasksUITests.swift rename to mac/FocalboardUITests/TasksUITests.swift index e84d81aff..109685411 100644 --- a/mac/TasksUITests/TasksUITests.swift +++ b/mac/FocalboardUITests/TasksUITests.swift @@ -1,9 +1,5 @@ -// -// TasksUITests.swift -// TasksUITests -// -// Created by Chen-I Lim on 10/7/20. -// +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. import XCTest