From 2b76968391e6b9628c4a2bf94ccbbf2c3e39c2e1 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sat, 9 Nov 2024 09:44:22 -0800 Subject: [PATCH] Fix some package paths. Treat warnings as errors in all local modules. --- Account/Package.swift | 38 ++++++++++++++++++---------------- Articles/Package.swift | 26 ++++++++++++----------- ArticlesDatabase/Package.swift | 8 ++++--- Secrets/Package.swift | 29 +++++++++++++------------- SyncDatabase/Package.swift | 6 ++++-- 5 files changed, 58 insertions(+), 49 deletions(-) diff --git a/Account/Package.swift b/Account/Package.swift index 4efd91a47..7b65bd22b 100644 --- a/Account/Package.swift +++ b/Account/Package.swift @@ -3,28 +3,28 @@ import PackageDescription let package = Package( - name: "Account", + name: "Account", platforms: [.macOS(.v14), .iOS(.v17)], - products: [ - .library( - name: "Account", + products: [ + .library( + name: "Account", type: .dynamic, - targets: ["Account"]), - ], - dependencies: [ + targets: ["Account"]), + ], + dependencies: [ .package(path: "../RSWeb"), .package(path: "../Articles"), .package(path: "../ArticlesDatabase"), .package(path: "../Secrets"), .package(path: "../SyncDatabase"), .package(path: "../RSCore"), - .package(url: "https://github.com/Ranchero-Software/RSDatabase.git", .upToNextMajor(from: "1.0.0")), - .package(url: "https://github.com/Ranchero-Software/RSParser.git", .upToNextMajor(from: "2.0.2")), + .package(path: "../RSDatabase"), + .package(path: "../RSParser"), ], - targets: [ - .target( - name: "Account", - dependencies: [ + targets: [ + .target( + name: "Account", + dependencies: [ "RSCore", "RSDatabase", "RSParser", @@ -33,12 +33,14 @@ let package = Package( "ArticlesDatabase", "Secrets", "SyncDatabase", - ]), - .testTarget( - name: "AccountTests", - dependencies: ["Account"], + ], + swiftSettings: [.unsafeFlags(["-warnings-as-errors"])] + ), + .testTarget( + name: "AccountTests", + dependencies: ["Account"], resources: [ .copy("JSON"), ]), - ] + ] ) diff --git a/Articles/Package.swift b/Articles/Package.swift index 86299ca10..17a37b46e 100644 --- a/Articles/Package.swift +++ b/Articles/Package.swift @@ -3,22 +3,24 @@ import PackageDescription let package = Package( - name: "Articles", + name: "Articles", platforms: [.macOS(.v14), .iOS(.v17)], - products: [ - .library( - name: "Articles", + products: [ + .library( + name: "Articles", type: .dynamic, - targets: ["Articles"]), - ], - dependencies: [ + targets: ["Articles"]), + ], + dependencies: [ .package(path: "../RSCore"), - ], - targets: [ - .target( - name: "Articles", + ], + targets: [ + .target( + name: "Articles", dependencies: [ "RSCore" - ]), + ], + swiftSettings: [.unsafeFlags(["-warnings-as-errors"])] + ), ] ) diff --git a/ArticlesDatabase/Package.swift b/ArticlesDatabase/Package.swift index 7f1aed59d..aef384892 100644 --- a/ArticlesDatabase/Package.swift +++ b/ArticlesDatabase/Package.swift @@ -12,8 +12,8 @@ let package = Package( targets: ["ArticlesDatabase"]), ], dependencies: [ - .package(url: "https://github.com/Ranchero-Software/RSDatabase.git", .upToNextMajor(from: "1.0.0")), - .package(url: "https://github.com/Ranchero-Software/RSParser.git", .upToNextMajor(from: "2.0.2")), + .package(path: "../RSDatabase"), + .package(path: "../RSParser"), .package(path: "../RSCore"), .package(path: "../Articles"), ], @@ -25,6 +25,8 @@ let package = Package( "RSDatabase", "RSParser", "Articles", - ]), + ], + swiftSettings: [.unsafeFlags(["-warnings-as-errors"])] + ), ] ) diff --git a/Secrets/Package.swift b/Secrets/Package.swift index 72fb1184c..da31d80c3 100644 --- a/Secrets/Package.swift +++ b/Secrets/Package.swift @@ -3,20 +3,21 @@ import PackageDescription let package = Package( - name: "Secrets", + name: "Secrets", platforms: [.macOS(.v14), .iOS(.v17)], - products: [ - .library( - name: "Secrets", + products: [ + .library( + name: "Secrets", type: .dynamic, - targets: ["Secrets"] - ) - ], - dependencies: [], - targets: [ - .target( - name: "Secrets", - dependencies: [] - ) - ] + targets: ["Secrets"] + ) + ], + dependencies: [], + targets: [ + .target( + name: "Secrets", + dependencies: [], + swiftSettings: [.unsafeFlags(["-warnings-as-errors"])] + ) + ] ) diff --git a/SyncDatabase/Package.swift b/SyncDatabase/Package.swift index 5b5dd70a5..a5ee79444 100644 --- a/SyncDatabase/Package.swift +++ b/SyncDatabase/Package.swift @@ -14,7 +14,7 @@ let package = Package( dependencies: [ .package(path: "../RSCore"), .package(path: "../Articles"), - .package(url: "https://github.com/Ranchero-Software/RSDatabase.git", .upToNextMajor(from: "1.0.0")), + .package(path: "../RSDatabase.git"), ], targets: [ .target( @@ -23,6 +23,8 @@ let package = Package( "RSCore", "RSDatabase", "Articles", - ]), + ], + swiftSettings: [.unsafeFlags(["-warnings-as-errors"])] + ), ] )