FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace import DataModel with import Data.

Browse Source
This commit is contained in:
Brent Simmons 2017-07-08 13:18:59 -07:00
parent 36b93c7332
commit 95c077b725
9 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Evergreen.xcodeproj/project.pbxproj
View File

@ -76,6 +76,8 @@
84B06FFE1ED3818D00F0B54B /* RSTree.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84B06FFA1ED3818000F0B54B /* RSTree.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 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 */; }; 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, ); }; }; 84B0700B1ED3822600F0B54B /* RSTextDrawing.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84B070071ED3821900F0B54B /* RSTextDrawing.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
84BB4B771F11753300858766 /* Data.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84BB4B681F1174D400858766 /* Data.framework */; };
84BB4B781F11753300858766 /* Data.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84BB4B681F1174D400858766 /* Data.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
84FB9A2F1EDCD6C4003D53B9 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84FB9A2D1EDCD6B8003D53B9 /* Sparkle.framework */; }; 84FB9A2F1EDCD6C4003D53B9 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84FB9A2D1EDCD6B8003D53B9 /* Sparkle.framework */; };
84FB9A301EDCD6C4003D53B9 /* Sparkle.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84FB9A2D1EDCD6B8003D53B9 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 84FB9A301EDCD6C4003D53B9 /* Sparkle.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84FB9A2D1EDCD6B8003D53B9 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
@ -312,6 +314,13 @@
remoteGlobalIDString = 844BEE641F0AB3C9004AB7CD; remoteGlobalIDString = 844BEE641F0AB3C9004AB7CD;
remoteInfo = DataTests; remoteInfo = DataTests;
}; };
84BB4B791F11753300858766 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 84BB4B611F1174D400858766 /* Data.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 844BEE5A1F0AB3C8004AB7CD;
remoteInfo = Data;
};
/* End PBXContainerItemProxy section */ /* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */ /* Begin PBXCopyFilesBuildPhase section */
@ -321,6 +330,7 @@
dstPath = ""; dstPath = "";
dstSubfolderSpec = 10; dstSubfolderSpec = 10;
files = ( files = (
84BB4B781F11753300858766 /* Data.framework in Embed Frameworks */,
84FB9A301EDCD6C4003D53B9 /* Sparkle.framework in Embed Frameworks */, 84FB9A301EDCD6C4003D53B9 /* Sparkle.framework in Embed Frameworks */,
849B897D1F0349D000578A8D /* RSParser.framework in Embed Frameworks */, 849B897D1F0349D000578A8D /* RSParser.framework in Embed Frameworks */,
84B06FB31ED37DBD00F0B54B /* RSDatabase.framework in Embed Frameworks */, 84B06FB31ED37DBD00F0B54B /* RSDatabase.framework in Embed Frameworks */,
@ -411,6 +421,7 @@
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
84BB4B771F11753300858766 /* Data.framework in Frameworks */,
84B06FB21ED37DBD00F0B54B /* RSDatabase.framework in Frameworks */, 84B06FB21ED37DBD00F0B54B /* RSDatabase.framework in Frameworks */,
849B897C1F0349D000578A8D /* RSParser.framework in Frameworks */, 849B897C1F0349D000578A8D /* RSParser.framework in Frameworks */,
84B0700A1ED3822600F0B54B /* RSTextDrawing.framework in Frameworks */, 84B0700A1ED3822600F0B54B /* RSTextDrawing.framework in Frameworks */,
@ -777,6 +788,7 @@
84B0700D1ED3822600F0B54B /* PBXTargetDependency */, 84B0700D1ED3822600F0B54B /* PBXTargetDependency */,
8471A2F81ED4D062008F099E /* PBXTargetDependency */, 8471A2F81ED4D062008F099E /* PBXTargetDependency */,
849B897F1F0349D000578A8D /* PBXTargetDependency */, 849B897F1F0349D000578A8D /* PBXTargetDependency */,
84BB4B7A1F11753300858766 /* PBXTargetDependency */,
); );
name = Evergreen; name = Evergreen;
productName = Evergreen; productName = Evergreen;
@ -1185,6 +1197,11 @@
name = RSTextDrawing; name = RSTextDrawing;
targetProxy = 84B0700C1ED3822600F0B54B /* PBXContainerItemProxy */; targetProxy = 84B0700C1ED3822600F0B54B /* PBXContainerItemProxy */;
}; };
84BB4B7A1F11753300858766 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = Data;
targetProxy = 84BB4B791F11753300858766 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */ /* End PBXTargetDependency section */
/* Begin PBXVariantGroup section */ /* Begin PBXVariantGroup section */
@ -1294,6 +1311,8 @@
SDKROOT = macosx; SDKROOT = macosx;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
}; };
name = Debug; name = Debug;
}; };
@ -1335,6 +1354,8 @@
MTL_ENABLE_DEBUG_INFO = NO; MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx; SDKROOT = macosx;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
}; };
name = Release; name = Release;
}; };
@ -1355,7 +1376,6 @@
PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.Evergreen; PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.Evergreen;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 3.0;
}; };
name = Debug; name = Debug;
}; };
@ -1376,7 +1396,6 @@
PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.Evergreen; PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.Evergreen;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 3.0;
}; };
name = Release; name = Release;
}; };
@ -1391,7 +1410,6 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.EvergreenTests; PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.EvergreenTests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Evergreen.app/Contents/MacOS/Evergreen"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Evergreen.app/Contents/MacOS/Evergreen";
}; };
name = Debug; name = Debug;
@ -1407,7 +1425,6 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.EvergreenTests; PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.EvergreenTests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Evergreen.app/Contents/MacOS/Evergreen"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Evergreen.app/Contents/MacOS/Evergreen";
}; };
name = Release; name = Release;

2
Frameworks/LocalAccount/LocalAccount.swift
View File

@ -10,7 +10,7 @@ import Foundation
import RSCore import RSCore
import RSParser import RSParser
import RSWeb import RSWeb
import DataModel import Data
private let localAccountType = "OnMyMac" private let localAccountType = "OnMyMac"

2
Frameworks/LocalAccount/LocalArticle.swift
View File

@ -7,7 +7,7 @@
// //
import Foundation import Foundation
import DataModel import Data
import RSParser import RSParser
public final class LocalArticle: Article, Hashable { public final class LocalArticle: Article, Hashable {

2
Frameworks/LocalAccount/LocalArticleStatus.swift
View File

@ -8,7 +8,7 @@
import Foundation import Foundation
import RSDatabase import RSDatabase
import DataModel import Data
public final class LocalArticleStatus: ArticleStatus, Hashable { public final class LocalArticleStatus: ArticleStatus, Hashable {

2
Frameworks/LocalAccount/LocalAuthor.swift
View File

@ -8,7 +8,7 @@
import Foundation import Foundation
import RSParser import RSParser
import DataModel import Data
extension ParsedAuthor: Author { extension ParsedAuthor: Author {
} }

2
Frameworks/LocalAccount/LocalDatabase.swift
View File

@ -10,7 +10,7 @@ import Foundation
import RSCore import RSCore
import RSParser import RSParser
import RSDatabase import RSDatabase
import DataModel import Data
let sqlLogging = false let sqlLogging = false

2
Frameworks/LocalAccount/LocalFeed.swift
View File

@ -8,7 +8,7 @@
import Foundation import Foundation
import RSWeb import RSWeb
import DataModel import Data
import RSCore import RSCore
public final class LocalFeed: Feed, PlistProvider, Hashable { public final class LocalFeed: Feed, PlistProvider, Hashable {

2
Frameworks/LocalAccount/LocalFolder.swift
View File

@ -8,7 +8,7 @@
import Foundation import Foundation
import RSCore import RSCore
import DataModel import Data
let folderIDKey = "folderID" let folderIDKey = "folderID"
private let folderNameKey = "name" private let folderNameKey = "name"

2
Frameworks/LocalAccount/LocalStatusesManager.swift
View File

@ -10,7 +10,7 @@ import Foundation
import RSCore import RSCore
import RSDatabase import RSDatabase
import RSParser import RSParser
import DataModel import Data
final class LocalStatusesManager { final class LocalStatusesManager {