diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a1eb0df..77229b8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -114,7 +114,7 @@ jobs: if-no-files-found: error build-macos: - runs-on: macos-latest + runs-on: macos-26 steps: - name: Checkout repository diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index f677fed..c1cd1fd 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -21,6 +21,7 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ + 0B8FF6F32F376B3200FF7D81 /* app_icon.icon in Resources */ = {isa = PBXBuildFile; fileRef = 0B8FF6F22F376B3200FF7D81 /* app_icon.icon */; }; 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; }; 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; }; 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; }; @@ -62,6 +63,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 0B8FF6F22F376B3200FF7D81 /* app_icon.icon */ = {isa = PBXFileReference; lastKnownFileType = folder.iconcomposer.icon; path = app_icon.icon; sourceTree = ""; }; 22CE727754232422BACCB200 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; @@ -138,6 +140,7 @@ 33CC10EE2044A3C60003C045 /* Products */, D73912EC22F37F3D000D13A0 /* Frameworks */, D138EEB821812481C5B2C671 /* Pods */, + 0B8FF6F22F376B3200FF7D81 /* app_icon.icon */, ); sourceTree = ""; }; @@ -315,6 +318,7 @@ buildActionMask = 2147483647; files = ( 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */, + 0B8FF6F32F376B3200FF7D81 /* app_icon.icon in Resources */, 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -571,12 +575,14 @@ isa = XCBuildConfiguration; baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = app_icon; + ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; INFOPLIST_FILE = Runner/Info.plist; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", @@ -704,12 +710,14 @@ isa = XCBuildConfiguration; baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = app_icon; + ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; INFOPLIST_FILE = Runner/Info.plist; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", @@ -725,12 +733,14 @@ isa = XCBuildConfiguration; baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = app_icon; + ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; INFOPLIST_FILE = Runner/Info.plist; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", diff --git a/macos/Runner/Assets.xcassets/Contents.json b/macos/Runner/Assets.xcassets/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/macos/Runner/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/macos/Runner/Info.plist b/macos/Runner/Info.plist index 4789daa..5e29d06 100644 --- a/macos/Runner/Info.plist +++ b/macos/Runner/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIconFile - + app_icon CFBundleIdentifier $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion diff --git a/macos/app_icon.icon/Assets/bg.png b/macos/app_icon.icon/Assets/bg.png new file mode 100644 index 0000000..78c867d Binary files /dev/null and b/macos/app_icon.icon/Assets/bg.png differ diff --git a/macos/app_icon.icon/Assets/notch.png b/macos/app_icon.icon/Assets/notch.png new file mode 100644 index 0000000..4b6a1e8 Binary files /dev/null and b/macos/app_icon.icon/Assets/notch.png differ diff --git a/macos/app_icon.icon/Assets/robot.png b/macos/app_icon.icon/Assets/robot.png new file mode 100644 index 0000000..b0fdf00 Binary files /dev/null and b/macos/app_icon.icon/Assets/robot.png differ diff --git a/macos/app_icon.icon/Assets/wifi.png b/macos/app_icon.icon/Assets/wifi.png new file mode 100644 index 0000000..cd2e461 Binary files /dev/null and b/macos/app_icon.icon/Assets/wifi.png differ diff --git a/macos/app_icon.icon/icon.json b/macos/app_icon.icon/icon.json new file mode 100644 index 0000000..0ed435f --- /dev/null +++ b/macos/app_icon.icon/icon.json @@ -0,0 +1,90 @@ +{ + "fill" : "automatic", + "groups" : [ + { + "layers" : [ + { + "fill" : "none", + "glass" : false, + "image-name" : "robot.png", + "name" : "robot", + "position" : { + "scale" : 1, + "translation-in-points" : [ + -0.5, + 260.5390625 + ] + } + }, + { + "glass" : false, + "image-name" : "wifi.png", + "name" : "wifi", + "position" : { + "scale" : 1, + "translation-in-points" : [ + 0.5, + 0 + ] + } + }, + { + "image-name" : "notch.png", + "name" : "notch", + "position" : { + "scale" : 1, + "translation-in-points" : [ + 0, + -267.203125 + ] + } + }, + { + "blend-mode-specializations" : [ + { + "appearance" : "dark", + "value" : "normal" + } + ], + "fill-specializations" : [ + { + "value" : "automatic" + }, + { + "appearance" : "dark", + "value" : { + "solid" : "extended-gray:1.00000,1.00000" + } + } + ], + "glass" : true, + "image-name" : "bg.png", + "name" : "bg", + "position" : { + "scale" : 1, + "translation-in-points" : [ + 0, + 93.5 + ] + } + } + ], + "shadow" : { + "kind" : "neutral", + "opacity" : 0.5 + }, + "translucency" : { + "enabled" : true, + "value" : 0.5 + } + } + ], + "supported-platforms" : { + "circles" : [ + "watchOS" + ], + "squares" : [ + "macOS" + ] + } +} \ No newline at end of file