Skip to content

Commit 44f49a2

Browse files
Merge branch '385-upgrade-to-xcode-26-without-liquid-glass' into 'master'
Resolve "Upgrade to Xcode 26 without liquid glass" Closes #385 See merge request pace/mobile/ios/pace-cloud-sdk!444
2 parents 5d6b9ec + bdf1314 commit 44f49a2

File tree

25 files changed

+83
-85
lines changed

25 files changed

+83
-85
lines changed

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ before_script:
2626
## Infrastructure
2727
.xcode_version:
2828
tags:
29-
- m1-xcode-16
29+
- m1-xcode-26
3030

3131
### PLists
3232
.plist:

ExampleApp/PACECloudSDKExample.xcodeproj/xcshareddata/xcschemes/PACECloudSDKExample.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1410"
3+
LastUpgradeVersion = "2600"
44
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"

ExampleApp/PACECloudSDKExample/Utils/String+Extension.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import Foundation
99

1010
extension String: Identifiable {
11-
public typealias ID = Int
11+
public typealias ID = Int // swiftlint:disable:this type_name
1212

1313
public var id: Int {
1414
return hash

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

Lines changed: 46 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

FuelingExampleApp/FuelingExampleApp/GasStationList/GasStationListViewModel.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class GasStationListViewModelImplementation: NSObject, GasStationListViewModel {
9090
return
9191
}
9292

93-
if result.response as? FuelingAPI.Fueling.ApproachingAtTheForecourt.Response.Status404 != nil {
93+
if result.response is FuelingAPI.Fueling.ApproachingAtTheForecourt.Response.Status404 {
9494
self?.showApproachingError(message: "Connected Fueling is coming soon to this gas station.")
9595
NSLog("[GasStationListViewModelImplementation] Failed approaching at station \(stationId): 404 - Coming Soon. Request with request-id: \(APIHelper.retrieveRequestID(from: response.urlResponse))") // swiftlint:disable:this line_length
9696
return

FuelingExampleApp/FuelingExampleApp/Login/LoginViewController.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,9 @@ class LoginViewController: UIViewController {
152152
}
153153

154154
private func presentErrorAlert(message: String?) {
155-
let alert = UIAlertController.errorAlert(message: message)
156-
present(alert, animated: true)
155+
DispatchQueue.main.async { [weak self] in
156+
let alert = UIAlertController.errorAlert(message: message)
157+
self?.present(alert, animated: true)
158+
}
157159
}
158160
}

FuelingExampleApp/FuelingExampleApp/PumpStatus/PumpStatusViewModel.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,13 +256,13 @@ extension PumpStatusViewModelImplementation {
256256
waitForTransactionRequest = APIHelper.makePayRequest(request) { [weak self] response in
257257
switch response.result {
258258
case .success(let result):
259-
if result.response as? PayAPI.PaymentTransactions.GetTransaction.Response.Status410 != nil {
259+
if result.response is PayAPI.PaymentTransactions.GetTransaction.Response.Status410 {
260260
self?.handleCancelledTransaction()
261261
NSLog("[PumpStatusViewModelImplementation] Wait for transaction cancelled: Status code 410. Request with request-id: \(APIHelper.retrieveRequestID(from: response.urlResponse))") // swiftlint:disable:this line_length
262262
return
263263
}
264264

265-
if result.response as? PayAPI.PaymentTransactions.GetTransaction.Response.Status404 != nil {
265+
if result.response is PayAPI.PaymentTransactions.GetTransaction.Response.Status404 {
266266
self?.waitForTransaction()
267267
return
268268
}

PACECloudSDK.xcodeproj/project.pbxproj

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,6 @@
419419
3B79FAA826C15BF900C0278F /* LiveData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B5503F02539E61C00C291F1 /* LiveData.swift */; };
420420
3B79FAA926C15BF900C0278F /* POIKitLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BD1B2B12581287E001EFEB0 /* POIKitLogger.swift */; };
421421
3B79FAAA26C15BF900C0278F /* POIKitConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BD1B2B525812899001EFEB0 /* POIKitConstants.swift */; };
422-
3B79FAAB26C15BF900C0278F /* PKOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BC9A7E12539DDAD00B933AE /* PKOperation.swift */; };
423422
3B79FAAC26C15BF900C0278F /* MimeTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B855326253D7052001F7B66 /* MimeTypes.swift */; };
424423
3B79FAAD26C15BFD00C0278F /* Polyline.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BC9A7CF2539DDAD00B933AE /* Polyline.swift */; };
425424
3B79FAAE26C15C0300C0278F /* Notification+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B970A062542D9BA0072F6BA /* Notification+Extension.swift */; };
@@ -789,7 +788,6 @@
789788
3BC9A8152539DDAD00B933AE /* Polyline.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BC9A7CF2539DDAD00B933AE /* Polyline.swift */; };
790789
3BC9A8162539DDAD00B933AE /* POIKitConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BC9A7D02539DDAD00B933AE /* POIKitConfig.swift */; };
791790
3BC9A81E2539DDAD00B933AE /* POIKitDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BC9A7DA2539DDAD00B933AE /* POIKitDelegate.swift */; };
792-
3BC9A8222539DDAD00B933AE /* PKOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BC9A7E12539DDAD00B933AE /* PKOperation.swift */; };
793791
3BC9A8232539DDAD00B933AE /* NSURLErrors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BC9A7E22539DDAD00B933AE /* NSURLErrors.swift */; };
794792
3BC9A8252539DDAD00B933AE /* CLLocationCoordinate2D+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BC9A7E52539DDAD00B933AE /* CLLocationCoordinate2D+Extension.swift */; };
795793
3BC9A8262539DDAD00B933AE /* GeometryCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BC9A7E62539DDAD00B933AE /* GeometryCommand.swift */; };
@@ -1609,7 +1607,6 @@
16091607
3BC9A7CF2539DDAD00B933AE /* Polyline.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Polyline.swift; sourceTree = "<group>"; };
16101608
3BC9A7D02539DDAD00B933AE /* POIKitConfig.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = POIKitConfig.swift; sourceTree = "<group>"; };
16111609
3BC9A7DA2539DDAD00B933AE /* POIKitDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = POIKitDelegate.swift; sourceTree = "<group>"; };
1612-
3BC9A7E12539DDAD00B933AE /* PKOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PKOperation.swift; sourceTree = "<group>"; };
16131610
3BC9A7E22539DDAD00B933AE /* NSURLErrors.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSURLErrors.swift; sourceTree = "<group>"; };
16141611
3BC9A7E52539DDAD00B933AE /* CLLocationCoordinate2D+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CLLocationCoordinate2D+Extension.swift"; sourceTree = "<group>"; };
16151612
3BC9A7E62539DDAD00B933AE /* GeometryCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeometryCommand.swift; sourceTree = "<group>"; };
@@ -2841,7 +2838,6 @@
28412838
children = (
28422839
3B5503F02539E61C00C291F1 /* LiveData.swift */,
28432840
3B855326253D7052001F7B66 /* MimeTypes.swift */,
2844-
3BC9A7E12539DDAD00B933AE /* PKOperation.swift */,
28452841
3BD1B2B12581287E001EFEB0 /* POIKitLogger.swift */,
28462842
3BD1B2B525812899001EFEB0 /* POIKitConstants.swift */,
28472843
);
@@ -3678,7 +3674,7 @@
36783674
attributes = {
36793675
BuildIndependentTargetsInParallel = YES;
36803676
LastSwiftUpdateCheck = 1240;
3681-
LastUpgradeCheck = 1500;
3677+
LastUpgradeCheck = 2600;
36823678
TargetAttributes = {
36833679
17BB0CD6268CCED6009D4755 = {
36843680
CreatedOnToolsVersion = 12.5.1;
@@ -4005,7 +4001,6 @@
40054001
17BB0D15268CCF92009D4755 /* FuelingAPICancelPreAuth.swift in Sources */,
40064002
17B4E54F26D39CA400AEAF13 /* UserAPIDeleteCurrentUser.swift in Sources */,
40074003
3BDBA7222BF396F1006C0151 /* PCPOIStats.swift in Sources */,
4008-
3B79FAAB26C15BF900C0278F /* PKOperation.swift in Sources */,
40094004
17BB0D00268CCF13009D4755 /* PayAPIDeletePaymentMethod.swift in Sources */,
40104005
3B79FA8F26C15BEB00C0278F /* tile_query_response.proto in Sources */,
40114006
17BB0D05268CCF13009D4755 /* PayAPICreatePaymentMethodSEPA.swift in Sources */,
@@ -4512,7 +4507,6 @@
45124507
841A3ED625B9C8D50065284A /* FuelingAPIResponse.swift in Sources */,
45134508
84A43AD92580E35A00DE36FA /* APIClientError.swift in Sources */,
45144509
3BC9A80D2539DDAD00B933AE /* CGPoint+Coordinates.swift in Sources */,
4515-
3BC9A8222539DDAD00B933AE /* PKOperation.swift in Sources */,
45164510
3B2FB1D72844EB2800E8CD0C /* PCUserOAuth2Error.swift in Sources */,
45174511
84600F5125C03B340087194F /* FuelingAPIGetPump.swift in Sources */,
45184512
3BC9A7F92539DDAD00B933AE /* tile_query_response.proto in Sources */,
@@ -5107,6 +5101,7 @@
51075101
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
51085102
CLANG_WARN_UNREACHABLE_CODE = YES;
51095103
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
5104+
CODE_SIGN_IDENTITY = "";
51105105
CODE_SIGN_STYLE = Automatic;
51115106
COPY_PHASE_STRIP = YES;
51125107
CURRENT_PROJECT_VERSION = 1;
@@ -5194,6 +5189,7 @@
51945189
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
51955190
CLANG_WARN_UNREACHABLE_CODE = YES;
51965191
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
5192+
CODE_SIGN_IDENTITY = "";
51975193
CODE_SIGN_STYLE = Automatic;
51985194
COPY_PHASE_STRIP = YES;
51995195
CURRENT_PROJECT_VERSION = 1;
@@ -5276,6 +5272,7 @@
52765272
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
52775273
CLANG_WARN_UNREACHABLE_CODE = YES;
52785274
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
5275+
CODE_SIGN_IDENTITY = "";
52795276
CODE_SIGN_STYLE = Automatic;
52805277
COPY_PHASE_STRIP = YES;
52815278
CURRENT_PROJECT_VERSION = 1;
@@ -5645,7 +5642,6 @@
56455642
3BB9D5F6255A6C26004A2762 /* Sandbox */ = {
56465643
isa = XCBuildConfiguration;
56475644
buildSettings = {
5648-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
56495645
CLANG_ENABLE_MODULES = YES;
56505646
CODE_SIGN_STYLE = Automatic;
56515647
DEVELOPMENT_TEAM = 8T694MPXAZ;
@@ -5880,7 +5876,6 @@
58805876
921E68442534883200438491 /* Development */ = {
58815877
isa = XCBuildConfiguration;
58825878
buildSettings = {
5883-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
58845879
CLANG_ENABLE_MODULES = YES;
58855880
CODE_SIGN_STYLE = Automatic;
58865881
DEVELOPMENT_TEAM = 8T694MPXAZ;
@@ -5905,7 +5900,6 @@
59055900
921E68452534883200438491 /* Production */ = {
59065901
isa = XCBuildConfiguration;
59075902
buildSettings = {
5908-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
59095903
CLANG_ENABLE_MODULES = YES;
59105904
CODE_SIGN_STYLE = Automatic;
59115905
DEVELOPMENT_TEAM = 8T694MPXAZ;
@@ -5960,6 +5954,7 @@
59605954
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
59615955
CLANG_WARN_UNREACHABLE_CODE = YES;
59625956
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
5957+
CODE_SIGN_IDENTITY = "";
59635958
CODE_SIGN_STYLE = Automatic;
59645959
COPY_PHASE_STRIP = YES;
59655960
CURRENT_PROJECT_VERSION = 1;
@@ -6047,6 +6042,7 @@
60476042
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
60486043
CLANG_WARN_UNREACHABLE_CODE = YES;
60496044
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
6045+
CODE_SIGN_IDENTITY = "";
60506046
CODE_SIGN_STYLE = Automatic;
60516047
COPY_PHASE_STRIP = YES;
60526048
CURRENT_PROJECT_VERSION = 1;
@@ -6128,6 +6124,7 @@
61286124
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
61296125
CLANG_WARN_UNREACHABLE_CODE = YES;
61306126
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
6127+
CODE_SIGN_IDENTITY = "";
61316128
CODE_SIGN_STYLE = Automatic;
61326129
COPY_PHASE_STRIP = YES;
61336130
CURRENT_PROJECT_VERSION = 1;

PACECloudSDK.xcodeproj/xcshareddata/xcschemes/PACECloudSDK.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1500"
3+
LastUpgradeVersion = "2600"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

PACECloudSDK.xcodeproj/xcshareddata/xcschemes/PACECloudSDKTests.xcscheme

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1500"
3+
LastUpgradeVersion = "2600"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -72,15 +72,6 @@
7272
savedToolIdentifier = ""
7373
useCustomWorkingDirectory = "NO"
7474
debugDocumentVersioning = "YES">
75-
<MacroExpansion>
76-
<BuildableReference
77-
BuildableIdentifier = "primary"
78-
BlueprintIdentifier = "921E682B2534883100438491"
79-
BuildableName = "PACECloudSDK.framework"
80-
BlueprintName = "PACECloudSDK"
81-
ReferencedContainer = "container:PACECloudSDK.xcodeproj">
82-
</BuildableReference>
83-
</MacroExpansion>
8475
</ProfileAction>
8576
<AnalyzeAction
8677
buildConfiguration = "Development">

0 commit comments

Comments
 (0)