From 7e8d5c3746c1c19b498ed6059678006e3067a1c6 Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Tue, 22 Apr 2025 21:47:13 -0700
Subject: [PATCH] Regularize ArticlesDatabase Package.swift. Fix #4602.

---
 ArticlesDatabase/Package.swift | 47 ++++++++++++----------------------
 1 file changed, 17 insertions(+), 30 deletions(-)

diff --git a/ArticlesDatabase/Package.swift b/ArticlesDatabase/Package.swift
index cb13cebfb..a51c24928 100644
--- a/ArticlesDatabase/Package.swift
+++ b/ArticlesDatabase/Package.swift
@@ -1,42 +1,29 @@
 // swift-tools-version:5.10
-// The swift-tools-version declares the minimum version of Swift required to build this package.
-
 import PackageDescription
 
-var dependencies: [Package.Dependency] = [
-    .package(url: "https://github.com/Ranchero-Software/RSDatabase.git", .upToNextMajor(from: "1.0.0")),
-]
-
-#if swift(>=5.6)
-dependencies.append(contentsOf: [
-	.package(path: "../Articles"),
-	.package(path: "../RSCore"),
-	.package(path: "../RSParser"),
-])
-#else
-dependencies.append(contentsOf: [
-    .package(url: "../Articles", .upToNextMajor(from: "1.0.0")),
-])
-#endif
-
 let package = Package(
-    name: "ArticlesDatabase",
+	name: "ArticlesDatabase",
 	platforms: [.macOS(.v13), .iOS(.v17)],
-    products: [
-        .library(
-            name: "ArticlesDatabase",
+	products: [
+		.library(
+			name: "ArticlesDatabase",
 			type: .dynamic,
-            targets: ["ArticlesDatabase"]),
-    ],
-    dependencies: dependencies,
-    targets: [
-        .target(
-            name: "ArticlesDatabase",
-            dependencies: [
+			targets: ["ArticlesDatabase"]),
+	],
+	dependencies: [
+		.package(path: "../Articles"),
+		.package(path: "../RSCore"),
+		.package(path: "../RSParser"),
+		.package(path: "../RSDatabase"),
+	],
+	targets: [
+		.target(
+			name: "ArticlesDatabase",
+			dependencies: [
 				"RSCore",
 				"RSDatabase",
 				"RSParser",
 				"Articles",
 			]),
-    ]
+	]
 )