diff --git a/.gitignore b/.gitignore index 98647dfa5..aab97332a 100644 --- a/.gitignore +++ b/.gitignore @@ -72,4 +72,5 @@ fastlane/test_output /Shared/Secrets.swift /Frameworks/Secrets/Secrets.swift +Secrets/Sources/Secrets/Secrets.swift *.py[cod] diff --git a/Frameworks/Secrets/Secrets.xcodeproj/project.pbxproj b/Frameworks/Secrets/Secrets.xcodeproj/project.pbxproj deleted file mode 100644 index 8713133b2..000000000 --- a/Frameworks/Secrets/Secrets.xcodeproj/project.pbxproj +++ /dev/null @@ -1,285 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 52; - objects = { - -/* Begin PBXBuildFile section */ - 513839F324D1E3E40027E272 /* OAuthSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 513839F224D1E3E40027E272 /* OAuthSwift */; }; - 514446BE243FFF0300EE752D /* Secrets_project_release.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 514446B9243FFF0200EE752D /* Secrets_project_release.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 */; }; - 514446ED2440030900EE752D /* Secrets.swift in Sources */ = {isa = PBXBuildFile; fileRef = 514446EC2440030900EE752D /* Secrets.swift */; }; - 514BB43B243FFBFF0023B621 /* CredentialsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 514BB439243FFBFF0023B621 /* CredentialsManager.swift */; }; - 514BB43C243FFBFF0023B621 /* Credentials.swift in Sources */ = {isa = PBXBuildFile; fileRef = 514BB43A243FFBFF0023B621 /* Credentials.swift */; }; - 5152BEF2244633FA00138380 /* OAuth1SwiftProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5152BEF1244633FA00138380 /* OAuth1SwiftProvider.swift */; }; - 5193CD56245E40B70092735E /* OAuth2SwiftProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5193CD55245E40B70092735E /* OAuth2SwiftProvider.swift */; }; -/* End PBXBuildFile section */ - -/* Begin PBXFileReference section */ - 514446B9243FFF0200EE752D /* Secrets_project_release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Secrets_project_release.xcconfig; sourceTree = ""; }; - 514446BB243FFF0200EE752D /* Secrets_project_debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Secrets_project_debug.xcconfig; sourceTree = ""; }; - 514446BC243FFF0200EE752D /* Secrets_project.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Secrets_project.xcconfig; sourceTree = ""; }; - 514446BD243FFF0300EE752D /* Secrets_target.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Secrets_target.xcconfig; sourceTree = ""; }; - 514446EC2440030900EE752D /* Secrets.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Secrets.swift; sourceTree = ""; }; - 514BB41A243FFA640023B621 /* Secrets.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Secrets.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 514BB41E243FFA640023B621 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 514BB439243FFBFF0023B621 /* CredentialsManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CredentialsManager.swift; sourceTree = ""; }; - 514BB43A243FFBFF0023B621 /* Credentials.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Credentials.swift; sourceTree = ""; }; - 5152BEF1244633FA00138380 /* OAuth1SwiftProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OAuth1SwiftProvider.swift; sourceTree = ""; }; - 5193CD55245E40B70092735E /* OAuth2SwiftProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OAuth2SwiftProvider.swift; sourceTree = ""; }; - 51C99ABC2447DD730027D5F6 /* OAuthSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = OAuthSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 514BB417243FFA640023B621 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 513839F324D1E3E40027E272 /* OAuthSwift in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 514BB410243FFA640023B621 = { - isa = PBXGroup; - children = ( - 514BB43A243FFBFF0023B621 /* Credentials.swift */, - 514BB439243FFBFF0023B621 /* CredentialsManager.swift */, - 5152BEF1244633FA00138380 /* OAuth1SwiftProvider.swift */, - 5193CD55245E40B70092735E /* OAuth2SwiftProvider.swift */, - 514BB41E243FFA640023B621 /* Info.plist */, - 514BB41B243FFA640023B621 /* Products */, - 514446EC2440030900EE752D /* Secrets.swift */, - 514BB42B243FFAF50023B621 /* xcconfig */, - 51C99ABB2447DD730027D5F6 /* Frameworks */, - ); - sourceTree = ""; - }; - 514BB41B243FFA640023B621 /* Products */ = { - isa = PBXGroup; - children = ( - 514BB41A243FFA640023B621 /* Secrets.framework */, - ); - name = Products; - sourceTree = ""; - }; - 514BB42B243FFAF50023B621 /* xcconfig */ = { - isa = PBXGroup; - children = ( - 514446BB243FFF0200EE752D /* Secrets_project_debug.xcconfig */, - 514446B9243FFF0200EE752D /* Secrets_project_release.xcconfig */, - 514446BC243FFF0200EE752D /* Secrets_project.xcconfig */, - 514446BD243FFF0300EE752D /* Secrets_target.xcconfig */, - ); - path = xcconfig; - sourceTree = ""; - }; - 51C99ABB2447DD730027D5F6 /* Frameworks */ = { - isa = PBXGroup; - children = ( - 51C99ABC2447DD730027D5F6 /* OAuthSwift.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXHeadersBuildPhase section */ - 514BB415243FFA640023B621 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXHeadersBuildPhase section */ - -/* Begin PBXNativeTarget section */ - 514BB419243FFA640023B621 /* Secrets */ = { - isa = PBXNativeTarget; - buildConfigurationList = 514BB422243FFA640023B621 /* Build configuration list for PBXNativeTarget "Secrets" */; - buildPhases = ( - 514BB415243FFA640023B621 /* Headers */, - 514BB416243FFA640023B621 /* Sources */, - 514BB417243FFA640023B621 /* Frameworks */, - 514BB418243FFA640023B621 /* Resources */, - 514BB438243FFBB30023B621 /* Run Script: Verfiy No Build Settings */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = Secrets; - packageProductDependencies = ( - 513839F224D1E3E40027E272 /* OAuthSwift */, - ); - productName = Credentials; - productReference = 514BB41A243FFA640023B621 /* Secrets.framework */; - productType = "com.apple.product-type.framework"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 514BB411243FFA640023B621 /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 1140; - ORGANIZATIONNAME = "Ranchero Software, LLC"; - TargetAttributes = { - 514BB419243FFA640023B621 = { - CreatedOnToolsVersion = 11.4; - }; - }; - }; - buildConfigurationList = 514BB414243FFA640023B621 /* Build configuration list for PBXProject "Secrets" */; - compatibilityVersion = "Xcode 9.3"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 514BB410243FFA640023B621; - packageReferences = ( - 513839F124D1E3E40027E272 /* XCRemoteSwiftPackageReference "OAuthSwift" */, - ); - productRefGroup = 514BB41B243FFA640023B621 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 514BB419243FFA640023B621 /* Secrets */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 514BB418243FFA640023B621 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 514446C0243FFF0300EE752D /* Secrets_project_debug.xcconfig in Resources */, - 514446C2243FFF0300EE752D /* Secrets_target.xcconfig in Resources */, - 514446C1243FFF0300EE752D /* Secrets_project.xcconfig in Resources */, - 514446BE243FFF0300EE752D /* Secrets_project_release.xcconfig in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - 514BB438243FFBB30023B621 /* Run Script: Verfiy No Build Settings */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - name = "Run Script: Verfiy No Build Settings"; - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "if [ \"$ENABLE_PREVIEWS\" = \"YES\" ]; then exit 0; fi\n\nxcrun -sdk macosx swiftc -target x86_64-macosx10.11 ../../buildscripts/VerifyNoBuildSettings.swift -o $CONFIGURATION_TEMP_DIR/VerifyNoBS\n$CONFIGURATION_TEMP_DIR/VerifyNoBS ${PROJECT_NAME}.xcodeproj/project.pbxproj\n\nif [ $? -ne 0 ]\nthen\n echo \"error: Build Setting were found in the project.pbxproj file. Most likely you didn't intend to change this file and should revert it.\"\n exit 1\nfi\n"; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 514BB416243FFA640023B621 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 514BB43C243FFBFF0023B621 /* Credentials.swift in Sources */, - 514446ED2440030900EE752D /* Secrets.swift in Sources */, - 5152BEF2244633FA00138380 /* OAuth1SwiftProvider.swift in Sources */, - 5193CD56245E40B70092735E /* OAuth2SwiftProvider.swift in Sources */, - 514BB43B243FFBFF0023B621 /* CredentialsManager.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - 514BB420243FFA640023B621 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 514446BB243FFF0200EE752D /* Secrets_project_debug.xcconfig */; - buildSettings = { - }; - name = Debug; - }; - 514BB421243FFA640023B621 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 514446B9243FFF0200EE752D /* Secrets_project_release.xcconfig */; - buildSettings = { - }; - name = Release; - }; - 514BB423243FFA640023B621 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 514446BD243FFF0300EE752D /* Secrets_target.xcconfig */; - buildSettings = { - PRODUCT_NAME = Secrets; - }; - name = Debug; - }; - 514BB424243FFA640023B621 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 514446BD243FFF0300EE752D /* Secrets_target.xcconfig */; - buildSettings = { - PRODUCT_NAME = Secrets; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 514BB414243FFA640023B621 /* Build configuration list for PBXProject "Secrets" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 514BB420243FFA640023B621 /* Debug */, - 514BB421243FFA640023B621 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 514BB422243FFA640023B621 /* Build configuration list for PBXNativeTarget "Secrets" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 514BB423243FFA640023B621 /* Debug */, - 514BB424243FFA640023B621 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - -/* Begin XCRemoteSwiftPackageReference section */ - 513839F124D1E3E40027E272 /* XCRemoteSwiftPackageReference "OAuthSwift" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/OAuthSwift/OAuthSwift.git"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 2.1.2; - }; - }; -/* End XCRemoteSwiftPackageReference section */ - -/* Begin XCSwiftPackageProductDependency section */ - 513839F224D1E3E40027E272 /* OAuthSwift */ = { - isa = XCSwiftPackageProductDependency; - package = 513839F124D1E3E40027E272 /* XCRemoteSwiftPackageReference "OAuthSwift" */; - productName = OAuthSwift; - }; -/* End XCSwiftPackageProductDependency section */ - }; - rootObject = 514BB411243FFA640023B621 /* Project object */; -} diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj index 575aa9569..8538ef04e 100644 --- a/NetNewsWire.xcodeproj/project.pbxproj +++ b/NetNewsWire.xcodeproj/project.pbxproj @@ -76,13 +76,6 @@ 5102AE7C24D17FFB0050839C /* RSCore in Frameworks */ = {isa = PBXBuildFile; productRef = 5102AE7B24D17FFB0050839C /* RSCore */; }; 5102AE7D24D17FFB0050839C /* RSCore in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 5102AE7B24D17FFB0050839C /* RSCore */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 5102AE7F24D17FFB0050839C /* RSCoreResources in Frameworks */ = {isa = PBXBuildFile; productRef = 5102AE7E24D17FFB0050839C /* RSCoreResources */; }; - 5102FD83244009F000534F17 /* Secrets.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5102FD7B244008A700534F17 /* Secrets.framework */; }; - 5102FD84244009F000534F17 /* Secrets.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 5102FD7B244008A700534F17 /* Secrets.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 5102FD9B244009FA00534F17 /* Secrets.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5102FD7B244008A700534F17 /* Secrets.framework */; }; - 5102FD9C244009FA00534F17 /* Secrets.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 5102FD7B244008A700534F17 /* Secrets.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 5102FD9D24400A0500534F17 /* Secrets.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5102FD7B244008A700534F17 /* Secrets.framework */; }; - 5102FD9E24400A0500534F17 /* Secrets.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 5102FD7B244008A700534F17 /* Secrets.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 5102FDA224400A2000534F17 /* Secrets.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5102FD7B244008A700534F17 /* Secrets.framework */; }; 5103A9982421643300410853 /* blank.html in Resources */ = {isa = PBXBuildFile; fileRef = 5103A9972421643300410853 /* blank.html */; }; 5103A9992421643300410853 /* blank.html in Resources */ = {isa = PBXBuildFile; fileRef = 5103A9972421643300410853 /* blank.html */; }; 5103A9B424216A4200410853 /* blank.html in Resources */ = {isa = PBXBuildFile; fileRef = 5103A9B324216A4200410853 /* blank.html */; }; @@ -491,14 +484,10 @@ 51E4398023805EBC00015C31 /* AddComboTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51E4397F23805EBC00015C31 /* AddComboTableViewCell.swift */; }; 51E4987F24A8061400B667CB /* Account.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8407166A2262A60D00344432 /* Account.framework */; }; 51E4988024A8061400B667CB /* Account.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8407166A2262A60D00344432 /* Account.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 51E4989124A8061400B667CB /* Secrets.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5102FD7B244008A700534F17 /* Secrets.framework */; }; - 51E4989224A8061400B667CB /* Secrets.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 5102FD7B244008A700534F17 /* Secrets.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 51E4989724A8065700B667CB /* CloudKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51E4989624A8065700B667CB /* CloudKit.framework */; }; 51E4989924A8067000B667CB /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51E4989824A8067000B667CB /* WebKit.framework */; }; 51E4989A24A8069300B667CB /* Account.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8407166A2262A60D00344432 /* Account.framework */; }; 51E4989B24A8069300B667CB /* Account.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8407166A2262A60D00344432 /* Account.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 51E498AC24A8069300B667CB /* Secrets.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5102FD7B244008A700534F17 /* Secrets.framework */; }; - 51E498AD24A8069300B667CB /* Secrets.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 5102FD7B244008A700534F17 /* Secrets.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 51E498B124A806A400B667CB /* CloudKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51E4DAEC2425F6940091EB5B /* CloudKit.framework */; }; 51E498B324A806AA00B667CB /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51E498B224A806AA00B667CB /* WebKit.framework */; }; 51E498C724A8085D00B667CB /* StarredFeedDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 845EE7B01FC2366500854A1F /* StarredFeedDelegate.swift */; }; @@ -1070,13 +1059,6 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 5102FD7A244008A700534F17 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 5102FD72244008A700534F17 /* Secrets.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 514BB41A243FFA640023B621; - remoteInfo = Secrets; - }; 5131463C235A7BBE00387FDC /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 849C64581ED37A5D003D8FC0 /* Project object */; @@ -1334,7 +1316,6 @@ 510ECA4624D1E010001C31A6 /* RSTree in Embed Frameworks */, 51383A3624D1F91F0027E272 /* RSWeb in Embed Frameworks */, 5102AE6F24D17F9C0050839C /* RSCore in Embed Frameworks */, - 5102FD9E24400A0500534F17 /* Secrets.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -1349,7 +1330,6 @@ 51E4988024A8061400B667CB /* Account.framework in Embed Frameworks */, 51383A3924D1F9470027E272 /* RSWeb in Embed Frameworks */, 5102AE7A24D17FF20050839C /* RSCore in Embed Frameworks */, - 51E4989224A8061400B667CB /* Secrets.framework in Embed Frameworks */, 51B0DF1F24D24F53000AD99E /* RSDatabase in Embed Frameworks */, ); name = "Embed Frameworks"; @@ -1367,7 +1347,6 @@ 51383A3C24D1F9510027E272 /* RSWeb in Embed Frameworks */, 5102AE7D24D17FFB0050839C /* RSCore in Embed Frameworks */, 51E4997724A87FFC00B667CB /* Sparkle.framework in Embed Frameworks */, - 51E498AD24A8069300B667CB /* Secrets.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -1405,7 +1384,6 @@ files = ( 65ED4076235DEF6C0081F399 /* Account.framework in Embed Frameworks */, 5102AE6A24D17F7C0050839C /* RSCore in Embed Frameworks */, - 5102FD9C244009FA00534F17 /* Secrets.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -1444,7 +1422,6 @@ 51B0DF1024D24E3B000AD99E /* RSDatabase in Embed Frameworks */, 51B0DF2624D2C7FA000AD99E /* RSParser in Embed Frameworks */, 51383A3324D1F90E0027E272 /* RSWeb in Embed Frameworks */, - 5102FD84244009F000534F17 /* Secrets.framework in Embed Frameworks */, 5102AE6524D17F640050839C /* RSCore in Embed Frameworks */, 51C451BE226377D000C03939 /* Account.framework in Embed Frameworks */, 65ED42DF235E74230081F399 /* Sparkle.framework in Embed Frameworks */, @@ -1505,7 +1482,6 @@ 510289D12451BC1F00426DDF /* TwitterSelectTypeTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TwitterSelectTypeTableViewController.swift; sourceTree = ""; }; 510289D32451BD7B00426DDF /* SelectURLBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectURLBuilder.swift; sourceTree = ""; }; 510289D52451DDD100426DDF /* TwitterSelectAccountTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TwitterSelectAccountTableViewController.swift; sourceTree = ""; }; - 5102FD72244008A700534F17 /* Secrets.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Secrets.xcodeproj; path = Frameworks/Secrets/Secrets.xcodeproj; sourceTree = SOURCE_ROOT; }; 5103A9972421643300410853 /* blank.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = blank.html; sourceTree = ""; }; 5103A9B324216A4200410853 /* blank.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = blank.html; sourceTree = ""; }; 5103A9DA242258C600410853 /* AccountsAddCloudKit.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AccountsAddCloudKit.xib; sourceTree = ""; }; @@ -1752,6 +1728,7 @@ 51CD32A824D2CB25009ABAEF /* SyncDatabase */ = {isa = PBXFileReference; lastKnownFileType = folder; path = SyncDatabase; sourceTree = ""; }; 51CD32C324D2CD57009ABAEF /* ArticlesDatabase */ = {isa = PBXFileReference; lastKnownFileType = folder; path = ArticlesDatabase; sourceTree = ""; }; 51CD32C424D2CF1D009ABAEF /* Articles */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Articles; sourceTree = ""; }; + 51CD32C524D2D070009ABAEF /* Secrets */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Secrets; sourceTree = ""; }; 51CE1C0823621EDA005548FC /* RefreshProgressView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = RefreshProgressView.xib; sourceTree = ""; }; 51CE1C0A23622006005548FC /* RefreshProgressView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RefreshProgressView.swift; sourceTree = ""; }; 51D6A5BB23199C85001C27D8 /* MasterTimelineDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MasterTimelineDataSource.swift; sourceTree = ""; }; @@ -2042,7 +2019,6 @@ buildActionMask = 2147483647; files = ( 513146BF235A8FDB00387FDC /* Account.framework in Frameworks */, - 5102FDA224400A2000534F17 /* Secrets.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2072,7 +2048,6 @@ 5102AE7924D17FF20050839C /* RSCore in Frameworks */, 51E4987F24A8061400B667CB /* Account.framework in Frameworks */, 51E4989724A8065700B667CB /* CloudKit.framework in Frameworks */, - 51E4989124A8061400B667CB /* Secrets.framework in Frameworks */, 51E4989924A8067000B667CB /* WebKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -2089,7 +2064,6 @@ 51E498B124A806A400B667CB /* CloudKit.framework in Frameworks */, 5102AE7C24D17FFB0050839C /* RSCore in Frameworks */, 51B0DF2124D24F66000AD99E /* RSDatabase in Frameworks */, - 51E498AC24A8069300B667CB /* Secrets.framework in Frameworks */, 51E498B324A806AA00B667CB /* WebKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -2108,7 +2082,6 @@ 5102AE6C24D17F7C0050839C /* RSCoreResources in Frameworks */, 65ED4048235DEF6C0081F399 /* Account.framework in Frameworks */, 5102AE6924D17F7C0050839C /* RSCore in Frameworks */, - 5102FD9B244009FA00534F17 /* Secrets.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2127,7 +2100,6 @@ 510ECA4524D1E010001C31A6 /* RSTree in Frameworks */, 5102AE6E24D17F9C0050839C /* RSCore in Frameworks */, 51C452B42265141B00C03939 /* WebKit.framework in Frameworks */, - 5102FD9D24400A0500534F17 /* Secrets.framework in Frameworks */, 51C451F82264C83E00C03939 /* Account.framework in Frameworks */, 51E4DB082425F9EB0091EB5B /* CloudKit.framework in Frameworks */, ); @@ -2146,7 +2118,6 @@ 51E4DAED2425F6940091EB5B /* CloudKit.framework in Frameworks */, 51383A3224D1F90E0027E272 /* RSWeb in Frameworks */, 5102AE6424D17F640050839C /* RSCore in Frameworks */, - 5102FD83244009F000534F17 /* Secrets.framework in Frameworks */, 51B0DF2524D2C7FA000AD99E /* RSParser in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -2302,14 +2273,6 @@ path = Twitter; sourceTree = ""; }; - 5102FD73244008A700534F17 /* Products */ = { - isa = PBXGroup; - children = ( - 5102FD7B244008A700534F17 /* Secrets.framework */, - ); - name = Products; - sourceTree = ""; - }; 510C43F5243D0325009F70C3 /* ExtensionPoints */ = { isa = PBXGroup; children = ( @@ -3222,6 +3185,7 @@ 849C64571ED37A5D003D8FC0 = { isa = PBXGroup; children = ( + 51CD32C524D2D070009ABAEF /* Secrets */, 51CD32C424D2CF1D009ABAEF /* Articles */, 51CD32C324D2CD57009ABAEF /* ArticlesDatabase */, 51CD32A824D2CB25009ABAEF /* SyncDatabase */, @@ -3307,7 +3271,6 @@ isa = PBXGroup; children = ( 846E77301F6EF5D600A165E2 /* Account.xcodeproj */, - 5102FD72244008A700534F17 /* Secrets.xcodeproj */, 842E45CD1ED8C308000A8B52 /* AppNotifications.swift */, 511B9805237DCAC90028BCAA /* UserInfoKey.swift */, 51C452AD2265102800C03939 /* Timeline */, @@ -3951,10 +3914,6 @@ ProductGroup = 840716652262A60D00344432 /* Products */; ProjectRef = 846E77301F6EF5D600A165E2 /* Account.xcodeproj */; }, - { - ProductGroup = 5102FD73244008A700534F17 /* Products */; - ProjectRef = 5102FD72244008A700534F17 /* Secrets.xcodeproj */; - }, { ProductGroup = 65ED429A235E71B40081F399 /* Products */; ProjectRef = 65ED4299235E71B40081F399 /* Sparkle.xcodeproj */; @@ -3978,13 +3937,6 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - 5102FD7B244008A700534F17 /* Secrets.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Secrets.framework; - remoteRef = 5102FD7A244008A700534F17 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 65ED42B0235E71B40081F399 /* Sparkle.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; diff --git a/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire.xcscheme b/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire.xcscheme index 558eacef4..df4f25bb1 100644 --- a/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire.xcscheme +++ b/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire.xcscheme @@ -46,56 +46,6 @@ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> - - - - - - - - - - - - - - - - - - - - - - - - - -