diff --git a/.goreleaser.yml b/.goreleaser.yml index 2326b63..76fd751 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -25,20 +25,26 @@ universal_binaries: - name_template: tart.app/Contents/MacOS/tart replace: true hooks: - post: gon gon.hcl + post: + - mkdir -p dist/tart_darwin_all/tart.app/Contents/Resources + - cp Resources/embedded.provisionprofile dist/tart_darwin_all/tart.app/Contents/ + - cp Resources/Info.plist dist/tart_darwin_all/tart.app/Contents/ + - cp "Resources/actool/UPW Tart.icns" "Resources/actool/Assets.car" dist/tart_darwin_all/tart.app/Contents/Resources/ + - gon gon.hcl archives: - name_template: "{{ .ProjectName }}" files: - - src: Resources/embedded.provisionprofile - dst: tart.app/Contents - strip_parent: true - - src: Resources/Info.plist - dst: tart.app/Contents - strip_parent: true - - src: Resources/AppIcon.png - dst: tart.app/Contents/Resources - strip_parent: true + - src: dist/tart_darwin_all/tart.app/Contents/Info.plist + dst: tart.app/Contents/Info.plist + - src: dist/tart_darwin_all/tart.app/Contents/embedded.provisionprofile + dst: tart.app/Contents/embedded.provisionprofile + - src: dist/tart_darwin_all/tart.app/Contents/Resources/UPW Tart.icns + dst: tart.app/Contents/Resources/UPW Tart.icns + - src: dist/tart_darwin_all/tart.app/Contents/Resources/Assets.car + dst: tart.app/Contents/Resources/Assets.car + - src: dist/tart_darwin_all/tart.app/Contents/_CodeSignature/CodeResources + dst: tart.app/Contents/_CodeSignature/CodeResources - LICENSE release: diff --git a/Resources/AppIcon.png b/Resources/AppIcon.png deleted file mode 100644 index 5ef123b..0000000 Binary files a/Resources/AppIcon.png and /dev/null differ diff --git a/Resources/Info.plist b/Resources/Info.plist index fd682e1..df4558b 100644 --- a/Resources/Info.plist +++ b/Resources/Info.plist @@ -7,15 +7,17 @@ CFBundleDisplayName Tart CFBundleIdentifier - org.cirruslabs.tart + com.github.cirruslabs.tart CFBundleExecutable tart - LSApplicationCategoryType - public.app-category.developer-tools - CFBundleIconFiles - - AppIcon.png - + CFBundlePackageType + APPL + LSApplicationCategoryType + public.app-category.developer-tools + CFBundleIconFile + UPW Tart + CFBundleIconName + UPW Tart NSAppTransportSecurity NSAllowsArbitraryLoads diff --git a/Resources/UPW Tart.icon/Assets/1.1-–-layer.png b/Resources/UPW Tart.icon/Assets/1.1-–-layer.png new file mode 100644 index 0000000..6dfddc4 Binary files /dev/null and b/Resources/UPW Tart.icon/Assets/1.1-–-layer.png differ diff --git a/Resources/UPW Tart.icon/Assets/2.2-–-layer.png b/Resources/UPW Tart.icon/Assets/2.2-–-layer.png new file mode 100644 index 0000000..98a447e Binary files /dev/null and b/Resources/UPW Tart.icon/Assets/2.2-–-layer.png differ diff --git a/Resources/UPW Tart.icon/Assets/3.3-–-layer.png b/Resources/UPW Tart.icon/Assets/3.3-–-layer.png new file mode 100644 index 0000000..c205f3a Binary files /dev/null and b/Resources/UPW Tart.icon/Assets/3.3-–-layer.png differ diff --git a/Resources/UPW Tart.icon/Assets/4.4-–-layer.png b/Resources/UPW Tart.icon/Assets/4.4-–-layer.png new file mode 100644 index 0000000..726d693 Binary files /dev/null and b/Resources/UPW Tart.icon/Assets/4.4-–-layer.png differ diff --git a/Resources/UPW Tart.icon/Assets/UPW Tart L1.png b/Resources/UPW Tart.icon/Assets/UPW Tart L1.png new file mode 100644 index 0000000..6dfddc4 Binary files /dev/null and b/Resources/UPW Tart.icon/Assets/UPW Tart L1.png differ diff --git a/Resources/UPW Tart.icon/Assets/UPW Tart L2.png b/Resources/UPW Tart.icon/Assets/UPW Tart L2.png new file mode 100644 index 0000000..98a447e Binary files /dev/null and b/Resources/UPW Tart.icon/Assets/UPW Tart L2.png differ diff --git a/Resources/UPW Tart.icon/Assets/UPW Tart L3.png b/Resources/UPW Tart.icon/Assets/UPW Tart L3.png new file mode 100644 index 0000000..03b6669 Binary files /dev/null and b/Resources/UPW Tart.icon/Assets/UPW Tart L3.png differ diff --git a/Resources/UPW Tart.icon/Assets/UPW Tart L4.png b/Resources/UPW Tart.icon/Assets/UPW Tart L4.png new file mode 100644 index 0000000..1a93ee9 Binary files /dev/null and b/Resources/UPW Tart.icon/Assets/UPW Tart L4.png differ diff --git a/Resources/UPW Tart.icon/icon.json b/Resources/UPW Tart.icon/icon.json new file mode 100644 index 0000000..57156ab --- /dev/null +++ b/Resources/UPW Tart.icon/icon.json @@ -0,0 +1,140 @@ +{ + "fill" : "automatic", + "groups" : [ + { + "blend-mode" : "normal", + "blur-material" : 0.5, + "layers" : [ + { + "hidden" : false, + "image-name-specializations" : [ + { + "value" : "4.4-–-layer.png" + }, + { + "idiom" : "square", + "value" : "UPW Tart L4.png" + } + ], + "name" : "UPW Tart L4" + } + ], + "opacity" : 1, + "shadow" : { + "kind" : "neutral", + "opacity" : 1 + }, + "specular" : true, + "translucency" : { + "enabled" : true, + "value" : 0.25 + } + }, + { + "layers" : [ + { + "image-name-specializations" : [ + { + "value" : "3.3-–-layer.png" + }, + { + "idiom" : "square", + "value" : "UPW Tart L3.png" + } + ], + "name" : "UPW Tart L3", + "position-specializations" : [ + { + "idiom" : "square", + "value" : { + "scale" : 1, + "translation-in-points" : [ + 0, + 0 + ] + } + } + ] + } + ], + "shadow" : { + "kind" : "none", + "opacity" : 1 + }, + "specular" : false, + "translucency" : { + "enabled" : true, + "value" : 0.25 + } + }, + { + "blur-material" : null, + "layers" : [ + { + "image-name-specializations" : [ + { + "value" : "2.2-–-layer.png" + }, + { + "idiom" : "square", + "value" : "UPW Tart L2.png" + } + ], + "name" : "UPW Tart L2" + } + ], + "position-specializations" : [ + { + "idiom" : "square", + "value" : { + "scale" : 1, + "translation-in-points" : [ + 0, + 0 + ] + } + } + ], + "shadow" : { + "kind" : "none", + "opacity" : 1 + }, + "specular" : true, + "translucency" : { + "enabled" : true, + "value" : 0.25 + } + }, + { + "layers" : [ + { + "image-name-specializations" : [ + { + "value" : "1.1-–-layer.png" + }, + { + "idiom" : "square", + "value" : "UPW Tart L1.png" + } + ], + "name" : "UPW Tart L1" + } + ], + "shadow" : { + "kind" : "layer-color", + "opacity" : 0.5 + }, + "specular" : true, + "translucency" : { + "enabled" : true, + "value" : 0.25 + } + } + ], + "supported-platforms" : { + "circles" : [ + "watchOS" + ], + "squares" : "shared" + } +} \ No newline at end of file diff --git a/Resources/actool/Assets.car b/Resources/actool/Assets.car new file mode 100644 index 0000000..0516371 Binary files /dev/null and b/Resources/actool/Assets.car differ diff --git a/Resources/actool/Info.plist b/Resources/actool/Info.plist new file mode 100644 index 0000000..cd9f223 --- /dev/null +++ b/Resources/actool/Info.plist @@ -0,0 +1,10 @@ + + + + + CFBundleIconFile + UPW Tart + CFBundleIconName + UPW Tart + + diff --git a/Resources/actool/UPW Tart.icns b/Resources/actool/UPW Tart.icns new file mode 100644 index 0000000..4bf10fe Binary files /dev/null and b/Resources/actool/UPW Tart.icns differ diff --git a/actool.sh b/actool.sh new file mode 100755 index 0000000..a12ad94 --- /dev/null +++ b/actool.sh @@ -0,0 +1,30 @@ +#!/usr/bin/env bash + +# Set shell options to enable fail-fast behavior +# +# * -e: fail the script when an error occurs or command fails +# * -u: fail the script when attempting to reference unset parameters +# * -o pipefail: by default an exit status of a pipeline is that of its +# last command, this fails the pipe early if an error in +# any of its commands occurs +# +set -euo pipefail + +OUTPUT_PATH="Resources/actool" +PLIST_PATH="$OUTPUT_PATH/Info.plist" + +rm -rf "${OUTPUT_PATH}" +mkdir -p "${OUTPUT_PATH}" + +actool "Resources/UPW Tart.icon" \ + --compile "${OUTPUT_PATH}" \ + --output-format human-readable-text \ + --notices \ + --warnings \ + --errors \ + --app-icon "UPW Tart" \ + --output-partial-info-plist $PLIST_PATH \ + --include-all-app-icons \ + --target-device mac \ + --minimum-deployment-target 13.0 \ + --platform macosx diff --git a/gon.hcl b/gon.hcl index 461d2aa..6d01549 100644 --- a/gon.hcl +++ b/gon.hcl @@ -1,4 +1,4 @@ -source = [ "dist/tart_darwin_all/tart.app/Contents/MacOS/tart" ] +source = [ "dist/tart_darwin_all/tart.app" ] bundle_id = "com.github.cirruslabs.tart" apple_id { diff --git a/scripts/run-signed.sh b/scripts/run-signed.sh index 2090037..4baf178 100755 --- a/scripts/run-signed.sh +++ b/scripts/run-signed.sh @@ -6,13 +6,14 @@ set -e swift build --product tart -codesign --sign - --entitlements Resources/tart-dev.entitlements --force .build/debug/tart rm -Rf .build/tart.app/ mkdir -p .build/tart.app/Contents/MacOS .build/tart.app/Contents/Resources cp -c .build/debug/tart .build/tart.app/Contents/MacOS/tart cp -c Resources/embedded.provisionprofile .build/tart.app/Contents/embedded.provisionprofile cp -c Resources/Info.plist .build/tart.app/Contents/Info.plist -cp -c Resources/AppIcon.png .build/tart.app/Contents/Resources +cp -c "Resources/actool/UPW Tart.icns" "Resources/actool/Assets.car" .build/tart.app/Contents/Resources/ + +codesign --sign - --entitlements Resources/tart-dev.entitlements --force .build/tart.app .build/tart.app/Contents/MacOS/tart "$@"