renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3999 from stuartbreckenridge/feature/ios_target_cleanup

Browse Source 
Removes @available for iOS 14 and 15
This commit is contained in:
Brent Simmons
2023-05-30 21:52:46 -07:00
committed by GitHub
parent ac403050b8 5750b7c250
commit b59625c5b9
8 changed files with 3 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Mac/MainWindow/About/AboutHTML.swift
View File

@@ -8,7 +8,6 @@
import Html
@available(macOS 12, *)
struct AboutHTML: LoadableAboutData {
private func stylesheet() -> StaticString {

4
Mac/MainWindow/About/AboutNewNewsWireView.swift
View File

@@ -10,7 +10,6 @@ import SwiftUI
import WebKit
import Html
@available(macOS 12, *)
fileprivate struct WebView: NSViewRepresentable {
var htmlString: String
@@ -50,7 +49,6 @@ fileprivate struct WebView: NSViewRepresentable {
}
}
@available(macOS 12, *)
struct AboutNewNewsWireView: View, LoadableAboutData {
var body: some View {
VStack(spacing: 4) {
@@ -85,7 +83,7 @@ struct AboutNewNewsWireView: View, LoadableAboutData {
}
}
@available(macOS 12, *)
struct AboutNetNewsWireView_Previews: PreviewProvider {
static var previews: some View {
AboutNewNewsWireView()

2
Mac/MainWindow/About/AboutWindowController.swift
View File

@@ -16,7 +16,6 @@ extension NSUserInterfaceItemIdentifier {
// MARK: - AboutWindowController
@available(macOS 12, *)
class AboutWindowController: NSWindowController {
var hostingController: AboutHostingController
@@ -44,7 +43,6 @@ class AboutWindowController: NSWindowController {
// MARK: - AboutHostingController
@available(macOS 12, *)
class AboutHostingController: NSHostingController<AnyView> {
override init(rootView: AnyView) {

41
Mac/MainWindow/Detail/DetailWebView.swift
View File

@@ -53,51 +53,10 @@ import RSCore
override func viewDidEndLiveResize() {
super.viewDidEndLiveResize()
evaluateJavaScript("document.body.style.overflow = 'visible';", completionHandler: nil)
bigSurOffsetFix()
}
override func setFrameSize(_ newSize: NSSize) {
super.setFrameSize(newSize)
if (!inLiveResize) {
bigSurOffsetFix()
}
}
private var inBigSurOffsetFix = false
@available(macOS, obsoleted: 12, message: "when minimum deployment > macOS 11 remove bigSurOffsetFix() and calls to it.")
private func bigSurOffsetFix() {
/*
On macOS 11, when a user exits full screen
or exits zoomed mode by disconnecting an external display
the webview's `origin.y` is offset by a sizeable amount.
This code adjusts the height of the window by -1pt/+1pt,
which puts the webview back in the correct place.
This code is only executed if currently running on macOS 11
*/
if #unavailable(macOS 12) {
guard var frame = window?.frame else {
return
}
guard !inBigSurOffsetFix else {
return
}
inBigSurOffsetFix = true
defer {
inBigSurOffsetFix = false
}
frame.size = NSSize(width: window!.frame.width, height: window!.frame.height - 1)
window!.setFrame(frame, display: false)
frame.size = NSSize(width: frame.width, height: frame.height + 1)
window!.setFrame(frame, display: false)
}
}
// MARK: NSTextFinderClient

6
Shared/AboutData.swift
View File

@@ -8,14 +8,10 @@
import Foundation
@available(iOS 15, *)
@available(macOS 12, *)
protocol LoadableAboutData {
var about: AboutData { get }
}
@available(iOS 15, *)
@available(macOS 12, *)
extension LoadableAboutData {
var about: AboutData {
@@ -29,8 +25,6 @@ extension LoadableAboutData {
}
@available(iOS 15, *)
@available(macOS 12, *)
struct AboutData: Codable {
var PrimaryContributors: [Contributor]
var AdditionalContributors: [Contributor]

1
Shared/Widget/WidgetDataEncoder.swift
View File

@@ -67,7 +67,6 @@ public final class WidgetDataEncoder {
}
}
@available(iOS 14, *)
private func encodeWidgetData(completion: @escaping (WidgetData?) -> Void) {
let dispatchGroup = DispatchGroup()
var groupError: Error? = nil

2
xcconfig/NetNewsWire_project.xcconfig
View File

@@ -40,7 +40,7 @@ GCC_WARN_UNDECLARED_SELECTOR = YES
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE
GCC_WARN_UNUSED_FUNCTION = YES
GCC_WARN_UNUSED_VARIABLE = YES
MACOSX_DEPLOYMENT_TARGET = 11.0
MACOSX_DEPLOYMENT_TARGET = 13.0
IPHONEOS_DEPLOYMENT_TARGET = 15.0
//SDKROOT = macosx
SWIFT_SWIFT3_OBJC_INFERENCE = Off

2
xcconfig/common/NetNewsWire_mac_target_common.xcconfig
View File

@@ -6,5 +6,5 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon
COMBINE_HIDPI_IMAGES = YES
MACOSX_DEPLOYMENT_TARGET = 11.0
MACOSX_DEPLOYMENT_TARGET = 13.0
SDKROOT = macosx;