[macOS] Project naming tweaks

.github/workflows/build.yml

@@ -54,7 +54,7 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Check binary permissions
-      working-directory: ./osx/qmk_toolbox/Resources
+      working-directory: ./macos/QMK Toolbox/Resources
       env:
         QMK_BINARIES: avrdude bootloadHID dfu-programmer dfu-util mdloader_mac teensy_loader_cli
       run: |
@@ -67,7 +67,7 @@ jobs:
         exit $status
 
     - name: Build
-      working-directory: ./osx
+      working-directory: ./macos
       run: |
         mkdir build
         xcodebuild CONFIGURATION_BUILD_DIR=build
@@ -76,10 +76,10 @@ jobs:
     - uses: actions/upload-artifact@v2
       with:
         name: QMK.Toolbox.app.zip
-        path: osx/build/QMK.Toolbox.app.zip
+        path: macos/build/QMK.Toolbox.app.zip
 
     - name: Create installer
-      working-directory: ./osx
+      working-directory: ./macos
       run: |
         brew install packages
         packagesbuild -v "QMK Toolbox.pkgproj"
@@ -88,7 +88,7 @@ jobs:
     - uses: actions/upload-artifact@v2
       with:
         name: QMK.Toolbox.pkg
-        path: osx/build/QMK.Toolbox.pkg
+        path: macos/build/QMK.Toolbox.pkg
 
   publish:
     name: Publish

.gitignore

@@ -260,9 +260,8 @@ DerivedData/
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
-*.xcworkspace
-!default.xcworkspace
-xcuserdata/
+xcuserdata
+!xcshareddata
 
 ## Other
 *.moved-aside

osx/QMK Toolbox.xcodeproj/project.pbxproj → macos/QMK Toolbox.xcodeproj/project.pbxproj

@@ -100,7 +100,7 @@
 			isa = PBXGroup;
 			children = (
 				098AEE071F5F370900CA054D /* IOKit.framework */,
-				092963FA1F5C8B2C004F2D3F /* qmk_toolbox */,
+				092963FA1F5C8B2C004F2D3F /* QMK Toolbox */,
 				092963F91F5C8B2C004F2D3F /* Products */,
 			);
 			sourceTree = "<group>";
@@ -113,7 +113,7 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		092963FA1F5C8B2C004F2D3F /* qmk_toolbox */ = {
+		092963FA1F5C8B2C004F2D3F /* QMK Toolbox */ = {
 			isa = PBXGroup;
 			children = (
 				092964011F5C8B2C004F2D3F /* Assets.xcassets */,
@@ -135,7 +135,7 @@
 				098AEE091F5F97A000CA054D /* USB.m */,
 				092963FE1F5C8B2C004F2D3F /* Supporting Files */,
 			);
-			path = qmk_toolbox;
+			path = "QMK Toolbox";
 			sourceTree = "<group>";
 		};
 		092963FE1F5C8B2C004F2D3F /* Supporting Files */ = {
@@ -184,7 +184,7 @@
 			dependencies = (
 			);
 			name = "QMK Toolbox";
-			productName = qmk_toolbox;
+			productName = "QMK Toolbox";
 			productReference = 092963F81F5C8B2C004F2D3F /* QMK Toolbox.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -379,14 +379,14 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
-				INFOPLIST_FILE = qmk_toolbox/Info.plist;
+				INFOPLIST_FILE = "QMK Toolbox/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/qmk_toolbox",
+					"$(PROJECT_DIR)/QMK Toolbox",
 					"$(PROJECT_DIR)",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = fm.qmk.toolbox;
@@ -400,14 +400,14 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
-				INFOPLIST_FILE = qmk_toolbox/Info.plist;
+				INFOPLIST_FILE = "QMK Toolbox/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/qmk_toolbox",
+					"$(PROJECT_DIR)/QMK Toolbox",
 					"$(PROJECT_DIR)",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = fm.qmk.toolbox;

macos/QMK Toolbox.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

macos/QMK Toolbox.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PreviewsEnabled</key>
+	<false/>
+</dict>
+</plist>

macos/QMK Toolbox.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>