mirror of
https://github.com/yattee/yattee.git
synced 2026-08-08 08:11:29 +00:00
Compare commits
6 Commits
rewrite/v2
...
2.0.0-beta
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
447f593950 | ||
|
|
90a0c6fd1a | ||
|
|
f3f45fdfdc | ||
|
|
a673968f1e | ||
|
|
0a91182089 | ||
|
|
c0815353d7 |
@@ -570,7 +570,7 @@
|
||||
AUTOMATION_APPLE_EVENTS = NO;
|
||||
CODE_SIGN_ENTITLEMENTS = Yattee/Yattee.entitlements;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 262;
|
||||
CURRENT_PROJECT_VERSION = 264;
|
||||
DEAD_CODE_STRIPPING = YES;
|
||||
DEVELOPMENT_TEAM = 78Z5H3M6RJ;
|
||||
ENABLE_APP_SANDBOX = YES;
|
||||
@@ -656,7 +656,7 @@
|
||||
CODE_SIGN_ENTITLEMENTS = Yattee/Yattee.entitlements;
|
||||
"CODE_SIGN_ENTITLEMENTS[sdk=macosx*]" = "Yattee/Yattee-macOS.entitlements";
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 262;
|
||||
CURRENT_PROJECT_VERSION = 264;
|
||||
DEAD_CODE_STRIPPING = YES;
|
||||
DEVELOPMENT_TEAM = 78Z5H3M6RJ;
|
||||
ENABLE_APP_SANDBOX = YES;
|
||||
@@ -800,7 +800,7 @@
|
||||
CODE_SIGN_ENTITLEMENTS = Yattee/Yattee.entitlements;
|
||||
"CODE_SIGN_ENTITLEMENTS[sdk=macosx*]" = "Yattee/Yattee-macOS-DeveloperID.entitlements";
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 262;
|
||||
CURRENT_PROJECT_VERSION = 264;
|
||||
DEAD_CODE_STRIPPING = YES;
|
||||
DEVELOPMENT_TEAM = 78Z5H3M6RJ;
|
||||
ENABLE_APP_SANDBOX = YES;
|
||||
@@ -881,7 +881,7 @@
|
||||
buildSettings = {
|
||||
BUNDLE_LOADER = "$(TEST_HOST)";
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 262;
|
||||
CURRENT_PROJECT_VERSION = 264;
|
||||
DEAD_CODE_STRIPPING = YES;
|
||||
DEVELOPMENT_TEAM = 78Z5H3M6RJ;
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
@@ -910,7 +910,7 @@
|
||||
buildSettings = {
|
||||
CODE_SIGN_ENTITLEMENTS = YatteeShareExtension/YatteeShareExtension.entitlements;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 262;
|
||||
CURRENT_PROJECT_VERSION = 264;
|
||||
DEVELOPMENT_TEAM = 78Z5H3M6RJ;
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
INFOPLIST_FILE = YatteeShareExtension/Info.plist;
|
||||
@@ -942,7 +942,7 @@
|
||||
buildSettings = {
|
||||
CODE_SIGN_ENTITLEMENTS = YatteeTopShelf/YatteeTopShelf.entitlements;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 262;
|
||||
CURRENT_PROJECT_VERSION = 264;
|
||||
DEVELOPMENT_TEAM = 78Z5H3M6RJ;
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
INFOPLIST_FILE = YatteeTopShelf/Info.plist;
|
||||
@@ -977,7 +977,7 @@
|
||||
buildSettings = {
|
||||
CODE_SIGN_ENTITLEMENTS = YatteeShareExtension/YatteeShareExtension.entitlements;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 262;
|
||||
CURRENT_PROJECT_VERSION = 264;
|
||||
DEVELOPMENT_TEAM = 78Z5H3M6RJ;
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
INFOPLIST_FILE = YatteeShareExtension/Info.plist;
|
||||
@@ -1008,7 +1008,7 @@
|
||||
buildSettings = {
|
||||
CODE_SIGN_ENTITLEMENTS = YatteeShareExtension/YatteeShareExtension.entitlements;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 262;
|
||||
CURRENT_PROJECT_VERSION = 264;
|
||||
DEVELOPMENT_TEAM = 78Z5H3M6RJ;
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
INFOPLIST_FILE = YatteeShareExtension/Info.plist;
|
||||
@@ -1040,7 +1040,7 @@
|
||||
buildSettings = {
|
||||
CODE_SIGN_ENTITLEMENTS = YatteeTopShelf/YatteeTopShelf.entitlements;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 262;
|
||||
CURRENT_PROJECT_VERSION = 264;
|
||||
DEVELOPMENT_TEAM = 78Z5H3M6RJ;
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
INFOPLIST_FILE = YatteeTopShelf/Info.plist;
|
||||
@@ -1074,7 +1074,7 @@
|
||||
buildSettings = {
|
||||
CODE_SIGN_ENTITLEMENTS = YatteeTopShelf/YatteeTopShelf.entitlements;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 262;
|
||||
CURRENT_PROJECT_VERSION = 264;
|
||||
DEVELOPMENT_TEAM = 78Z5H3M6RJ;
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
INFOPLIST_FILE = YatteeTopShelf/Info.plist;
|
||||
@@ -1109,7 +1109,7 @@
|
||||
buildSettings = {
|
||||
BUNDLE_LOADER = "$(TEST_HOST)";
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 262;
|
||||
CURRENT_PROJECT_VERSION = 264;
|
||||
DEAD_CODE_STRIPPING = YES;
|
||||
DEVELOPMENT_TEAM = 78Z5H3M6RJ;
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
@@ -1138,7 +1138,7 @@
|
||||
buildSettings = {
|
||||
BUNDLE_LOADER = "$(TEST_HOST)";
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 262;
|
||||
CURRENT_PROJECT_VERSION = 264;
|
||||
DEAD_CODE_STRIPPING = YES;
|
||||
DEVELOPMENT_TEAM = 78Z5H3M6RJ;
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
|
||||
@@ -63,8 +63,12 @@ struct LegacyAccountsImportView: View {
|
||||
}
|
||||
.confirmationDialog(
|
||||
pendingRemoval?.confirmationTitle ?? "",
|
||||
item: $pendingRemoval,
|
||||
titleVisibility: .visible
|
||||
isPresented: Binding(
|
||||
get: { pendingRemoval != nil },
|
||||
set: { if !$0 { pendingRemoval = nil } }
|
||||
),
|
||||
titleVisibility: .visible,
|
||||
presenting: pendingRemoval
|
||||
) { removal in
|
||||
Button(String(localized: "migration.accounts.remove.confirm"), role: .destructive) {
|
||||
confirmRemoval(removal)
|
||||
|
||||
@@ -328,6 +328,8 @@ platform :mac do
|
||||
|
||||
build_mac_app(
|
||||
scheme: SCHEME,
|
||||
sdk: "macosx",
|
||||
destination: "generic/platform=macOS",
|
||||
configuration: "Release-DeveloperID",
|
||||
output_directory: "fastlane/builds/#{version}-#{build}/macOS",
|
||||
output_name: APP_NAME,
|
||||
@@ -348,10 +350,12 @@ platform :mac do
|
||||
|
||||
# Staple the notarization ticket so Gatekeeper doesn't need to phone home
|
||||
# when the user first launches from Sparkle/DMG.
|
||||
sh "xcrun stapler staple 'fastlane/builds/#{version}-#{build}/macOS/#{APP_NAME}.app'"
|
||||
# NOTE: sh runs from the fastlane/ directory, so paths here are relative
|
||||
# to it (no fastlane/ prefix), unlike action arguments above.
|
||||
sh "xcrun stapler staple 'builds/#{version}-#{build}/macOS/#{APP_NAME}.app'"
|
||||
|
||||
# Package the stapled .app into a .zip (Sparkle) and .dmg (Homebrew / direct).
|
||||
dir = "fastlane/builds/#{version}-#{build}/macOS"
|
||||
dir = "builds/#{version}-#{build}/macOS"
|
||||
app = "#{dir}/#{APP_NAME}.app"
|
||||
zip = "#{dir}/#{APP_NAME}-#{version}-macOS.zip"
|
||||
dmg = "#{dir}/#{APP_NAME}-#{version}-macOS.dmg"
|
||||
|
||||
Reference in New Issue
Block a user