Skip to content

Commit a991764

Browse files
authored
Merge pull request #813 from XcodesOrg/hopefullyfixLaunchCrash
fix crash on launch for some people
2 parents 2f2c258 + 644e82c commit a991764

6 files changed

Lines changed: 1319 additions & 234 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ on:
88

99
jobs:
1010
test:
11-
runs-on: macos-15
11+
runs-on: macos-26
1212
steps:
1313
- uses: actions/checkout@v4
1414
- name: Run tests
1515
env:
16-
DEVELOPER_DIR: /Applications/Xcode_16.4.app
16+
DEVELOPER_DIR: /Applications/Xcode_26.5.app
1717
run: xcodebuild test -scheme Xcodes

.github/workflows/xcstrings.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
jobs:
1111
test:
12-
runs-on: macos-13
12+
runs-on: macos-26
1313
steps:
1414
- uses: actions/checkout@v4
1515

Xcodes.xcodeproj/project.pbxproj

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,6 @@
305305
E87DD6EA25D053FA00D86808 /* Progress+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Progress+.swift"; sourceTree = "<group>"; };
306306
E89342F925EDCC17007CF557 /* NotificationManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationManager.swift; sourceTree = "<group>"; };
307307
E8977EA225C11E1500835F80 /* PreferencesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesView.swift; sourceTree = "<group>"; };
308-
E89CBD3B2D5FC0B10037ED95 /* XcodesLoginKit */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = XcodesLoginKit; path = ../XcodesLoginKit; sourceTree = "<group>"; };
309308
E89CBD3F2D6434E10037ED95 /* SignInFederatedView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInFederatedView.swift; sourceTree = "<group>"; };
310309
E8B20CBE2A2EDEC20057D816 /* SDKs+Xcode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SDKs+Xcode.swift"; sourceTree = "<group>"; };
311310
E8C0EB1B291EF9A10081528A /* AppState+Runtimes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppState+Runtimes.swift"; sourceTree = "<group>"; };
@@ -539,7 +538,6 @@
539538
CAD2E7952449574E00113D76 = {
540539
isa = PBXGroup;
541540
children = (
542-
E89CBD3B2D5FC0B10037ED95 /* XcodesLoginKit */,
543541
CA8FB5F8256E0F9400469DA5 /* README.md */,
544542
CABFA9D42592EF6300380FEE /* DECISIONS.md */,
545543
CABFA9A02592EAF500380FEE /* R&PLogo.png */,
@@ -775,6 +773,7 @@
775773
E8FD5725291EE4AC001E004C /* XCRemoteSwiftPackageReference "AsyncHTTPNetworkService" */,
776774
E8F44A1C296B4CD7002D6592 /* XCRemoteSwiftPackageReference "Path" */,
777775
E856BB74291EDD3D00DC438B /* XCRemoteSwiftPackageReference "XcodesKit" */,
776+
E89CBD3B2D5FC0B10037ED95 /* XCRemoteSwiftPackageReference "XcodesLoginKit" */,
778777
E84E4F552B335094003F3959 /* XCRemoteSwiftPackageReference "swift-collections" */,
779778
E83FDC422CBB649100679C6B /* XCRemoteSwiftPackageReference "Sparkle" */,
780779
);
@@ -1100,7 +1099,7 @@
11001099
"@executable_path/../Frameworks",
11011100
"@loader_path/../Frameworks",
11021101
);
1103-
MACOSX_DEPLOYMENT_TARGET = 13.0;
1102+
MACOSX_DEPLOYMENT_TARGET = 14.6;
11041103
PRODUCT_BUNDLE_IDENTIFIER = com.robotsandpencils.XcodesAppTests;
11051104
PRODUCT_NAME = "$(TARGET_NAME)";
11061105
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1380,7 +1379,7 @@
13801379
"@executable_path/../Frameworks",
13811380
"@loader_path/../Frameworks",
13821381
);
1383-
MACOSX_DEPLOYMENT_TARGET = 13.0;
1382+
MACOSX_DEPLOYMENT_TARGET = 14.6;
13841383
PRODUCT_BUNDLE_IDENTIFIER = com.robotsandpencils.XcodesAppTests;
13851384
PRODUCT_NAME = "$(TARGET_NAME)";
13861385
SWIFT_VERSION = 6.0;
@@ -1403,7 +1402,7 @@
14031402
"@executable_path/../Frameworks",
14041403
"@loader_path/../Frameworks",
14051404
);
1406-
MACOSX_DEPLOYMENT_TARGET = 13.0;
1405+
MACOSX_DEPLOYMENT_TARGET = 14.6;
14071406
PRODUCT_BUNDLE_IDENTIFIER = com.xcodesorg.xcodesapp.XcodesAppTests;
14081407
PRODUCT_NAME = "$(TARGET_NAME)";
14091408
SWIFT_VERSION = 6.0;
@@ -1521,6 +1520,14 @@
15211520
minimumVersion = 1.0.3;
15221521
};
15231522
};
1523+
E89CBD3B2D5FC0B10037ED95 /* XCRemoteSwiftPackageReference "XcodesLoginKit" */ = {
1524+
isa = XCRemoteSwiftPackageReference;
1525+
repositoryURL = "https://github.com/XcodesOrg/XcodesLoginKit";
1526+
requirement = {
1527+
branch = main;
1528+
kind = branch;
1529+
};
1530+
};
15241531
E8F44A1C296B4CD7002D6592 /* XCRemoteSwiftPackageReference "Path" */ = {
15251532
isa = XCRemoteSwiftPackageReference;
15261533
repositoryURL = "https://github.com/mxcl/Path.swift";
@@ -1581,10 +1588,12 @@
15811588
};
15821589
E89CBD372D5FAB950037ED95 /* XcodesLoginKit */ = {
15831590
isa = XCSwiftPackageProductDependency;
1591+
package = E89CBD3B2D5FC0B10037ED95 /* XCRemoteSwiftPackageReference "XcodesLoginKit" */;
15841592
productName = XcodesLoginKit;
15851593
};
15861594
E89CBD392D5FB8920037ED95 /* XcodesLoginKitSecurityKey */ = {
15871595
isa = XCSwiftPackageProductDependency;
1596+
package = E89CBD3B2D5FC0B10037ED95 /* XCRemoteSwiftPackageReference "XcodesLoginKit" */;
15881597
productName = XcodesLoginKitSecurityKey;
15891598
};
15901599
E8C0EB19291EF43E0081528A /* XcodesKit */ = {

Xcodes.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 11 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Xcodes/Backend/HelperClient.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ final class HelperClient {
3030

3131
private func helper(errorHandler: @escaping @Sendable (Error) -> Void) -> HelperXPCProtocol? {
3232
guard
33-
let helper = self.currentConnection()?.remoteObjectProxyWithErrorHandler({ error in
34-
errorHandler(error)
35-
}) as? HelperXPCProtocol
33+
let helper = self.currentConnection()?.remoteObjectProxyWithErrorHandler(errorHandler) as? HelperXPCProtocol
3634
else { return nil }
3735
return helper
3836
}

0 commit comments

Comments
 (0)