From 83403ac5e1a2269955da453163d161be967711af Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Sat, 29 Oct 2022 15:50:51 -0500 Subject: [PATCH 1/7] Updated release notes --- Technotes/ReleaseNotes-iOS.markdown | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Technotes/ReleaseNotes-iOS.markdown b/Technotes/ReleaseNotes-iOS.markdown index 0415c81c2..d21fd89cb 100644 --- a/Technotes/ReleaseNotes-iOS.markdown +++ b/Technotes/ReleaseNotes-iOS.markdown @@ -1,5 +1,9 @@ # iOS Release Notes +### 6.1 TestFlight build 6109 - 30 Oct 2022 +Enhanced Widget integration to make counts more accurate +Enhanced Widget integration to make make it more efficient and save on battery life + ### 6.1 TestFlight build 6108 - 28 Oct 2022 Fixed a bug that could prevent BazQux syncing when an article may not contain all the info we expect Fixed a bug that could prevent Feedly syncing when marking a large number of articles as read From d90bd8b202bae3e7505209adc0a01d9ce4963288 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Mon, 31 Oct 2022 10:17:58 -0700 Subject: [PATCH 2/7] Update version and release notes date. --- Technotes/ReleaseNotes-iOS.markdown | 2 +- xcconfig/common/NetNewsWire_ios_target_common.xcconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Technotes/ReleaseNotes-iOS.markdown b/Technotes/ReleaseNotes-iOS.markdown index d21fd89cb..042e84d39 100644 --- a/Technotes/ReleaseNotes-iOS.markdown +++ b/Technotes/ReleaseNotes-iOS.markdown @@ -1,6 +1,6 @@ # iOS Release Notes -### 6.1 TestFlight build 6109 - 30 Oct 2022 +### 6.1 TestFlight build 6109 - 31 Oct 2022 Enhanced Widget integration to make counts more accurate Enhanced Widget integration to make make it more efficient and save on battery life diff --git a/xcconfig/common/NetNewsWire_ios_target_common.xcconfig b/xcconfig/common/NetNewsWire_ios_target_common.xcconfig index b709df344..c58ae1aa8 100644 --- a/xcconfig/common/NetNewsWire_ios_target_common.xcconfig +++ b/xcconfig/common/NetNewsWire_ios_target_common.xcconfig @@ -1,7 +1,7 @@ // High Level Settings common to both the iOS application and any extensions we bundle with it MARKETING_VERSION = 6.1 -CURRENT_PROJECT_VERSION = 6108 +CURRENT_PROJECT_VERSION = 6109 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon From 7f531282d6a12fe1d333f491b6bf711ff3beec2b Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Tue, 1 Nov 2022 20:24:58 -0500 Subject: [PATCH 3/7] 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 17143eb72..ec71add8e 100644 --- a/NetNewsWire.xcodeproj/project.pbxproj +++ b/NetNewsWire.xcodeproj/project.pbxproj @@ -4909,7 +4909,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 e3944ddf909ec29fac592ebc44bddf57b5178cc7 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Tue, 8 Nov 2022 21:55:03 -0800 Subject: [PATCH 4/7] =?UTF-8?q?Remove,=20from=20default=20feeds,=20?= =?UTF-8?q?=E2=80=9CAccidentally=20in=20Code=E2=80=9D=20since=20it=20hasn?= =?UTF-8?q?=E2=80=99t=20been=20updated=20in=20quite=20a=20while.=20Replace?= =?UTF-8?q?=20it=20with=20inessential,=20since=20I=E2=80=99ll=20be=20retur?= =?UTF-8?q?ning=20to=20blogging.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Shared/Importers/DefaultFeeds.opml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Shared/Importers/DefaultFeeds.opml b/Shared/Importers/DefaultFeeds.opml index 0011c80b4..4afb73ce2 100644 --- a/Shared/Importers/DefaultFeeds.opml +++ b/Shared/Importers/DefaultFeeds.opml @@ -5,11 +5,11 @@ - + From c3392091522d76802972beae9d83b4de01f926f5 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Tue, 8 Nov 2022 21:55:27 -0800 Subject: [PATCH 5/7] Create the first draft of release notes for 6.1. --- Technotes/ReleaseNotes-iOS.markdown | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/Technotes/ReleaseNotes-iOS.markdown b/Technotes/ReleaseNotes-iOS.markdown index 042e84d39..052a6c06d 100644 --- a/Technotes/ReleaseNotes-iOS.markdown +++ b/Technotes/ReleaseNotes-iOS.markdown @@ -1,10 +1,32 @@ # iOS Release Notes +### 6.1 Release build 6110 - 8 Nov 2022 + +Changes since 6.0.1… + +Article themes. Several themes ship with the app, and you can create your own. You can change the theme in Preferences. +Fixed a bug that could prevent BazQux syncing when an article may not contain all the info we expect +Fixed a bug that could prevent Feedly syncing when marking a large number of articles as read +Disallow creation of iCloud account in the app if iCloud and iCloud Drive aren’t both enabled +Added links to iCloud Syncing Limitations & Solutions on iCloud Account Management UI +Copy URLs using repaired, rather than raw, feed links +Fixed bug showing quote tweets that only included an image +Video autoplay is now disallowed +Article view now supports RTL layout +Fixed a few crashing bugs +Fixed a layout bug that could happen on returning to the Feeds list +Fixed a bug where go-to-feed might not properly expand disclosure triangles +Prevented the Delete option from showing in the Edit menu on the Article View +Fixed Widget article icon lookup bug + + ### 6.1 TestFlight build 6109 - 31 Oct 2022 + Enhanced Widget integration to make counts more accurate Enhanced Widget integration to make make it more efficient and save on battery life ### 6.1 TestFlight build 6108 - 28 Oct 2022 + Fixed a bug that could prevent BazQux syncing when an article may not contain all the info we expect Fixed a bug that could prevent Feedly syncing when marking a large number of articles as read Prevent Widget integration from running while in the background to remove some crashes From db77677676367d6b57530608ca8c5ae9583d0c83 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Tue, 8 Nov 2022 21:58:55 -0800 Subject: [PATCH 6/7] Update Package.resolved --- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 12ca02d79..f107850d7 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": "b1a342da19ed9b3af61ea2efa7656c2af30aeb7c", - "version": "1.11.0" + "revision": "6b27393cad517c067dceea85fadf050e70c4ceaa", + "version": "1.10.1" } }, { From 3bd22a1598626acab2d867fa89a2dc3872a3d030 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Wed, 9 Nov 2022 21:25:36 -0800 Subject: [PATCH 7/7] Bump build number to 6110. --- Technotes/ReleaseNotes-iOS.markdown | 2 +- xcconfig/common/NetNewsWire_ios_target_common.xcconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Technotes/ReleaseNotes-iOS.markdown b/Technotes/ReleaseNotes-iOS.markdown index 052a6c06d..1f2366312 100644 --- a/Technotes/ReleaseNotes-iOS.markdown +++ b/Technotes/ReleaseNotes-iOS.markdown @@ -1,6 +1,6 @@ # iOS Release Notes -### 6.1 Release build 6110 - 8 Nov 2022 +### 6.1 Release build 6110 - 9 Nov 2022 Changes since 6.0.1… diff --git a/xcconfig/common/NetNewsWire_ios_target_common.xcconfig b/xcconfig/common/NetNewsWire_ios_target_common.xcconfig index c58ae1aa8..ca01779a8 100644 --- a/xcconfig/common/NetNewsWire_ios_target_common.xcconfig +++ b/xcconfig/common/NetNewsWire_ios_target_common.xcconfig @@ -1,7 +1,7 @@ // High Level Settings common to both the iOS application and any extensions we bundle with it MARKETING_VERSION = 6.1 -CURRENT_PROJECT_VERSION = 6109 +CURRENT_PROJECT_VERSION = 6110 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon