diff --git a/Scripts/check_fork_identity.sh b/Scripts/check_fork_identity.sh index aef6d40d..8a7c9d72 100755 --- a/Scripts/check_fork_identity.sh +++ b/Scripts/check_fork_identity.sh @@ -43,8 +43,8 @@ readonly app_id="dev.jacobcx.Xcodes" readonly tests_id="dev.jacobcx.Xcodes.Tests" readonly helper_id="dev.jacobcx.Xcodes.Helper" readonly team_id="K2648T24P4" -readonly marketing_version="4.1.3" -readonly build_number="51" +readonly marketing_version="4.1.4" +readonly build_number="52" readonly app_copyright="Fork contributions © 2026 JacobCXDev. Upstream contributors retain their copyrights." # shellcheck disable=SC2016 # Xcode expands this build-setting literal, not the shell. readonly app_requirement='identifier "dev.jacobcx.Xcodes" and info [CFBundleShortVersionString] >= "1.0.0" and anchor apple generic and certificate leaf[subject.OU] = "$(CODE_SIGNING_SUBJECT_ORGANIZATIONAL_UNIT)"' diff --git a/Xcodes.xcodeproj/project.pbxproj b/Xcodes.xcodeproj/project.pbxproj index f95d8a16..cb629883 100644 --- a/Xcodes.xcodeproj/project.pbxproj +++ b/Xcodes.xcodeproj/project.pbxproj @@ -1094,7 +1094,7 @@ CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 51; + CURRENT_PROJECT_VERSION = 52; DEVELOPMENT_ASSET_PATHS = "\"Xcodes/Preview Content\""; DEVELOPMENT_TEAM = K2648T24P4; ENABLE_HARDENED_RUNTIME = NO; @@ -1106,7 +1106,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 14.6; - MARKETING_VERSION = 4.1.3; + MARKETING_VERSION = 4.1.4; PRODUCT_BUNDLE_IDENTIFIER = dev.jacobcx.Xcodes; PRODUCT_NAME = Xcodes; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1347,7 +1347,7 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 51; + CURRENT_PROJECT_VERSION = 52; DEVELOPMENT_ASSET_PATHS = "\"Xcodes/Preview Content\""; DEVELOPMENT_TEAM = K2648T24P4; ENABLE_HARDENED_RUNTIME = YES; @@ -1359,7 +1359,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 14.6; - MARKETING_VERSION = 4.1.3; + MARKETING_VERSION = 4.1.4; PRODUCT_BUNDLE_IDENTIFIER = dev.jacobcx.Xcodes; PRODUCT_NAME = Xcodes; SWIFT_VERSION = 6.0; @@ -1376,7 +1376,7 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 51; + CURRENT_PROJECT_VERSION = 52; DEVELOPMENT_ASSET_PATHS = "\"Xcodes/Preview Content\""; DEVELOPMENT_TEAM = K2648T24P4; ENABLE_HARDENED_RUNTIME = YES; @@ -1388,7 +1388,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 14.6; - MARKETING_VERSION = 4.1.3; + MARKETING_VERSION = 4.1.4; PRODUCT_BUNDLE_IDENTIFIER = dev.jacobcx.Xcodes; PRODUCT_NAME = Xcodes; SWIFT_VERSION = 6.0; diff --git a/Xcodes/Frontend/Preferences/GeneralPreferencePane.swift b/Xcodes/Frontend/Preferences/GeneralPreferencePane.swift index b32bc578..a9f56486 100644 --- a/Xcodes/Frontend/Preferences/GeneralPreferencePane.swift +++ b/Xcodes/Frontend/Preferences/GeneralPreferencePane.swift @@ -24,6 +24,7 @@ enum AppleAccountPreferencePresentation: Equatable { struct GeneralPreferencePane: View { @EnvironmentObject var appState: AppState + @SwiftUI.Environment(\.openWindow) private var openWindow var body: some View { VStack(alignment: .leading) { @@ -38,7 +39,10 @@ struct GeneralPreferencePane: View { case .signedIn: SignedInView() case .signedOut: - Button("SignIn", action: { self.appState.presentedSheet = .signIn }) + Button("SignIn") { + openWindow(id: "main") + appState.presentedSheet = .signIn + } } } .groupBoxStyle(PreferencesGroupBoxStyle())