diff --git a/Pachyderm/Info.plist b/Pachyderm/Info.plist deleted file mode 100644 index e1fe4cfb7b..0000000000 --- a/Pachyderm/Info.plist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - - diff --git a/Pachyderm/Pachyderm.h b/Pachyderm/Pachyderm.h deleted file mode 100644 index 85604eeb6a..0000000000 --- a/Pachyderm/Pachyderm.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// Pachyderm.h -// Pachyderm -// -// Created by Shadowfacts on 9/8/18. -// Copyright © 2018 Shadowfacts. All rights reserved. -// - -#import - -//! Project version number for Pachyderm. -FOUNDATION_EXPORT double PachydermVersionNumber; - -//! Project version string for Pachyderm. -FOUNDATION_EXPORT const unsigned char PachydermVersionString[]; - -// In this header, you should import all the public headers of your framework using statements like #import - - diff --git a/Pachyderm/Package.swift b/Pachyderm/Package.swift new file mode 100644 index 0000000000..ed1bf8a142 --- /dev/null +++ b/Pachyderm/Package.swift @@ -0,0 +1,33 @@ +// swift-tools-version: 5.6 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "Pachyderm", + platforms: [ + .iOS(.v14), + ], + products: [ + // Products define the executables and libraries a package produces, and make them visible to other packages. + .library( + name: "Pachyderm", + targets: ["Pachyderm"]), + ], + dependencies: [ + // Dependencies declare other packages that this package depends on. + .package(url: "https://github.com/karwa/swift-url.git", from: "0.3.1"), + ], + targets: [ + // Targets are the basic building blocks of a package. A target can define a module or a test suite. + // Targets can depend on other targets in this package, and on products in packages this package depends on. + .target( + name: "Pachyderm", + dependencies: [ + .product(name: "WebURL", package: "swift-url"), + ]), + .testTarget( + name: "PachydermTests", + dependencies: ["Pachyderm"]), + ] +) diff --git a/Pachyderm/README.md b/Pachyderm/README.md new file mode 100644 index 0000000000..dbb2d890b7 --- /dev/null +++ b/Pachyderm/README.md @@ -0,0 +1,3 @@ +# Pachyderm + +A description of this package. diff --git a/Pachyderm/Client.swift b/Pachyderm/Sources/Pachyderm/Client.swift similarity index 100% rename from Pachyderm/Client.swift rename to Pachyderm/Sources/Pachyderm/Client.swift diff --git a/Pachyderm/Extensions/Data.swift b/Pachyderm/Sources/Pachyderm/Extensions/Data.swift similarity index 100% rename from Pachyderm/Extensions/Data.swift rename to Pachyderm/Sources/Pachyderm/Extensions/Data.swift diff --git a/Pachyderm/Model/Account.swift b/Pachyderm/Sources/Pachyderm/Model/Account.swift similarity index 100% rename from Pachyderm/Model/Account.swift rename to Pachyderm/Sources/Pachyderm/Model/Account.swift diff --git a/Pachyderm/Model/Application.swift b/Pachyderm/Sources/Pachyderm/Model/Application.swift similarity index 100% rename from Pachyderm/Model/Application.swift rename to Pachyderm/Sources/Pachyderm/Model/Application.swift diff --git a/Pachyderm/Model/Attachment.swift b/Pachyderm/Sources/Pachyderm/Model/Attachment.swift similarity index 100% rename from Pachyderm/Model/Attachment.swift rename to Pachyderm/Sources/Pachyderm/Model/Attachment.swift diff --git a/Pachyderm/Model/Card.swift b/Pachyderm/Sources/Pachyderm/Model/Card.swift similarity index 100% rename from Pachyderm/Model/Card.swift rename to Pachyderm/Sources/Pachyderm/Model/Card.swift diff --git a/Pachyderm/Model/ConversationContext.swift b/Pachyderm/Sources/Pachyderm/Model/ConversationContext.swift similarity index 100% rename from Pachyderm/Model/ConversationContext.swift rename to Pachyderm/Sources/Pachyderm/Model/ConversationContext.swift diff --git a/Pachyderm/Model/DirectoryOrder.swift b/Pachyderm/Sources/Pachyderm/Model/DirectoryOrder.swift similarity index 100% rename from Pachyderm/Model/DirectoryOrder.swift rename to Pachyderm/Sources/Pachyderm/Model/DirectoryOrder.swift diff --git a/Pachyderm/Model/Emoji.swift b/Pachyderm/Sources/Pachyderm/Model/Emoji.swift similarity index 100% rename from Pachyderm/Model/Emoji.swift rename to Pachyderm/Sources/Pachyderm/Model/Emoji.swift diff --git a/Pachyderm/Model/Filter.swift b/Pachyderm/Sources/Pachyderm/Model/Filter.swift similarity index 100% rename from Pachyderm/Model/Filter.swift rename to Pachyderm/Sources/Pachyderm/Model/Filter.swift diff --git a/Pachyderm/Model/Hashtag.swift b/Pachyderm/Sources/Pachyderm/Model/Hashtag.swift similarity index 100% rename from Pachyderm/Model/Hashtag.swift rename to Pachyderm/Sources/Pachyderm/Model/Hashtag.swift diff --git a/Pachyderm/Model/History.swift b/Pachyderm/Sources/Pachyderm/Model/History.swift similarity index 100% rename from Pachyderm/Model/History.swift rename to Pachyderm/Sources/Pachyderm/Model/History.swift diff --git a/Pachyderm/Model/Instance.swift b/Pachyderm/Sources/Pachyderm/Model/Instance.swift similarity index 100% rename from Pachyderm/Model/Instance.swift rename to Pachyderm/Sources/Pachyderm/Model/Instance.swift diff --git a/Pachyderm/Model/List.swift b/Pachyderm/Sources/Pachyderm/Model/List.swift similarity index 100% rename from Pachyderm/Model/List.swift rename to Pachyderm/Sources/Pachyderm/Model/List.swift diff --git a/Pachyderm/Model/LoginSettings.swift b/Pachyderm/Sources/Pachyderm/Model/LoginSettings.swift similarity index 100% rename from Pachyderm/Model/LoginSettings.swift rename to Pachyderm/Sources/Pachyderm/Model/LoginSettings.swift diff --git a/Pachyderm/Model/MastodonError.swift b/Pachyderm/Sources/Pachyderm/Model/MastodonError.swift similarity index 100% rename from Pachyderm/Model/MastodonError.swift rename to Pachyderm/Sources/Pachyderm/Model/MastodonError.swift diff --git a/Pachyderm/Model/Mention.swift b/Pachyderm/Sources/Pachyderm/Model/Mention.swift similarity index 100% rename from Pachyderm/Model/Mention.swift rename to Pachyderm/Sources/Pachyderm/Model/Mention.swift diff --git a/Pachyderm/Model/NodeInfo.swift b/Pachyderm/Sources/Pachyderm/Model/NodeInfo.swift similarity index 100% rename from Pachyderm/Model/NodeInfo.swift rename to Pachyderm/Sources/Pachyderm/Model/NodeInfo.swift diff --git a/Pachyderm/Model/Notification.swift b/Pachyderm/Sources/Pachyderm/Model/Notification.swift similarity index 100% rename from Pachyderm/Model/Notification.swift rename to Pachyderm/Sources/Pachyderm/Model/Notification.swift diff --git a/Pachyderm/Model/Poll.swift b/Pachyderm/Sources/Pachyderm/Model/Poll.swift similarity index 100% rename from Pachyderm/Model/Poll.swift rename to Pachyderm/Sources/Pachyderm/Model/Poll.swift diff --git a/Pachyderm/Model/Protocols/AccountProtocol.swift b/Pachyderm/Sources/Pachyderm/Model/Protocols/AccountProtocol.swift similarity index 100% rename from Pachyderm/Model/Protocols/AccountProtocol.swift rename to Pachyderm/Sources/Pachyderm/Model/Protocols/AccountProtocol.swift diff --git a/Pachyderm/Model/Protocols/StatusProtocol.swift b/Pachyderm/Sources/Pachyderm/Model/Protocols/StatusProtocol.swift similarity index 100% rename from Pachyderm/Model/Protocols/StatusProtocol.swift rename to Pachyderm/Sources/Pachyderm/Model/Protocols/StatusProtocol.swift diff --git a/Pachyderm/Model/PushSubscription.swift b/Pachyderm/Sources/Pachyderm/Model/PushSubscription.swift similarity index 100% rename from Pachyderm/Model/PushSubscription.swift rename to Pachyderm/Sources/Pachyderm/Model/PushSubscription.swift diff --git a/Pachyderm/Model/RegisteredApplication.swift b/Pachyderm/Sources/Pachyderm/Model/RegisteredApplication.swift similarity index 100% rename from Pachyderm/Model/RegisteredApplication.swift rename to Pachyderm/Sources/Pachyderm/Model/RegisteredApplication.swift diff --git a/Pachyderm/Model/Relationship.swift b/Pachyderm/Sources/Pachyderm/Model/Relationship.swift similarity index 100% rename from Pachyderm/Model/Relationship.swift rename to Pachyderm/Sources/Pachyderm/Model/Relationship.swift diff --git a/Pachyderm/Model/Report.swift b/Pachyderm/Sources/Pachyderm/Model/Report.swift similarity index 100% rename from Pachyderm/Model/Report.swift rename to Pachyderm/Sources/Pachyderm/Model/Report.swift diff --git a/Pachyderm/Model/Scope.swift b/Pachyderm/Sources/Pachyderm/Model/Scope.swift similarity index 100% rename from Pachyderm/Model/Scope.swift rename to Pachyderm/Sources/Pachyderm/Model/Scope.swift diff --git a/Pachyderm/Model/SearchResultType.swift b/Pachyderm/Sources/Pachyderm/Model/SearchResultType.swift similarity index 100% rename from Pachyderm/Model/SearchResultType.swift rename to Pachyderm/Sources/Pachyderm/Model/SearchResultType.swift diff --git a/Pachyderm/Model/SearchResults.swift b/Pachyderm/Sources/Pachyderm/Model/SearchResults.swift similarity index 100% rename from Pachyderm/Model/SearchResults.swift rename to Pachyderm/Sources/Pachyderm/Model/SearchResults.swift diff --git a/Pachyderm/Model/Status.swift b/Pachyderm/Sources/Pachyderm/Model/Status.swift similarity index 100% rename from Pachyderm/Model/Status.swift rename to Pachyderm/Sources/Pachyderm/Model/Status.swift diff --git a/Pachyderm/Model/StatusContentType.swift b/Pachyderm/Sources/Pachyderm/Model/StatusContentType.swift similarity index 100% rename from Pachyderm/Model/StatusContentType.swift rename to Pachyderm/Sources/Pachyderm/Model/StatusContentType.swift diff --git a/Pachyderm/Model/Timeline.swift b/Pachyderm/Sources/Pachyderm/Model/Timeline.swift similarity index 100% rename from Pachyderm/Model/Timeline.swift rename to Pachyderm/Sources/Pachyderm/Model/Timeline.swift diff --git a/Pachyderm/Model/WellKnown.swift b/Pachyderm/Sources/Pachyderm/Model/WellKnown.swift similarity index 100% rename from Pachyderm/Model/WellKnown.swift rename to Pachyderm/Sources/Pachyderm/Model/WellKnown.swift diff --git a/Pachyderm/Request/Body.swift b/Pachyderm/Sources/Pachyderm/Request/Body.swift similarity index 100% rename from Pachyderm/Request/Body.swift rename to Pachyderm/Sources/Pachyderm/Request/Body.swift diff --git a/Pachyderm/Request/Endpoint.swift b/Pachyderm/Sources/Pachyderm/Request/Endpoint.swift similarity index 100% rename from Pachyderm/Request/Endpoint.swift rename to Pachyderm/Sources/Pachyderm/Request/Endpoint.swift diff --git a/Pachyderm/Request/FormAttachment.swift b/Pachyderm/Sources/Pachyderm/Request/FormAttachment.swift similarity index 100% rename from Pachyderm/Request/FormAttachment.swift rename to Pachyderm/Sources/Pachyderm/Request/FormAttachment.swift diff --git a/Pachyderm/Request/Method.swift b/Pachyderm/Sources/Pachyderm/Request/Method.swift similarity index 100% rename from Pachyderm/Request/Method.swift rename to Pachyderm/Sources/Pachyderm/Request/Method.swift diff --git a/Pachyderm/Request/Parameter.swift b/Pachyderm/Sources/Pachyderm/Request/Parameter.swift similarity index 100% rename from Pachyderm/Request/Parameter.swift rename to Pachyderm/Sources/Pachyderm/Request/Parameter.swift diff --git a/Pachyderm/Request/Request.swift b/Pachyderm/Sources/Pachyderm/Request/Request.swift similarity index 100% rename from Pachyderm/Request/Request.swift rename to Pachyderm/Sources/Pachyderm/Request/Request.swift diff --git a/Pachyderm/Request/RequestRange.swift b/Pachyderm/Sources/Pachyderm/Request/RequestRange.swift similarity index 100% rename from Pachyderm/Request/RequestRange.swift rename to Pachyderm/Sources/Pachyderm/Request/RequestRange.swift diff --git a/Pachyderm/Response/Empty.swift b/Pachyderm/Sources/Pachyderm/Response/Empty.swift similarity index 100% rename from Pachyderm/Response/Empty.swift rename to Pachyderm/Sources/Pachyderm/Response/Empty.swift diff --git a/Pachyderm/Response/Pagination.swift b/Pachyderm/Sources/Pachyderm/Response/Pagination.swift similarity index 100% rename from Pachyderm/Response/Pagination.swift rename to Pachyderm/Sources/Pachyderm/Response/Pagination.swift diff --git a/Pachyderm/Response/Response.swift b/Pachyderm/Sources/Pachyderm/Response/Response.swift similarity index 100% rename from Pachyderm/Response/Response.swift rename to Pachyderm/Sources/Pachyderm/Response/Response.swift diff --git a/Pachyderm/Utilities/CharacterCounter.swift b/Pachyderm/Sources/Pachyderm/Utilities/CharacterCounter.swift similarity index 100% rename from Pachyderm/Utilities/CharacterCounter.swift rename to Pachyderm/Sources/Pachyderm/Utilities/CharacterCounter.swift diff --git a/Pachyderm/Utilities/InstanceSelector.swift b/Pachyderm/Sources/Pachyderm/Utilities/InstanceSelector.swift similarity index 100% rename from Pachyderm/Utilities/InstanceSelector.swift rename to Pachyderm/Sources/Pachyderm/Utilities/InstanceSelector.swift diff --git a/Pachyderm/Utilities/NotificationGroup.swift b/Pachyderm/Sources/Pachyderm/Utilities/NotificationGroup.swift similarity index 100% rename from Pachyderm/Utilities/NotificationGroup.swift rename to Pachyderm/Sources/Pachyderm/Utilities/NotificationGroup.swift diff --git a/Pachyderm/Utilities/StatusState.swift b/Pachyderm/Sources/Pachyderm/Utilities/StatusState.swift similarity index 100% rename from Pachyderm/Utilities/StatusState.swift rename to Pachyderm/Sources/Pachyderm/Utilities/StatusState.swift diff --git a/Pachyderm/Utilities/TimelineSegment.swift b/Pachyderm/Sources/Pachyderm/Utilities/TimelineSegment.swift similarity index 100% rename from Pachyderm/Utilities/TimelineSegment.swift rename to Pachyderm/Sources/Pachyderm/Utilities/TimelineSegment.swift diff --git a/PachydermTests/CharacterCounterTests.swift b/Pachyderm/Tests/PachydermTests/CharacterCounterTests.swift similarity index 100% rename from PachydermTests/CharacterCounterTests.swift rename to Pachyderm/Tests/PachydermTests/CharacterCounterTests.swift diff --git a/PachydermTests/Info.plist b/PachydermTests/Info.plist deleted file mode 100644 index 6c40a6cd0c..0000000000 --- a/PachydermTests/Info.plist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - BNDL - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - - diff --git a/PachydermTests/PachydermTests.swift b/PachydermTests/PachydermTests.swift deleted file mode 100644 index aa6850994e..0000000000 --- a/PachydermTests/PachydermTests.swift +++ /dev/null @@ -1,34 +0,0 @@ -// -// PachydermTests.swift -// PachydermTests -// -// Created by Shadowfacts on 9/8/18. -// Copyright © 2018 Shadowfacts. All rights reserved. -// - -import XCTest -@testable import Pachyderm - -class PachydermTests: XCTestCase { - - override func setUp() { - // Put setup code here. This method is called before the invocation of each test method in the class. - } - - override func tearDown() { - // Put teardown code here. This method is called after the invocation of each test method in the class. - } - - func testExample() { - // This is an example of a functional test case. - // Use XCTAssert and related functions to verify your tests produce the correct results. - } - - func testPerformanceExample() { - // This is an example of a performance test case. - self.measure { - // Put the code you want to measure the time of here. - } - } - -} diff --git a/Tusker.xcodeproj/project.pbxproj b/Tusker.xcodeproj/project.pbxproj index 0a215418a0..66c01832f2 100644 --- a/Tusker.xcodeproj/project.pbxproj +++ b/Tusker.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 54; + objectVersion = 55; objects = { /* Begin PBXBuildFile section */ @@ -29,56 +29,13 @@ D60E2F292442372B005F8713 /* AccountMO.swift in Sources */ = {isa = PBXBuildFile; fileRef = D60E2F252442372B005F8713 /* AccountMO.swift */; }; D60E2F2C24423EAD005F8713 /* LazilyDecoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = D60E2F2B24423EAD005F8713 /* LazilyDecoding.swift */; }; D60E2F2E244248BF005F8713 /* MastodonCachePersistentStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = D60E2F2D244248BF005F8713 /* MastodonCachePersistentStore.swift */; }; - D60E2F3124424F1A005F8713 /* StatusProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = D60E2F3024424F1A005F8713 /* StatusProtocol.swift */; }; - D60E2F3324425374005F8713 /* AccountProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = D60E2F3224425374005F8713 /* AccountProtocol.swift */; }; - D61099B42144B0CC00432DC2 /* Pachyderm.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D61099AB2144B0CC00432DC2 /* Pachyderm.framework */; }; - D61099BB2144B0CC00432DC2 /* PachydermTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61099BA2144B0CC00432DC2 /* PachydermTests.swift */; }; - D61099BD2144B0CC00432DC2 /* Pachyderm.h in Headers */ = {isa = PBXBuildFile; fileRef = D61099AD2144B0CC00432DC2 /* Pachyderm.h */; settings = {ATTRIBUTES = (Public, ); }; }; - D61099C02144B0CC00432DC2 /* Pachyderm.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D61099AB2144B0CC00432DC2 /* Pachyderm.framework */; }; - D61099C12144B0CC00432DC2 /* Pachyderm.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D61099AB2144B0CC00432DC2 /* Pachyderm.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - D61099C92144B13C00432DC2 /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61099C82144B13C00432DC2 /* Client.swift */; }; - D61099CB2144B20500432DC2 /* Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61099CA2144B20500432DC2 /* Request.swift */; }; - D61099D02144B2D700432DC2 /* Method.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61099CF2144B2D700432DC2 /* Method.swift */; }; - D61099D22144B2E600432DC2 /* Body.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61099D12144B2E600432DC2 /* Body.swift */; }; - D61099D42144B32E00432DC2 /* Parameter.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61099D32144B32E00432DC2 /* Parameter.swift */; }; - D61099D62144B4B200432DC2 /* FormAttachment.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61099D52144B4B200432DC2 /* FormAttachment.swift */; }; - D61099D92144B76400432DC2 /* Data.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61099D82144B76400432DC2 /* Data.swift */; }; - D61099DC2144BDBF00432DC2 /* Response.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61099DB2144BDBF00432DC2 /* Response.swift */; }; - D61099DF2144C11400432DC2 /* MastodonError.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61099DE2144C11400432DC2 /* MastodonError.swift */; }; - D61099E12144C1DC00432DC2 /* Account.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61099E02144C1DC00432DC2 /* Account.swift */; }; - D61099E32144C38900432DC2 /* Emoji.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61099E22144C38900432DC2 /* Emoji.swift */; }; - D61099E5214561AB00432DC2 /* Application.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61099E4214561AB00432DC2 /* Application.swift */; }; - D61099E7214561FF00432DC2 /* Attachment.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61099E6214561FF00432DC2 /* Attachment.swift */; }; - D61099E92145658300432DC2 /* Card.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61099E82145658300432DC2 /* Card.swift */; }; - D61099EB2145661700432DC2 /* ConversationContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61099EA2145661700432DC2 /* ConversationContext.swift */; }; - D61099ED2145664800432DC2 /* Filter.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61099EC2145664800432DC2 /* Filter.swift */; }; - D61099EF214566C000432DC2 /* Instance.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61099EE214566C000432DC2 /* Instance.swift */; }; - D61099F12145686D00432DC2 /* List.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61099F02145686D00432DC2 /* List.swift */; }; - D61099F32145688600432DC2 /* Mention.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61099F22145688600432DC2 /* Mention.swift */; }; - D61099F5214568C300432DC2 /* Notification.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61099F4214568C300432DC2 /* Notification.swift */; }; - D61099F72145693500432DC2 /* PushSubscription.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61099F62145693500432DC2 /* PushSubscription.swift */; }; - D61099F92145698900432DC2 /* Relationship.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61099F82145698900432DC2 /* Relationship.swift */; }; - D61099FB214569F600432DC2 /* Report.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61099FA214569F600432DC2 /* Report.swift */; }; - D61099FD21456A1D00432DC2 /* SearchResults.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61099FC21456A1D00432DC2 /* SearchResults.swift */; }; - D61099FF21456A4C00432DC2 /* Status.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61099FE21456A4C00432DC2 /* Status.swift */; }; - D6109A0121456B0800432DC2 /* Hashtag.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6109A0021456B0800432DC2 /* Hashtag.swift */; }; - D6109A032145722C00432DC2 /* RegisteredApplication.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6109A022145722C00432DC2 /* RegisteredApplication.swift */; }; - D6109A05214572BF00432DC2 /* Scope.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6109A04214572BF00432DC2 /* Scope.swift */; }; - D6109A072145756700432DC2 /* LoginSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6109A062145756700432DC2 /* LoginSettings.swift */; }; - D6109A0921458C4A00432DC2 /* Empty.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6109A0821458C4A00432DC2 /* Empty.swift */; }; - D6109A0D214599E100432DC2 /* RequestRange.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6109A0C214599E100432DC2 /* RequestRange.swift */; }; - D6109A0F21459B6900432DC2 /* Pagination.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6109A0E21459B6900432DC2 /* Pagination.swift */; }; - D6109A11214607D500432DC2 /* Timeline.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6109A10214607D500432DC2 /* Timeline.swift */; }; D6114E0927F3EA3D0080E273 /* CrashReporterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6114E0827F3EA3D0080E273 /* CrashReporterViewController.swift */; }; - D6114E0B27F3F6EA0080E273 /* Endpoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6114E0A27F3F6EA0080E273 /* Endpoint.swift */; }; D6114E0D27F7FEB30080E273 /* TrendingStatusesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6114E0C27F7FEB30080E273 /* TrendingStatusesViewController.swift */; }; - D6114E0F27F897D70080E273 /* History.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6114E0E27F897D70080E273 /* History.swift */; }; D6114E1127F899B30080E273 /* TrendingLinksViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6114E1027F899B30080E273 /* TrendingLinksViewController.swift */; }; D6114E1327F89B440080E273 /* TrendingLinkTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6114E1227F89B440080E273 /* TrendingLinkTableViewCell.swift */; }; D6114E1727F8BB210080E273 /* VersionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6114E1627F8BB210080E273 /* VersionTests.swift */; }; D611C2CF232DC61100C86A49 /* HashtagTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D611C2CD232DC61100C86A49 /* HashtagTableViewCell.swift */; }; D611C2D0232DC61100C86A49 /* HashtagTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D611C2CE232DC61100C86A49 /* HashtagTableViewCell.xib */; }; - D61AC1D3232E928600C54D2D /* InstanceSelector.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61AC1D2232E928600C54D2D /* InstanceSelector.swift */; }; D61AC1D5232E9FA600C54D2D /* InstanceSelectorTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61AC1D4232E9FA600C54D2D /* InstanceSelectorTableViewController.swift */; }; D61AC1D8232EA42D00C54D2D /* InstanceTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61AC1D6232EA42D00C54D2D /* InstanceTableViewCell.swift */; }; D61AC1D9232EA42D00C54D2D /* InstanceTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D61AC1D7232EA42D00C54D2D /* InstanceTableViewCell.xib */; }; @@ -93,7 +50,6 @@ D62275A824F1CA2800B82A16 /* ComposeReplyContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D62275A724F1CA2800B82A16 /* ComposeReplyContentView.swift */; }; D62275AA24F1E01C00B82A16 /* ComposeTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D62275A924F1E01C00B82A16 /* ComposeTextView.swift */; }; D623A53D2635F5590095BD04 /* StatusPollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D623A53C2635F5590095BD04 /* StatusPollView.swift */; }; - D623A53F2635F6910095BD04 /* Poll.swift in Sources */ = {isa = PBXBuildFile; fileRef = D623A53E2635F6910095BD04 /* Poll.swift */; }; D623A5412635FB3C0095BD04 /* PollOptionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D623A5402635FB3C0095BD04 /* PollOptionView.swift */; }; D623A543263634100095BD04 /* PollOptionCheckboxView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D623A542263634100095BD04 /* PollOptionCheckboxView.swift */; }; D625E4822588262A0074BB2B /* DraggableTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D625E4812588262A0074BB2B /* DraggableTableViewCell.swift */; }; @@ -117,14 +73,11 @@ D627FF7B217E951500CC0648 /* DraftsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D627FF7A217E951500CC0648 /* DraftsTableViewController.swift */; }; D627FF7D217E958900CC0648 /* DraftTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D627FF7C217E958900CC0648 /* DraftTableViewCell.xib */; }; D627FF7F217E95E000CC0648 /* DraftTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D627FF7E217E95E000CC0648 /* DraftTableViewCell.swift */; }; - D6285B4F21EA695800FE4B39 /* StatusContentType.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6285B4E21EA695800FE4B39 /* StatusContentType.swift */; }; D6285B5321EA708700FE4B39 /* StatusFormat.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6285B5221EA708700FE4B39 /* StatusFormat.swift */; }; D6289E84217B795D0003D1D7 /* LargeImageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D6289E83217B795D0003D1D7 /* LargeImageViewController.xib */; }; D62D2422217AA7E1005076CC /* UserActivityManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = D62D2421217AA7E1005076CC /* UserActivityManager.swift */; }; D62D2424217ABF3F005076CC /* NSUserActivity+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = D62D2423217ABF3F005076CC /* NSUserActivity+Extensions.swift */; }; D62D2426217ABF63005076CC /* UserActivityType.swift in Sources */ = {isa = PBXBuildFile; fileRef = D62D2425217ABF63005076CC /* UserActivityType.swift */; }; - D62E9981279C691F00C26176 /* NodeInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = D62E9980279C691F00C26176 /* NodeInfo.swift */; }; - D62E9983279C69D400C26176 /* WellKnown.swift in Sources */ = {isa = PBXBuildFile; fileRef = D62E9982279C69D400C26176 /* WellKnown.swift */; }; D62E9985279CA23900C26176 /* URLSession+Development.swift in Sources */ = {isa = PBXBuildFile; fileRef = D62E9984279CA23900C26176 /* URLSession+Development.swift */; }; D62E9987279D094F00C26176 /* StatusMetaIndicatorsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D62E9986279D094F00C26176 /* StatusMetaIndicatorsView.swift */; }; D62E9989279DB2D100C26176 /* InstanceFeatures.swift in Sources */ = {isa = PBXBuildFile; fileRef = D62E9988279DB2D100C26176 /* InstanceFeatures.swift */; }; @@ -132,7 +85,6 @@ D6311C5025B3765B00B27539 /* ImageDataCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6311C4F25B3765B00B27539 /* ImageDataCache.swift */; }; D6333B372137838300CE884A /* AttributedString+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6333B362137838300CE884A /* AttributedString+Helpers.swift */; }; D6333B792139AEFD00CE884A /* Date+TimeAgo.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6333B782139AEFD00CE884A /* Date+TimeAgo.swift */; }; - D63569E023908A8D003DD353 /* StatusState.swift in Sources */ = {isa = PBXBuildFile; fileRef = D60A4FFB238B726A008AC647 /* StatusState.swift */; }; D63661C02381C144004B9E16 /* PreferencesNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D63661BF2381C144004B9E16 /* PreferencesNavigationController.swift */; }; D6370B9C24421FF30092A7FF /* Tusker.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = D6370B9A24421FF30092A7FF /* Tusker.xcdatamodeld */; }; D63A8D0B2561C27F00D9DFFF /* ProfileStatusesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D63A8D0A2561C27F00D9DFFF /* ProfileStatusesViewController.swift */; }; @@ -191,6 +143,7 @@ D667E5F82135C3040057A976 /* Mastodon+Equatable.swift in Sources */ = {isa = PBXBuildFile; fileRef = D667E5F72135C3040057A976 /* Mastodon+Equatable.swift */; }; D66A77BB233838DC0058F1EC /* UIFont+Traits.swift in Sources */ = {isa = PBXBuildFile; fileRef = D66A77BA233838DC0058F1EC /* UIFont+Traits.swift */; }; D670F8B62537DC890046588A /* EmojiPickerWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = D670F8B52537DC890046588A /* EmojiPickerWrapper.swift */; }; + D674A50927F9128D00BA03AC /* Pachyderm in Frameworks */ = {isa = PBXBuildFile; productRef = D674A50827F9128D00BA03AC /* Pachyderm */; }; D6757A7C2157E01900721E32 /* XCBManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6757A7B2157E01900721E32 /* XCBManager.swift */; }; D6757A7E2157E02600721E32 /* XCBRequestSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6757A7D2157E02600721E32 /* XCBRequestSpec.swift */; }; D6757A822157E8FA00721E32 /* XCBSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6757A812157E8FA00721E32 /* XCBSession.swift */; }; @@ -224,7 +177,6 @@ D690797324A4EF9700023A34 /* UIBezierPath+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = D690797224A4EF9700023A34 /* UIBezierPath+Helpers.swift */; }; D693A72825CF282E003A14E2 /* TrendingHashtagsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D693A72725CF282E003A14E2 /* TrendingHashtagsViewController.swift */; }; D693A72A25CF8C1E003A14E2 /* ProfileDirectoryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D693A72925CF8C1E003A14E2 /* ProfileDirectoryViewController.swift */; }; - D693A72C25CF8D15003A14E2 /* DirectoryOrder.swift in Sources */ = {isa = PBXBuildFile; fileRef = D693A72B25CF8D15003A14E2 /* DirectoryOrder.swift */; }; D693A72F25CF91C6003A14E2 /* FeaturedProfileCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D693A72D25CF91C6003A14E2 /* FeaturedProfileCollectionViewCell.swift */; }; D693A73025CF91C6003A14E2 /* FeaturedProfileCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D693A72E25CF91C6003A14E2 /* FeaturedProfileCollectionViewCell.xib */; }; D693DE5723FE1A6A0061E07D /* EnhancedNavigationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D693DE5623FE1A6A0061E07D /* EnhancedNavigationViewController.swift */; }; @@ -240,8 +192,6 @@ D6969EA0240C8384002843CE /* EmojiLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6969E9F240C8384002843CE /* EmojiLabel.swift */; }; D69CCBBF249E6EFD000AF167 /* CrashReporter in Frameworks */ = {isa = PBXBuildFile; productRef = D69CCBBE249E6EFD000AF167 /* CrashReporter */; }; D6A00B1D26379FC900316AD4 /* PollOptionsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A00B1C26379FC900316AD4 /* PollOptionsView.swift */; }; - D6A3BC7723218E1300FD64D5 /* TimelineSegment.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A3BC7323218C6E00FD64D5 /* TimelineSegment.swift */; }; - D6A3BC7923218E9200FD64D5 /* NotificationGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A3BC7823218E9200FD64D5 /* NotificationGroup.swift */; }; D6A3BC7C232195C600FD64D5 /* ActionNotificationGroupTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A3BC7A232195C600FD64D5 /* ActionNotificationGroupTableViewCell.swift */; }; D6A3BC7D232195C600FD64D5 /* ActionNotificationGroupTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D6A3BC7B232195C600FD64D5 /* ActionNotificationGroupTableViewCell.xib */; }; D6A3BC802321B7E600FD64D5 /* FollowNotificationGroupTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6A3BC7E2321B7E600FD64D5 /* FollowNotificationGroupTableViewCell.swift */; }; @@ -336,17 +286,13 @@ D6E4269D2532A3E100C02E1C /* FuzzyMatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E4269C2532A3E100C02E1C /* FuzzyMatcher.swift */; }; D6E426AD25334DA500C02E1C /* FuzzyMatcherTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E426AC25334DA500C02E1C /* FuzzyMatcherTests.swift */; }; D6E426B325337C7000C02E1C /* CustomEmojiImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E426B225337C7000C02E1C /* CustomEmojiImageView.swift */; }; - D6E426B9253382B300C02E1C /* SearchResultType.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E426B8253382B300C02E1C /* SearchResultType.swift */; }; D6E57FA325C26FAB00341037 /* Localizable.stringsdict in Resources */ = {isa = PBXBuildFile; fileRef = D6E57FA525C26FAB00341037 /* Localizable.stringsdict */; }; - D6E6F26321603F8B006A8599 /* CharacterCounter.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E6F26221603F8B006A8599 /* CharacterCounter.swift */; }; - D6E6F26521604242006A8599 /* CharacterCounterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6E6F26421604242006A8599 /* CharacterCounterTests.swift */; }; D6EAE0DB2550CC8A002DB0AC /* FocusableTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6EAE0DA2550CC8A002DB0AC /* FocusableTextField.swift */; }; D6EBF01523C55C0900AE061B /* UIApplication+Scenes.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6EBF01423C55C0900AE061B /* UIApplication+Scenes.swift */; }; D6EBF01723C55E0D00AE061B /* UISceneSession+MastodonController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6EBF01623C55E0D00AE061B /* UISceneSession+MastodonController.swift */; }; D6EE63FB2551F7F60065485C /* StatusCollapseButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6EE63FA2551F7F60065485C /* StatusCollapseButton.swift */; }; D6F0B12B24A3071C001E48C3 /* MainSplitViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6F0B12A24A3071C001E48C3 /* MainSplitViewController.swift */; }; D6F0B17524A3A1AA001E48C3 /* MainSidebarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6F0B17424A3A1AA001E48C3 /* MainSidebarViewController.swift */; }; - D6F1F9DF27B0613300CB7D88 /* WebURL in Frameworks */ = {isa = PBXBuildFile; productRef = D6F1F9DE27B0613300CB7D88 /* WebURL */; settings = {ATTRIBUTES = (Required, ); }; }; D6F2E965249E8BFD005846BB /* IssueReporterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6F2E963249E8BFD005846BB /* IssueReporterViewController.swift */; }; D6F2E966249E8BFD005846BB /* IssueReporterViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D6F2E964249E8BFD005846BB /* IssueReporterViewController.xib */; }; D6F953F021251A2900CF0F2B /* MastodonController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6F953EF21251A2900CF0F2B /* MastodonController.swift */; }; @@ -354,27 +300,6 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - D61099B52144B0CC00432DC2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = D6D4DDC4212518A000E1C4BB /* Project object */; - proxyType = 1; - remoteGlobalIDString = D61099AA2144B0CC00432DC2; - remoteInfo = Pachyderm; - }; - D61099B72144B0CC00432DC2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = D6D4DDC4212518A000E1C4BB /* Project object */; - proxyType = 1; - remoteGlobalIDString = D6D4DDCB212518A000E1C4BB; - remoteInfo = Tusker; - }; - D61099BE2144B0CC00432DC2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = D6D4DDC4212518A000E1C4BB /* Project object */; - proxyType = 1; - remoteGlobalIDString = D61099AA2144B0CC00432DC2; - remoteInfo = Pachyderm; - }; D6D4DDE1212518A200E1C4BB /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = D6D4DDC4212518A000E1C4BB /* Project object */; @@ -416,7 +341,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - D61099C12144B0CC00432DC2 /* Pachyderm.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -440,63 +364,18 @@ D6093FAE25BE0B01004811E6 /* TrendingHashtagTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrendingHashtagTableViewCell.swift; sourceTree = ""; }; D6093FAF25BE0B01004811E6 /* TrendingHashtagTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TrendingHashtagTableViewCell.xib; sourceTree = ""; }; D6093FB625BE0CF3004811E6 /* TrendHistoryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrendHistoryView.swift; sourceTree = ""; }; - D60A4FFB238B726A008AC647 /* StatusState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusState.swift; sourceTree = ""; }; D60D2B8123844C71001B87A3 /* BaseStatusTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseStatusTableViewCell.swift; sourceTree = ""; }; D60E2F232442372B005F8713 /* StatusMO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusMO.swift; sourceTree = ""; }; D60E2F252442372B005F8713 /* AccountMO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountMO.swift; sourceTree = ""; }; D60E2F2B24423EAD005F8713 /* LazilyDecoding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LazilyDecoding.swift; sourceTree = ""; }; D60E2F2D244248BF005F8713 /* MastodonCachePersistentStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MastodonCachePersistentStore.swift; sourceTree = ""; }; - D60E2F3024424F1A005F8713 /* StatusProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusProtocol.swift; sourceTree = ""; }; - D60E2F3224425374005F8713 /* AccountProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountProtocol.swift; sourceTree = ""; }; - D61099AB2144B0CC00432DC2 /* Pachyderm.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pachyderm.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D61099AD2144B0CC00432DC2 /* Pachyderm.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Pachyderm.h; sourceTree = ""; }; - D61099AE2144B0CC00432DC2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - D61099B32144B0CC00432DC2 /* PachydermTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PachydermTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - D61099BA2144B0CC00432DC2 /* PachydermTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PachydermTests.swift; sourceTree = ""; }; - D61099BC2144B0CC00432DC2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - D61099C82144B13C00432DC2 /* Client.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Client.swift; sourceTree = ""; }; - D61099CA2144B20500432DC2 /* Request.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Request.swift; sourceTree = ""; }; - D61099CF2144B2D700432DC2 /* Method.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Method.swift; sourceTree = ""; }; - D61099D12144B2E600432DC2 /* Body.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Body.swift; sourceTree = ""; }; - D61099D32144B32E00432DC2 /* Parameter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Parameter.swift; sourceTree = ""; }; - D61099D52144B4B200432DC2 /* FormAttachment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FormAttachment.swift; sourceTree = ""; }; - D61099D82144B76400432DC2 /* Data.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Data.swift; sourceTree = ""; }; - D61099DB2144BDBF00432DC2 /* Response.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Response.swift; sourceTree = ""; }; - D61099DE2144C11400432DC2 /* MastodonError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MastodonError.swift; sourceTree = ""; }; - D61099E02144C1DC00432DC2 /* Account.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Account.swift; sourceTree = ""; }; - D61099E22144C38900432DC2 /* Emoji.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Emoji.swift; sourceTree = ""; }; - D61099E4214561AB00432DC2 /* Application.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Application.swift; sourceTree = ""; }; - D61099E6214561FF00432DC2 /* Attachment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Attachment.swift; sourceTree = ""; }; - D61099E82145658300432DC2 /* Card.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Card.swift; sourceTree = ""; }; - D61099EA2145661700432DC2 /* ConversationContext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationContext.swift; sourceTree = ""; }; - D61099EC2145664800432DC2 /* Filter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Filter.swift; sourceTree = ""; }; - D61099EE214566C000432DC2 /* Instance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Instance.swift; sourceTree = ""; }; - D61099F02145686D00432DC2 /* List.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = List.swift; sourceTree = ""; }; - D61099F22145688600432DC2 /* Mention.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Mention.swift; sourceTree = ""; }; - D61099F4214568C300432DC2 /* Notification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notification.swift; sourceTree = ""; }; - D61099F62145693500432DC2 /* PushSubscription.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PushSubscription.swift; sourceTree = ""; }; - D61099F82145698900432DC2 /* Relationship.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Relationship.swift; sourceTree = ""; }; - D61099FA214569F600432DC2 /* Report.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Report.swift; sourceTree = ""; }; - D61099FC21456A1D00432DC2 /* SearchResults.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchResults.swift; sourceTree = ""; }; - D61099FE21456A4C00432DC2 /* Status.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Status.swift; sourceTree = ""; }; - D6109A0021456B0800432DC2 /* Hashtag.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Hashtag.swift; sourceTree = ""; }; - D6109A022145722C00432DC2 /* RegisteredApplication.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegisteredApplication.swift; sourceTree = ""; }; - D6109A04214572BF00432DC2 /* Scope.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Scope.swift; sourceTree = ""; }; - D6109A062145756700432DC2 /* LoginSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginSettings.swift; sourceTree = ""; }; - D6109A0821458C4A00432DC2 /* Empty.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Empty.swift; sourceTree = ""; }; - D6109A0C214599E100432DC2 /* RequestRange.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RequestRange.swift; sourceTree = ""; }; - D6109A0E21459B6900432DC2 /* Pagination.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Pagination.swift; sourceTree = ""; }; - D6109A10214607D500432DC2 /* Timeline.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Timeline.swift; sourceTree = ""; }; D6114E0827F3EA3D0080E273 /* CrashReporterViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CrashReporterViewController.swift; sourceTree = ""; }; - D6114E0A27F3F6EA0080E273 /* Endpoint.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Endpoint.swift; sourceTree = ""; }; D6114E0C27F7FEB30080E273 /* TrendingStatusesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrendingStatusesViewController.swift; sourceTree = ""; }; - D6114E0E27F897D70080E273 /* History.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = History.swift; sourceTree = ""; }; D6114E1027F899B30080E273 /* TrendingLinksViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrendingLinksViewController.swift; sourceTree = ""; }; D6114E1227F89B440080E273 /* TrendingLinkTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrendingLinkTableViewCell.swift; sourceTree = ""; }; D6114E1627F8BB210080E273 /* VersionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VersionTests.swift; sourceTree = ""; }; D611C2CD232DC61100C86A49 /* HashtagTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HashtagTableViewCell.swift; sourceTree = ""; }; D611C2CE232DC61100C86A49 /* HashtagTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HashtagTableViewCell.xib; sourceTree = ""; }; - D61AC1D2232E928600C54D2D /* InstanceSelector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InstanceSelector.swift; sourceTree = ""; }; D61AC1D4232E9FA600C54D2D /* InstanceSelectorTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InstanceSelectorTableViewController.swift; sourceTree = ""; }; D61AC1D6232EA42D00C54D2D /* InstanceTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InstanceTableViewCell.swift; sourceTree = ""; }; D61AC1D7232EA42D00C54D2D /* InstanceTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = InstanceTableViewCell.xib; sourceTree = ""; }; @@ -511,7 +390,6 @@ D62275A724F1CA2800B82A16 /* ComposeReplyContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeReplyContentView.swift; sourceTree = ""; }; D62275A924F1E01C00B82A16 /* ComposeTextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeTextView.swift; sourceTree = ""; }; D623A53C2635F5590095BD04 /* StatusPollView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusPollView.swift; sourceTree = ""; }; - D623A53E2635F6910095BD04 /* Poll.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Poll.swift; sourceTree = ""; }; D623A5402635FB3C0095BD04 /* PollOptionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PollOptionView.swift; sourceTree = ""; }; D623A542263634100095BD04 /* PollOptionCheckboxView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PollOptionCheckboxView.swift; sourceTree = ""; }; D625E4812588262A0074BB2B /* DraggableTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DraggableTableViewCell.swift; sourceTree = ""; }; @@ -535,14 +413,11 @@ D627FF7A217E951500CC0648 /* DraftsTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DraftsTableViewController.swift; sourceTree = ""; }; D627FF7C217E958900CC0648 /* DraftTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DraftTableViewCell.xib; sourceTree = ""; }; D627FF7E217E95E000CC0648 /* DraftTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DraftTableViewCell.swift; sourceTree = ""; }; - D6285B4E21EA695800FE4B39 /* StatusContentType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusContentType.swift; sourceTree = ""; }; D6285B5221EA708700FE4B39 /* StatusFormat.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusFormat.swift; sourceTree = ""; }; D6289E83217B795D0003D1D7 /* LargeImageViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = LargeImageViewController.xib; sourceTree = ""; }; D62D2421217AA7E1005076CC /* UserActivityManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserActivityManager.swift; sourceTree = ""; }; D62D2423217ABF3F005076CC /* NSUserActivity+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSUserActivity+Extensions.swift"; sourceTree = ""; }; D62D2425217ABF63005076CC /* UserActivityType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserActivityType.swift; sourceTree = ""; }; - D62E9980279C691F00C26176 /* NodeInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NodeInfo.swift; sourceTree = ""; }; - D62E9982279C69D400C26176 /* WellKnown.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WellKnown.swift; sourceTree = ""; }; D62E9984279CA23900C26176 /* URLSession+Development.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URLSession+Development.swift"; sourceTree = ""; }; D62E9986279D094F00C26176 /* StatusMetaIndicatorsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusMetaIndicatorsView.swift; sourceTree = ""; }; D62E9988279DB2D100C26176 /* InstanceFeatures.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InstanceFeatures.swift; sourceTree = ""; }; @@ -611,6 +486,7 @@ D667E5F72135C3040057A976 /* Mastodon+Equatable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Mastodon+Equatable.swift"; sourceTree = ""; }; D66A77BA233838DC0058F1EC /* UIFont+Traits.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIFont+Traits.swift"; sourceTree = ""; }; D670F8B52537DC890046588A /* EmojiPickerWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmojiPickerWrapper.swift; sourceTree = ""; }; + D674A50727F910F300BA03AC /* Pachyderm */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Pachyderm; sourceTree = ""; }; D6757A7B2157E01900721E32 /* XCBManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XCBManager.swift; sourceTree = ""; }; D6757A7D2157E02600721E32 /* XCBRequestSpec.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XCBRequestSpec.swift; sourceTree = ""; }; D6757A812157E8FA00721E32 /* XCBSession.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XCBSession.swift; sourceTree = ""; }; @@ -644,7 +520,6 @@ D690797224A4EF9700023A34 /* UIBezierPath+Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIBezierPath+Helpers.swift"; sourceTree = ""; }; D693A72725CF282E003A14E2 /* TrendingHashtagsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrendingHashtagsViewController.swift; sourceTree = ""; }; D693A72925CF8C1E003A14E2 /* ProfileDirectoryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileDirectoryViewController.swift; sourceTree = ""; }; - D693A72B25CF8D15003A14E2 /* DirectoryOrder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DirectoryOrder.swift; sourceTree = ""; }; D693A72D25CF91C6003A14E2 /* FeaturedProfileCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeaturedProfileCollectionViewCell.swift; sourceTree = ""; }; D693A72E25CF91C6003A14E2 /* FeaturedProfileCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FeaturedProfileCollectionViewCell.xib; sourceTree = ""; }; D693DE5623FE1A6A0061E07D /* EnhancedNavigationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnhancedNavigationViewController.swift; sourceTree = ""; }; @@ -659,8 +534,6 @@ D6969E9D240C81B9002843CE /* NSTextAttachment+Emoji.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSTextAttachment+Emoji.swift"; sourceTree = ""; }; D6969E9F240C8384002843CE /* EmojiLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmojiLabel.swift; sourceTree = ""; }; D6A00B1C26379FC900316AD4 /* PollOptionsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PollOptionsView.swift; sourceTree = ""; }; - D6A3BC7323218C6E00FD64D5 /* TimelineSegment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineSegment.swift; sourceTree = ""; }; - D6A3BC7823218E9200FD64D5 /* NotificationGroup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationGroup.swift; sourceTree = ""; }; D6A3BC7A232195C600FD64D5 /* ActionNotificationGroupTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionNotificationGroupTableViewCell.swift; sourceTree = ""; }; D6A3BC7B232195C600FD64D5 /* ActionNotificationGroupTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ActionNotificationGroupTableViewCell.xib; sourceTree = ""; }; D6A3BC7E2321B7E600FD64D5 /* FollowNotificationGroupTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FollowNotificationGroupTableViewCell.swift; sourceTree = ""; }; @@ -760,11 +633,8 @@ D6E4269C2532A3E100C02E1C /* FuzzyMatcher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FuzzyMatcher.swift; sourceTree = ""; }; D6E426AC25334DA500C02E1C /* FuzzyMatcherTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FuzzyMatcherTests.swift; sourceTree = ""; }; D6E426B225337C7000C02E1C /* CustomEmojiImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomEmojiImageView.swift; sourceTree = ""; }; - D6E426B8253382B300C02E1C /* SearchResultType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchResultType.swift; sourceTree = ""; }; D6E4885C24A2890C0011C13E /* Tusker.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Tusker.entitlements; sourceTree = ""; }; D6E57FA425C26FAB00341037 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = en; path = en.lproj/Localizable.stringsdict; sourceTree = ""; }; - D6E6F26221603F8B006A8599 /* CharacterCounter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CharacterCounter.swift; sourceTree = ""; }; - D6E6F26421604242006A8599 /* CharacterCounterTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CharacterCounterTests.swift; sourceTree = ""; }; D6EAE0DA2550CC8A002DB0AC /* FocusableTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FocusableTextField.swift; sourceTree = ""; }; D6EBF01423C55C0900AE061B /* UIApplication+Scenes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIApplication+Scenes.swift"; sourceTree = ""; }; D6EBF01623C55E0D00AE061B /* UISceneSession+MastodonController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UISceneSession+MastodonController.swift"; sourceTree = ""; }; @@ -778,27 +648,11 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - D61099A82144B0CC00432DC2 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - D6F1F9DF27B0613300CB7D88 /* WebURL in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - D61099B02144B0CC00432DC2 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - D61099B42144B0CC00432DC2 /* Pachyderm.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; D6D4DDC9212518A000E1C4BB /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - D61099C02144B0CC00432DC2 /* Pachyderm.framework in Frameworks */, + D674A50927F9128D00BA03AC /* Pachyderm in Frameworks */, D6B0539F23BD2BA300A066FA /* SheetController in Frameworks */, D69CCBBF249E6EFD000AF167 /* CrashReporter in Frameworks */, D60CFFDB24A290BA00D00083 /* SwiftSoup in Frameworks */, @@ -843,109 +697,6 @@ path = "Attachment Gallery"; sourceTree = ""; }; - D60E2F2F24424F0D005F8713 /* Protocols */ = { - isa = PBXGroup; - children = ( - D60E2F3024424F1A005F8713 /* StatusProtocol.swift */, - D60E2F3224425374005F8713 /* AccountProtocol.swift */, - ); - path = Protocols; - sourceTree = ""; - }; - D61099AC2144B0CC00432DC2 /* Pachyderm */ = { - isa = PBXGroup; - children = ( - D61099AD2144B0CC00432DC2 /* Pachyderm.h */, - D61099AE2144B0CC00432DC2 /* Info.plist */, - D61099C82144B13C00432DC2 /* Client.swift */, - D6A3BC7223218C6E00FD64D5 /* Utilities */, - D61099D72144B74500432DC2 /* Extensions */, - D61099CC2144B2C300432DC2 /* Request */, - D61099DA2144BDB600432DC2 /* Response */, - D61099DD2144C10C00432DC2 /* Model */, - ); - path = Pachyderm; - sourceTree = ""; - }; - D61099B92144B0CC00432DC2 /* PachydermTests */ = { - isa = PBXGroup; - children = ( - D61099BA2144B0CC00432DC2 /* PachydermTests.swift */, - D6E6F26421604242006A8599 /* CharacterCounterTests.swift */, - D61099BC2144B0CC00432DC2 /* Info.plist */, - ); - path = PachydermTests; - sourceTree = ""; - }; - D61099CC2144B2C300432DC2 /* Request */ = { - isa = PBXGroup; - children = ( - D61099CA2144B20500432DC2 /* Request.swift */, - D6109A0C214599E100432DC2 /* RequestRange.swift */, - D61099CF2144B2D700432DC2 /* Method.swift */, - D61099D12144B2E600432DC2 /* Body.swift */, - D61099D32144B32E00432DC2 /* Parameter.swift */, - D61099D52144B4B200432DC2 /* FormAttachment.swift */, - D6114E0A27F3F6EA0080E273 /* Endpoint.swift */, - ); - path = Request; - sourceTree = ""; - }; - D61099D72144B74500432DC2 /* Extensions */ = { - isa = PBXGroup; - children = ( - D61099D82144B76400432DC2 /* Data.swift */, - ); - path = Extensions; - sourceTree = ""; - }; - D61099DA2144BDB600432DC2 /* Response */ = { - isa = PBXGroup; - children = ( - D61099DB2144BDBF00432DC2 /* Response.swift */, - D6109A0821458C4A00432DC2 /* Empty.swift */, - D6109A0E21459B6900432DC2 /* Pagination.swift */, - ); - path = Response; - sourceTree = ""; - }; - D61099DD2144C10C00432DC2 /* Model */ = { - isa = PBXGroup; - children = ( - D60E2F2F24424F0D005F8713 /* Protocols */, - D61099DE2144C11400432DC2 /* MastodonError.swift */, - D6109A04214572BF00432DC2 /* Scope.swift */, - D61099E02144C1DC00432DC2 /* Account.swift */, - D61099E4214561AB00432DC2 /* Application.swift */, - D61099E6214561FF00432DC2 /* Attachment.swift */, - D61099E82145658300432DC2 /* Card.swift */, - D61099EA2145661700432DC2 /* ConversationContext.swift */, - D693A72B25CF8D15003A14E2 /* DirectoryOrder.swift */, - D61099E22144C38900432DC2 /* Emoji.swift */, - D61099EC2145664800432DC2 /* Filter.swift */, - D6109A0021456B0800432DC2 /* Hashtag.swift */, - D6114E0E27F897D70080E273 /* History.swift */, - D61099EE214566C000432DC2 /* Instance.swift */, - D61099F02145686D00432DC2 /* List.swift */, - D6109A062145756700432DC2 /* LoginSettings.swift */, - D61099F22145688600432DC2 /* Mention.swift */, - D62E9980279C691F00C26176 /* NodeInfo.swift */, - D61099F4214568C300432DC2 /* Notification.swift */, - D623A53E2635F6910095BD04 /* Poll.swift */, - D61099F62145693500432DC2 /* PushSubscription.swift */, - D6109A022145722C00432DC2 /* RegisteredApplication.swift */, - D61099F82145698900432DC2 /* Relationship.swift */, - D61099FA214569F600432DC2 /* Report.swift */, - D61099FC21456A1D00432DC2 /* SearchResults.swift */, - D6E426B8253382B300C02E1C /* SearchResultType.swift */, - D61099FE21456A4C00432DC2 /* Status.swift */, - D6285B4E21EA695800FE4B39 /* StatusContentType.swift */, - D6109A10214607D500432DC2 /* Timeline.swift */, - D62E9982279C69D400C26176 /* WellKnown.swift */, - ); - path = Model; - sourceTree = ""; - }; D611C2CC232DC5FC00C86A49 /* Hashtag Cell */ = { isa = PBXGroup; children = ( @@ -1387,18 +1138,6 @@ path = "Account Detail"; sourceTree = ""; }; - D6A3BC7223218C6E00FD64D5 /* Utilities */ = { - isa = PBXGroup; - children = ( - D60A4FFB238B726A008AC647 /* StatusState.swift */, - D6E6F26221603F8B006A8599 /* CharacterCounter.swift */, - D6A3BC7323218C6E00FD64D5 /* TimelineSegment.swift */, - D6A3BC7823218E9200FD64D5 /* NotificationGroup.swift */, - D61AC1D2232E928600C54D2D /* InstanceSelector.swift */, - ); - path = Utilities; - sourceTree = ""; - }; D6A3BC822321F69400FD64D5 /* Account List */ = { isa = PBXGroup; children = ( @@ -1575,8 +1314,7 @@ D6D4DDC3212518A000E1C4BB = { isa = PBXGroup; children = ( - D61099AC2144B0CC00432DC2 /* Pachyderm */, - D61099B92144B0CC00432DC2 /* PachydermTests */, + D674A50727F910F300BA03AC /* Pachyderm */, D6D4DDCE212518A000E1C4BB /* Tusker */, D6D4DDE3212518A200E1C4BB /* TuskerTests */, D6D4DDEE212518A200E1C4BB /* TuskerUITests */, @@ -1592,8 +1330,6 @@ D6D4DDCC212518A000E1C4BB /* Tusker.app */, D6D4DDE0212518A200E1C4BB /* TuskerTests.xctest */, D6D4DDEB212518A200E1C4BB /* TuskerUITests.xctest */, - D61099AB2144B0CC00432DC2 /* Pachyderm.framework */, - D61099B32144B0CC00432DC2 /* PachydermTests.xctest */, D6E343A8265AAD6B00C4AA01 /* OpenInTusker.appex */, ); name = Products; @@ -1719,58 +1455,7 @@ }; /* End PBXGroup section */ -/* Begin PBXHeadersBuildPhase section */ - D61099A62144B0CC00432DC2 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - D61099BD2144B0CC00432DC2 /* Pachyderm.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXHeadersBuildPhase section */ - /* Begin PBXNativeTarget section */ - D61099AA2144B0CC00432DC2 /* Pachyderm */ = { - isa = PBXNativeTarget; - buildConfigurationList = D61099C22144B0CC00432DC2 /* Build configuration list for PBXNativeTarget "Pachyderm" */; - buildPhases = ( - D61099A62144B0CC00432DC2 /* Headers */, - D61099A72144B0CC00432DC2 /* Sources */, - D61099A82144B0CC00432DC2 /* Frameworks */, - D61099A92144B0CC00432DC2 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = Pachyderm; - packageProductDependencies = ( - D6F1F9DE27B0613300CB7D88 /* WebURL */, - ); - productName = Pachyderm; - productReference = D61099AB2144B0CC00432DC2 /* Pachyderm.framework */; - productType = "com.apple.product-type.framework"; - }; - D61099B22144B0CC00432DC2 /* PachydermTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = D61099C52144B0CC00432DC2 /* Build configuration list for PBXNativeTarget "PachydermTests" */; - buildPhases = ( - D61099AF2144B0CC00432DC2 /* Sources */, - D61099B02144B0CC00432DC2 /* Frameworks */, - D61099B12144B0CC00432DC2 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - D61099B62144B0CC00432DC2 /* PBXTargetDependency */, - D61099B82144B0CC00432DC2 /* PBXTargetDependency */, - ); - name = PachydermTests; - productName = PachydermTests; - productReference = D61099B32144B0CC00432DC2 /* PachydermTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; D6D4DDCB212518A000E1C4BB /* Tusker */ = { isa = PBXNativeTarget; buildConfigurationList = D6D4DDF4212518A200E1C4BB /* Build configuration list for PBXNativeTarget "Tusker" */; @@ -1786,7 +1471,6 @@ buildRules = ( ); dependencies = ( - D61099BF2144B0CC00432DC2 /* PBXTargetDependency */, D6E343B3265AAD6B00C4AA01 /* PBXTargetDependency */, ); name = Tusker; @@ -1795,6 +1479,7 @@ D69CCBBE249E6EFD000AF167 /* CrashReporter */, D60CFFDA24A290BA00D00083 /* SwiftSoup */, D6676CA427A8D0020052936B /* WebURLFoundationExtras */, + D674A50827F9128D00BA03AC /* Pachyderm */, ); productName = Tusker; productReference = D6D4DDCC212518A000E1C4BB /* Tusker.app */; @@ -1865,15 +1550,6 @@ LastUpgradeCheck = 1250; ORGANIZATIONNAME = Shadowfacts; TargetAttributes = { - D61099AA2144B0CC00432DC2 = { - CreatedOnToolsVersion = 10.0; - LastSwiftMigration = 1020; - }; - D61099B22144B0CC00432DC2 = { - CreatedOnToolsVersion = 10.0; - LastSwiftMigration = 1020; - TestTargetID = D6D4DDCB212518A000E1C4BB; - }; D6D4DDCB212518A000E1C4BB = { CreatedOnToolsVersion = 10.0; LastSwiftMigration = 1200; @@ -1894,7 +1570,7 @@ }; }; buildConfigurationList = D6D4DDC7212518A000E1C4BB /* Build configuration list for PBXProject "Tusker" */; - compatibilityVersion = "Xcode 9.3"; + compatibilityVersion = "Xcode 13.0"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( @@ -1921,28 +1597,12 @@ D6D4DDCB212518A000E1C4BB /* Tusker */, D6D4DDDF212518A200E1C4BB /* TuskerTests */, D6D4DDEA212518A200E1C4BB /* TuskerUITests */, - D61099AA2144B0CC00432DC2 /* Pachyderm */, - D61099B22144B0CC00432DC2 /* PachydermTests */, D6E343A7265AAD6B00C4AA01 /* OpenInTusker */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - D61099A92144B0CC00432DC2 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - D61099B12144B0CC00432DC2 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; D6D4DDCA212518A000E1C4BB /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -2048,70 +1708,6 @@ /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - D61099A72144B0CC00432DC2 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - D61099E5214561AB00432DC2 /* Application.swift in Sources */, - D62E9983279C69D400C26176 /* WellKnown.swift in Sources */, - D61099FF21456A4C00432DC2 /* Status.swift in Sources */, - D61099E32144C38900432DC2 /* Emoji.swift in Sources */, - D6109A0D214599E100432DC2 /* RequestRange.swift in Sources */, - D61099D92144B76400432DC2 /* Data.swift in Sources */, - D61099EB2145661700432DC2 /* ConversationContext.swift in Sources */, - D61AC1D3232E928600C54D2D /* InstanceSelector.swift in Sources */, - D61099C92144B13C00432DC2 /* Client.swift in Sources */, - D61099D42144B32E00432DC2 /* Parameter.swift in Sources */, - D61099CB2144B20500432DC2 /* Request.swift in Sources */, - D6109A05214572BF00432DC2 /* Scope.swift in Sources */, - D6109A11214607D500432DC2 /* Timeline.swift in Sources */, - D6E426B9253382B300C02E1C /* SearchResultType.swift in Sources */, - D60E2F3324425374005F8713 /* AccountProtocol.swift in Sources */, - D61099E7214561FF00432DC2 /* Attachment.swift in Sources */, - D60E2F3124424F1A005F8713 /* StatusProtocol.swift in Sources */, - D61099D02144B2D700432DC2 /* Method.swift in Sources */, - D6E6F26321603F8B006A8599 /* CharacterCounter.swift in Sources */, - D61099FB214569F600432DC2 /* Report.swift in Sources */, - D693A72C25CF8D15003A14E2 /* DirectoryOrder.swift in Sources */, - D61099F92145698900432DC2 /* Relationship.swift in Sources */, - D61099E12144C1DC00432DC2 /* Account.swift in Sources */, - D61099E92145658300432DC2 /* Card.swift in Sources */, - D61099F32145688600432DC2 /* Mention.swift in Sources */, - D6109A0F21459B6900432DC2 /* Pagination.swift in Sources */, - D6109A032145722C00432DC2 /* RegisteredApplication.swift in Sources */, - D6109A0921458C4A00432DC2 /* Empty.swift in Sources */, - D6285B4F21EA695800FE4B39 /* StatusContentType.swift in Sources */, - D62E9981279C691F00C26176 /* NodeInfo.swift in Sources */, - D6A3BC7923218E9200FD64D5 /* NotificationGroup.swift in Sources */, - D61099DF2144C11400432DC2 /* MastodonError.swift in Sources */, - D6A3BC7723218E1300FD64D5 /* TimelineSegment.swift in Sources */, - D61099D62144B4B200432DC2 /* FormAttachment.swift in Sources */, - D6109A072145756700432DC2 /* LoginSettings.swift in Sources */, - D61099ED2145664800432DC2 /* Filter.swift in Sources */, - D61099DC2144BDBF00432DC2 /* Response.swift in Sources */, - D61099F72145693500432DC2 /* PushSubscription.swift in Sources */, - D61099F5214568C300432DC2 /* Notification.swift in Sources */, - D6114E0B27F3F6EA0080E273 /* Endpoint.swift in Sources */, - D61099EF214566C000432DC2 /* Instance.swift in Sources */, - D61099D22144B2E600432DC2 /* Body.swift in Sources */, - D6114E0F27F897D70080E273 /* History.swift in Sources */, - D623A53F2635F6910095BD04 /* Poll.swift in Sources */, - D63569E023908A8D003DD353 /* StatusState.swift in Sources */, - D6109A0121456B0800432DC2 /* Hashtag.swift in Sources */, - D61099FD21456A1D00432DC2 /* SearchResults.swift in Sources */, - D61099F12145686D00432DC2 /* List.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - D61099AF2144B0CC00432DC2 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - D6E6F26521604242006A8599 /* CharacterCounterTests.swift in Sources */, - D61099BB2144B0CC00432DC2 /* PachydermTests.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; D6D4DDC8212518A000E1C4BB /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -2394,21 +1990,6 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - D61099B62144B0CC00432DC2 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = D61099AA2144B0CC00432DC2 /* Pachyderm */; - targetProxy = D61099B52144B0CC00432DC2 /* PBXContainerItemProxy */; - }; - D61099B82144B0CC00432DC2 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = D6D4DDCB212518A000E1C4BB /* Tusker */; - targetProxy = D61099B72144B0CC00432DC2 /* PBXContainerItemProxy */; - }; - D61099BF2144B0CC00432DC2 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = D61099AA2144B0CC00432DC2 /* Pachyderm */; - targetProxy = D61099BE2144B0CC00432DC2 /* PBXContainerItemProxy */; - }; D6D4DDE2212518A200E1C4BB /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = D6D4DDCB212518A000E1C4BB /* Tusker */; @@ -2454,111 +2035,6 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - D61099C32144B0CC00432DC2 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = V4WK9KR9U2; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = Pachyderm/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - "IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.3; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - OTHER_CODE_SIGN_FLAGS = "--deep"; - OTHER_SWIFT_FLAGS = ""; - PRODUCT_BUNDLE_IDENTIFIER = space.vaccor.Tusker.Pachyderm; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Debug; - }; - D61099C42144B0CC00432DC2 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = V4WK9KR9U2; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = Pachyderm/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - "IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.3; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - OTHER_CODE_SIGN_FLAGS = "--deep"; - OTHER_SWIFT_FLAGS = ""; - PRODUCT_BUNDLE_IDENTIFIER = space.vaccor.Tusker.Pachyderm; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SKIP_INSTALL = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Release; - }; - D61099C62144B0CC00432DC2 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = HGYVAQA9FW; - INFOPLIST_FILE = PachydermTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = net.shadowfacts.Tusker.PachydermTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Tusker.app/Tusker"; - }; - name = Debug; - }; - D61099C72144B0CC00432DC2 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = HGYVAQA9FW; - INFOPLIST_FILE = PachydermTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = net.shadowfacts.Tusker.PachydermTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Tusker.app/Tusker"; - }; - name = Release; - }; D6D4DDF2212518A200E1C4BB /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -2880,24 +2356,6 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - D61099C22144B0CC00432DC2 /* Build configuration list for PBXNativeTarget "Pachyderm" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - D61099C32144B0CC00432DC2 /* Debug */, - D61099C42144B0CC00432DC2 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - D61099C52144B0CC00432DC2 /* Build configuration list for PBXNativeTarget "PachydermTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - D61099C62144B0CC00432DC2 /* Debug */, - D61099C72144B0CC00432DC2 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; D6D4DDC7212518A000E1C4BB /* Build configuration list for PBXProject "Tusker" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -2991,6 +2449,10 @@ package = D6676CA127A8D0020052936B /* XCRemoteSwiftPackageReference "swift-url" */; productName = WebURLFoundationExtras; }; + D674A50827F9128D00BA03AC /* Pachyderm */ = { + isa = XCSwiftPackageProductDependency; + productName = Pachyderm; + }; D69CCBBE249E6EFD000AF167 /* CrashReporter */ = { isa = XCSwiftPackageProductDependency; package = D69CCBBD249E6EFD000AF167 /* XCRemoteSwiftPackageReference "plcrashreporter" */; @@ -3001,11 +2463,6 @@ package = D6B0539D23BD2BA300A066FA /* XCRemoteSwiftPackageReference "SheetController" */; productName = SheetController; }; - D6F1F9DE27B0613300CB7D88 /* WebURL */ = { - isa = XCSwiftPackageProductDependency; - package = D6676CA127A8D0020052936B /* XCRemoteSwiftPackageReference "swift-url" */; - productName = WebURL; - }; /* End XCSwiftPackageProductDependency section */ /* Begin XCVersionGroup section */ diff --git a/Tusker.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Tusker.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 26828795ad..919434a625 100644 --- a/Tusker.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/Tusker.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> diff --git a/Tusker.xcworkspace/contents.xcworkspacedata b/Tusker.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 452f061e24..0000000000 --- a/Tusker.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - diff --git a/Tusker.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Tusker.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d981003d..0000000000 --- a/Tusker.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/Tusker.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Tusker.xcworkspace/xcshareddata/swiftpm/Package.resolved deleted file mode 100644 index 404a81ee75..0000000000 --- a/Tusker.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ /dev/null @@ -1,50 +0,0 @@ -{ - "pins" : [ - { - "identity" : "plcrashreporter", - "kind" : "remoteSourceControl", - "location" : "https://github.com/microsoft/plcrashreporter", - "state" : { - "revision" : "de6b8f9db4b2a0aa859a5507550a70548e4da936", - "version" : "1.8.1" - } - }, - { - "identity" : "sheetcontroller", - "kind" : "remoteSourceControl", - "location" : "https://git.shadowfacts.net/shadowfacts/SheetController.git", - "state" : { - "branch" : "master", - "revision" : "aa0f5192eaf19d01c89dbfa9ec5878a700376f23" - } - }, - { - "identity" : "swift-system", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-system.git", - "state" : { - "revision" : "836bc4557b74fe6d2660218d56e3ce96aff76574", - "version" : "1.1.1" - } - }, - { - "identity" : "swift-url", - "kind" : "remoteSourceControl", - "location" : "https://github.com/karwa/swift-url", - "state" : { - "branch" : "main", - "revision" : "9d06f9f89397de16c8942aa123c425568654fd6a" - } - }, - { - "identity" : "swiftsoup", - "kind" : "remoteSourceControl", - "location" : "https://github.com/scinfu/SwiftSoup.git", - "state" : { - "revision" : "774dc9c7213085db8aa59595e27c1cd22e428904", - "version" : "2.3.2" - } - } - ], - "version" : 2 -} diff --git a/Tusker/Models/StatusFormat.swift b/Tusker/Models/StatusFormat.swift index a791b45933..da2096fc8c 100644 --- a/Tusker/Models/StatusFormat.swift +++ b/Tusker/Models/StatusFormat.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Shadowfacts. All rights reserved. // -import Foundation +import UIKit import Pachyderm enum StatusFormat: CaseIterable { diff --git a/Tusker/Preferences/Preferences.swift b/Tusker/Preferences/Preferences.swift index 8b52ff0a19..674e93d0c4 100644 --- a/Tusker/Preferences/Preferences.swift +++ b/Tusker/Preferences/Preferences.swift @@ -6,7 +6,7 @@ // Copyright © 2018 Shadowfacts. All rights reserved. // -import Foundation +import UIKit import Pachyderm import Combine