Merge pull request #5669 from wikimedia/update-deployment-target

l-olson1214 · web-flow · commit 8e5ca003450d · 2026-02-12T10:36:51.000-05:00
Update deployment target to iOS 17+
diff --git a/WMFComponents/Package.swift b/WMFComponents/Package.swift
@@ -1,11 +1,11 @@
-// swift-tools-version: 5.8
+// swift-tools-version: 5.9
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
     name: "WMFComponents",
-    platforms: [.iOS(.v16)],
+    platforms: [.iOS(.v17)],
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.
         .library(
diff --git a/WMFComponents/Sources/WMFComponents/Components/Article Tabs/WMFArticleTabsView.swift b/WMFComponents/Sources/WMFComponents/Components/Article Tabs/WMFArticleTabsView.swift
@@ -2,7 +2,6 @@ import SwiftUI
 import WMFData
 import UIKit
 
-@available(iOS 16.4, *) // Note: the app is currently 16.6+, but the package config doesn't allow minor version configs
 public struct WMFArticleTabsView: View {
     @ObservedObject var appEnvironment = WMFAppEnvironment.current
     @Environment(\.colorScheme) var colorScheme
diff --git a/WMFComponents/Sources/WMFComponents/Components/Editors/Source Editor/WMFSourceEditorTextFrameworkMediator.swift b/WMFComponents/Sources/WMFComponents/Components/Editors/Source Editor/WMFSourceEditorTextFrameworkMediator.swift
diff --git a/WMFComponents/Sources/WMFComponents/Components/History/WMFHistoryView.swift b/WMFComponents/Sources/WMFComponents/Components/History/WMFHistoryView.swift
@@ -1,7 +1,6 @@
 import SwiftUI
 import WMFData
 
-@available(iOS 16.4, *) // Note: the app is currently 16.6+, but the package config doesn't allow minor version configs
 public struct WMFHistoryView: View {
 
     // MARK: - Properties
diff --git a/WMFComponents/Sources/WMFComponents/Components/Shared/Onboarding/WMFOnboardingView.swift b/WMFComponents/Sources/WMFComponents/Components/Shared/Onboarding/WMFOnboardingView.swift
@@ -79,18 +79,10 @@ public struct WMFOnboardingView: View {
 
     public var body: some View {
         VStack(spacing: 0) {
-
-            if #available(iOS 17.0, *) {
-                ScrollView(showsIndicators: true) {
-                    scrollViewContent
-                }
-                .scrollIndicatorsFlash(trigger: flashScrollIndicators)
-            } else {
-                ScrollView(showsIndicators: true) {
-                    scrollViewContent
-                }
+            ScrollView(showsIndicators: true) {
+                scrollViewContent
             }
-
+            .scrollIndicatorsFlash(trigger: flashScrollIndicators)
             buttonArea
         }
         .background(Color(appEnvironment.theme.paperBackground).ignoresSafeArea())
diff --git a/WMFComponents/Sources/WMFComponents/Components/Year in Review/Views/WMFYearInReviewScrollView.swift b/WMFComponents/Sources/WMFComponents/Components/Year in Review/Views/WMFYearInReviewScrollView.swift
@@ -26,25 +26,16 @@ struct WMFYearInReviewScrollView: View {
             scrollViewContents
         }
     }
-    
-    @available(iOS 17.0, *)
+
     private var flashingScrollView: some View {
         scrollView
         .scrollIndicatorsFlash(trigger: flashScrollIndicators)
         .scrollBounceBehavior(.basedOnSize, axes: .vertical)
     }
-    
-    private var nonFlashingScrollView: some View {
-        scrollView
-    }
-    
+
     private var content: some View {
         Group {
-            if #available(iOS 17.0, *) {
-                flashingScrollView
-            } else {
-                nonFlashingScrollView
-            }
+            flashingScrollView
         }
     }
 
diff --git a/WMFComponents/Sources/WMFComponents/Extensions/Navigation Bar/WMFNavigationBarConfiguring.swift b/WMFComponents/Sources/WMFComponents/Extensions/Navigation Bar/WMFNavigationBarConfiguring.swift
@@ -254,24 +254,12 @@ public extension WMFNavigationBarConfiguring where Self: UIViewController {
             
             if searchBarConfig.showsScopeBar {
                 searchController.searchBar.showsScopeBar = searchBarConfig.showsScopeBar
-                
-                if #available(iOS 16.0, *) {
-                    searchController.scopeBarActivation = .manual
-                } else {
-                    // Fallback on earlier versions
-                }
-                
+                searchController.scopeBarActivation = .manual
                 searchController.searchBar.scopeButtonTitles = searchBarConfig.scopeButtonTitles
             }
-            
+
             navigationItem.hidesSearchBarWhenScrolling = false
-            
-            if #available(iOS 16.0, *) {
-                navigationItem.preferredSearchBarPlacement = .stacked
-            } else {
-                // Fallback on earlier versions
-            }
-            
+            navigationItem.preferredSearchBarPlacement = .stacked
             navigationItem.searchController = searchController
         }
     }
diff --git a/WMFComponents/Sources/WMFComponents/Style/Extensions/View+Extensions.swift b/WMFComponents/Sources/WMFComponents/Style/Extensions/View+Extensions.swift
@@ -8,24 +8,15 @@ public extension View {
     /// - Returns: a modified `View` with the desired background `Color` applied
     @ViewBuilder
     func listBackgroundColor(_ color: Color) -> some View {
-        if #available(iOS 16, *) {
-            self
-                .scrollContentBackground(.hidden)
-                .background(color)
-        } else {
-            self.background(color)
-        }
+        self.scrollContentBackground(.hidden)
+            .background(color)
     }
 
 	/// Adds custom section spacing if available on current iOS version
 	/// - Parameter spacing: the amount of spacing to use
 	/// - Returns: a modified `View` with the `List` `Section` spacing applied if possible
 	@ViewBuilder
 	func listCustomSectionSpacing(_ spacing: CGFloat) -> some View {
-		if #available(iOS 17, *) {
-			self.listSectionSpacing(.custom(spacing))
-		} else {
-			self
-		}
+        self.listSectionSpacing(.custom(spacing))
 	}
 }
diff --git a/WMFComponents/Sources/WMFComponentsObjC/WMFSourceEditorTextStorage.h b/WMFComponents/Sources/WMFComponentsObjC/WMFSourceEditorTextStorage.h
@@ -5,7 +5,7 @@ NS_ASSUME_NONNULL_BEGIN
 @class WMFSourceEditorColors, WMFSourceEditorFonts, WMFSourceEditorFormatter;
 @protocol WMFSourceEditorStorageDelegate;
 
-@interface WMFSourceEditorTextStorage : NSTextStorage
+@interface WMFSourceEditorTextStorage : NSTextStorage // delete 
 
 @property (nonatomic, weak) id<WMFSourceEditorStorageDelegate> storageDelegate;
 @property (nonatomic, assign) BOOL syntaxHighlightProcessingEnabled;
diff --git a/WMFData/Package.swift b/WMFData/Package.swift
@@ -1,11 +1,11 @@
-// swift-tools-version: 5.8
+// swift-tools-version: 5.9
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
     name: "WMFData",
-    platforms: [.iOS(.v16)],
+    platforms: [.iOS(.v17)],
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.
                 .library(
diff --git a/Widgets/Utilities/View+Extensions.swift b/Widgets/Utilities/View+Extensions.swift
@@ -13,25 +13,17 @@ extension View {
     /// - Returns: a modified `View` with the desired background `Color` applied
     @ViewBuilder
     func listBackgroundColor(_ color: Color, ignoringSafeAreaEdges edges: Edge.Set = .all) -> some View {
-        if #available(iOS 16, *) {
-            self
-                .scrollContentBackground(.hidden)
-                .background(color).edgesIgnoringSafeArea(edges)
-        } else {
-            self.background(color).edgesIgnoringSafeArea(edges)
-        }
+        self.scrollContentBackground(.hidden)
+            .background(color).edgesIgnoringSafeArea(edges)
+
     }
 
     /// Sets container background of the view to `Color.clear` if on iOS 17
     /// - Returns: a modified `View` with the iOS 17 container background modifier applied if needed
     @ViewBuilder
     func clearWidgetContainerBackground() -> some View {
-        if #available(iOS 17.0, *) {
-            self.containerBackground(for: .widget) {
-                Color.clear
-            }
-        } else {
-            self
+        self.containerBackground(for: .widget) {
+            Color.clear
         }
     }
 
diff --git a/Widgets/Widgets/LockscreenSearchWidget.swift b/Widgets/Widgets/LockscreenSearchWidget.swift
@@ -117,10 +117,6 @@ struct LockscreenSearchWidgetView: View {
 
 struct ContainerBackgroundModifier: ViewModifier {
     func body(content: Content) -> some View {
-        if #available(iOS 17.0, *) {
-            content.containerBackground(Color.clear, for: .widget)
-        } else {
-            content
-        }
+        content.containerBackground(Color.clear, for: .widget)
     }
 }
diff --git a/Widgets/Widgets/SearchWidget.swift b/Widgets/Widgets/SearchWidget.swift
@@ -82,62 +82,30 @@ struct SearchWidgetView: View {
     }
     
     var body: some View {
-        
-        if #available(iOS 17, *) {
-            
-            VStack(spacing: 12) {
-                Image("wikipedia-globe")
-                    .resizable()
-                    .aspectRatio(contentMode: .fit)
-                    .frame(width: 70, height: 70)
-                    .padding(.bottom, 8)
-                
-                HStack(spacing: 8) {
-                    Image(systemName: "magnifyingglass")
-                        .font(.system(size: 14))
-                        .foregroundColor(Color(theme.colors.secondaryText))
-                    
-                    Spacer()
-                }
-                .padding(.horizontal, 12)
-                .padding(.vertical, 8)
-                .background(Color(theme.colors.searchFieldBackground))
-                .cornerRadius(8)
-                
-            }
-            .padding(16)
-            .frame(maxWidth: .infinity, maxHeight: .infinity)
-            .widgetURL(entry.url)
-            .containerBackground(Color(theme.colors.paperBackground), for: .widget)
-            
-        } else {
-            
-            VStack(spacing: 12) {
-                Image("wikipedia-globe")
-                    .resizable()
-                    .aspectRatio(contentMode: .fit)
-                    .frame(width: 70, height: 70)
-                    .padding(.bottom, 8)
-                
-                HStack(spacing: 8) {
-                    Image(systemName: "magnifyingglass")
-                        .font(.system(size: 14))
-                        .foregroundColor(Color(theme.colors.secondaryText))
-                    
-                    Spacer()
-                }
-                .padding(.horizontal, 12)
-                .padding(.vertical, 8)
-                .background(Color(theme.colors.searchFieldBackground))
-                .cornerRadius(8)
-                
+        VStack(spacing: 12) {
+            Image("wikipedia-globe")
+                .resizable()
+                .aspectRatio(contentMode: .fit)
+                .frame(width: 70, height: 70)
+                .padding(.bottom, 8)
+
+            HStack(spacing: 8) {
+                Image(systemName: "magnifyingglass")
+                    .font(.system(size: 14))
+                    .foregroundColor(Color(theme.colors.secondaryText))
+
+                Spacer()
             }
-            .padding(16)
-            .frame(maxWidth: .infinity, maxHeight: .infinity)
-            .widgetURL(entry.url)
-            .background(Color(theme.colors.paperBackground))
+            .padding(.horizontal, 12)
+            .padding(.vertical, 8)
+            .background(Color(theme.colors.searchFieldBackground))
+            .cornerRadius(8)
+
         }
-        
+        .padding(16)
+        .frame(maxWidth: .infinity, maxHeight: .infinity)
+        .widgetURL(entry.url)
+        .containerBackground(Color(theme.colors.paperBackground), for: .widget)
     }
 }
 
diff --git a/Wikipedia.xcodeproj/project.pbxproj b/Wikipedia.xcodeproj/project.pbxproj
diff --git a/Wikipedia/Code/ArticleViewController.swift b/Wikipedia/Code/ArticleViewController.swift
diff --git a/WikipediaUnitTests/Code/WMFDateFormatterTests.m b/WikipediaUnitTests/Code/WMFDateFormatterTests.m

Original file line number	Diff line number	Diff line change
`@@ -26,25 +26,16 @@ struct WMFYearInReviewScrollView: View {`
`26`	`26`	`scrollViewContents`
`27`	`27`	`}`
`28`	`28`	`}`
`29`		`-`
`30`		`- @available(iOS 17.0, *)`
	`29`	`+`
`31`	`30`	`private var flashingScrollView: some View {`
`32`	`31`	`scrollView`
`33`	`32`	`.scrollIndicatorsFlash(trigger: flashScrollIndicators)`
`34`	`33`	`.scrollBounceBehavior(.basedOnSize, axes: .vertical)`
`35`	`34`	`}`
`36`		`-`
`37`		`- private var nonFlashingScrollView: some View {`
`38`		`- scrollView`
`39`		`- }`
`40`		`-`
	`35`	`+`
`41`	`36`	`private var content: some View {`
`42`	`37`	`Group {`
`43`		`- if #available(iOS 17.0, *) {`
`44`		`- flashingScrollView`
`45`		`- } else {`
`46`		`- nonFlashingScrollView`
`47`		`- }`
	`38`	`+ flashingScrollView`
`48`	`39`	`}`
`49`	`40`	`}`
`50`	`41`