From 4a3205d74f6990a61f629d35a2d07ca5b85a3757 Mon Sep 17 00:00:00 2001 From: Maurice Parker <mo@vincode.io> Date: Fri, 24 Apr 2020 17:08:10 -0500 Subject: [PATCH] Removed Test build configuration --- .../Account/Account.xcodeproj/project.pbxproj | 26 ------ .../Feedly/FeedlyTestSupport.swift | 1 + .../xcconfig/Account_project_test.xcconfig | 3 - .../Articles.xcodeproj/project.pbxproj | 26 ------ .../xcconfig/Articles_project_test.xcconfig | 3 - .../project.pbxproj | 26 ------ .../ArticlesDatabase_project_test.xcconfig | 3 - .../Secrets/Secrets.xcodeproj/project.pbxproj | 21 ----- .../xcconfig/Secrets_project_test.xcconfig | 3 - .../SyncDatabase.xcodeproj/project.pbxproj | 18 ---- .../SyncDatabase_project_test.xcconfig | 3 - NetNewsWire.xcodeproj/project.pbxproj | 87 +------------------ .../xcschemes/NetNewsWire-iOS.xcscheme | 2 +- .../xcschemes/NetNewsWire.xcscheme | 2 +- submodules/RSCore | 2 +- submodules/RSDatabase | 2 +- submodules/RSParser | 2 +- submodules/RSTree | 2 +- submodules/RSWeb | 2 +- xcconfig/NetNewsWire_project_test.xcconfig | 4 - 20 files changed, 9 insertions(+), 229 deletions(-) delete mode 100644 Frameworks/Account/xcconfig/Account_project_test.xcconfig delete mode 100644 Frameworks/Articles/xcconfig/Articles_project_test.xcconfig delete mode 100644 Frameworks/ArticlesDatabase/xcconfig/ArticlesDatabase_project_test.xcconfig delete mode 100644 Frameworks/Secrets/xcconfig/Secrets_project_test.xcconfig delete mode 100644 Frameworks/SyncDatabase/xcconfig/SyncDatabase_project_test.xcconfig delete mode 100644 xcconfig/NetNewsWire_project_test.xcconfig diff --git a/Frameworks/Account/Account.xcodeproj/project.pbxproj b/Frameworks/Account/Account.xcodeproj/project.pbxproj index 5f2eaa40e..6573d99b1 100644 --- a/Frameworks/Account/Account.xcodeproj/project.pbxproj +++ b/Frameworks/Account/Account.xcodeproj/project.pbxproj @@ -310,7 +310,6 @@ 5165D73022837F3400D9D53D /* InitialFeedDownloader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InitialFeedDownloader.swift; sourceTree = "<group>"; }; 516896342448EBEA00185AC5 /* FeedProviderManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedProviderManager.swift; sourceTree = "<group>"; }; 5170743B232AEDB500A461A3 /* OPMLFile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OPMLFile.swift; sourceTree = "<group>"; }; - 518B2EA52351306200400001 /* Account_project_test.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Account_project_test.xcconfig; sourceTree = "<group>"; }; 519E84A52433D49000D238B0 /* OPMLNormalizer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OPMLNormalizer.swift; sourceTree = "<group>"; }; 519E84A72434C5EF00D238B0 /* CloudKitArticlesZone.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CloudKitArticlesZone.swift; sourceTree = "<group>"; }; 519E84AB2435019100D238B0 /* CloudKitArticlesZoneDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CloudKitArticlesZoneDelegate.swift; sourceTree = "<group>"; }; @@ -922,7 +921,6 @@ isa = PBXGroup; children = ( D511EEB8202422BB00712EC3 /* Account_project.xcconfig */, - 518B2EA52351306200400001 /* Account_project_test.xcconfig */, D511EEB5202422BB00712EC3 /* Account_project_debug.xcconfig */, D511EEB7202422BB00712EC3 /* Account_project_release.xcconfig */, D511EEB6202422BB00712EC3 /* Account_target.xcconfig */, @@ -1322,27 +1320,6 @@ /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - 51EC893023511FFE0061B6F6 /* Test */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 518B2EA52351306200400001 /* Account_project_test.xcconfig */; - buildSettings = { - }; - name = Test; - }; - 51EC893123511FFE0061B6F6 /* Test */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = D511EEB6202422BB00712EC3 /* Account_target.xcconfig */; - buildSettings = { - }; - name = Test; - }; - 51EC893223511FFE0061B6F6 /* Test */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = D511EEB9202422BB00712EC3 /* Accounttests_target.xcconfig */; - buildSettings = { - }; - name = Test; - }; 848935081F62485000CEBD24 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = D511EEB5202422BB00712EC3 /* Account_project_debug.xcconfig */; @@ -1392,7 +1369,6 @@ isa = XCConfigurationList; buildConfigurations = ( 848935081F62485000CEBD24 /* Debug */, - 51EC893023511FFE0061B6F6 /* Test */, 848935091F62485000CEBD24 /* Release */, ); defaultConfigurationIsVisible = 0; @@ -1402,7 +1378,6 @@ isa = XCConfigurationList; buildConfigurations = ( 8489350B1F62485000CEBD24 /* Debug */, - 51EC893123511FFE0061B6F6 /* Test */, 8489350C1F62485000CEBD24 /* Release */, ); defaultConfigurationIsVisible = 0; @@ -1412,7 +1387,6 @@ isa = XCConfigurationList; buildConfigurations = ( 8489350E1F62485000CEBD24 /* Debug */, - 51EC893223511FFE0061B6F6 /* Test */, 8489350F1F62485000CEBD24 /* Release */, ); defaultConfigurationIsVisible = 0; diff --git a/Frameworks/Account/AccountTests/Feedly/FeedlyTestSupport.swift b/Frameworks/Account/AccountTests/Feedly/FeedlyTestSupport.swift index ea677dbe4..9f4846230 100644 --- a/Frameworks/Account/AccountTests/Feedly/FeedlyTestSupport.swift +++ b/Frameworks/Account/AccountTests/Feedly/FeedlyTestSupport.swift @@ -8,6 +8,7 @@ import XCTest import RSParser +import Secrets @testable import Account import os.log import SyncDatabase diff --git a/Frameworks/Account/xcconfig/Account_project_test.xcconfig b/Frameworks/Account/xcconfig/Account_project_test.xcconfig deleted file mode 100644 index c8292a9fe..000000000 --- a/Frameworks/Account/xcconfig/Account_project_test.xcconfig +++ /dev/null @@ -1,3 +0,0 @@ -#include "./Account_project_debug.xcconfig" - -OTHER_SWIFT_FLAGS = -DTEST $(inherited) diff --git a/Frameworks/Articles/Articles.xcodeproj/project.pbxproj b/Frameworks/Articles/Articles.xcodeproj/project.pbxproj index 27a1ea842..c8c0c3e3c 100644 --- a/Frameworks/Articles/Articles.xcodeproj/project.pbxproj +++ b/Frameworks/Articles/Articles.xcodeproj/project.pbxproj @@ -48,7 +48,6 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 518B2EA62351309100400001 /* Articles_project_test.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Articles_project_test.xcconfig; sourceTree = "<group>"; }; 840405C91F1A8E4300DF0296 /* DatabaseID.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DatabaseID.swift; sourceTree = "<group>"; }; 844BEE5B1F0AB3C8004AB7CD /* Articles.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Articles.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 844BEE641F0AB3C9004AB7CD /* ArticlesTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ArticlesTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -147,7 +146,6 @@ children = ( D511EEE220242DFB00712EC3 /* Articles_project.xcconfig */, D511EEE120242DFB00712EC3 /* Articles_project_debug.xcconfig */, - 518B2EA62351309100400001 /* Articles_project_test.xcconfig */, D511EEE420242DFB00712EC3 /* Articles_project_release.xcconfig */, D511EEE320242DFB00712EC3 /* Articles_target.xcconfig */, D511EEE020242DFB00712EC3 /* ArticlesDataTests_target.xcconfig */, @@ -346,27 +344,6 @@ /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - 51EC89332351200F0061B6F6 /* Test */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 518B2EA62351309100400001 /* Articles_project_test.xcconfig */; - buildSettings = { - }; - name = Test; - }; - 51EC89342351200F0061B6F6 /* Test */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = D511EEE320242DFB00712EC3 /* Articles_target.xcconfig */; - buildSettings = { - }; - name = Test; - }; - 51EC89352351200F0061B6F6 /* Test */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = D511EEE020242DFB00712EC3 /* ArticlesDataTests_target.xcconfig */; - buildSettings = { - }; - name = Test; - }; 844BEE6D1F0AB3C9004AB7CD /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = D511EEE120242DFB00712EC3 /* Articles_project_debug.xcconfig */; @@ -416,7 +393,6 @@ isa = XCConfigurationList; buildConfigurations = ( 844BEE6D1F0AB3C9004AB7CD /* Debug */, - 51EC89332351200F0061B6F6 /* Test */, 844BEE6E1F0AB3C9004AB7CD /* Release */, ); defaultConfigurationIsVisible = 0; @@ -426,7 +402,6 @@ isa = XCConfigurationList; buildConfigurations = ( 844BEE701F0AB3C9004AB7CD /* Debug */, - 51EC89342351200F0061B6F6 /* Test */, 844BEE711F0AB3C9004AB7CD /* Release */, ); defaultConfigurationIsVisible = 0; @@ -436,7 +411,6 @@ isa = XCConfigurationList; buildConfigurations = ( 844BEE731F0AB3C9004AB7CD /* Debug */, - 51EC89352351200F0061B6F6 /* Test */, 844BEE741F0AB3C9004AB7CD /* Release */, ); defaultConfigurationIsVisible = 0; diff --git a/Frameworks/Articles/xcconfig/Articles_project_test.xcconfig b/Frameworks/Articles/xcconfig/Articles_project_test.xcconfig deleted file mode 100644 index 43a4b80bc..000000000 --- a/Frameworks/Articles/xcconfig/Articles_project_test.xcconfig +++ /dev/null @@ -1,3 +0,0 @@ -#include "./Articles_project_debug.xcconfig" - -OTHER_SWIFT_FLAGS = -DTEST $(inherited) diff --git a/Frameworks/ArticlesDatabase/ArticlesDatabase.xcodeproj/project.pbxproj b/Frameworks/ArticlesDatabase/ArticlesDatabase.xcodeproj/project.pbxproj index a1349177f..4a7ef6045 100644 --- a/Frameworks/ArticlesDatabase/ArticlesDatabase.xcodeproj/project.pbxproj +++ b/Frameworks/ArticlesDatabase/ArticlesDatabase.xcodeproj/project.pbxproj @@ -112,7 +112,6 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 518B2EA7235130CD00400001 /* ArticlesDatabase_project_test.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ArticlesDatabase_project_test.xcconfig; sourceTree = "<group>"; }; 51C451FE2264CF2100C03939 /* RSParser.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = RSParser.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 84116B8823E01E86000B2E98 /* FetchFeedUnreadCountOperation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FetchFeedUnreadCountOperation.swift; sourceTree = "<group>"; }; 841D4D732106B59F00DD04E6 /* Articles.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Articles.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -296,7 +295,6 @@ D511EEE820242E0800712EC3 /* ArticlesDatabase_target.xcconfig */, D511EEE920242E0800712EC3 /* ArticlesDatabase_project.xcconfig */, D511EEEA20242E0800712EC3 /* ArticlesDatabase_project_debug.xcconfig */, - 518B2EA7235130CD00400001 /* ArticlesDatabase_project_test.xcconfig */, D511EEEB20242E0800712EC3 /* ArticlesDatabase_project_release.xcconfig */, ); path = xcconfig; @@ -566,27 +564,6 @@ /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - 51EC89362351201E0061B6F6 /* Test */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 518B2EA7235130CD00400001 /* ArticlesDatabase_project_test.xcconfig */; - buildSettings = { - }; - name = Test; - }; - 51EC89372351201E0061B6F6 /* Test */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = D511EEE820242E0800712EC3 /* ArticlesDatabase_target.xcconfig */; - buildSettings = { - }; - name = Test; - }; - 51EC89382351201E0061B6F6 /* Test */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = D511EEE720242E0800712EC3 /* ArticlesDatabaseTests_target.xcconfig */; - buildSettings = { - }; - name = Test; - }; 844BEE491F0AB3AB004AB7CD /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = D511EEEA20242E0800712EC3 /* ArticlesDatabase_project_debug.xcconfig */; @@ -636,7 +613,6 @@ isa = XCConfigurationList; buildConfigurations = ( 844BEE491F0AB3AB004AB7CD /* Debug */, - 51EC89362351201E0061B6F6 /* Test */, 844BEE4A1F0AB3AB004AB7CD /* Release */, ); defaultConfigurationIsVisible = 0; @@ -646,7 +622,6 @@ isa = XCConfigurationList; buildConfigurations = ( 844BEE4C1F0AB3AB004AB7CD /* Debug */, - 51EC89372351201E0061B6F6 /* Test */, 844BEE4D1F0AB3AB004AB7CD /* Release */, ); defaultConfigurationIsVisible = 0; @@ -656,7 +631,6 @@ isa = XCConfigurationList; buildConfigurations = ( 844BEE4F1F0AB3AB004AB7CD /* Debug */, - 51EC89382351201E0061B6F6 /* Test */, 844BEE501F0AB3AB004AB7CD /* Release */, ); defaultConfigurationIsVisible = 0; diff --git a/Frameworks/ArticlesDatabase/xcconfig/ArticlesDatabase_project_test.xcconfig b/Frameworks/ArticlesDatabase/xcconfig/ArticlesDatabase_project_test.xcconfig deleted file mode 100644 index dea4895af..000000000 --- a/Frameworks/ArticlesDatabase/xcconfig/ArticlesDatabase_project_test.xcconfig +++ /dev/null @@ -1,3 +0,0 @@ -#include "./ArticlesDatabase_project_debug.xcconfig" - -OTHER_SWIFT_FLAGS = -DTEST $(inherited) diff --git a/Frameworks/Secrets/Secrets.xcodeproj/project.pbxproj b/Frameworks/Secrets/Secrets.xcodeproj/project.pbxproj index 38dc95e54..489bf569f 100644 --- a/Frameworks/Secrets/Secrets.xcodeproj/project.pbxproj +++ b/Frameworks/Secrets/Secrets.xcodeproj/project.pbxproj @@ -8,7 +8,6 @@ /* Begin PBXBuildFile section */ 514446BE243FFF0300EE752D /* Secrets_project_release.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 514446B9243FFF0200EE752D /* Secrets_project_release.xcconfig */; }; - 514446BF243FFF0300EE752D /* Secrets_project_test.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 514446BA243FFF0200EE752D /* Secrets_project_test.xcconfig */; }; 514446C0243FFF0300EE752D /* Secrets_project_debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 514446BB243FFF0200EE752D /* Secrets_project_debug.xcconfig */; }; 514446C1243FFF0300EE752D /* Secrets_project.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 514446BC243FFF0200EE752D /* Secrets_project.xcconfig */; }; 514446C2243FFF0300EE752D /* Secrets_target.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 514446BD243FFF0300EE752D /* Secrets_target.xcconfig */; }; @@ -21,7 +20,6 @@ /* Begin PBXFileReference section */ 514446B9243FFF0200EE752D /* Secrets_project_release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Secrets_project_release.xcconfig; sourceTree = "<group>"; }; - 514446BA243FFF0200EE752D /* Secrets_project_test.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Secrets_project_test.xcconfig; sourceTree = "<group>"; }; 514446BB243FFF0200EE752D /* Secrets_project_debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Secrets_project_debug.xcconfig; sourceTree = "<group>"; }; 514446BC243FFF0200EE752D /* Secrets_project.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Secrets_project.xcconfig; sourceTree = "<group>"; }; 514446BD243FFF0300EE752D /* Secrets_target.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Secrets_target.xcconfig; sourceTree = "<group>"; }; @@ -73,7 +71,6 @@ children = ( 514446BB243FFF0200EE752D /* Secrets_project_debug.xcconfig */, 514446B9243FFF0200EE752D /* Secrets_project_release.xcconfig */, - 514446BA243FFF0200EE752D /* Secrets_project_test.xcconfig */, 514446BC243FFF0200EE752D /* Secrets_project.xcconfig */, 514446BD243FFF0300EE752D /* Secrets_target.xcconfig */, ); @@ -158,7 +155,6 @@ buildActionMask = 2147483647; files = ( 514446C0243FFF0300EE752D /* Secrets_project_debug.xcconfig in Resources */, - 514446BF243FFF0300EE752D /* Secrets_project_test.xcconfig in Resources */, 514446C2243FFF0300EE752D /* Secrets_target.xcconfig in Resources */, 514446C1243FFF0300EE752D /* Secrets_project.xcconfig in Resources */, 514446BE243FFF0300EE752D /* Secrets_project_release.xcconfig in Resources */, @@ -233,21 +229,6 @@ }; name = Release; }; - 514BB436243FFB800023B621 /* Test */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 514446BA243FFF0200EE752D /* Secrets_project_test.xcconfig */; - buildSettings = { - }; - name = Test; - }; - 514BB437243FFB800023B621 /* Test */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 514446BD243FFF0300EE752D /* Secrets_target.xcconfig */; - buildSettings = { - PRODUCT_NAME = Secrets; - }; - name = Test; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -255,7 +236,6 @@ isa = XCConfigurationList; buildConfigurations = ( 514BB420243FFA640023B621 /* Debug */, - 514BB436243FFB800023B621 /* Test */, 514BB421243FFA640023B621 /* Release */, ); defaultConfigurationIsVisible = 0; @@ -265,7 +245,6 @@ isa = XCConfigurationList; buildConfigurations = ( 514BB423243FFA640023B621 /* Debug */, - 514BB437243FFB800023B621 /* Test */, 514BB424243FFA640023B621 /* Release */, ); defaultConfigurationIsVisible = 0; diff --git a/Frameworks/Secrets/xcconfig/Secrets_project_test.xcconfig b/Frameworks/Secrets/xcconfig/Secrets_project_test.xcconfig deleted file mode 100644 index 77fe155da..000000000 --- a/Frameworks/Secrets/xcconfig/Secrets_project_test.xcconfig +++ /dev/null @@ -1,3 +0,0 @@ -#include "./Secrets_project_debug.xcconfig" - -OTHER_SWIFT_FLAGS = -DTEST $(inherited) diff --git a/Frameworks/SyncDatabase/SyncDatabase.xcodeproj/project.pbxproj b/Frameworks/SyncDatabase/SyncDatabase.xcodeproj/project.pbxproj index 635e293f3..69ca2e492 100644 --- a/Frameworks/SyncDatabase/SyncDatabase.xcodeproj/project.pbxproj +++ b/Frameworks/SyncDatabase/SyncDatabase.xcodeproj/project.pbxproj @@ -32,7 +32,6 @@ 51554C35228B72F40055115A /* RSDatabase.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = RSDatabase.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 51554C37228B7DAC0055115A /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; }; 51554C39228B83380055115A /* Articles.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Articles.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 518B2EA82351310D00400001 /* SyncDatabase_project_test.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = SyncDatabase_project_test.xcconfig; sourceTree = "<group>"; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -74,7 +73,6 @@ isa = PBXGroup; children = ( 51554C1A228B701F0055115A /* SyncDatabase_project_debug.xcconfig */, - 518B2EA82351310D00400001 /* SyncDatabase_project_test.xcconfig */, 51554C1C228B701F0055115A /* SyncDatabase_project_release.xcconfig */, 51554C19228B701F0055115A /* SyncDatabase_project.xcconfig */, 51554C1D228B701F0055115A /* SyncDatabase_target.xcconfig */, @@ -232,20 +230,6 @@ }; name = Release; }; - 51EC89392351202A0061B6F6 /* Test */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 51554C1A228B701F0055115A /* SyncDatabase_project_debug.xcconfig */; - buildSettings = { - }; - name = Test; - }; - 51EC893A2351202A0061B6F6 /* Test */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 51554C1D228B701F0055115A /* SyncDatabase_target.xcconfig */; - buildSettings = { - }; - name = Test; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -253,7 +237,6 @@ isa = XCConfigurationList; buildConfigurations = ( 51554BF1228B6E8F0055115A /* Debug */, - 51EC89392351202A0061B6F6 /* Test */, 51554BF2228B6E8F0055115A /* Release */, ); defaultConfigurationIsVisible = 0; @@ -263,7 +246,6 @@ isa = XCConfigurationList; buildConfigurations = ( 51554BF4228B6E8F0055115A /* Debug */, - 51EC893A2351202A0061B6F6 /* Test */, 51554BF5228B6E8F0055115A /* Release */, ); defaultConfigurationIsVisible = 0; diff --git a/Frameworks/SyncDatabase/xcconfig/SyncDatabase_project_test.xcconfig b/Frameworks/SyncDatabase/xcconfig/SyncDatabase_project_test.xcconfig deleted file mode 100644 index 35df4b2b5..000000000 --- a/Frameworks/SyncDatabase/xcconfig/SyncDatabase_project_test.xcconfig +++ /dev/null @@ -1,3 +0,0 @@ -#include "./SyncDatabase_project_debug.xcconfig" - -OTHER_SWIFT_FLAGS = -DTEST $(inherited) diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj index 75846af92..599217fad 100644 --- a/NetNewsWire.xcodeproj/project.pbxproj +++ b/NetNewsWire.xcodeproj/project.pbxproj @@ -1568,7 +1568,6 @@ 51E595A4228CC36500FCC42B /* ArticleStatusSyncTimer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArticleStatusSyncTimer.swift; sourceTree = "<group>"; }; 51EAED95231363EF00A9EEE3 /* NonIntrinsicButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NonIntrinsicButton.swift; sourceTree = "<group>"; }; 51EC114B2149FE3300B296E3 /* FolderTreeMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = FolderTreeMenu.swift; path = AddFeed/FolderTreeMenu.swift; sourceTree = "<group>"; }; - 51EC892923511D3B0061B6F6 /* NetNewsWire_project_test.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = NetNewsWire_project_test.xcconfig; sourceTree = "<group>"; }; 51EF0F76227716200050506E /* FaviconGenerator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FaviconGenerator.swift; sourceTree = "<group>"; }; 51EF0F78227716380050506E /* ColorHash.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorHash.swift; sourceTree = "<group>"; }; 51EF0F7D2277A57D0050506E /* MasterTimelineAccessibilityCellLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MasterTimelineAccessibilityCellLayout.swift; sourceTree = "<group>"; }; @@ -2670,13 +2669,13 @@ 84C9FCA52262A1E600D921D6 /* Tests */, D5907CDA2002F084005947E5 /* xcconfig */, 849C64611ED37A5D003D8FC0 /* Products */, + 51C452B22265141B00C03939 /* Frameworks */, 517A754424451BD500B553B9 /* OAuthSwift.xcodeproj */, 84C37F7A20DD8CF200CA8CF5 /* RSCore.xcodeproj */, 84C37FB920DD8E0C00CA8CF5 /* RSDatabase.xcodeproj */, 84C37F8620DD8CF800CA8CF5 /* RSParser.xcodeproj */, 84C37F8F20DD8CFD00CA8CF5 /* RSTree.xcodeproj */, 84C37F9820DD8D0400CA8CF5 /* RSWeb.xcodeproj */, - 51C452B22265141B00C03939 /* Frameworks */, ); sourceTree = "<group>"; usesTabs = 1; @@ -3048,7 +3047,6 @@ isa = PBXGroup; children = ( D5907CDD2002F0BE005947E5 /* NetNewsWire_project_debug.xcconfig */, - 51EC892923511D3B0061B6F6 /* NetNewsWire_project_test.xcconfig */, D5907CDC2002F0BE005947E5 /* NetNewsWire_project_release.xcconfig */, D5907CDE2002F0BE005947E5 /* NetNewsWire_project.xcconfig */, D5907CE02002F0FA005947E5 /* NetNewsWire_macapp_target.xcconfig */, @@ -4873,13 +4871,6 @@ }; name = Debug; }; - 51314641235A7BBE00387FDC /* Test */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 51314617235A797400387FDC /* NetNewsWire_iOSintentextension_target.xcconfig */; - buildSettings = { - }; - name = Test; - }; 51314642235A7BBE00387FDC /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 51314617235A797400387FDC /* NetNewsWire_iOSintentextension_target.xcconfig */; @@ -4908,13 +4899,6 @@ }; name = Debug; }; - 518B2EDA2351B3DD00400001 /* Test */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 518B2EE92351B4C200400001 /* NetNewsWire_iOSTests_target.xcconfig */; - buildSettings = { - }; - name = Test; - }; 518B2EDB2351B3DD00400001 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 518B2EE92351B4C200400001 /* NetNewsWire_iOSTests_target.xcconfig */; @@ -4922,48 +4906,6 @@ }; name = Release; }; - 51EC892A23511DA80061B6F6 /* Test */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 51EC892923511D3B0061B6F6 /* NetNewsWire_project_test.xcconfig */; - buildSettings = { - }; - name = Test; - }; - 51EC892B23511DA80061B6F6 /* Test */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = D5907CE02002F0FA005947E5 /* NetNewsWire_macapp_target.xcconfig */; - buildSettings = { - }; - name = Test; - }; - 51EC892C23511DA80061B6F6 /* Test */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = D5907CDF2002F0F9005947E5 /* NetNewsWireTests_target.xcconfig */; - buildSettings = { - }; - name = Test; - }; - 51EC892D23511DA80061B6F6 /* Test */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 51121AA12265430A00BC0EC1 /* NetNewsWire_iOSapp_target.xcconfig */; - buildSettings = { - }; - name = Test; - }; - 51EC892E23511DA80061B6F6 /* Test */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = D519E74722EE553300923F27 /* NetNewsWire_safariextension_target.xcconfig */; - buildSettings = { - }; - name = Test; - }; - 51EC892F23511DA80061B6F6 /* Test */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 515D4FCE2325B3D000EE1167 /* NetNewsWire_iOSshareextension_target.xcconfig */; - buildSettings = { - }; - name = Test; - }; 6581C74720CED60100F4AD34 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = D519E74722EE553300923F27 /* NetNewsWire_safariextension_target.xcconfig */; @@ -4987,15 +4929,6 @@ }; name = Debug; }; - 65ED4081235DEF6C0081F399 /* Test */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 65ED40F2235DF5E00081F399 /* NetNewsWire_macapp_target_macappstore.xcconfig */; - buildSettings = { - CODE_SIGN_IDENTITY = "Apple Development"; - PRODUCT_NAME = NetNewsWire; - }; - name = Test; - }; 65ED4082235DEF6C0081F399 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 65ED40F2235DF5E00081F399 /* NetNewsWire_macapp_target_macappstore.xcconfig */; @@ -5013,14 +4946,6 @@ }; name = Debug; }; - 65ED409B235DEF770081F399 /* Test */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 65ED4186235E045B0081F399 /* NetNewsWire_safariextension_target_macappstore.xcconfig */; - buildSettings = { - PRODUCT_NAME = "Subscribe to Feed"; - }; - name = Test; - }; 65ED409C235DEF770081F399 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 65ED4186235E045B0081F399 /* NetNewsWire_safariextension_target_macappstore.xcconfig */; @@ -5092,7 +5017,6 @@ isa = XCConfigurationList; buildConfigurations = ( 51314640235A7BBE00387FDC /* Debug */, - 51314641235A7BBE00387FDC /* Test */, 51314642235A7BBE00387FDC /* Release */, ); defaultConfigurationIsVisible = 0; @@ -5102,7 +5026,6 @@ isa = XCConfigurationList; buildConfigurations = ( 513C5CF2232571C2003D4054 /* Debug */, - 51EC892F23511DA80061B6F6 /* Test */, 513C5CF3232571C2003D4054 /* Release */, ); defaultConfigurationIsVisible = 0; @@ -5112,7 +5035,6 @@ isa = XCConfigurationList; buildConfigurations = ( 518B2ED92351B3DD00400001 /* Debug */, - 518B2EDA2351B3DD00400001 /* Test */, 518B2EDB2351B3DD00400001 /* Release */, ); defaultConfigurationIsVisible = 0; @@ -5122,7 +5044,6 @@ isa = XCConfigurationList; buildConfigurations = ( 6581C74720CED60100F4AD34 /* Debug */, - 51EC892E23511DA80061B6F6 /* Test */, 6581C74820CED60100F4AD34 /* Release */, ); defaultConfigurationIsVisible = 0; @@ -5132,7 +5053,6 @@ isa = XCConfigurationList; buildConfigurations = ( 65ED4080235DEF6C0081F399 /* Debug */, - 65ED4081235DEF6C0081F399 /* Test */, 65ED4082235DEF6C0081F399 /* Release */, ); defaultConfigurationIsVisible = 0; @@ -5142,7 +5062,6 @@ isa = XCConfigurationList; buildConfigurations = ( 65ED409A235DEF770081F399 /* Debug */, - 65ED409B235DEF770081F399 /* Test */, 65ED409C235DEF770081F399 /* Release */, ); defaultConfigurationIsVisible = 0; @@ -5152,7 +5071,6 @@ isa = XCConfigurationList; buildConfigurations = ( 840D61A42029031E009BC708 /* Debug */, - 51EC892D23511DA80061B6F6 /* Test */, 840D61A52029031E009BC708 /* Release */, ); defaultConfigurationIsVisible = 0; @@ -5162,7 +5080,6 @@ isa = XCConfigurationList; buildConfigurations = ( 849C64781ED37A5D003D8FC0 /* Debug */, - 51EC892A23511DA80061B6F6 /* Test */, 849C64791ED37A5D003D8FC0 /* Release */, ); defaultConfigurationIsVisible = 0; @@ -5172,7 +5089,6 @@ isa = XCConfigurationList; buildConfigurations = ( 849C647B1ED37A5D003D8FC0 /* Debug */, - 51EC892B23511DA80061B6F6 /* Test */, 849C647C1ED37A5D003D8FC0 /* Release */, ); defaultConfigurationIsVisible = 0; @@ -5182,7 +5098,6 @@ isa = XCConfigurationList; buildConfigurations = ( 849C647E1ED37A5D003D8FC0 /* Debug */, - 51EC892C23511DA80061B6F6 /* Test */, 849C647F1ED37A5D003D8FC0 /* Release */, ); defaultConfigurationIsVisible = 0; diff --git a/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire-iOS.xcscheme b/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire-iOS.xcscheme index 09a6799e5..28b02bdd0 100644 --- a/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire-iOS.xcscheme +++ b/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire-iOS.xcscheme @@ -41,7 +41,7 @@ </BuildActionEntries> </BuildAction> <TestAction - buildConfiguration = "Test" + buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> diff --git a/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire.xcscheme b/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire.xcscheme index 3e3ec99e6..5a6644028 100644 --- a/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire.xcscheme +++ b/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire.xcscheme @@ -41,7 +41,7 @@ </BuildActionEntries> </BuildAction> <TestAction - buildConfiguration = "Test" + buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> diff --git a/submodules/RSCore b/submodules/RSCore index 3dfa570a4..0ba28167b 160000 --- a/submodules/RSCore +++ b/submodules/RSCore @@ -1 +1 @@ -Subproject commit 3dfa570a4600690290cd946b8e122b0b99da0a13 +Subproject commit 0ba28167babdd4710adc1764ed49979c9eb42ead diff --git a/submodules/RSDatabase b/submodules/RSDatabase index de7753914..0a8718c5c 160000 --- a/submodules/RSDatabase +++ b/submodules/RSDatabase @@ -1 +1 @@ -Subproject commit de7753914c4f47aa97adfbe7a121acf0d2f8cd40 +Subproject commit 0a8718c5c412585141d8374ae01b1e9e75dd1019 diff --git a/submodules/RSParser b/submodules/RSParser index a977d8e84..8c035b267 160000 --- a/submodules/RSParser +++ b/submodules/RSParser @@ -1 +1 @@ -Subproject commit a977d8e84af8645fc8268ac843e8a79b3644b133 +Subproject commit 8c035b26767e66f5639c2fc0f3398216a46cb3d1 diff --git a/submodules/RSTree b/submodules/RSTree index 2fc9b9cff..81011808b 160000 --- a/submodules/RSTree +++ b/submodules/RSTree @@ -1 +1 @@ -Subproject commit 2fc9b9cff60032a272303ff6d6df5b39ec297179 +Subproject commit 81011808b6c4242cbf95cb55120f250c157d594c diff --git a/submodules/RSWeb b/submodules/RSWeb index 05388e4f7..162f8ee2a 160000 --- a/submodules/RSWeb +++ b/submodules/RSWeb @@ -1 +1 @@ -Subproject commit 05388e4f7073b014f786cfce18782c3d61f8e378 +Subproject commit 162f8ee2a8599d895eea9552d6aaf17db2ab575d diff --git a/xcconfig/NetNewsWire_project_test.xcconfig b/xcconfig/NetNewsWire_project_test.xcconfig deleted file mode 100644 index fa08e7ae8..000000000 --- a/xcconfig/NetNewsWire_project_test.xcconfig +++ /dev/null @@ -1,4 +0,0 @@ -#include "./NetNewsWire_project_debug.xcconfig" - -OTHER_SWIFT_FLAGS = -DTEST $(inherited) -FRAMEWORK_SEARCH_PATHS = $(inherited) $(SYMROOT)/Release$(EFFECTIVE_PLATFORM_NAME)