From 5bf5706ac95ebf2943bb25cca7427873089a1e2f Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Tue, 1 Nov 2022 20:24:58 -0500 Subject: [PATCH 1/3] Restrict RSCore version so that we don't pick up version 1.1 when it happens --- Account/Package.swift | 2 +- Articles/Package.swift | 2 +- ArticlesDatabase/Package.swift | 2 +- NetNewsWire.xcodeproj/project.pbxproj | 2 +- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- SyncDatabase/Package.swift | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Account/Package.swift b/Account/Package.swift index 5c6289899..27a197347 100644 --- a/Account/Package.swift +++ b/Account/Package.swift @@ -2,7 +2,7 @@ import PackageDescription var dependencies: [Package.Dependency] = [ - .package(url: "https://github.com/Ranchero-Software/RSCore.git", .upToNextMajor(from: "1.0.0")), + .package(url: "https://github.com/Ranchero-Software/RSCore.git", .upToNextMinor(from: "1.0.0")), .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(url: "https://github.com/Ranchero-Software/RSWeb.git", .upToNextMajor(from: "1.0.0")), diff --git a/Articles/Package.swift b/Articles/Package.swift index d5353dc79..bc8d988dc 100644 --- a/Articles/Package.swift +++ b/Articles/Package.swift @@ -11,7 +11,7 @@ let package = Package( targets: ["Articles"]), ], dependencies: [ - .package(url: "https://github.com/Ranchero-Software/RSCore.git", .upToNextMajor(from: "1.0.0")), + .package(url: "https://github.com/Ranchero-Software/RSCore.git", .upToNextMinor(from: "1.0.0")), ], targets: [ .target( diff --git a/ArticlesDatabase/Package.swift b/ArticlesDatabase/Package.swift index e47d036b5..90a03bcef 100644 --- a/ArticlesDatabase/Package.swift +++ b/ArticlesDatabase/Package.swift @@ -4,7 +4,7 @@ import PackageDescription var dependencies: [Package.Dependency] = [ - .package(url: "https://github.com/Ranchero-Software/RSCore.git", .upToNextMajor(from: "1.0.0")), + .package(url: "https://github.com/Ranchero-Software/RSCore.git", .upToNextMinor(from: "1.0.0")), .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")), ] diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj index a4c1e9dd3..c9288c665 100644 --- a/NetNewsWire.xcodeproj/project.pbxproj +++ b/NetNewsWire.xcodeproj/project.pbxproj @@ -4963,7 +4963,7 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/Ranchero-Software/RSCore.git"; requirement = { - kind = upToNextMajorVersion; + kind = upToNextMinorVersion; minimumVersion = 1.0.0; }; }; diff --git a/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index f107850d7..12ca02d79 100644 --- a/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -51,8 +51,8 @@ "repositoryURL": "https://github.com/microsoft/plcrashreporter.git", "state": { "branch": null, - "revision": "6b27393cad517c067dceea85fadf050e70c4ceaa", - "version": "1.10.1" + "revision": "b1a342da19ed9b3af61ea2efa7656c2af30aeb7c", + "version": "1.11.0" } }, { diff --git a/SyncDatabase/Package.swift b/SyncDatabase/Package.swift index 19f86b7ce..71abb4c5f 100644 --- a/SyncDatabase/Package.swift +++ b/SyncDatabase/Package.swift @@ -2,7 +2,7 @@ import PackageDescription var dependencies: [Package.Dependency] = [ - .package(url: "https://github.com/Ranchero-Software/RSCore.git", .upToNextMajor(from: "1.0.0")), + .package(url: "https://github.com/Ranchero-Software/RSCore.git", .upToNextMinor(from: "1.0.0")), .package(url: "https://github.com/Ranchero-Software/RSDatabase.git", .upToNextMajor(from: "1.0.0")), ] From b76581e4e08c6522d83f6bcb99e0dc8e737335f3 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Wed, 2 Nov 2022 01:52:36 -0500 Subject: [PATCH 2/3] Updated change notes --- Technotes/ReleaseNotes-Mac.markdown | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Technotes/ReleaseNotes-Mac.markdown b/Technotes/ReleaseNotes-Mac.markdown index 36e62da37..dbe14194b 100644 --- a/Technotes/ReleaseNotes-Mac.markdown +++ b/Technotes/ReleaseNotes-Mac.markdown @@ -1,5 +1,10 @@ # Mac Release Notes +### 6.1.1 build 6107 3 Nov 2022 + +Fixed a bug that could prevent users from accessing BazQux if an article was missing a field +Fixed an issue that could prevent Feedly users from syncing if they tried to mark too many articles as read at the same time + ### 6.1 build 6106 6 April 2022 Small cosmetic change — better alignment for items in General Preferences pane From 1cfc4532d7e91b23ff65e34b8d0c4a28e31d3495 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Wed, 2 Nov 2022 20:54:47 -0700 Subject: [PATCH 3/3] Bump version and build to 6.1.1b1/6107. --- Technotes/ReleaseNotes-Mac.markdown | 2 +- xcconfig/common/NetNewsWire_mac_target_common.xcconfig | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Technotes/ReleaseNotes-Mac.markdown b/Technotes/ReleaseNotes-Mac.markdown index dbe14194b..92b5c1f5b 100644 --- a/Technotes/ReleaseNotes-Mac.markdown +++ b/Technotes/ReleaseNotes-Mac.markdown @@ -1,6 +1,6 @@ # Mac Release Notes -### 6.1.1 build 6107 3 Nov 2022 +### 6.1.1b1 build 6107 3 Nov 2022 Fixed a bug that could prevent users from accessing BazQux if an article was missing a field Fixed an issue that could prevent Feedly users from syncing if they tried to mark too many articles as read at the same time diff --git a/xcconfig/common/NetNewsWire_mac_target_common.xcconfig b/xcconfig/common/NetNewsWire_mac_target_common.xcconfig index c1e47f798..e26e42d17 100644 --- a/xcconfig/common/NetNewsWire_mac_target_common.xcconfig +++ b/xcconfig/common/NetNewsWire_mac_target_common.xcconfig @@ -1,6 +1,6 @@ // High Level Settings common to both the Mac application and any extensions we bundle with it -MARKETING_VERSION = 6.1 -CURRENT_PROJECT_VERSION = 6106 +MARKETING_VERSION = 6.1.1b1 +CURRENT_PROJECT_VERSION = 6107 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;