diff --git a/Evergreen.xcodeproj/project.pbxproj b/Evergreen.xcodeproj/project.pbxproj index 084d7ac9d..c719c6624 100644 --- a/Evergreen.xcodeproj/project.pbxproj +++ b/Evergreen.xcodeproj/project.pbxproj @@ -123,8 +123,6 @@ 84B06FEA1ED3803A00F0B54B /* RSFeedFinder.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84B06FE61ED3803200F0B54B /* RSFeedFinder.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 84B06FFD1ED3818D00F0B54B /* RSTree.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84B06FFA1ED3818000F0B54B /* RSTree.framework */; }; 84B06FFE1ED3818D00F0B54B /* RSTree.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84B06FFA1ED3818000F0B54B /* RSTree.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 84B0700A1ED3822600F0B54B /* RSTextDrawing.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84B070071ED3821900F0B54B /* RSTextDrawing.framework */; }; - 84B0700B1ED3822600F0B54B /* RSTextDrawing.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84B070071ED3821900F0B54B /* RSTextDrawing.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 84B7178C201E66580091657D /* SidebarViewController+ContextualMenus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84B7178B201E66580091657D /* SidebarViewController+ContextualMenus.swift */; }; 84B99C671FAE35E600ECDEDB /* FeedListTreeControllerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84B99C661FAE35E600ECDEDB /* FeedListTreeControllerDelegate.swift */; }; 84B99C691FAE36B800ECDEDB /* FeedListFolder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84B99C681FAE36B800ECDEDB /* FeedListFolder.swift */; }; @@ -431,27 +429,6 @@ remoteGlobalIDString = 842A0BE01CFCB9BC00BF746C; remoteInfo = RSTree; }; - 84B070061ED3821900F0B54B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 84B070011ED3821800F0B54B /* RSTextDrawing.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8439D9FB1C8937C800E5E4B4; - remoteInfo = RSTextDrawing; - }; - 84B070081ED3821900F0B54B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 84B070011ED3821800F0B54B /* RSTextDrawing.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8439DA051C8937C800E5E4B4; - remoteInfo = RSTextDrawingTests; - }; - 84B0700C1ED3822600F0B54B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 84B070011ED3821800F0B54B /* RSTextDrawing.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 8439D9FA1C8937C800E5E4B4; - remoteInfo = RSTextDrawing; - }; 84BB4B671F1174D400858766 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 84BB4B611F1174D400858766 /* Data.xcodeproj */; @@ -487,7 +464,6 @@ 849B897D1F0349D000578A8D /* RSParser.framework in Embed Frameworks */, 846E77421F6EF6A100A165E2 /* Database.framework in Embed Frameworks */, 84B06FB31ED37DBD00F0B54B /* RSDatabase.framework in Embed Frameworks */, - 84B0700B1ED3822600F0B54B /* RSTextDrawing.framework in Embed Frameworks */, 84B06FEA1ED3803A00F0B54B /* RSFeedFinder.framework in Embed Frameworks */, 84B06FFE1ED3818D00F0B54B /* RSTree.framework in Embed Frameworks */, 84B06FAF1ED37DBD00F0B54B /* RSCore.framework in Embed Frameworks */, @@ -646,7 +622,6 @@ 84B06FC61ED37F7200F0B54B /* DB5.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = DB5.xcodeproj; path = Frameworks/DB5/DB5.xcodeproj; sourceTree = ""; }; 84B06FE01ED3803200F0B54B /* RSFeedFinder.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RSFeedFinder.xcodeproj; path = Frameworks/RSFeedFinder/RSFeedFinder.xcodeproj; sourceTree = ""; }; 84B06FF41ED3818000F0B54B /* RSTree.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RSTree.xcodeproj; path = Frameworks/RSTree/RSTree.xcodeproj; sourceTree = ""; }; - 84B070011ED3821800F0B54B /* RSTextDrawing.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RSTextDrawing.xcodeproj; path = Frameworks/RSTextDrawing/RSTextDrawing.xcodeproj; sourceTree = ""; }; 84B7178B201E66580091657D /* SidebarViewController+ContextualMenus.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "SidebarViewController+ContextualMenus.swift"; sourceTree = ""; }; 84B99C661FAE35E600ECDEDB /* FeedListTreeControllerDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedListTreeControllerDelegate.swift; sourceTree = ""; }; 84B99C681FAE36B800ECDEDB /* FeedListFolder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedListFolder.swift; sourceTree = ""; }; @@ -744,7 +719,6 @@ 84B06FB21ED37DBD00F0B54B /* RSDatabase.framework in Frameworks */, 849B897C1F0349D000578A8D /* RSParser.framework in Frameworks */, 846E77411F6EF6A100A165E2 /* Database.framework in Frameworks */, - 84B0700A1ED3822600F0B54B /* RSTextDrawing.framework in Frameworks */, 84B06FE91ED3803A00F0B54B /* RSFeedFinder.framework in Frameworks */, 84B06FFD1ED3818D00F0B54B /* RSTree.framework in Frameworks */, 84B06FAE1ED37DBD00F0B54B /* RSCore.framework in Frameworks */, @@ -1148,7 +1122,6 @@ 84B06F961ED37DA000F0B54B /* RSDatabase.xcodeproj */, 84B06FE01ED3803200F0B54B /* RSFeedFinder.xcodeproj */, 849B89681F0349C100578A8D /* RSParser.xcodeproj */, - 84B070011ED3821800F0B54B /* RSTextDrawing.xcodeproj */, 84B06FF41ED3818000F0B54B /* RSTree.xcodeproj */, 84B06FB61ED37E8B00F0B54B /* RSWeb.xcodeproj */, ); @@ -1252,15 +1225,6 @@ name = Products; sourceTree = ""; }; - 84B070021ED3821800F0B54B /* Products */ = { - isa = PBXGroup; - children = ( - 84B070071ED3821900F0B54B /* RSTextDrawing.framework */, - 84B070091ED3821900F0B54B /* RSTextDrawingTests.xctest */, - ); - name = Products; - sourceTree = ""; - }; 84BB4B621F1174D400858766 /* Products */ = { isa = PBXGroup; children = ( @@ -1482,7 +1446,6 @@ 84B06FD21ED37F7D00F0B54B /* PBXTargetDependency */, 84B06FEC1ED3803A00F0B54B /* PBXTargetDependency */, 84B070001ED3818D00F0B54B /* PBXTargetDependency */, - 84B0700D1ED3822600F0B54B /* PBXTargetDependency */, 849B897F1F0349D000578A8D /* PBXTargetDependency */, 84BB4B7A1F11753300858766 /* PBXTargetDependency */, 846E77401F6EF67A00A165E2 /* PBXTargetDependency */, @@ -1596,10 +1559,6 @@ ProductGroup = 849B89691F0349C100578A8D /* Products */; ProjectRef = 849B89681F0349C100578A8D /* RSParser.xcodeproj */; }, - { - ProductGroup = 84B070021ED3821800F0B54B /* Products */; - ProjectRef = 84B070011ED3821800F0B54B /* RSTextDrawing.xcodeproj */; - }, { ProductGroup = 84B06FF51ED3818000F0B54B /* Products */; ProjectRef = 84B06FF41ED3818000F0B54B /* RSTree.xcodeproj */; @@ -1768,20 +1727,6 @@ remoteRef = 84B06FFB1ED3818000F0B54B /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 84B070071ED3821900F0B54B /* RSTextDrawing.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = RSTextDrawing.framework; - remoteRef = 84B070061ED3821900F0B54B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 84B070091ED3821900F0B54B /* RSTextDrawingTests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = RSTextDrawingTests.xctest; - remoteRef = 84B070081ED3821900F0B54B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 84BB4B681F1174D400858766 /* Data.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; @@ -2104,11 +2049,6 @@ name = RSTree; targetProxy = 84B06FFF1ED3818D00F0B54B /* PBXContainerItemProxy */; }; - 84B0700D1ED3822600F0B54B /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = RSTextDrawing; - targetProxy = 84B0700C1ED3822600F0B54B /* PBXContainerItemProxy */; - }; 84BB4B7A1F11753300858766 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = Data; diff --git a/Evergreen/AppDelegate.swift b/Evergreen/AppDelegate.swift index 57eddc4c3..25e298b3c 100644 --- a/Evergreen/AppDelegate.swift +++ b/Evergreen/AppDelegate.swift @@ -9,7 +9,6 @@ import AppKit import DB5 import Data -import RSTextDrawing import RSTree import RSWeb import Account @@ -165,7 +164,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations, func applicationDidResignActive(_ notification: Notification) { - RSMultiLineRenderer.emptyCache() TimelineCellData.emptyCache() timelineEmptyCaches() diff --git a/Evergreen/MainWindow/Timeline/Cell/TimelineCellLayout.swift b/Evergreen/MainWindow/Timeline/Cell/TimelineCellLayout.swift index 1e6f410fa..a1a4f78b7 100644 --- a/Evergreen/MainWindow/Timeline/Cell/TimelineCellLayout.swift +++ b/Evergreen/MainWindow/Timeline/Cell/TimelineCellLayout.swift @@ -7,7 +7,6 @@ // import AppKit -import RSTextDrawing import RSCore struct TimelineCellLayout { @@ -81,16 +80,9 @@ private extension TimelineCellLayout { var r = textBoxRect let height = MultilineTextFieldSizer.size(for: cellData.attributedTitle, numberOfLines: 2, width: Int(textBoxRect.width)) -// let renderer = RSMultiLineRenderer(attributedTitle: cellData.attributedTitle) -// -// let measurements = renderer.measurements(forWidth: textBoxRect.width) r.size.height = CGFloat(height) return r -// var rline1 = r -// rline1.size.height = CGFloat(measurements.heightOfFirstLine) -// -// return (r, rline1) } static func rectForDate(_ textBoxRect: NSRect, _ titleRect: NSRect, _ appearance: TimelineCellAppearance, _ cellData: TimelineCellData) -> NSRect { diff --git a/Evergreen/MainWindow/Timeline/TimelineTableRowView.swift b/Evergreen/MainWindow/Timeline/TimelineTableRowView.swift index 03ed5b125..06f76089b 100644 --- a/Evergreen/MainWindow/Timeline/TimelineTableRowView.swift +++ b/Evergreen/MainWindow/Timeline/TimelineTableRowView.swift @@ -54,7 +54,7 @@ class TimelineTableRowView : NSTableRowView { override func drawSeparator(in dirtyRect: NSRect) { let path = NSBezierPath() - let originX = floor(cellAppearance.boxLeftMargin) + let originX = floor(cellAppearance.boxLeftMargin) + 2.0 let destinationX = ceil(NSMaxX(bounds)) let y = floor(NSMaxY(bounds)) - 0.5 path.move(to: NSPoint(x: originX, y: y)) diff --git a/Evergreen/MainWindow/Timeline/TimelineViewController.swift b/Evergreen/MainWindow/Timeline/TimelineViewController.swift index 687aad8ec..d445e0150 100644 --- a/Evergreen/MainWindow/Timeline/TimelineViewController.swift +++ b/Evergreen/MainWindow/Timeline/TimelineViewController.swift @@ -8,7 +8,6 @@ import Foundation import RSCore -import RSTextDrawing import Data import Account @@ -135,7 +134,6 @@ class TimelineViewController: NSViewController, UndoableCommandRunner { private func fontSizeDidChange() { TimelineCellData.emptyCache() - RSMultiLineRenderer.emptyCache() cellAppearance = TimelineCellAppearance(theme: appDelegate.currentTheme, showAvatar: false, fontSize: fontSize) cellAppearanceWithAvatar = TimelineCellAppearance(theme: appDelegate.currentTheme, showAvatar: true, fontSize: fontSize) diff --git a/Frameworks/RSTextDrawing/RSTextDrawing.xcodeproj/project.pbxproj b/Frameworks/RSTextDrawing/RSTextDrawing.xcodeproj/project.pbxproj deleted file mode 100644 index 9bd1d0a2f..000000000 --- a/Frameworks/RSTextDrawing/RSTextDrawing.xcodeproj/project.pbxproj +++ /dev/null @@ -1,340 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXBuildFile section */ - 84193AB31CF4EEEB00EAC812 /* RSMultiLineRendererMeasurements.h in Headers */ = {isa = PBXBuildFile; fileRef = 84193AB11CF4EEEB00EAC812 /* RSMultiLineRendererMeasurements.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 84193AB41CF4EEEB00EAC812 /* RSMultiLineRendererMeasurements.m in Sources */ = {isa = PBXBuildFile; fileRef = 84193AB21CF4EEEB00EAC812 /* RSMultiLineRendererMeasurements.m */; }; - 8439D9FF1C8937C800E5E4B4 /* RSTextDrawing.h in Headers */ = {isa = PBXBuildFile; fileRef = 8439D9FE1C8937C800E5E4B4 /* RSTextDrawing.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 8439DA061C8937C800E5E4B4 /* RSTextDrawing.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8439D9FB1C8937C800E5E4B4 /* RSTextDrawing.framework */; }; - 8439DA0B1C8937C800E5E4B4 /* RSTextDrawingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8439DA0A1C8937C800E5E4B4 /* RSTextDrawingTests.m */; }; - 84B7177B1CF9665100FF029D /* RSMultiLineView.h in Headers */ = {isa = PBXBuildFile; fileRef = 84B717791CF9665100FF029D /* RSMultiLineView.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 84B7177C1CF9665100FF029D /* RSMultiLineView.m in Sources */ = {isa = PBXBuildFile; fileRef = 84B7177A1CF9665100FF029D /* RSMultiLineView.m */; }; - 84B7177D1CF9834700FF029D /* RSMultiLineRenderer.m in Sources */ = {isa = PBXBuildFile; fileRef = 846416431C8938470064C661 /* RSMultiLineRenderer.m */; }; - 84B7177E1CF9834A00FF029D /* RSMultiLineRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 846416421C8938470064C661 /* RSMultiLineRenderer.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 84BA010F1C8D20C60029943B /* RSTextRendererProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 84BA010D1C8D20C60029943B /* RSTextRendererProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 84E697E41C8E6C01009C585A /* RSCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84E697E31C8E6C01009C585A /* RSCore.framework */; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - 8439DA071C8937C800E5E4B4 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8439D9F21C8937C800E5E4B4 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 8439D9FA1C8937C800E5E4B4; - remoteInfo = RSTextDrawing; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXFileReference section */ - 84193AB11CF4EEEB00EAC812 /* RSMultiLineRendererMeasurements.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RSMultiLineRendererMeasurements.h; path = RSTextDrawing/RSMultiLineRendererMeasurements.h; sourceTree = ""; }; - 84193AB21CF4EEEB00EAC812 /* RSMultiLineRendererMeasurements.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RSMultiLineRendererMeasurements.m; path = RSTextDrawing/RSMultiLineRendererMeasurements.m; sourceTree = ""; }; - 8439D9FB1C8937C800E5E4B4 /* RSTextDrawing.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RSTextDrawing.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 8439D9FE1C8937C800E5E4B4 /* RSTextDrawing.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RSTextDrawing.h; path = RSTextDrawing/RSTextDrawing.h; sourceTree = ""; }; - 8439DA001C8937C800E5E4B4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = RSTextDrawing/Info.plist; sourceTree = ""; }; - 8439DA051C8937C800E5E4B4 /* RSTextDrawingTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RSTextDrawingTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 8439DA0A1C8937C800E5E4B4 /* RSTextDrawingTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RSTextDrawingTests.m; sourceTree = ""; }; - 8439DA0C1C8937C800E5E4B4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 846416421C8938470064C661 /* RSMultiLineRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RSMultiLineRenderer.h; path = RSTextDrawing/RSMultiLineRenderer.h; sourceTree = ""; }; - 846416431C8938470064C661 /* RSMultiLineRenderer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RSMultiLineRenderer.m; path = RSTextDrawing/RSMultiLineRenderer.m; sourceTree = ""; }; - 84B717791CF9665100FF029D /* RSMultiLineView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RSMultiLineView.h; path = RSTextDrawing/RSMultiLineView.h; sourceTree = ""; }; - 84B7177A1CF9665100FF029D /* RSMultiLineView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RSMultiLineView.m; path = RSTextDrawing/RSMultiLineView.m; sourceTree = ""; }; - 84BA010D1C8D20C60029943B /* RSTextRendererProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RSTextRendererProtocol.h; path = RSTextDrawing/RSTextRendererProtocol.h; sourceTree = ""; }; - 84E697E31C8E6C01009C585A /* RSCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RSCore.framework; path = ../RSCore/build/Debug/RSCore.framework; sourceTree = ""; }; - D511EF1520242EB900712EC3 /* RSTextDrawing_project_release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSTextDrawing_project_release.xcconfig; sourceTree = ""; }; - D511EF1620242EB900712EC3 /* RSTextDrawingTests_target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSTextDrawingTests_target.xcconfig; sourceTree = ""; }; - D511EF1720242EB900712EC3 /* RSTextDrawing_project_debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSTextDrawing_project_debug.xcconfig; sourceTree = ""; }; - D511EF1820242EB900712EC3 /* RSTextDrawing_project.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSTextDrawing_project.xcconfig; sourceTree = ""; }; - D511EF1920242EB900712EC3 /* RSTextDrawing_target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSTextDrawing_target.xcconfig; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 8439D9F71C8937C800E5E4B4 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 84E697E41C8E6C01009C585A /* RSCore.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 8439DA021C8937C800E5E4B4 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 8439DA061C8937C800E5E4B4 /* RSTextDrawing.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 8439D9F11C8937C800E5E4B4 = { - isa = PBXGroup; - children = ( - 8439D9FE1C8937C800E5E4B4 /* RSTextDrawing.h */, - 84B717791CF9665100FF029D /* RSMultiLineView.h */, - 84B7177A1CF9665100FF029D /* RSMultiLineView.m */, - 84BA010D1C8D20C60029943B /* RSTextRendererProtocol.h */, - 846416421C8938470064C661 /* RSMultiLineRenderer.h */, - 846416431C8938470064C661 /* RSMultiLineRenderer.m */, - 84193AB11CF4EEEB00EAC812 /* RSMultiLineRendererMeasurements.h */, - 84193AB21CF4EEEB00EAC812 /* RSMultiLineRendererMeasurements.m */, - 8439DA001C8937C800E5E4B4 /* Info.plist */, - 8439DA091C8937C800E5E4B4 /* RSTextDrawingTests */, - 8439D9FC1C8937C800E5E4B4 /* Products */, - 84E697E31C8E6C01009C585A /* RSCore.framework */, - D511EF1420242EB900712EC3 /* xcconfig */, - ); - sourceTree = ""; - }; - 8439D9FC1C8937C800E5E4B4 /* Products */ = { - isa = PBXGroup; - children = ( - 8439D9FB1C8937C800E5E4B4 /* RSTextDrawing.framework */, - 8439DA051C8937C800E5E4B4 /* RSTextDrawingTests.xctest */, - ); - name = Products; - sourceTree = ""; - }; - 8439DA091C8937C800E5E4B4 /* RSTextDrawingTests */ = { - isa = PBXGroup; - children = ( - 8439DA0A1C8937C800E5E4B4 /* RSTextDrawingTests.m */, - 8439DA0C1C8937C800E5E4B4 /* Info.plist */, - ); - path = RSTextDrawingTests; - sourceTree = ""; - }; - D511EF1420242EB900712EC3 /* xcconfig */ = { - isa = PBXGroup; - children = ( - D511EF1820242EB900712EC3 /* RSTextDrawing_project.xcconfig */, - D511EF1720242EB900712EC3 /* RSTextDrawing_project_debug.xcconfig */, - D511EF1520242EB900712EC3 /* RSTextDrawing_project_release.xcconfig */, - D511EF1920242EB900712EC3 /* RSTextDrawing_target.xcconfig */, - D511EF1620242EB900712EC3 /* RSTextDrawingTests_target.xcconfig */, - ); - path = xcconfig; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXHeadersBuildPhase section */ - 8439D9F81C8937C800E5E4B4 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 8439D9FF1C8937C800E5E4B4 /* RSTextDrawing.h in Headers */, - 84B7177E1CF9834A00FF029D /* RSMultiLineRenderer.h in Headers */, - 84BA010F1C8D20C60029943B /* RSTextRendererProtocol.h in Headers */, - 84193AB31CF4EEEB00EAC812 /* RSMultiLineRendererMeasurements.h in Headers */, - 84B7177B1CF9665100FF029D /* RSMultiLineView.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXHeadersBuildPhase section */ - -/* Begin PBXNativeTarget section */ - 8439D9FA1C8937C800E5E4B4 /* RSTextDrawing */ = { - isa = PBXNativeTarget; - buildConfigurationList = 8439DA0F1C8937C800E5E4B4 /* Build configuration list for PBXNativeTarget "RSTextDrawing" */; - buildPhases = ( - 8439D9F61C8937C800E5E4B4 /* Sources */, - 8439D9F71C8937C800E5E4B4 /* Frameworks */, - 8439D9F81C8937C800E5E4B4 /* Headers */, - 8439D9F91C8937C800E5E4B4 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = RSTextDrawing; - productName = RSTextDrawing; - productReference = 8439D9FB1C8937C800E5E4B4 /* RSTextDrawing.framework */; - productType = "com.apple.product-type.framework"; - }; - 8439DA041C8937C800E5E4B4 /* RSTextDrawingTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 8439DA121C8937C800E5E4B4 /* Build configuration list for PBXNativeTarget "RSTextDrawingTests" */; - buildPhases = ( - 8439DA011C8937C800E5E4B4 /* Sources */, - 8439DA021C8937C800E5E4B4 /* Frameworks */, - 8439DA031C8937C800E5E4B4 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 8439DA081C8937C800E5E4B4 /* PBXTargetDependency */, - ); - name = RSTextDrawingTests; - productName = RSTextDrawingTests; - productReference = 8439DA051C8937C800E5E4B4 /* RSTextDrawingTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 8439D9F21C8937C800E5E4B4 /* Project object */ = { - isa = PBXProject; - attributes = { - LastSwiftUpdateCheck = 0730; - LastUpgradeCheck = 0930; - ORGANIZATIONNAME = "Ranchero Software"; - TargetAttributes = { - 8439D9FA1C8937C800E5E4B4 = { - CreatedOnToolsVersion = 7.2.1; - LastSwiftMigration = 0800; - }; - 8439DA041C8937C800E5E4B4 = { - CreatedOnToolsVersion = 7.2.1; - LastSwiftMigration = 0800; - }; - }; - }; - buildConfigurationList = 8439D9F51C8937C800E5E4B4 /* Build configuration list for PBXProject "RSTextDrawing" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - hasScannedForEncodings = 0; - knownRegions = ( - en, - ); - mainGroup = 8439D9F11C8937C800E5E4B4; - productRefGroup = 8439D9FC1C8937C800E5E4B4 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 8439D9FA1C8937C800E5E4B4 /* RSTextDrawing */, - 8439DA041C8937C800E5E4B4 /* RSTextDrawingTests */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 8439D9F91C8937C800E5E4B4 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 8439DA031C8937C800E5E4B4 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 8439D9F61C8937C800E5E4B4 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 84B7177C1CF9665100FF029D /* RSMultiLineView.m in Sources */, - 84B7177D1CF9834700FF029D /* RSMultiLineRenderer.m in Sources */, - 84193AB41CF4EEEB00EAC812 /* RSMultiLineRendererMeasurements.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 8439DA011C8937C800E5E4B4 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 8439DA0B1C8937C800E5E4B4 /* RSTextDrawingTests.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - 8439DA081C8937C800E5E4B4 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 8439D9FA1C8937C800E5E4B4 /* RSTextDrawing */; - targetProxy = 8439DA071C8937C800E5E4B4 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin XCBuildConfiguration section */ - 8439DA0D1C8937C800E5E4B4 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = D511EF1720242EB900712EC3 /* RSTextDrawing_project_debug.xcconfig */; - buildSettings = { - CODE_SIGN_IDENTITY = "-"; - }; - name = Debug; - }; - 8439DA0E1C8937C800E5E4B4 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = D511EF1520242EB900712EC3 /* RSTextDrawing_project_release.xcconfig */; - buildSettings = { - CODE_SIGN_IDENTITY = "-"; - }; - name = Release; - }; - 8439DA101C8937C800E5E4B4 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = D511EF1920242EB900712EC3 /* RSTextDrawing_target.xcconfig */; - buildSettings = { - }; - name = Debug; - }; - 8439DA111C8937C800E5E4B4 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = D511EF1920242EB900712EC3 /* RSTextDrawing_target.xcconfig */; - buildSettings = { - }; - name = Release; - }; - 8439DA131C8937C800E5E4B4 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = D511EF1620242EB900712EC3 /* RSTextDrawingTests_target.xcconfig */; - buildSettings = { - }; - name = Debug; - }; - 8439DA141C8937C800E5E4B4 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = D511EF1620242EB900712EC3 /* RSTextDrawingTests_target.xcconfig */; - buildSettings = { - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 8439D9F51C8937C800E5E4B4 /* Build configuration list for PBXProject "RSTextDrawing" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 8439DA0D1C8937C800E5E4B4 /* Debug */, - 8439DA0E1C8937C800E5E4B4 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 8439DA0F1C8937C800E5E4B4 /* Build configuration list for PBXNativeTarget "RSTextDrawing" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 8439DA101C8937C800E5E4B4 /* Debug */, - 8439DA111C8937C800E5E4B4 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 8439DA121C8937C800E5E4B4 /* Build configuration list for PBXNativeTarget "RSTextDrawingTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 8439DA131C8937C800E5E4B4 /* Debug */, - 8439DA141C8937C800E5E4B4 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 8439D9F21C8937C800E5E4B4 /* Project object */; -} diff --git a/Frameworks/RSTextDrawing/RSTextDrawing.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Frameworks/RSTextDrawing/RSTextDrawing.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index a11ac5bda..000000000 --- a/Frameworks/RSTextDrawing/RSTextDrawing.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - -