Skip to content

Commit dbee2ee

Browse files
alicerunsonfedoraalicerunsonfedora
committed
Bump minimum target to OS 26
1 parent 10374db commit dbee2ee

20 files changed

+216
-294
lines changed

‎Alidade.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

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

‎MCMaps.xcodeproj/project.pbxproj‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -460,10 +460,10 @@
460460
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
461461
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
462462
INFOPLIST_KEY_UISupportsDocumentBrowser = YES;
463-
IPHONEOS_DEPLOYMENT_TARGET = 18.2;
463+
IPHONEOS_DEPLOYMENT_TARGET = 26.0;
464464
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
465465
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
466-
MACOSX_DEPLOYMENT_TARGET = 15.2;
466+
MACOSX_DEPLOYMENT_TARGET = 26.0;
467467
MARKETING_VERSION = 2026.1;
468468
PRODUCT_BUNDLE_IDENTIFIER = net.marquiskurt.MCMaps;
469469
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -518,10 +518,10 @@
518518
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
519519
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
520520
INFOPLIST_KEY_UISupportsDocumentBrowser = YES;
521-
IPHONEOS_DEPLOYMENT_TARGET = 18.2;
521+
IPHONEOS_DEPLOYMENT_TARGET = 26.0;
522522
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
523523
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
524-
MACOSX_DEPLOYMENT_TARGET = 15.2;
524+
MACOSX_DEPLOYMENT_TARGET = 26.0;
525525
MARKETING_VERSION = 2026.1;
526526
PRODUCT_BUNDLE_IDENTIFIER = net.marquiskurt.MCMaps;
527527
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -543,16 +543,17 @@
543543
CURRENT_PROJECT_VERSION = 1;
544544
DEAD_CODE_STRIPPING = YES;
545545
GENERATE_INFOPLIST_FILE = YES;
546-
IPHONEOS_DEPLOYMENT_TARGET = 18.2;
547-
MACOSX_DEPLOYMENT_TARGET = 15.2;
546+
IPHONEOS_DEPLOYMENT_TARGET = 26.0;
547+
MACOSX_DEPLOYMENT_TARGET = 26.0;
548548
MARKETING_VERSION = 1.0;
549549
PRODUCT_BUNDLE_IDENTIFIER = net.marquiskurt.MCMapsTests;
550550
PRODUCT_NAME = "$(TARGET_NAME)";
551551
SDKROOT = auto;
552-
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx xros xrsimulator";
552+
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
553+
SUPPORTS_MACCATALYST = NO;
553554
SWIFT_EMIT_LOC_STRINGS = NO;
554555
SWIFT_VERSION = 5.0;
555-
TARGETED_DEVICE_FAMILY = "1,2,7";
556+
TARGETED_DEVICE_FAMILY = "1,2";
556557
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Alidade.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Alidade";
557558
XROS_DEPLOYMENT_TARGET = 2.2;
558559
};
@@ -566,16 +567,17 @@
566567
CURRENT_PROJECT_VERSION = 1;
567568
DEAD_CODE_STRIPPING = YES;
568569
GENERATE_INFOPLIST_FILE = YES;
569-
IPHONEOS_DEPLOYMENT_TARGET = 18.2;
570-
MACOSX_DEPLOYMENT_TARGET = 15.2;
570+
IPHONEOS_DEPLOYMENT_TARGET = 26.0;
571+
MACOSX_DEPLOYMENT_TARGET = 26.0;
571572
MARKETING_VERSION = 1.0;
572573
PRODUCT_BUNDLE_IDENTIFIER = net.marquiskurt.MCMapsTests;
573574
PRODUCT_NAME = "$(TARGET_NAME)";
574575
SDKROOT = auto;
575-
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx xros xrsimulator";
576+
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
577+
SUPPORTS_MACCATALYST = NO;
576578
SWIFT_EMIT_LOC_STRINGS = NO;
577579
SWIFT_VERSION = 5.0;
578-
TARGETED_DEVICE_FAMILY = "1,2,7";
580+
TARGETED_DEVICE_FAMILY = "1,2";
579581
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Alidade.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Alidade";
580582
XROS_DEPLOYMENT_TARGET = 2.2;
581583
};

‎MCMaps/Red Window/Extensions/View+BackgroundExtensionEffect.swift‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎MCMaps/Red Window/Views/Detail/Cells/RedWindowPinHeader.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ struct RedWindowPinHeader: RedWindowDetailCell {
3636
LinearGradient(
3737
colors: [
3838
Color.black.opacity(1),
39-
Color.black.opacity(0)
39+
Color.black.opacity(0),
4040
],
4141
startPoint: .bottom,
4242
endPoint: .top)
@@ -76,7 +76,7 @@ struct RedWindowPinHeader: RedWindowDetailCell {
7676
}
7777

7878
.frame(height: Constants.headerHeight)
79-
.backgroundExtensionEffectIfAvailable()
79+
.backgroundExtensionEffect()
8080
.animation(.interactiveSpring, value: colorSchemeContrast)
8181
.overlay(alignment: .bottomLeading) {
8282
HStack {

‎MCMaps/Red Window/Views/Detail/RedWindowPinDetailView.swift‎

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -144,21 +144,21 @@ struct RedWindowPinDetailView: View {
144144
WorldCodedDimensionPicker(selection: $pin.dimension)
145145
}
146146
}
147-
RedWindowToolbarSpacer()
147+
ToolbarSpacer(.fixed)
148148
ToolbarItem {
149149
Button("Manage Tags…", systemImage: "tag") {
150150
presentTagEditor.toggle()
151151
}
152152
}
153-
RedWindowToolbarSpacer()
153+
ToolbarSpacer(.fixed)
154154
}
155155

156156
if !editMode {
157-
RedWindowToolbarSpacer()
157+
ToolbarSpacer(.fixed)
158158
photoUploadToolbar
159159
}
160160

161-
RedWindowToolbarSpacer()
161+
ToolbarSpacer(.fixed)
162162

163163
if !editMode {
164164
ToolbarItem {
@@ -169,13 +169,13 @@ struct RedWindowPinDetailView: View {
169169
}
170170
}
171171

172-
RedWindowToolbarSpacer()
172+
ToolbarSpacer(.fixed)
173173

174174
ToolbarItem {
175175
editButton
176176
}
177177

178-
RedWindowToolbarSpacer()
178+
ToolbarSpacer(.fixed)
179179

180180
ToolbarItem {
181181
if canDisplayMapView {
@@ -283,20 +283,12 @@ struct RedWindowPinDetailView: View {
283283
private var editButton: some View {
284284
Group {
285285
if editMode {
286-
if #available(iOS 19, macOS 16, *) {
287-
Button(role: .confirm) {
288-
withAnimation {
289-
editMode.toggle()
290-
}
291-
}
292-
} else {
293-
Button("Done", systemImage: "checkmark") {
294-
withAnimation {
295-
editMode.toggle()
296-
}
297-
}
298-
.buttonStyle(.borderedProminent)
286+
Button("Done", systemImage: "checkmark") {
287+
withAnimation {
288+
editMode.toggle()
299289
}
290+
}
291+
.buttonStyle(.borderedProminent)
300292
} else {
301293
Button("Edit") {
302294
withAnimation {

‎MCMaps/Red Window/Views/Library/RedWindowPinLibraryView.swift‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,7 @@ struct RedWindowPinLibraryView: View {
151151
.pickerStyle(.inline)
152152
}
153153
}
154-
if #available(macOS 16, iOS 19, *) {
155-
ToolbarSpacer(.fixed)
156-
}
154+
ToolbarSpacer(.fixed)
157155
ToolbarItem {
158156
Button("Create Pin", systemImage: "plus") {
159157
displayForm.toggle()

‎MCMaps/Red Window/Views/Map/RedWindowMapView.swift‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,29 +55,29 @@ struct RedWindowMapView: View {
5555
}
5656
}
5757
#if os(macOS)
58-
.toolbarBackgroundVisibility(.hidden, for: .windowToolbar)
58+
.toolbarBackgroundVisibility(.hidden, for: .windowToolbar)
5959
#endif
6060
.animation(.interactiveSpring, value: state)
6161
.ignoresSafeArea(.all)
6262
.overlay(alignment: .bottomLeading) {
6363
IntegrationFetchStateView(state: state)
6464
.padding(8)
6565
.opacity(file.integrations.enabled ? 1 : 0)
66-
#if os(macOS)
67-
.padding(.bottom, 4)
68-
#endif
66+
#if os(macOS)
67+
.padding(.bottom, 4)
68+
#endif
6969
}
7070
.overlay(alignment: .bottomTrailing) {
7171
LocationBadge(location: env.mapCenterCoordinate)
7272
.environment(\.contentTransitionAddsDrawingGroup, true)
7373
.labelStyle(.titleAndIcon)
74-
#if os(macOS)
75-
.padding(.bottom, 4)
76-
// NOTE(alicerunsonfedora): This applies the zoom control's width (36) with some extra padding,
77-
// but it's unclear how this will change over time, let alone whether this is the right way to
78-
// offset the badge to prevent obstructions (see ALD-20).
79-
.padding(.trailing, 48)
80-
#endif
74+
#if os(macOS)
75+
.padding(.bottom, 4)
76+
// NOTE(alicerunsonfedora): This applies the zoom control's width (36) with some extra padding,
77+
// but it's unclear how this will change over time, let alone whether this is the right way to
78+
// offset the badge to prevent obstructions (see ALD-20).
79+
.padding(.trailing, 48)
80+
#endif
8181
}
8282
.onChange(of: env.currentModalRoute, initial: false) { _, newValue in
8383
guard let newValue else { return }
@@ -130,9 +130,7 @@ struct RedWindowMapView: View {
130130
}
131131
}
132132

133-
if #available(macOS 16, iOS 19, *) {
134-
ToolbarSpacer(.fixed)
135-
}
133+
ToolbarSpacer(.fixed)
136134

137135
ToolbarItem {
138136
Button("Go To", systemImage: "figure.walk") {

‎MCMaps/Red Window/Views/Map/RedWindowMapWarpForm.swift‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ struct RedWindowMapWarpForm: View {
2222
var body: some View {
2323
Form {
2424
#if os(iOS)
25-
LabeledContent("X Coordinate") {
25+
LabeledContent("X Coordinate") {
26+
TextField("X", value: $xCoordinate, format: .number)
27+
}
28+
LabeledContent("Z Coordinate") {
29+
TextField("Z", value: $zCoordinate, format: .number)
30+
}
31+
#else
2632
TextField("X", value: $xCoordinate, format: .number)
27-
}
28-
LabeledContent("Z Coordinate") {
2933
TextField("Z", value: $zCoordinate, format: .number)
30-
}
31-
#else
32-
TextField("X", value: $xCoordinate, format: .number)
33-
TextField("Z", value: $zCoordinate, format: .number)
3434
#endif
3535
}
3636
#if os(macOS)
@@ -39,16 +39,9 @@ struct RedWindowMapWarpForm: View {
3939
.navigationTitle("Go To Coordinate")
4040
.toolbar {
4141
ToolbarItem {
42-
if #available(iOS 19, macOS 16, *) {
43-
Button("Go", systemImage: "checkmark", role: .confirm) {
44-
redWindowEnvironment.mapCenterCoordinate = CGPoint(x: xCoordinate, y: zCoordinate)
45-
dismiss()
46-
}
47-
} else {
48-
Button("Go") {
49-
redWindowEnvironment.mapCenterCoordinate = CGPoint(x: xCoordinate, y: zCoordinate)
50-
dismiss()
51-
}
42+
Button("Go", systemImage: "checkmark", role: .confirm) {
43+
redWindowEnvironment.mapCenterCoordinate = CGPoint(x: xCoordinate, y: zCoordinate)
44+
dismiss()
5245
}
5346
}
5447
}

‎MCMaps/Red Window/Views/RedWindowToolbarSpacer.swift‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎MCMaps/Resources/Alidade.docc/Changelogs/Changelog-Unreleased.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,7 @@ release.
1414
This document is used to cover upcoming features and changes to Alidade
1515
that aren't available in a particular release yet. These will change over
1616
time as new versions and features are added.
17+
18+
### General
19+
20+
- Alidade 2026.1 now requires iOS/macOS 26 or later.

0 commit comments

Comments
 (0)