From 579717dd861ca1f23ceb5cd9f13426c5569694a0 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Thu, 17 Oct 2019 06:01:08 -0500 Subject: [PATCH] Move extensions for compositing query items to RSWeb --- .../Account/Account.xcodeproj/project.pbxproj | 4 --- Frameworks/Account/URL+Extensions.swift | 30 ------------------- submodules/RSWeb | 2 +- 3 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 Frameworks/Account/URL+Extensions.swift diff --git a/Frameworks/Account/Account.xcodeproj/project.pbxproj b/Frameworks/Account/Account.xcodeproj/project.pbxproj index 8f7abd3ee..0f04f4032 100644 --- a/Frameworks/Account/Account.xcodeproj/project.pbxproj +++ b/Frameworks/Account/Account.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 3BF611F223583530000EF978 /* URL+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BF611E62358352F000EF978 /* URL+Extensions.swift */; }; 5107A099227DE42E00C7C3C5 /* AccountCredentialsTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5107A098227DE42E00C7C3C5 /* AccountCredentialsTest.swift */; }; 5107A09B227DE49500C7C3C5 /* TestAccountManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5107A09A227DE49500C7C3C5 /* TestAccountManager.swift */; }; 5107A09D227DE77700C7C3C5 /* TestTransport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5107A09C227DE77700C7C3C5 /* TestTransport.swift */; }; @@ -186,7 +185,6 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 3BF611E62358352F000EF978 /* URL+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "URL+Extensions.swift"; sourceTree = ""; }; 5107A098227DE42E00C7C3C5 /* AccountCredentialsTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountCredentialsTest.swift; sourceTree = ""; }; 5107A09A227DE49500C7C3C5 /* TestAccountManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestAccountManager.swift; sourceTree = ""; }; 5107A09C227DE77700C7C3C5 /* TestTransport.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestTransport.swift; sourceTree = ""; }; @@ -482,7 +480,6 @@ 841974001F6DD1EC006346C4 /* Folder.swift */, 844B297E210CE37E004020B3 /* UnreadCountProvider.swift */, 51FE1007234635A20056195D /* DeepLinkProvider.swift */, - 3BF611E62358352F000EF978 /* URL+Extensions.swift */, 5165D71F22835E9800D9D53D /* FeedFinder */, 515E4EB12324FF7D0057B0E7 /* Credentials */, 8419742B1F6DDE84006346C4 /* LocalAccount */, @@ -912,7 +909,6 @@ 9E1773D5234570E30056A5A8 /* FeedlyEntryParser.swift in Sources */, 9E1D1555233431A600F4944C /* FeedlyOperation.swift in Sources */, 9E1AF38B2353D41A008BD1D5 /* FeedlySetStarredArticlesOperation.swift in Sources */, - 3BF611F223583530000EF978 /* URL+Extensions.swift in Sources */, 84F1F06E2243524700DA0616 /* AccountMetadata.swift in Sources */, 84245C851FDDD8CB0074AFBB /* FeedbinSubscription.swift in Sources */, ); diff --git a/Frameworks/Account/URL+Extensions.swift b/Frameworks/Account/URL+Extensions.swift deleted file mode 100644 index 69a048ac8..000000000 --- a/Frameworks/Account/URL+Extensions.swift +++ /dev/null @@ -1,30 +0,0 @@ -// -// URL+Extensions.swift -// Account -// -// Created by Jonathan Bennett on 2019-10-16. -// Copyright © 2019 Ranchero Software, LLC. All rights reserved. -// - -import Foundation - - -public extension URL { - - func appendingQueryItem(_ queryItem: URLQueryItem) -> URL? { - appendingQueryItems([queryItem]) - } - - func appendingQueryItems(_ queryItems: [URLQueryItem]) -> URL? { - guard var components = URLComponents(url: self, resolvingAgainstBaseURL: false) else { - return nil - } - - var newQueryItems = components.queryItems ?? [] - newQueryItems.append(contentsOf: queryItems) - components.queryItems = newQueryItems - - return components.url - } - -} diff --git a/submodules/RSWeb b/submodules/RSWeb index 06ba2a25f..1ea5f5ccf 160000 --- a/submodules/RSWeb +++ b/submodules/RSWeb @@ -1 +1 @@ -Subproject commit 06ba2a25fc15b016d2f5c41230e0ed9fe5feab25 +Subproject commit 1ea5f5ccfc3646ffdf2891abbc5ea63e3d449def