From 19ce65844aa67e987ddfdfbdabc27e267240e58a Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Thu, 31 Oct 2024 22:17:56 -0700 Subject: [PATCH] Use Swift 5.9. --- Account/Package.swift | 2 +- Articles/Package.swift | 2 +- ArticlesDatabase/Package.swift | 3 +-- Secrets/Package.swift | 2 +- SyncDatabase/Package.swift | 2 +- xcconfig/NetNewsWire_iOSapp_target.xcconfig | 1 - xcconfig/NetNewsWire_project.xcconfig | 2 +- 7 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Account/Package.swift b/Account/Package.swift index 27a197347..2b94423a7 100644 --- a/Account/Package.swift +++ b/Account/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.3 +// swift-tools-version: 5.9 import PackageDescription var dependencies: [Package.Dependency] = [ diff --git a/Articles/Package.swift b/Articles/Package.swift index bc8d988dc..32a1caa64 100644 --- a/Articles/Package.swift +++ b/Articles/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.3 +// swift-tools-version: 5.9 import PackageDescription let package = Package( diff --git a/ArticlesDatabase/Package.swift b/ArticlesDatabase/Package.swift index 90a03bcef..112a4633d 100644 --- a/ArticlesDatabase/Package.swift +++ b/ArticlesDatabase/Package.swift @@ -1,5 +1,4 @@ -// swift-tools-version:5.3 -// The swift-tools-version declares the minimum version of Swift required to build this package. +// swift-tools-version: 5.9 import PackageDescription diff --git a/Secrets/Package.swift b/Secrets/Package.swift index 80da648ec..f8f3b109b 100644 --- a/Secrets/Package.swift +++ b/Secrets/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.3 +// swift-tools-version: 5.9 import PackageDescription let package = Package( diff --git a/SyncDatabase/Package.swift b/SyncDatabase/Package.swift index 71abb4c5f..e42078b5a 100644 --- a/SyncDatabase/Package.swift +++ b/SyncDatabase/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.3 +// swift-tools-version: 5.9 import PackageDescription var dependencies: [Package.Dependency] = [ diff --git a/xcconfig/NetNewsWire_iOSapp_target.xcconfig b/xcconfig/NetNewsWire_iOSapp_target.xcconfig index 0d5ed6927..038feb996 100644 --- a/xcconfig/NetNewsWire_iOSapp_target.xcconfig +++ b/xcconfig/NetNewsWire_iOSapp_target.xcconfig @@ -43,4 +43,3 @@ PRODUCT_BUNDLE_IDENTIFIER = $(ORGANIZATION_IDENTIFIER).NetNewsWire.iOS PRODUCT_NAME = NetNewsWire CLANG_ENABLE_MODULES = YES SWIFT_OBJC_BRIDGING_HEADER = iOS/Resources/NetNewsWire-iOS-Bridging-Header.h -SWIFT_VERSION = 5.0 diff --git a/xcconfig/NetNewsWire_project.xcconfig b/xcconfig/NetNewsWire_project.xcconfig index 2a51a2d1d..28b53b1cd 100644 --- a/xcconfig/NetNewsWire_project.xcconfig +++ b/xcconfig/NetNewsWire_project.xcconfig @@ -43,7 +43,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.15 IPHONEOS_DEPLOYMENT_TARGET = 13.4 //SDKROOT = macosx SWIFT_SWIFT3_OBJC_INFERENCE = Off -SWIFT_VERSION = 5.1 +SWIFT_VERSION = 5.9 // https://forums.swift.org/t/swift-packages-in-multiple-targets-results-in-this-will-result-in-duplication-of-library-code-errors/34892/33 DISABLE_DIAMOND_PROBLEM_DIAGNOSTIC = YES