From d94783be66d1355ef84d6a3762e70e28c31421b4 Mon Sep 17 00:00:00 2001 From: Florian Friedrich Date: Tue, 16 Apr 2024 16:18:09 +0200 Subject: [PATCH] Drop Swift pre 5.8 support, add support for Swift 5.9 and 5.10, bump deployment targets to supported minimums --- Configs/Module-Shared.xcconfig | 6 +- Package.swift | 8 +-- Package@swift-5.7.swift | 64 ------------------- ...swift-5.5.swift => Package@swift-5.8.swift | 8 +-- ...swift-5.6.swift => Package@swift-5.9.swift | 8 +-- 5 files changed, 15 insertions(+), 79 deletions(-) delete mode 100644 Package@swift-5.7.swift rename Package@swift-5.5.swift => Package@swift-5.8.swift (95%) rename Package@swift-5.6.swift => Package@swift-5.9.swift (95%) diff --git a/Configs/Module-Shared.xcconfig b/Configs/Module-Shared.xcconfig index a39875618..e8980c2c7 100644 --- a/Configs/Module-Shared.xcconfig +++ b/Configs/Module-Shared.xcconfig @@ -199,7 +199,7 @@ GCC_WARN_UNUSED_VARIABLE = YES HEADER_SEARCH_PATHS = $(inherited) // Code will load on this and later versions of iOS. Framework APIs that are unavailable in earlier versions will be weak-linked; your code should check for null function pointers or specific system versions before calling newer APIs. -IPHONEOS_DEPLOYMENT_TARGET = 11.0 +IPHONEOS_DEPLOYMENT_TARGET = 12.0 // This is a list of paths to be added to the `runpath` search path list for the image being created. At runtime, `dyld` uses the `runpath` when searching for dylibs whose load path begins with `@rpath/`. LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @loader_path/Frameworks @@ -252,10 +252,10 @@ SWIFT_VERSION = 5.0 TARGETED_DEVICE_FAMILY = 1,2,3,4 // Code will load on this and later versions of tvOS. Framework APIs that are unavailable in earlier versions will be weak-linked; your code should check for null function pointers or specific system versions before calling newer APIs. -TVOS_DEPLOYMENT_TARGET = 11.0 +TVOS_DEPLOYMENT_TARGET = 12.0 // Selects the process used for version-stamping generated files. * *None:* Use no versioning system. * *Apple Generic:* Use the current project version setting. [apple-generic] VERSIONING_SYSTEM = apple-generic // Code will load on this and later versions of watchOS. Framework APIs that are unavailable in earlier versions will be weak-linked; your code should check for null function pointers or specific system versions before calling newer APIs. -WATCHOS_DEPLOYMENT_TARGET = 4.0 +WATCHOS_DEPLOYMENT_TARGET = 5.0 diff --git a/Package.swift b/Package.swift index 778652a72..9dec62eea 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.8 +// swift-tools-version:5.10 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription @@ -7,9 +7,9 @@ let package = Package( name: "CocoaLumberjack", platforms: [ .macOS(.v10_13), - .iOS(.v11), - .tvOS(.v11), - .watchOS(.v4), + .iOS(.v12), + .tvOS(.v12), + .watchOS(.v5), ], products: [ // Products define the executables and libraries produced by a package, and make them visible to other packages. diff --git a/Package@swift-5.7.swift b/Package@swift-5.7.swift deleted file mode 100644 index a29d225ea..000000000 --- a/Package@swift-5.7.swift +++ /dev/null @@ -1,64 +0,0 @@ -// swift-tools-version:5.7 -// The swift-tools-version declares the minimum version of Swift required to build this package. - -import PackageDescription - -let package = Package( - name: "CocoaLumberjack", - platforms: [ - .macOS(.v10_13), - .iOS(.v11), - .tvOS(.v11), - .watchOS(.v4), - ], - products: [ - // Products define the executables and libraries produced by a package, and make them visible to other packages. - .library( - name: "CocoaLumberjack", - targets: ["CocoaLumberjack"]), - .library( - name: "CocoaLumberjackSwift", - targets: ["CocoaLumberjackSwift"]), - .library( - name: "CocoaLumberjackSwiftLogBackend", - targets: ["CocoaLumberjackSwiftLogBackend"]), - ], - dependencies: [ - .package(url: "https://github.com/apple/swift-log", from: "1.5.0"), - ], - targets: [ - // Targets are the basic building blocks of a package. A target can define a module or a test suite. - // Targets can depend on other targets in this package, and on products in packages which this package depends on. - .target( - name: "CocoaLumberjack", - exclude: ["Supporting Files"], - resources: [ - .process("PrivacyInfo.xcprivacy"), - ]), - .target( - name: "CocoaLumberjackSwiftSupport", - dependencies: ["CocoaLumberjack"]), - .target( - name: "CocoaLumberjackSwift", - dependencies: [ - "CocoaLumberjack", - "CocoaLumberjackSwiftSupport", - ], - exclude: ["Supporting Files"]), - .target( - name: "CocoaLumberjackSwiftLogBackend", - dependencies: [ - "CocoaLumberjack", - .product(name: "Logging", package: "swift-log"), - ]), - .testTarget( - name: "CocoaLumberjackTests", - dependencies: ["CocoaLumberjack"]), - .testTarget( - name: "CocoaLumberjackSwiftTests", - dependencies: ["CocoaLumberjackSwift"]), - .testTarget( - name: "CocoaLumberjackSwiftLogBackendTests", - dependencies: ["CocoaLumberjackSwiftLogBackend"]), - ] -) diff --git a/Package@swift-5.5.swift b/Package@swift-5.8.swift similarity index 95% rename from Package@swift-5.5.swift rename to Package@swift-5.8.swift index 51942d20e..9c85b1b90 100644 --- a/Package@swift-5.5.swift +++ b/Package@swift-5.8.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.5 +// swift-tools-version:5.8 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription @@ -7,9 +7,9 @@ let package = Package( name: "CocoaLumberjack", platforms: [ .macOS(.v10_13), - .iOS(.v11), - .tvOS(.v11), - .watchOS(.v4), + .iOS(.v12), + .tvOS(.v12), + .watchOS(.v5), ], products: [ // Products define the executables and libraries produced by a package, and make them visible to other packages. diff --git a/Package@swift-5.6.swift b/Package@swift-5.9.swift similarity index 95% rename from Package@swift-5.6.swift rename to Package@swift-5.9.swift index 7aa39de96..36c6bb72d 100644 --- a/Package@swift-5.6.swift +++ b/Package@swift-5.9.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.6 +// swift-tools-version:5.9 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription @@ -7,9 +7,9 @@ let package = Package( name: "CocoaLumberjack", platforms: [ .macOS(.v10_13), - .iOS(.v11), - .tvOS(.v11), - .watchOS(.v4), + .iOS(.v12), + .tvOS(.v12), + .watchOS(.v5), ], products: [ // Products define the executables and libraries produced by a package, and make them visible to other packages.