From 0c99a5f52350a7780e26c84efdc8fe88ffe6c9c8 Mon Sep 17 00:00:00 2001 From: Nate Weaver Date: Sun, 22 Sep 2019 15:14:18 -0500 Subject: [PATCH 1/2] Remove enableWebInspectorMenuItem outlet Fixes a console warning about the removed property. --- Mac/Base.lproj/Main.storyboard | 1 - 1 file changed, 1 deletion(-) diff --git a/Mac/Base.lproj/Main.storyboard b/Mac/Base.lproj/Main.storyboard index 05b2dee53..26af7046d 100644 --- a/Mac/Base.lproj/Main.storyboard +++ b/Mac/Base.lproj/Main.storyboard @@ -588,7 +588,6 @@ - From 08a8b8f6c20ce22615d4830f01d2745742d01fae Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Wed, 25 Sep 2019 15:32:30 -0500 Subject: [PATCH 2/2] Update to Swift 5.1 --- Frameworks/Account/xcconfig/Account_project.xcconfig | 2 +- Frameworks/Articles/Articles.xcodeproj/project.pbxproj | 4 ++-- Frameworks/Articles/xcconfig/Articles_project.xcconfig | 2 +- Frameworks/Articles/xcconfig/Articles_project_debug.xcconfig | 2 +- .../Articles/xcconfig/Articles_project_release.xcconfig | 2 +- .../xcconfig/ArticlesDatabase_project.xcconfig | 2 +- .../SyncDatabase/SyncDatabase.xcodeproj/project.pbxproj | 2 -- .../SyncDatabase/xcconfig/SyncDatabase_project.xcconfig | 2 +- submodules/RSCore | 2 +- submodules/RSDatabase | 2 +- submodules/RSParser | 2 +- submodules/RSTree | 2 +- submodules/RSWeb | 2 +- xcconfig/NetNewsWire_project.xcconfig | 2 +- 14 files changed, 14 insertions(+), 16 deletions(-) diff --git a/Frameworks/Account/xcconfig/Account_project.xcconfig b/Frameworks/Account/xcconfig/Account_project.xcconfig index e4ab38d16..c94ca1b22 100644 --- a/Frameworks/Account/xcconfig/Account_project.xcconfig +++ b/Frameworks/Account/xcconfig/Account_project.xcconfig @@ -10,7 +10,7 @@ DEVELOPMENT_TEAM = M8L2WTLA8W SDKROOT = macosx MACOSX_DEPLOYMENT_TARGET = 10.14 CLANG_ENABLE_OBJC_WEAK = YES -SWIFT_VERSION = 5.0 +SWIFT_VERSION = 5.1 COMBINE_HIDPI_IMAGES = YES COPY_PHASE_STRIP = NO diff --git a/Frameworks/Articles/Articles.xcodeproj/project.pbxproj b/Frameworks/Articles/Articles.xcodeproj/project.pbxproj index 12e1f6baa..8d3c4dfb9 100644 --- a/Frameworks/Articles/Articles.xcodeproj/project.pbxproj +++ b/Frameworks/Articles/Articles.xcodeproj/project.pbxproj @@ -331,7 +331,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.1; }; name = Debug; }; @@ -340,7 +340,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 5.1; }; name = Release; }; diff --git a/Frameworks/Articles/xcconfig/Articles_project.xcconfig b/Frameworks/Articles/xcconfig/Articles_project.xcconfig index ca916b2fa..39dd1a072 100644 --- a/Frameworks/Articles/xcconfig/Articles_project.xcconfig +++ b/Frameworks/Articles/xcconfig/Articles_project.xcconfig @@ -10,7 +10,7 @@ DEVELOPMENT_TEAM = M8L2WTLA8W SDKROOT = macosx MACOSX_DEPLOYMENT_TARGET = 10.13 CLANG_ENABLE_OBJC_WEAK = YES -SWIFT_VERSION = 5.0 +SWIFT_VERSION = 5.1 COMBINE_HIDPI_IMAGES = YES COPY_PHASE_STRIP = NO diff --git a/Frameworks/Articles/xcconfig/Articles_project_debug.xcconfig b/Frameworks/Articles/xcconfig/Articles_project_debug.xcconfig index e3b0dad0a..19e145a3e 100644 --- a/Frameworks/Articles/xcconfig/Articles_project_debug.xcconfig +++ b/Frameworks/Articles/xcconfig/Articles_project_debug.xcconfig @@ -1,4 +1,4 @@ -#include "./ArticlesData_project.xcconfig" +#include "./Articles_project.xcconfig" DEBUG_INFORMATION_FORMAT = dwarf ENABLE_TESTABILITY = YES diff --git a/Frameworks/Articles/xcconfig/Articles_project_release.xcconfig b/Frameworks/Articles/xcconfig/Articles_project_release.xcconfig index 5af43130c..ec397b637 100644 --- a/Frameworks/Articles/xcconfig/Articles_project_release.xcconfig +++ b/Frameworks/Articles/xcconfig/Articles_project_release.xcconfig @@ -1,4 +1,4 @@ -#include "./ArticlesData_project.xcconfig" +#include "./Articles_project.xcconfig" DEBUG_INFORMATION_FORMAT = dwarf-with-dsym ENABLE_NS_ASSERTIONS = NO diff --git a/Frameworks/ArticlesDatabase/xcconfig/ArticlesDatabase_project.xcconfig b/Frameworks/ArticlesDatabase/xcconfig/ArticlesDatabase_project.xcconfig index c9f66dd8b..4b20653e2 100644 --- a/Frameworks/ArticlesDatabase/xcconfig/ArticlesDatabase_project.xcconfig +++ b/Frameworks/ArticlesDatabase/xcconfig/ArticlesDatabase_project.xcconfig @@ -10,7 +10,7 @@ DEVELOPMENT_TEAM = 9C84TZ7Q6Z SDKROOT = macosx MACOSX_DEPLOYMENT_TARGET = 10.13 CLANG_ENABLE_OBJC_WEAK = YES -SWIFT_VERSION = 5.0 +SWIFT_VERSION = 5.1 COMBINE_HIDPI_IMAGES = YES COPY_PHASE_STRIP = NO diff --git a/Frameworks/SyncDatabase/SyncDatabase.xcodeproj/project.pbxproj b/Frameworks/SyncDatabase/SyncDatabase.xcodeproj/project.pbxproj index c2f2849ad..e20b5041b 100644 --- a/Frameworks/SyncDatabase/SyncDatabase.xcodeproj/project.pbxproj +++ b/Frameworks/SyncDatabase/SyncDatabase.xcodeproj/project.pbxproj @@ -328,7 +328,6 @@ PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.SyncDatabase; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; - SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -355,7 +354,6 @@ PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.SyncDatabase; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; - SWIFT_VERSION = 5.0; }; name = Release; }; diff --git a/Frameworks/SyncDatabase/xcconfig/SyncDatabase_project.xcconfig b/Frameworks/SyncDatabase/xcconfig/SyncDatabase_project.xcconfig index 9a1875f59..e8370d0aa 100644 --- a/Frameworks/SyncDatabase/xcconfig/SyncDatabase_project.xcconfig +++ b/Frameworks/SyncDatabase/xcconfig/SyncDatabase_project.xcconfig @@ -10,7 +10,7 @@ DEVELOPMENT_TEAM = 9C84TZ7Q6Z SDKROOT = macosx MACOSX_DEPLOYMENT_TARGET = 10.14 CLANG_ENABLE_OBJC_WEAK = YES -SWIFT_VERSION = 5.0 +SWIFT_VERSION = 5.1 COMBINE_HIDPI_IMAGES = YES COPY_PHASE_STRIP = NO diff --git a/submodules/RSCore b/submodules/RSCore index 98c050aca..b3a3178b0 160000 --- a/submodules/RSCore +++ b/submodules/RSCore @@ -1 +1 @@ -Subproject commit 98c050aca6e2c4f034b22c1d3d4f938893290543 +Subproject commit b3a3178b00810c9e2c668a8c3b17080501cf1f33 diff --git a/submodules/RSDatabase b/submodules/RSDatabase index 7b4476830..9bb7e3745 160000 --- a/submodules/RSDatabase +++ b/submodules/RSDatabase @@ -1 +1 @@ -Subproject commit 7b44768308dc6970ee78470d0ea1e5287badc2bc +Subproject commit 9bb7e374518ad481c6da14b656d6676c02b33548 diff --git a/submodules/RSParser b/submodules/RSParser index 9e86cf613..d3fe846f8 160000 --- a/submodules/RSParser +++ b/submodules/RSParser @@ -1 +1 @@ -Subproject commit 9e86cf613b40b6a3389b6248be9427d90debbf9f +Subproject commit d3fe846f8969f8914d233242b711f4314ec1cb17 diff --git a/submodules/RSTree b/submodules/RSTree index 350762104..7581b16d4 160000 --- a/submodules/RSTree +++ b/submodules/RSTree @@ -1 +1 @@ -Subproject commit 350762104423aef963ca945d4388ca9d47f991ce +Subproject commit 7581b16d4e8f22fad183d34338d44af85d37b30d diff --git a/submodules/RSWeb b/submodules/RSWeb index 168ce1a62..d140c97a1 160000 --- a/submodules/RSWeb +++ b/submodules/RSWeb @@ -1 +1 @@ -Subproject commit 168ce1a628847d986d032247498b00293e7659f2 +Subproject commit d140c97a13799a38fe62c09d1719c3963c3df3ce diff --git a/xcconfig/NetNewsWire_project.xcconfig b/xcconfig/NetNewsWire_project.xcconfig index 06f943932..f4968c19e 100644 --- a/xcconfig/NetNewsWire_project.xcconfig +++ b/xcconfig/NetNewsWire_project.xcconfig @@ -38,4 +38,4 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES CLANG_ANALYZER_NONNULL = YES SWIFT_SWIFT3_OBJC_INFERENCE = Off -SWIFT_VERSION = 5.0 +SWIFT_VERSION = 5.1