From d7f13ca4be0401b164e78df86d9489ed2f5400c4 Mon Sep 17 00:00:00 2001 From: Daniel Jalkut Date: Sat, 27 Jan 2018 21:50:48 -0500 Subject: [PATCH 1/6] Change from flatMap to new compactMap rename in Xcode 9.3. --- Commands/DeleteFromSidebarCommand.swift | 2 +- .../Keyboard/MainWIndowKeyboardHandler.swift | 2 +- .../MainWindow/MainWindowController.swift | 2 +- .../Keyboard/SidebarKeyboardDelegate.swift | 2 +- .../MainWindow/Timeline/ArticleArray.swift | 2 +- .../Keyboard/TimelineKeyboardDelegate.swift | 2 +- .../Scriptability/Account+Scriptability.swift | 4 +- .../NSApplication+Scriptability.swift | 2 +- Frameworks/Account/Account.swift | 6 +- .../Account/Feedbin/FeedbinArticle.swift | 2 +- .../Account/Feedbin/FeedbinSubscription.swift | 2 +- Frameworks/Account/Folder.swift | 2 +- Frameworks/Data/Author.swift | 2 +- .../Extensions/Article+Database.swift | 2 +- .../Extensions/Attachment+Database.swift | 6 +- .../Database/Extensions/Author+Database.swift | 2 +- .../RSCore/NSOutlineView+Extensions.swift | 2 +- Frameworks/RSDatabase/DatabaseTable.swift | 4 +- .../RSDatabase/DatabaseObject.swift | 2 +- .../DatabaseRelatedObjectsTable.swift | 2 +- .../Related Objects/RelatedObjectsMap.swift | 2 +- .../RSParser/Feeds/JSON/JSONFeedParser.swift | 6 +- .../RSParser/Feeds/JSON/RSSInJSONParser.swift | 4 +- .../Feeds/XML/RSParsedFeedTransformer.swift | 4 +- Importers/DefaultFeedsImporter.swift | 2 +- test.html | 117 ++++++++++++++++++ 26 files changed, 152 insertions(+), 35 deletions(-) create mode 100644 test.html diff --git a/Commands/DeleteFromSidebarCommand.swift b/Commands/DeleteFromSidebarCommand.swift index 583dc5edc..7047c8578 100644 --- a/Commands/DeleteFromSidebarCommand.swift +++ b/Commands/DeleteFromSidebarCommand.swift @@ -36,7 +36,7 @@ final class DeleteFromSidebarCommand: UndoableCommand { self.undoActionName = actionName self.undoManager = undoManager - let itemSpecifiers = nodesToDelete.flatMap{ SidebarItemSpecifier(node: $0) } + let itemSpecifiers = nodesToDelete.compactMap{ SidebarItemSpecifier(node: $0) } guard !itemSpecifiers.isEmpty else { return nil } diff --git a/Evergreen/MainWindow/Keyboard/MainWIndowKeyboardHandler.swift b/Evergreen/MainWindow/Keyboard/MainWIndowKeyboardHandler.swift index b8ac2678f..e2a9ba3d1 100644 --- a/Evergreen/MainWindow/Keyboard/MainWIndowKeyboardHandler.swift +++ b/Evergreen/MainWindow/Keyboard/MainWIndowKeyboardHandler.swift @@ -19,7 +19,7 @@ final class MainWindowKeyboardHandler: KeyboardDelegate { let f = Bundle.main.path(forResource: "GlobalKeyboardShortcuts", ofType: "plist")! let rawShortcuts = NSArray(contentsOfFile: f)! as! [[String: Any]] - self.globalShortcuts = Set(rawShortcuts.flatMap { KeyboardShortcut(dictionary: $0) }) + self.globalShortcuts = Set(rawShortcuts.compactMap { KeyboardShortcut(dictionary: $0) }) } func keydown(_ event: NSEvent, in view: NSView) -> Bool { diff --git a/Evergreen/MainWindow/MainWindowController.swift b/Evergreen/MainWindow/MainWindowController.swift index cf0898bec..26dfecda9 100644 --- a/Evergreen/MainWindow/MainWindowController.swift +++ b/Evergreen/MainWindow/MainWindowController.swift @@ -332,7 +332,7 @@ extension MainWindowController: NSSharingServicePickerDelegate { func sharingServicePicker(_ sharingServicePicker: NSSharingServicePicker, sharingServicesForItems items: [Any], proposedSharingServices proposedServices: [NSSharingService]) -> [NSSharingService] { - let sendToServices = appDelegate.sendToCommands.flatMap { (sendToCommand) -> NSSharingService? in + let sendToServices = appDelegate.sendToCommands.compactMap { (sendToCommand) -> NSSharingService? in guard let object = items.first else { return nil diff --git a/Evergreen/MainWindow/Sidebar/Keyboard/SidebarKeyboardDelegate.swift b/Evergreen/MainWindow/Sidebar/Keyboard/SidebarKeyboardDelegate.swift index e048db67a..0e993314a 100644 --- a/Evergreen/MainWindow/Sidebar/Keyboard/SidebarKeyboardDelegate.swift +++ b/Evergreen/MainWindow/Sidebar/Keyboard/SidebarKeyboardDelegate.swift @@ -19,7 +19,7 @@ import RSCore let f = Bundle.main.path(forResource: "SidebarKeyboardShortcuts", ofType: "plist")! let rawShortcuts = NSArray(contentsOfFile: f)! as! [[String: Any]] - self.shortcuts = Set(rawShortcuts.flatMap { KeyboardShortcut(dictionary: $0) }) + self.shortcuts = Set(rawShortcuts.compactMap { KeyboardShortcut(dictionary: $0) }) super.init() } diff --git a/Evergreen/MainWindow/Timeline/ArticleArray.swift b/Evergreen/MainWindow/Timeline/ArticleArray.swift index 531ea2247..2c30fa99d 100644 --- a/Evergreen/MainWindow/Timeline/ArticleArray.swift +++ b/Evergreen/MainWindow/Timeline/ArticleArray.swift @@ -45,7 +45,7 @@ extension Array where Element == Article { func articlesForIndexes(_ indexes: IndexSet) -> Set
{ - return Set(indexes.flatMap{ (oneIndex) -> Article? in + return Set(indexes.compactMap{ (oneIndex) -> Article? in return articleAtRow(oneIndex) }) } diff --git a/Evergreen/MainWindow/Timeline/Keyboard/TimelineKeyboardDelegate.swift b/Evergreen/MainWindow/Timeline/Keyboard/TimelineKeyboardDelegate.swift index 39ca4b3b3..d15d0be50 100644 --- a/Evergreen/MainWindow/Timeline/Keyboard/TimelineKeyboardDelegate.swift +++ b/Evergreen/MainWindow/Timeline/Keyboard/TimelineKeyboardDelegate.swift @@ -21,7 +21,7 @@ import RSCore let f = Bundle.main.path(forResource: "TimelineKeyboardShortcuts", ofType: "plist")! let rawShortcuts = NSArray(contentsOfFile: f)! as! [[String: Any]] - self.shortcuts = Set(rawShortcuts.flatMap { KeyboardShortcut(dictionary: $0) }) + self.shortcuts = Set(rawShortcuts.compactMap { KeyboardShortcut(dictionary: $0) }) super.init() } diff --git a/Evergreen/Scriptability/Account+Scriptability.swift b/Evergreen/Scriptability/Account+Scriptability.swift index 47723de6c..bd2c7cbf0 100644 --- a/Evergreen/Scriptability/Account+Scriptability.swift +++ b/Evergreen/Scriptability/Account+Scriptability.swift @@ -50,13 +50,13 @@ class ScriptableAccount: NSObject, UniqueIdScriptingObject, ScriptingObjectConta @objc(feeds) var feeds:NSArray { - let feeds = account.children.flatMap { $0 as? Feed } + let feeds = account.children.compactMap { $0 as? Feed } return feeds.map { ScriptableFeed($0, container:self) } as NSArray } @objc(folders) var folders:NSArray { - let folders = account.children.flatMap { $0 as? Folder } + let folders = account.children.compactMap { $0 as? Folder } return folders.map { ScriptableFolder($0, container:self) } as NSArray } diff --git a/Evergreen/Scriptability/NSApplication+Scriptability.swift b/Evergreen/Scriptability/NSApplication+Scriptability.swift index 9ecc48ee0..1fc26d668 100644 --- a/Evergreen/Scriptability/NSApplication+Scriptability.swift +++ b/Evergreen/Scriptability/NSApplication+Scriptability.swift @@ -36,7 +36,7 @@ extension NSApplication : ScriptingObjectContainer { let accounts = AccountManager.shared.accounts let emptyFeeds:[Feed] = [] let feeds = accounts.reduce(emptyFeeds) { (result, nthAccount) -> [Feed] in - let accountFeeds = nthAccount.children.flatMap { $0 as? Feed } + let accountFeeds = nthAccount.children.compactMap { $0 as? Feed } return result + accountFeeds } return feeds.map { ScriptableFeed($0, container:self) } as NSArray diff --git a/Frameworks/Account/Account.swift b/Frameworks/Account/Account.swift index b5abd4bf1..4f723d5aa 100644 --- a/Frameworks/Account/Account.swift +++ b/Frameworks/Account/Account.swift @@ -462,7 +462,7 @@ extension Account { func objects(with diskObjects: [[String: Any]]) -> [AnyObject] { - return diskObjects.flatMap { object(with: $0) } + return diskObjects.compactMap { object(with: $0) } } } @@ -508,7 +508,7 @@ private extension Account { func diskDictionary() -> NSDictionary { - let diskObjects = children.flatMap { (object) -> [String: Any]? in + let diskObjects = children.compactMap { (object) -> [String: Any]? in if let folder = object as? Folder { return folder.dictionary @@ -650,7 +650,7 @@ private extension Account { func noteStatusesForArticlesDidChange(_ articles: Set
) { - let feeds = Set(articles.flatMap { $0.feed }) + let feeds = Set(articles.compactMap { $0.feed }) let statuses = Set(articles.map { $0.status }) // .UnreadCountDidChange notification will get sent to Folder and Account objects, diff --git a/Frameworks/Account/Feedbin/FeedbinArticle.swift b/Frameworks/Account/Feedbin/FeedbinArticle.swift index cbd2c64bf..0305b59f1 100644 --- a/Frameworks/Account/Feedbin/FeedbinArticle.swift +++ b/Frameworks/Account/Feedbin/FeedbinArticle.swift @@ -90,7 +90,7 @@ struct FeedbinArticle { static func articles(with array: JSONArray) -> [FeedbinArticle]? { - let articlesArray = array.flatMap { FeedbinArticle(jsonDictionary: $0) } + let articlesArray = array.compactMap { FeedbinArticle(jsonDictionary: $0) } return articlesArray.isEmpty ? nil : articlesArray } } diff --git a/Frameworks/Account/Feedbin/FeedbinSubscription.swift b/Frameworks/Account/Feedbin/FeedbinSubscription.swift index c4678bcc8..0c76374b0 100644 --- a/Frameworks/Account/Feedbin/FeedbinSubscription.swift +++ b/Frameworks/Account/Feedbin/FeedbinSubscription.swift @@ -64,7 +64,7 @@ struct FeedbinSubscription { static func subscriptions(with array: JSONArray) -> [FeedbinSubscription]? { - let subs = array.flatMap { FeedbinSubscription(dictionary: $0) } + let subs = array.compactMap { FeedbinSubscription(dictionary: $0) } return subs.isEmpty ? nil : subs } } diff --git a/Frameworks/Account/Folder.swift b/Frameworks/Account/Folder.swift index f454eb2e9..442ada83f 100644 --- a/Frameworks/Account/Folder.swift +++ b/Frameworks/Account/Folder.swift @@ -107,7 +107,7 @@ public final class Folder: DisplayNameProvider, Container, UnreadCountProvider, d[Key.unreadCount] = unreadCount } - let childObjects = children.flatMap { (child) -> [String: Any]? in + let childObjects = children.compactMap { (child) -> [String: Any]? in if let feed = child as? Feed { return feed.dictionary diff --git a/Frameworks/Data/Author.swift b/Frameworks/Data/Author.swift index d75ddb1a7..df25a8741 100644 --- a/Frameworks/Data/Author.swift +++ b/Frameworks/Data/Author.swift @@ -84,7 +84,7 @@ public struct Author: Hashable { static func authorsWithDiskArray(_ diskArray: [[String: Any]]) -> Set? { - let authors = diskArray.flatMap { Author(dictionary: $0) } + let authors = diskArray.compactMap { Author(dictionary: $0) } return authors.isEmpty ? nil : Set(authors) } } diff --git a/Frameworks/Database/Extensions/Article+Database.swift b/Frameworks/Database/Extensions/Article+Database.swift index 082014821..bd61718f1 100644 --- a/Frameworks/Database/Extensions/Article+Database.swift +++ b/Frameworks/Database/Extensions/Article+Database.swift @@ -159,7 +159,7 @@ extension Set where Element == Article { func databaseDictionaries() -> [NSDictionary]? { - return self.flatMap { $0.databaseDictionary() } + return self.compactMap { $0.databaseDictionary() } } } diff --git a/Frameworks/Database/Extensions/Attachment+Database.swift b/Frameworks/Database/Extensions/Attachment+Database.swift index b84f0aae8..134cc14a3 100644 --- a/Frameworks/Database/Extensions/Attachment+Database.swift +++ b/Frameworks/Database/Extensions/Attachment+Database.swift @@ -39,7 +39,7 @@ extension Attachment { return nil } - let attachments = parsedAttachments.flatMap{ Attachment(parsedAttachment: $0) } + let attachments = parsedAttachments.compactMap{ Attachment(parsedAttachment: $0) } return attachments.isEmpty ? nil : Set(attachments) } @@ -91,11 +91,11 @@ extension Set where Element == Attachment { func databaseDictionaries() -> [NSDictionary] { - return self.flatMap { $0.databaseDictionary() } + return self.compactMap { $0.databaseDictionary() } } func databaseObjects() -> [DatabaseObject] { - return self.flatMap { $0 as DatabaseObject } + return self.compactMap { $0 as DatabaseObject } } } diff --git a/Frameworks/Database/Extensions/Author+Database.swift b/Frameworks/Database/Extensions/Author+Database.swift index 984aa9d6d..f28b4be4c 100644 --- a/Frameworks/Database/Extensions/Author+Database.swift +++ b/Frameworks/Database/Extensions/Author+Database.swift @@ -37,7 +37,7 @@ extension Author { return nil } - let authors = Set(parsedAuthors.flatMap { Author(parsedAuthor: $0) }) + let authors = Set(parsedAuthors.compactMap { Author(parsedAuthor: $0) }) return authors.isEmpty ? nil: authors } } diff --git a/Frameworks/RSCore/RSCore/NSOutlineView+Extensions.swift b/Frameworks/RSCore/RSCore/NSOutlineView+Extensions.swift index 94d0c1ef1..3150606fc 100755 --- a/Frameworks/RSCore/RSCore/NSOutlineView+Extensions.swift +++ b/Frameworks/RSCore/RSCore/NSOutlineView+Extensions.swift @@ -17,7 +17,7 @@ public extension NSOutlineView { return [AnyObject]() } - return selectedRowIndexes.flatMap { (oneIndex) -> AnyObject? in + return selectedRowIndexes.compactMap { (oneIndex) -> AnyObject? in return item(atRow: oneIndex) as AnyObject } } diff --git a/Frameworks/RSDatabase/DatabaseTable.swift b/Frameworks/RSDatabase/DatabaseTable.swift index d7ea0df15..723bb7135 100644 --- a/Frameworks/RSDatabase/DatabaseTable.swift +++ b/Frameworks/RSDatabase/DatabaseTable.swift @@ -95,7 +95,7 @@ public extension DatabaseTable { public extension FMResultSet { - public func flatMap(_ callback: (_ row: FMResultSet) -> T?) -> [T] { + public func compactMap(_ callback: (_ row: FMResultSet) -> T?) -> [T] { var objects = [T]() while next() { @@ -109,7 +109,7 @@ public extension FMResultSet { public func mapToSet(_ callback: (_ row: FMResultSet) -> T?) -> Set { - return Set(flatMap(callback)) + return Set(compactMap(callback)) } } diff --git a/Frameworks/RSDatabase/RSDatabase/DatabaseObject.swift b/Frameworks/RSDatabase/RSDatabase/DatabaseObject.swift index 0686c128a..2f6718776 100644 --- a/Frameworks/RSDatabase/RSDatabase/DatabaseObject.swift +++ b/Frameworks/RSDatabase/RSDatabase/DatabaseObject.swift @@ -53,7 +53,7 @@ extension Array where Element == DatabaseObject { func databaseDictionaries() -> [NSDictionary]? { - let dictionaries = self.flatMap{ $0.databaseDictionary() } + let dictionaries = self.compactMap{ $0.databaseDictionary() } return dictionaries.isEmpty ? nil : dictionaries } } diff --git a/Frameworks/RSDatabase/Related Objects/DatabaseRelatedObjectsTable.swift b/Frameworks/RSDatabase/Related Objects/DatabaseRelatedObjectsTable.swift index b53dee538..a2c897508 100644 --- a/Frameworks/RSDatabase/Related Objects/DatabaseRelatedObjectsTable.swift +++ b/Frameworks/RSDatabase/Related Objects/DatabaseRelatedObjectsTable.swift @@ -60,7 +60,7 @@ public extension DatabaseRelatedObjectsTable { func objectsWithResultSet(_ resultSet: FMResultSet) -> [DatabaseObject] { - return resultSet.flatMap(objectWithRow) + return resultSet.compactMap(objectWithRow) } func save(_ objects: [DatabaseObject], in database: FMDatabase) { diff --git a/Frameworks/RSDatabase/Related Objects/RelatedObjectsMap.swift b/Frameworks/RSDatabase/Related Objects/RelatedObjectsMap.swift index 3bf76a925..bc75e4926 100644 --- a/Frameworks/RSDatabase/Related Objects/RelatedObjectsMap.swift +++ b/Frameworks/RSDatabase/Related Objects/RelatedObjectsMap.swift @@ -23,7 +23,7 @@ public struct RelatedObjectsMap { for objectID in relatedObjectIDsMap.objectIDs() { if let relatedObjectIDs = relatedObjectIDsMap[objectID] { - let relatedObjects = relatedObjectIDs.flatMap{ relatedObjectsDictionary[$0] } + let relatedObjects = relatedObjectIDs.compactMap{ relatedObjectsDictionary[$0] } if !relatedObjects.isEmpty { d[objectID] = relatedObjects } diff --git a/Frameworks/RSParser/Feeds/JSON/JSONFeedParser.swift b/Frameworks/RSParser/Feeds/JSON/JSONFeedParser.swift index 7bfeb39a4..b1546b0e8 100644 --- a/Frameworks/RSParser/Feeds/JSON/JSONFeedParser.swift +++ b/Frameworks/RSParser/Feeds/JSON/JSONFeedParser.swift @@ -103,7 +103,7 @@ private extension JSONFeedParser { return nil } - let hubs = hubsArray.flatMap { (hubDictionary) -> ParsedHub? in + let hubs = hubsArray.compactMap { (hubDictionary) -> ParsedHub? in guard let hubURL = hubDictionary[Key.url] as? String, let hubType = hubDictionary[Key.type] as? String else { return nil } @@ -114,7 +114,7 @@ private extension JSONFeedParser { static func parseItems(_ itemsArray: JSONArray, _ feedURL: String) -> Set { - return Set(itemsArray.flatMap { (oneItemDictionary) -> ParsedItem? in + return Set(itemsArray.compactMap { (oneItemDictionary) -> ParsedItem? in return parseItem(oneItemDictionary, feedURL) }) } @@ -180,7 +180,7 @@ private extension JSONFeedParser { guard let attachmentsArray = itemDictionary[Key.attachments] as? JSONArray else { return nil } - return Set(attachmentsArray.flatMap { parseAttachment($0) }) + return Set(attachmentsArray.compactMap { parseAttachment($0) }) } static func parseAttachment(_ attachmentObject: JSONDictionary) -> ParsedAttachment? { diff --git a/Frameworks/RSParser/Feeds/JSON/RSSInJSONParser.swift b/Frameworks/RSParser/Feeds/JSON/RSSInJSONParser.swift index 8debc2a66..2bf595d47 100644 --- a/Frameworks/RSParser/Feeds/JSON/RSSInJSONParser.swift +++ b/Frameworks/RSParser/Feeds/JSON/RSSInJSONParser.swift @@ -60,7 +60,7 @@ private extension RSSInJSONParser { static func parseItems(_ itemsObject: JSONArray, _ feedURL: String) -> Set { - return Set(itemsObject.flatMap{ (oneItemDictionary) -> ParsedItem? in + return Set(itemsObject.compactMap{ (oneItemDictionary) -> ParsedItem? in return parsedItemWithDictionary(oneItemDictionary, feedURL) }) @@ -150,7 +150,7 @@ private extension RSSInJSONParser { return nil } else if let categoryArray = itemDictionary["category"] as? JSONArray { - return Set(categoryArray.flatMap{ $0["#value"] as? String }) + return Set(categoryArray.compactMap{ $0["#value"] as? String }) } return nil } diff --git a/Frameworks/RSParser/Feeds/XML/RSParsedFeedTransformer.swift b/Frameworks/RSParser/Feeds/XML/RSParsedFeedTransformer.swift index 05c9c0eee..2a4cbc458 100644 --- a/Frameworks/RSParser/Feeds/XML/RSParsedFeedTransformer.swift +++ b/Frameworks/RSParser/Feeds/XML/RSParsedFeedTransformer.swift @@ -52,7 +52,7 @@ private extension RSParsedFeedTransformer { return nil } - let transformedAuthors = authors.flatMap { (author) -> ParsedAuthor? in + let transformedAuthors = authors.compactMap { (author) -> ParsedAuthor? in return ParsedAuthor(name: author.name, url: author.url, avatarURL: nil, emailAddress: author.emailAddress) } @@ -65,7 +65,7 @@ private extension RSParsedFeedTransformer { return nil } - let attachments = enclosures.flatMap { (enclosure) -> ParsedAttachment? in + let attachments = enclosures.compactMap { (enclosure) -> ParsedAttachment? in let sizeInBytes = enclosure.length > 0 ? enclosure.length : nil return ParsedAttachment(url: enclosure.url, mimeType: enclosure.mimeType, title: nil, sizeInBytes: sizeInBytes, durationInSeconds: nil) diff --git a/Importers/DefaultFeedsImporter.swift b/Importers/DefaultFeedsImporter.swift index 3af6bdaed..2d57a93ce 100644 --- a/Importers/DefaultFeedsImporter.swift +++ b/Importers/DefaultFeedsImporter.swift @@ -56,7 +56,7 @@ struct FeedsImporter { private static func feeds(with feedDictionaries: [DiskFeedDictionary], accountID: String) -> Set { - let feedArray = feedDictionaries.flatMap { Feed(accountID: accountID, dictionary: $0) } + let feedArray = feedDictionaries.compactMap { Feed(accountID: accountID, dictionary: $0) } return Set(feedArray) } } diff --git a/test.html b/test.html new file mode 100644 index 000000000..d7df51ef0 --- /dev/null +++ b/test.html @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + +
Print page 1 of 1
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + Click on the Column Headings to sort accordingly.
+ Click on the Parcel ID to view the parcel detail.
  + +
Parcel IDLocationOwnerBuilt
+ Type + 		Total Value + Beds
+ Baths		Lot size
+ Fin area		LUC
+ Description		NHoodSale date
+ Sale price		Book Page
006.0-0005-0003.030  + FREEMAN STPITCHEL STUART +
GOODMAN JULIA		1914
+ Old Style +  		$615,4005
+ 3		5,502 +
2,472		101
+ One Family		18/19/1998
+ $299,000		28988-522
+ + + + + + + + +
Print page 1 of 1
+ + + + + + + + + From 68a8437ea283af8a3ef695e2cc639ce1edfdd67a Mon Sep 17 00:00:00 2001 From: Daniel Jalkut Date: Mon, 29 Jan 2018 11:02:37 -0500 Subject: [PATCH 2/6] It appears that libxml/parser.h must be explicitly imported as of Xcode 9.3. --- Frameworks/RSParser/SAX/RSSAXParser.m | 1 + 1 file changed, 1 insertion(+) diff --git a/Frameworks/RSParser/SAX/RSSAXParser.m b/Frameworks/RSParser/SAX/RSSAXParser.m index fe79e0c97..9de3e88d4 100755 --- a/Frameworks/RSParser/SAX/RSSAXParser.m +++ b/Frameworks/RSParser/SAX/RSSAXParser.m @@ -6,6 +6,7 @@ // Copyright (c) 2015 Ranchero Software, LLC. All rights reserved. // +#import #import #import #import From 3507313f84b2b5c95784358093db796cf270933f Mon Sep 17 00:00:00 2001 From: Daniel Jalkut Date: Mon, 29 Jan 2018 11:05:22 -0500 Subject: [PATCH 3/6] Accept Xcode 9.3 recommended build settings. --- Evergreen.xcodeproj/project.pbxproj | 2 +- .../Account/Account.xcodeproj/project.pbxproj | 11 ++++++++++- Frameworks/DB5/DB5.xcodeproj/project.pbxproj | 10 +++++++++- Frameworks/Data/Data.xcodeproj/project.pbxproj | 11 ++++++++++- .../Database/Database.xcodeproj/project.pbxproj | 11 ++++++++++- Frameworks/RSCore/RSCore.xcodeproj/project.pbxproj | 9 ++++++++- .../RSDatabase/RSDatabase.xcodeproj/project.pbxproj | 13 ++++++++++++- .../RSFeedFinder.xcodeproj/project.pbxproj | 11 ++++++++++- .../RSParser/RSParser.xcodeproj/project.pbxproj | 7 ++++++- .../RSTextDrawing.xcodeproj/project.pbxproj | 10 +++++++++- Frameworks/RSTree/RSTree.xcodeproj/project.pbxproj | 12 +++++++++++- Frameworks/RSWeb/RSWeb.xcodeproj/project.pbxproj | 9 ++++++++- xcconfig/Evergreen_project.xcconfig | 3 +++ 13 files changed, 107 insertions(+), 12 deletions(-) diff --git a/Evergreen.xcodeproj/project.pbxproj b/Evergreen.xcodeproj/project.pbxproj index ba0674228..eb330c638 100644 --- a/Evergreen.xcodeproj/project.pbxproj +++ b/Evergreen.xcodeproj/project.pbxproj @@ -1279,7 +1279,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0820; - LastUpgradeCheck = 0920; + LastUpgradeCheck = 0930; ORGANIZATIONNAME = "Ranchero Software"; TargetAttributes = { 849C645F1ED37A5D003D8FC0 = { diff --git a/Frameworks/Account/Account.xcodeproj/project.pbxproj b/Frameworks/Account/Account.xcodeproj/project.pbxproj index af2182fd3..e3b97b18b 100644 --- a/Frameworks/Account/Account.xcodeproj/project.pbxproj +++ b/Frameworks/Account/Account.xcodeproj/project.pbxproj @@ -316,7 +316,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0900; - LastUpgradeCheck = 0900; + LastUpgradeCheck = 0930; ORGANIZATIONNAME = "Ranchero Software, LLC"; TargetAttributes = { 848934F51F62484F00CEBD24 = { @@ -505,6 +505,7 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -512,6 +513,7 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -565,6 +567,7 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -572,6 +575,7 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -597,6 +601,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.13; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -607,6 +612,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; @@ -631,6 +637,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; @@ -654,6 +661,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = M8L2WTLA8W; @@ -669,6 +677,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = M8L2WTLA8W; diff --git a/Frameworks/DB5/DB5.xcodeproj/project.pbxproj b/Frameworks/DB5/DB5.xcodeproj/project.pbxproj index 2515d3c45..a097758f7 100644 --- a/Frameworks/DB5/DB5.xcodeproj/project.pbxproj +++ b/Frameworks/DB5/DB5.xcodeproj/project.pbxproj @@ -148,7 +148,7 @@ 84F22BC81B52DC2E000060CE /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0920; + LastUpgradeCheck = 0930; ORGANIZATIONNAME = "Ranchero Software, LLC"; TargetAttributes = { 84F22BD01B52DC2E000060CE = { @@ -237,12 +237,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -290,12 +292,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -328,6 +332,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -348,6 +353,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -367,6 +373,7 @@ 84F22BE91B52DC2E000060CE /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; INFOPLIST_FILE = DB5Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; @@ -379,6 +386,7 @@ 84F22BEA1B52DC2E000060CE /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; INFOPLIST_FILE = DB5Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; diff --git a/Frameworks/Data/Data.xcodeproj/project.pbxproj b/Frameworks/Data/Data.xcodeproj/project.pbxproj index 80c4cb50d..d1164a22a 100644 --- a/Frameworks/Data/Data.xcodeproj/project.pbxproj +++ b/Frameworks/Data/Data.xcodeproj/project.pbxproj @@ -199,7 +199,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0830; - LastUpgradeCheck = 0920; + LastUpgradeCheck = 0930; ORGANIZATIONNAME = "Ranchero Software"; TargetAttributes = { 844BEE5A1F0AB3C8004AB7CD = { @@ -328,6 +328,7 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -335,6 +336,7 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -389,6 +391,7 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -396,6 +399,7 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -420,6 +424,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.13; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; SWIFT_VERSION = 4.0; @@ -432,6 +437,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; @@ -454,6 +460,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; @@ -475,6 +482,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = 9C84TZ7Q6Z; INFOPLIST_FILE = DataTests/Info.plist; @@ -488,6 +496,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = 9C84TZ7Q6Z; INFOPLIST_FILE = DataTests/Info.plist; diff --git a/Frameworks/Database/Database.xcodeproj/project.pbxproj b/Frameworks/Database/Database.xcodeproj/project.pbxproj index 51f6e6342..f8bb2e4ff 100644 --- a/Frameworks/Database/Database.xcodeproj/project.pbxproj +++ b/Frameworks/Database/Database.xcodeproj/project.pbxproj @@ -325,7 +325,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0830; - LastUpgradeCheck = 0920; + LastUpgradeCheck = 0930; ORGANIZATIONNAME = "Ranchero Software"; TargetAttributes = { 844BEE361F0AB3AA004AB7CD = { @@ -526,6 +526,7 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -533,6 +534,7 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -587,6 +589,7 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -594,6 +597,7 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -618,6 +622,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.13; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; SWIFT_VERSION = 4.0; @@ -630,6 +635,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; @@ -652,6 +658,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; @@ -673,6 +680,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = 9C84TZ7Q6Z; INFOPLIST_FILE = DatabaseTests/Info.plist; @@ -686,6 +694,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = 9C84TZ7Q6Z; INFOPLIST_FILE = DatabaseTests/Info.plist; diff --git a/Frameworks/RSCore/RSCore.xcodeproj/project.pbxproj b/Frameworks/RSCore/RSCore.xcodeproj/project.pbxproj index 8829542f2..b036c6a16 100755 --- a/Frameworks/RSCore/RSCore.xcodeproj/project.pbxproj +++ b/Frameworks/RSCore/RSCore.xcodeproj/project.pbxproj @@ -624,7 +624,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0720; - LastUpgradeCheck = 0920; + LastUpgradeCheck = 0930; ORGANIZATIONNAME = "Ranchero Software, LLC"; TargetAttributes = { 842DD7BB1E14993900E061EB = { @@ -820,6 +820,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ANALYZER_NONNULL = YES; + CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -849,6 +850,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ANALYZER_NONNULL = YES; + CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -1011,6 +1013,7 @@ MTL_ENABLE_DEBUG_INFO = NO; RUN_CLANG_STATIC_ANALYZER = YES; SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; SWIFT_TREAT_WARNINGS_AS_ERRORS = YES; @@ -1028,6 +1031,7 @@ CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES; CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES; CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -1051,6 +1055,7 @@ CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES; CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES; CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -1070,6 +1075,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(DEVELOPER_FRAMEWORKS_DIR)", @@ -1090,6 +1096,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(DEVELOPER_FRAMEWORKS_DIR)", diff --git a/Frameworks/RSDatabase/RSDatabase.xcodeproj/project.pbxproj b/Frameworks/RSDatabase/RSDatabase.xcodeproj/project.pbxproj index 339637232..6b4768de7 100755 --- a/Frameworks/RSDatabase/RSDatabase.xcodeproj/project.pbxproj +++ b/Frameworks/RSDatabase/RSDatabase.xcodeproj/project.pbxproj @@ -307,7 +307,7 @@ 84F22C4C1B52E0D9000060CE /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0920; + LastUpgradeCheck = 0930; ORGANIZATIONNAME = "Ranchero Software, LLC"; TargetAttributes = { 8400ABF61E0CFBD800AA7C57 = { @@ -430,6 +430,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ANALYZER_NONNULL = YES; + CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -457,6 +458,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ANALYZER_NONNULL = YES; + CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -494,12 +496,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -550,12 +554,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -579,6 +585,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.13; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; SWIFT_VERSION = 4.0; @@ -591,6 +598,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -612,6 +620,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -632,6 +641,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; INFOPLIST_FILE = RSDatabaseTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; @@ -645,6 +655,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; INFOPLIST_FILE = RSDatabaseTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; diff --git a/Frameworks/RSFeedFinder/RSFeedFinder.xcodeproj/project.pbxproj b/Frameworks/RSFeedFinder/RSFeedFinder.xcodeproj/project.pbxproj index 1669108b8..2f18d02a7 100644 --- a/Frameworks/RSFeedFinder/RSFeedFinder.xcodeproj/project.pbxproj +++ b/Frameworks/RSFeedFinder/RSFeedFinder.xcodeproj/project.pbxproj @@ -189,7 +189,7 @@ 84BAAE161C8E6B3B009F5239 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0920; + LastUpgradeCheck = 0930; ORGANIZATIONNAME = "Ranchero Software"; TargetAttributes = { 84BAAE1E1C8E6B3B009F5239 = { @@ -285,12 +285,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -341,12 +343,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -371,6 +375,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.13; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; SWIFT_VERSION = 4.0; @@ -383,6 +388,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -403,6 +409,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -422,6 +429,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; INFOPLIST_FILE = RSFeedFinderTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; @@ -435,6 +443,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; INFOPLIST_FILE = RSFeedFinderTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; diff --git a/Frameworks/RSParser/RSParser.xcodeproj/project.pbxproj b/Frameworks/RSParser/RSParser.xcodeproj/project.pbxproj index f97c93ce2..ca86404f4 100644 --- a/Frameworks/RSParser/RSParser.xcodeproj/project.pbxproj +++ b/Frameworks/RSParser/RSParser.xcodeproj/project.pbxproj @@ -541,7 +541,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0900; - LastUpgradeCheck = 0900; + LastUpgradeCheck = 0930; ORGANIZATIONNAME = "Ranchero Software, LLC"; TargetAttributes = { 84FF5F831EFA285800C15A01 = { @@ -846,6 +846,7 @@ MTL_ENABLE_DEBUG_INFO = NO; RUN_CLANG_STATIC_ANALYZER = YES; SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; SWIFT_TREAT_WARNINGS_AS_ERRORS = YES; @@ -859,6 +860,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; @@ -883,6 +885,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; @@ -907,6 +910,7 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = M8L2WTLA8W; INFOPLIST_FILE = RSParserTests/Info.plist; @@ -923,6 +927,7 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = M8L2WTLA8W; INFOPLIST_FILE = RSParserTests/Info.plist; diff --git a/Frameworks/RSTextDrawing/RSTextDrawing.xcodeproj/project.pbxproj b/Frameworks/RSTextDrawing/RSTextDrawing.xcodeproj/project.pbxproj index c22f2094c..e45ce85be 100644 --- a/Frameworks/RSTextDrawing/RSTextDrawing.xcodeproj/project.pbxproj +++ b/Frameworks/RSTextDrawing/RSTextDrawing.xcodeproj/project.pbxproj @@ -178,7 +178,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0730; - LastUpgradeCheck = 0920; + LastUpgradeCheck = 0930; ORGANIZATIONNAME = "Ranchero Software"; TargetAttributes = { 8439D9FA1C8937C800E5E4B4 = { @@ -270,12 +270,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -324,12 +326,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -363,6 +367,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -384,6 +389,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -403,6 +409,7 @@ 8439DA131C8937C800E5E4B4 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; INFOPLIST_FILE = RSTextDrawingTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; @@ -415,6 +422,7 @@ 8439DA141C8937C800E5E4B4 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; INFOPLIST_FILE = RSTextDrawingTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; diff --git a/Frameworks/RSTree/RSTree.xcodeproj/project.pbxproj b/Frameworks/RSTree/RSTree.xcodeproj/project.pbxproj index 2d5b25c8e..30533f757 100644 --- a/Frameworks/RSTree/RSTree.xcodeproj/project.pbxproj +++ b/Frameworks/RSTree/RSTree.xcodeproj/project.pbxproj @@ -150,7 +150,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0730; - LastUpgradeCheck = 0920; + LastUpgradeCheck = 0930; ORGANIZATIONNAME = "Ranchero Software, LLC"; TargetAttributes = { 842A0BE01CFCB9BC00BF746C = { @@ -243,12 +243,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -301,12 +303,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -331,6 +335,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.13; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; SWIFT_VERSION = 4.0; @@ -343,6 +348,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -363,6 +369,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -375,6 +382,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSTree; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; + SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; }; name = Release; @@ -382,6 +390,7 @@ 842A0BF91CFCB9BC00BF746C /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; INFOPLIST_FILE = RSTreeTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; @@ -393,6 +402,7 @@ 842A0BFA1CFCB9BC00BF746C /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; INFOPLIST_FILE = RSTreeTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; diff --git a/Frameworks/RSWeb/RSWeb.xcodeproj/project.pbxproj b/Frameworks/RSWeb/RSWeb.xcodeproj/project.pbxproj index a88e9cbe1..d082e7398 100755 --- a/Frameworks/RSWeb/RSWeb.xcodeproj/project.pbxproj +++ b/Frameworks/RSWeb/RSWeb.xcodeproj/project.pbxproj @@ -299,7 +299,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0820; - LastUpgradeCheck = 0920; + LastUpgradeCheck = 0930; ORGANIZATIONNAME = "Ranchero Software"; TargetAttributes = { 849C08B51E0CAC85006B03FA = { @@ -590,6 +590,7 @@ MTL_ENABLE_DEBUG_INFO = NO; RUN_CLANG_STATIC_ANALYZER = YES; SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; SWIFT_TREAT_WARNINGS_AS_ERRORS = YES; @@ -603,6 +604,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; @@ -625,6 +627,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; @@ -646,6 +649,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = 9C84TZ7Q6Z; INFOPLIST_FILE = RSWebTests/Info.plist; @@ -659,6 +663,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = 9C84TZ7Q6Z; INFOPLIST_FILE = RSWebTests/Info.plist; @@ -672,6 +677,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; DEFINES_MODULE = YES; @@ -696,6 +702,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; DEFINES_MODULE = YES; diff --git a/xcconfig/Evergreen_project.xcconfig b/xcconfig/Evergreen_project.xcconfig index 21c28c3fd..a982e1b19 100644 --- a/xcconfig/Evergreen_project.xcconfig +++ b/xcconfig/Evergreen_project.xcconfig @@ -8,8 +8,10 @@ CLANG_CXX_LANGUAGE_STANDARD = gnu++0x CLANG_CXX_LIBRARY = libc++ CLANG_ENABLE_MODULES = YES CLANG_ENABLE_OBJC_ARC = YES +CLANG_ENABLE_OBJC_WEAK = YES ENABLE_STRICT_OBJC_MSGSEND = YES CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES +CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES CLANG_WARN_DOCUMENTATION_COMMENTS = YES CLANG_WARN_EMPTY_BODY = YES CLANG_WARN_BOOL_CONVERSION = YES @@ -33,6 +35,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES CLANG_WARN_OBJC_LITERAL_CONVERSION = YES GCC_WARN_UNDECLARED_SELECTOR = YES CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR +CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES CLANG_ANALYZER_NONNULL = YES SWIFT_SWIFT3_OBJC_INFERENCE = Off SWIFT_VERSION = 4.0 From 56a39042f3044f1bf46f41da812c63f15536421c Mon Sep 17 00:00:00 2001 From: Daniel Jalkut Date: Mon, 29 Jan 2018 11:10:43 -0500 Subject: [PATCH 4/6] Remove Garbage-Collection-specific finalize method overrides, which were flagged by new deprecated OBJC methods warning. --- .../RSDatabase/FMDB/fmdb-master/src/fmdb/FMDatabase.m | 10 ---------- .../RSDatabase/FMDB/fmdb-master/src/fmdb/FMResultSet.m | 5 ----- 2 files changed, 15 deletions(-) diff --git a/Frameworks/RSDatabase/FMDB/fmdb-master/src/fmdb/FMDatabase.m b/Frameworks/RSDatabase/FMDB/fmdb-master/src/fmdb/FMDatabase.m index cd7bf8676..685f11e08 100755 --- a/Frameworks/RSDatabase/FMDB/fmdb-master/src/fmdb/FMDatabase.m +++ b/Frameworks/RSDatabase/FMDB/fmdb-master/src/fmdb/FMDatabase.m @@ -47,11 +47,6 @@ return self; } -- (void)finalize { - [self close]; - [super finalize]; -} - - (void)dealloc { [self close]; FMDBRelease(_openResultSets); @@ -1398,11 +1393,6 @@ void FMDBBlockSQLiteCallBackFunction(sqlite3_context *context, int argc, sqlite3 @synthesize useCount=_useCount; @synthesize inUse=_inUse; -- (void)finalize { - [self close]; - [super finalize]; -} - - (void)dealloc { [self close]; FMDBRelease(_query); diff --git a/Frameworks/RSDatabase/FMDB/fmdb-master/src/fmdb/FMResultSet.m b/Frameworks/RSDatabase/FMDB/fmdb-master/src/fmdb/FMResultSet.m index e1949fd06..24848f7c5 100755 --- a/Frameworks/RSDatabase/FMDB/fmdb-master/src/fmdb/FMResultSet.m +++ b/Frameworks/RSDatabase/FMDB/fmdb-master/src/fmdb/FMResultSet.m @@ -25,11 +25,6 @@ return FMDBReturnAutoreleased(rs); } -- (void)finalize { - [self close]; - [super finalize]; -} - - (void)dealloc { [self close]; From e4136c21653a271265f48941baabe59f71568ea7 Mon Sep 17 00:00:00 2001 From: Daniel Jalkut Date: Mon, 29 Jan 2018 11:48:09 -0500 Subject: [PATCH 5/6] Sender should be Any? to reflect the fact it may be nil. This nuance seems to make the difference on Xcode 9.3/Swift 4.1 between crashing or not. Without this change, refreshing crashes every time, presumably because Swift is making assumptions about the parameter being non-nil and refreshProgressDidChange calls it explicitly with a nil parameter. --- Evergreen/MainWindow/MainWindowController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Evergreen/MainWindow/MainWindowController.swift b/Evergreen/MainWindow/MainWindowController.swift index cf0898bec..0a0b6b37a 100644 --- a/Evergreen/MainWindow/MainWindowController.swift +++ b/Evergreen/MainWindow/MainWindowController.swift @@ -113,7 +113,7 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations { // MARK: Toolbar - @objc func makeToolbarValidate(_ sender: Any) { + @objc func makeToolbarValidate(_ sender: Any?) { window?.toolbar?.validateVisibleItems() } From e038fb0fb5a4cd9e76658f9043a35d4fb5dbc5b7 Mon Sep 17 00:00:00 2001 From: Olof Hellman Date: Fri, 2 Feb 2018 03:24:13 -0800 Subject: [PATCH 6/6] convert Evergreen frameworks projects to use .xcconfig files. --- .../Account/Account.xcodeproj/project.pbxproj | 184 ++---------- .../Account/xcconfig/Account_project.xcconfig | 57 ++++ .../xcconfig/Account_project_debug.xcconfig | 15 + .../xcconfig/Account_project_release.xcconfig | 9 + .../Account/xcconfig/Account_target.xcconfig | 14 + .../xcconfig/Accounttests_target.xcconfig | 18 ++ Frameworks/DB5/DB5.xcodeproj/project.pbxproj | 159 ++-------- .../DB5/xcconfig/DB5Tests_target.xcconfig | 15 + Frameworks/DB5/xcconfig/DB5_project.xcconfig | 54 ++++ .../DB5/xcconfig/DB5_project_debug.xcconfig | 11 + .../DB5/xcconfig/DB5_project_release.xcconfig | 7 + Frameworks/DB5/xcconfig/DB5_target.xcconfig | 16 + .../Data/Data.xcodeproj/project.pbxproj | 198 +++---------- .../Data/xcconfig/DataTests_target.xcconfig | 18 ++ .../Data/xcconfig/Data_project.xcconfig | 57 ++++ .../Data/xcconfig/Data_project_debug.xcconfig | 15 + .../xcconfig/Data_project_release.xcconfig | 9 + Frameworks/Data/xcconfig/Data_target.xcconfig | 14 + .../Database.xcodeproj/project.pbxproj | 176 ++--------- .../xcconfig/DatabaseTests_target.xcconfig | 18 ++ .../xcconfig/Database_project.xcconfig | 58 ++++ .../xcconfig/Database_project_debug.xcconfig | 15 + .../Database_project_release.xcconfig | 9 + .../xcconfig/Database_target.xcconfig | 16 + .../RSCore/RSCore.xcodeproj/project.pbxproj | 279 +++--------------- .../xcconfig/RSCoreTests_target.xcconfig | 19 ++ .../xcconfig/RSCore_ios_target.xcconfig | 24 ++ .../xcconfig/RSCore_ios_target_debug.xcconfig | 5 + .../RSCore_ios_target_release.xcconfig | 4 + .../xcconfig/RSCore_mac_target.xcconfig | 17 ++ .../RSCore/xcconfig/RSCore_project.xcconfig | 64 ++++ .../xcconfig/RSCore_project_debug.xcconfig | 16 + .../xcconfig/RSCore_project_release.xcconfig | 9 + .../RSCore/xcconfig/RSCore_target.xcconfig | 12 + .../RSDatabase.xcodeproj/project.pbxproj | 233 +++------------ .../xcconfig/RSDatabaseTests_target.xcconfig | 18 ++ .../xcconfig/RSDatabase_ios_target.xcconfig | 24 ++ .../RSDatabase_ios_target_debug.xcconfig | 5 + .../RSDatabase_ios_target_release.xcconfig | 4 + .../xcconfig/RSDatabase_mac_target.xcconfig | 15 + .../xcconfig/RSDatabase_project.xcconfig | 49 +++ .../RSDatabase_project_debug.xcconfig | 15 + .../RSDatabase_project_release.xcconfig | 9 + .../xcconfig/RSDatabase_target.xcconfig | 12 + .../RSFeedFinder.xcodeproj/project.pbxproj | 167 ++--------- .../RSFeedFinderTests_target.xcconfig | 18 ++ .../xcconfig/RSFeedFinder_project.xcconfig | 58 ++++ .../RSFeedFinder_project_debug.xcconfig | 15 + .../RSFeedFinder_project_release.xcconfig | 9 + .../xcconfig/RSFeedFinder_target.xcconfig | 14 + .../RSParser.xcodeproj/project.pbxproj | 237 ++------------- .../xcconfig/RSParserTests_target.xcconfig | 18 ++ .../xcconfig/RSParser_project.xcconfig | 84 ++++++ .../xcconfig/RSParser_project_debug.xcconfig | 14 + .../RSParser_project_release.xcconfig | 9 + .../xcconfig/RSParser_target.xcconfig | 15 + .../RSTextDrawing.xcodeproj/project.pbxproj | 160 ++-------- .../RSTextDrawingTests_target.xcconfig | 18 ++ .../xcconfig/RSTextDrawing_project.xcconfig | 55 ++++ .../RSTextDrawing_project_debug.xcconfig | 15 + .../RSTextDrawing_project_release.xcconfig | 9 + .../xcconfig/RSTextDrawing_target.xcconfig | 14 + .../RSTree/RSTree.xcodeproj/project.pbxproj | 169 ++--------- .../xcconfig/RSTreeTests_target.xcconfig | 18 ++ .../RSTree/xcconfig/RSTree_project.xcconfig | 54 ++++ .../xcconfig/RSTree_project_debug.xcconfig | 15 + .../xcconfig/RSTree_project_release.xcconfig | 9 + .../RSTree/xcconfig/RSTree_target.xcconfig | 14 + .../RSWeb/RSWeb.xcodeproj/project.pbxproj | 268 +++-------------- .../RSWeb/xcconfig/RSWebTests_target.xcconfig | 18 ++ .../RSWeb/xcconfig/RSWeb_ios_target.xcconfig | 19 ++ .../xcconfig/RSWeb_ios_target_debug.xcconfig | 5 + .../RSWeb_ios_target_release.xcconfig | 4 + .../RSWeb/xcconfig/RSWeb_mac_target.xcconfig | 13 + .../RSWeb/xcconfig/RSWeb_project.xcconfig | 69 +++++ .../xcconfig/RSWeb_project_debug.xcconfig | 16 + .../xcconfig/RSWeb_project_release.xcconfig | 9 + .../RSWeb/xcconfig/RSWeb_target.xcconfig | 12 + 78 files changed, 1726 insertions(+), 1910 deletions(-) create mode 100644 Frameworks/Account/xcconfig/Account_project.xcconfig create mode 100644 Frameworks/Account/xcconfig/Account_project_debug.xcconfig create mode 100644 Frameworks/Account/xcconfig/Account_project_release.xcconfig create mode 100644 Frameworks/Account/xcconfig/Account_target.xcconfig create mode 100644 Frameworks/Account/xcconfig/Accounttests_target.xcconfig create mode 100644 Frameworks/DB5/xcconfig/DB5Tests_target.xcconfig create mode 100644 Frameworks/DB5/xcconfig/DB5_project.xcconfig create mode 100644 Frameworks/DB5/xcconfig/DB5_project_debug.xcconfig create mode 100644 Frameworks/DB5/xcconfig/DB5_project_release.xcconfig create mode 100644 Frameworks/DB5/xcconfig/DB5_target.xcconfig create mode 100644 Frameworks/Data/xcconfig/DataTests_target.xcconfig create mode 100644 Frameworks/Data/xcconfig/Data_project.xcconfig create mode 100644 Frameworks/Data/xcconfig/Data_project_debug.xcconfig create mode 100644 Frameworks/Data/xcconfig/Data_project_release.xcconfig create mode 100644 Frameworks/Data/xcconfig/Data_target.xcconfig create mode 100644 Frameworks/Database/xcconfig/DatabaseTests_target.xcconfig create mode 100644 Frameworks/Database/xcconfig/Database_project.xcconfig create mode 100644 Frameworks/Database/xcconfig/Database_project_debug.xcconfig create mode 100644 Frameworks/Database/xcconfig/Database_project_release.xcconfig create mode 100644 Frameworks/Database/xcconfig/Database_target.xcconfig create mode 100644 Frameworks/RSCore/xcconfig/RSCoreTests_target.xcconfig create mode 100644 Frameworks/RSCore/xcconfig/RSCore_ios_target.xcconfig create mode 100644 Frameworks/RSCore/xcconfig/RSCore_ios_target_debug.xcconfig create mode 100644 Frameworks/RSCore/xcconfig/RSCore_ios_target_release.xcconfig create mode 100644 Frameworks/RSCore/xcconfig/RSCore_mac_target.xcconfig create mode 100644 Frameworks/RSCore/xcconfig/RSCore_project.xcconfig create mode 100644 Frameworks/RSCore/xcconfig/RSCore_project_debug.xcconfig create mode 100644 Frameworks/RSCore/xcconfig/RSCore_project_release.xcconfig create mode 100644 Frameworks/RSCore/xcconfig/RSCore_target.xcconfig create mode 100644 Frameworks/RSDatabase/xcconfig/RSDatabaseTests_target.xcconfig create mode 100644 Frameworks/RSDatabase/xcconfig/RSDatabase_ios_target.xcconfig create mode 100644 Frameworks/RSDatabase/xcconfig/RSDatabase_ios_target_debug.xcconfig create mode 100644 Frameworks/RSDatabase/xcconfig/RSDatabase_ios_target_release.xcconfig create mode 100644 Frameworks/RSDatabase/xcconfig/RSDatabase_mac_target.xcconfig create mode 100644 Frameworks/RSDatabase/xcconfig/RSDatabase_project.xcconfig create mode 100644 Frameworks/RSDatabase/xcconfig/RSDatabase_project_debug.xcconfig create mode 100644 Frameworks/RSDatabase/xcconfig/RSDatabase_project_release.xcconfig create mode 100644 Frameworks/RSDatabase/xcconfig/RSDatabase_target.xcconfig create mode 100644 Frameworks/RSFeedFinder/xcconfig/RSFeedFinderTests_target.xcconfig create mode 100644 Frameworks/RSFeedFinder/xcconfig/RSFeedFinder_project.xcconfig create mode 100644 Frameworks/RSFeedFinder/xcconfig/RSFeedFinder_project_debug.xcconfig create mode 100644 Frameworks/RSFeedFinder/xcconfig/RSFeedFinder_project_release.xcconfig create mode 100644 Frameworks/RSFeedFinder/xcconfig/RSFeedFinder_target.xcconfig create mode 100644 Frameworks/RSParser/xcconfig/RSParserTests_target.xcconfig create mode 100644 Frameworks/RSParser/xcconfig/RSParser_project.xcconfig create mode 100644 Frameworks/RSParser/xcconfig/RSParser_project_debug.xcconfig create mode 100644 Frameworks/RSParser/xcconfig/RSParser_project_release.xcconfig create mode 100644 Frameworks/RSParser/xcconfig/RSParser_target.xcconfig create mode 100644 Frameworks/RSTextDrawing/xcconfig/RSTextDrawingTests_target.xcconfig create mode 100644 Frameworks/RSTextDrawing/xcconfig/RSTextDrawing_project.xcconfig create mode 100644 Frameworks/RSTextDrawing/xcconfig/RSTextDrawing_project_debug.xcconfig create mode 100644 Frameworks/RSTextDrawing/xcconfig/RSTextDrawing_project_release.xcconfig create mode 100644 Frameworks/RSTextDrawing/xcconfig/RSTextDrawing_target.xcconfig create mode 100644 Frameworks/RSTree/xcconfig/RSTreeTests_target.xcconfig create mode 100644 Frameworks/RSTree/xcconfig/RSTree_project.xcconfig create mode 100644 Frameworks/RSTree/xcconfig/RSTree_project_debug.xcconfig create mode 100644 Frameworks/RSTree/xcconfig/RSTree_project_release.xcconfig create mode 100644 Frameworks/RSTree/xcconfig/RSTree_target.xcconfig create mode 100644 Frameworks/RSWeb/xcconfig/RSWebTests_target.xcconfig create mode 100644 Frameworks/RSWeb/xcconfig/RSWeb_ios_target.xcconfig create mode 100644 Frameworks/RSWeb/xcconfig/RSWeb_ios_target_debug.xcconfig create mode 100644 Frameworks/RSWeb/xcconfig/RSWeb_ios_target_release.xcconfig create mode 100644 Frameworks/RSWeb/xcconfig/RSWeb_mac_target.xcconfig create mode 100644 Frameworks/RSWeb/xcconfig/RSWeb_project.xcconfig create mode 100644 Frameworks/RSWeb/xcconfig/RSWeb_project_debug.xcconfig create mode 100644 Frameworks/RSWeb/xcconfig/RSWeb_project_release.xcconfig create mode 100644 Frameworks/RSWeb/xcconfig/RSWeb_target.xcconfig diff --git a/Frameworks/Account/Account.xcodeproj/project.pbxproj b/Frameworks/Account/Account.xcodeproj/project.pbxproj index e3b97b18b..c4934b57f 100644 --- a/Frameworks/Account/Account.xcodeproj/project.pbxproj +++ b/Frameworks/Account/Account.xcodeproj/project.pbxproj @@ -128,6 +128,11 @@ 84C365491F899F3B001EC85C /* CombinedRefreshProgress.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CombinedRefreshProgress.swift; sourceTree = ""; }; 84C8B3F31F89DE430053CCA6 /* DataExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataExtensions.swift; sourceTree = ""; }; 84CAD7151FDF2E22000F0755 /* FeedbinArticle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedbinArticle.swift; sourceTree = ""; }; + D511EEB5202422BB00712EC3 /* Account_project_debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Account_project_debug.xcconfig; sourceTree = ""; }; + D511EEB6202422BB00712EC3 /* Account_target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Account_target.xcconfig; sourceTree = ""; }; + D511EEB7202422BB00712EC3 /* Account_project_release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Account_project_release.xcconfig; sourceTree = ""; }; + D511EEB8202422BB00712EC3 /* Account_project.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Account_project.xcconfig; sourceTree = ""; }; + D511EEB9202422BB00712EC3 /* Accounttests_target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Accounttests_target.xcconfig; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -239,6 +244,7 @@ 848934FA1F62484F00CEBD24 /* Info.plist */, 848935031F62484F00CEBD24 /* AccountTests */, 848934F71F62484F00CEBD24 /* Products */, + D511EEB4202422BB00712EC3 /* xcconfig */, ); sourceTree = ""; }; @@ -260,6 +266,18 @@ path = AccountTests; sourceTree = ""; }; + D511EEB4202422BB00712EC3 /* xcconfig */ = { + isa = PBXGroup; + children = ( + D511EEB8202422BB00712EC3 /* Account_project.xcconfig */, + D511EEB5202422BB00712EC3 /* Account_project_debug.xcconfig */, + D511EEB7202422BB00712EC3 /* Account_project_release.xcconfig */, + D511EEB6202422BB00712EC3 /* Account_target.xcconfig */, + D511EEB9202422BB00712EC3 /* Accounttests_target.xcconfig */, + ); + path = xcconfig; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -493,199 +511,45 @@ /* Begin XCBuildConfiguration section */ 848935081F62485000CEBD24 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EEB5202422BB00712EC3 /* Account_project_debug.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "Mac Developer"; - COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.13; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; }; name = Debug; }; 848935091F62485000CEBD24 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EEB7202422BB00712EC3 /* Account_project_release.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "Mac Developer"; - COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.13; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = macosx; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; }; name = Release; }; 8489350B1F62485000CEBD24 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EEB6202422BB00712EC3 /* Account_target.xcconfig */; buildSettings = { - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CODE_SIGN_IDENTITY = ""; - CODE_SIGN_STYLE = Automatic; - COMBINE_HIDPI_IMAGES = YES; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = M8L2WTLA8W; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.Account; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; }; name = Debug; }; 8489350C1F62485000CEBD24 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EEB6202422BB00712EC3 /* Account_target.xcconfig */; buildSettings = { - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CODE_SIGN_IDENTITY = ""; - CODE_SIGN_STYLE = Automatic; - COMBINE_HIDPI_IMAGES = YES; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = M8L2WTLA8W; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.Account; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SKIP_INSTALL = YES; - SWIFT_VERSION = 4.0; }; name = Release; }; 8489350E1F62485000CEBD24 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EEB9202422BB00712EC3 /* Accounttests_target.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CODE_SIGN_STYLE = Automatic; - COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = M8L2WTLA8W; - INFOPLIST_FILE = AccountTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.AccountTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; }; name = Debug; }; 8489350F1F62485000CEBD24 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EEB9202422BB00712EC3 /* Accounttests_target.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CODE_SIGN_STYLE = Automatic; - COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = M8L2WTLA8W; - INFOPLIST_FILE = AccountTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.AccountTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; }; name = Release; }; diff --git a/Frameworks/Account/xcconfig/Account_project.xcconfig b/Frameworks/Account/xcconfig/Account_project.xcconfig new file mode 100644 index 000000000..01aba393d --- /dev/null +++ b/Frameworks/Account/xcconfig/Account_project.xcconfig @@ -0,0 +1,57 @@ +CODE_SIGN_IDENTITY = Mac Developer +CODE_SIGN_STYLE = Automatic +DEVELOPMENT_TEAM = M8L2WTLA8W + +// See the notes in Evergreen_target.xcconfig on why the +// DeveloperSettings.xcconfig is #included here + +#include? "../../../SharedXcodeSettings/DeveloperSettings.xcconfig" + +SDKROOT = macosx +MACOSX_DEPLOYMENT_TARGET = 10.13 +CLANG_ENABLE_OBJC_WEAK = YES +SWIFT_VERSION = 4.0 +COMBINE_HIDPI_IMAGES = YES + +COPY_PHASE_STRIP = NO +MACOSX_DEPLOYMENT_TARGET = 10.13 +ALWAYS_SEARCH_USER_PATHS = NO +CURRENT_PROJECT_VERSION = 1 +VERSION_INFO_PREFIX = +VERSIONING_SYSTEM = apple-generic +GCC_NO_COMMON_BLOCKS = YES +GCC_C_LANGUAGE_STANDARD = gnu11 +CLANG_CXX_LANGUAGE_STANDARD = gnu++14 +CLANG_CXX_LIBRARY = libc++ +CLANG_ENABLE_MODULES = YES +CLANG_ENABLE_OBJC_ARC = YES +ENABLE_STRICT_OBJC_MSGSEND = YES +CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES +CLANG_WARN_DOCUMENTATION_COMMENTS = YES +CLANG_WARN_EMPTY_BODY = YES +CLANG_WARN_BOOL_CONVERSION = YES +CLANG_WARN_CONSTANT_CONVERSION = YES +GCC_WARN_64_TO_32_BIT_CONVERSION = YES +CLANG_WARN_ENUM_CONVERSION = YES +CLANG_WARN_INT_CONVERSION = YES +CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES +CLANG_WARN_INFINITE_RECURSION = YES +GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR +CLANG_WARN_STRICT_PROTOTYPES = YES +CLANG_WARN_COMMA = YES +CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE +GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE +CLANG_WARN_UNREACHABLE_CODE = YES +GCC_WARN_UNUSED_FUNCTION = YES +GCC_WARN_UNUSED_VARIABLE = YES +CLANG_WARN_RANGE_LOOP_ANALYSIS = YES +CLANG_WARN_SUSPICIOUS_MOVE = YES +CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +CLANG_WARN_OBJC_LITERAL_CONVERSION = YES +CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES +GCC_WARN_UNDECLARED_SELECTOR = YES +CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR +CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES +CLANG_ANALYZER_NONNULL = YES +CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE diff --git a/Frameworks/Account/xcconfig/Account_project_debug.xcconfig b/Frameworks/Account/xcconfig/Account_project_debug.xcconfig new file mode 100644 index 000000000..095f28641 --- /dev/null +++ b/Frameworks/Account/xcconfig/Account_project_debug.xcconfig @@ -0,0 +1,15 @@ +#include "./Account_project.xcconfig" + +DEBUG_INFORMATION_FORMAT = dwarf +ENABLE_TESTABILITY = YES +GCC_DYNAMIC_NO_PIC = NO +GCC_OPTIMIZATION_LEVEL = 0 +GCC_PREPROCESSOR_DEFINITIONS = DEBUG=1 $(inherited) + +MTL_ENABLE_DEBUG_INFO = YES +SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG +SWIFT_COMPILATION_MODE = singlefile +SWIFT_OPTIMIZATION_LEVEL = -Onone +ONLY_ACTIVE_ARCH = YES + + diff --git a/Frameworks/Account/xcconfig/Account_project_release.xcconfig b/Frameworks/Account/xcconfig/Account_project_release.xcconfig new file mode 100644 index 000000000..b613abc46 --- /dev/null +++ b/Frameworks/Account/xcconfig/Account_project_release.xcconfig @@ -0,0 +1,9 @@ +#include "./Account_project.xcconfig" + +DEBUG_INFORMATION_FORMAT = dwarf-with-dsym +ENABLE_NS_ASSERTIONS = NO + +MTL_ENABLE_DEBUG_INFO = NO +SWIFT_OPTIMIZATION_LEVEL = -O + +SWIFT_COMPILATION_MODE = wholemodule diff --git a/Frameworks/Account/xcconfig/Account_target.xcconfig b/Frameworks/Account/xcconfig/Account_target.xcconfig new file mode 100644 index 000000000..ce05ec71b --- /dev/null +++ b/Frameworks/Account/xcconfig/Account_target.xcconfig @@ -0,0 +1,14 @@ + +INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Frameworks +SKIP_INSTALL = YES +DYLIB_COMPATIBILITY_VERSION = 1 +DYLIB_CURRENT_VERSION = 1 +DYLIB_INSTALL_NAME_BASE = @rpath +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/Frameworks +DEFINES_MODULE = YES +FRAMEWORK_VERSION = A +INFOPLIST_FILE = Info.plist +PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.Account +PRODUCT_NAME = $(TARGET_NAME:c99extidentifier) +CLANG_ENABLE_MODULES = YES + diff --git a/Frameworks/Account/xcconfig/Accounttests_target.xcconfig b/Frameworks/Account/xcconfig/Accounttests_target.xcconfig new file mode 100644 index 000000000..a2dcf98de --- /dev/null +++ b/Frameworks/Account/xcconfig/Accounttests_target.xcconfig @@ -0,0 +1,18 @@ +ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks +INFOPLIST_FILE = AccountTests/Info.plist +PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.AccountTests +PRODUCT_NAME = $(TARGET_NAME) + + + + + + + + + + + + + diff --git a/Frameworks/DB5/DB5.xcodeproj/project.pbxproj b/Frameworks/DB5/DB5.xcodeproj/project.pbxproj index a097758f7..a6341fc8a 100644 --- a/Frameworks/DB5/DB5.xcodeproj/project.pbxproj +++ b/Frameworks/DB5/DB5.xcodeproj/project.pbxproj @@ -37,6 +37,11 @@ 84F22BEC1B52DC48000060CE /* VSTheme.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VSTheme.m; path = DB5/VSTheme.m; sourceTree = ""; }; 84F22BED1B52DC48000060CE /* VSThemeLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VSThemeLoader.h; path = DB5/VSThemeLoader.h; sourceTree = ""; }; 84F22BEE1B52DC48000060CE /* VSThemeLoader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VSThemeLoader.m; path = DB5/VSThemeLoader.m; sourceTree = ""; }; + D511EEF720242E3E00712EC3 /* DB5_project_debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DB5_project_debug.xcconfig; sourceTree = ""; }; + D511EEF820242E3E00712EC3 /* DB5Tests_target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DB5Tests_target.xcconfig; sourceTree = ""; }; + D511EEF920242E3E00712EC3 /* DB5_project.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DB5_project.xcconfig; sourceTree = ""; }; + D511EEFA20242E3E00712EC3 /* DB5_target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DB5_target.xcconfig; sourceTree = ""; }; + D511EEFB20242E3E00712EC3 /* DB5_project_release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DB5_project_release.xcconfig; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -69,6 +74,7 @@ 84F22BD61B52DC2E000060CE /* Info.plist */, 84F22BDF1B52DC2E000060CE /* DB5Tests */, 84F22BD21B52DC2E000060CE /* Products */, + D511EEF620242E3E00712EC3 /* xcconfig */, ); sourceTree = ""; }; @@ -90,6 +96,18 @@ path = DB5Tests; sourceTree = ""; }; + D511EEF620242E3E00712EC3 /* xcconfig */ = { + isa = PBXGroup; + children = ( + D511EEF720242E3E00712EC3 /* DB5_project_debug.xcconfig */, + D511EEF820242E3E00712EC3 /* DB5Tests_target.xcconfig */, + D511EEF920242E3E00712EC3 /* DB5_project.xcconfig */, + D511EEFA20242E3E00712EC3 /* DB5_target.xcconfig */, + D511EEFB20242E3E00712EC3 /* DB5_project_release.xcconfig */, + ); + path = xcconfig; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -227,172 +245,43 @@ /* Begin XCBuildConfiguration section */ 84F22BE31B52DC2E000060CE /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EEF720242E3E00712EC3 /* DB5_project_debug.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.13; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; }; name = Debug; }; 84F22BE41B52DC2E000060CE /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EEFB20242E3E00712EC3 /* DB5_project_release.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.13; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = macosx; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; }; name = Release; }; 84F22BE61B52DC2E000060CE /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EEFA20242E3E00712EC3 /* DB5_target.xcconfig */; buildSettings = { - CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - COMBINE_HIDPI_IMAGES = YES; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - INFOPLIST_FILE = DB5/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.DB5; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; }; name = Debug; }; 84F22BE71B52DC2E000060CE /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EEFA20242E3E00712EC3 /* DB5_target.xcconfig */; buildSettings = { - CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - COMBINE_HIDPI_IMAGES = YES; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - INFOPLIST_FILE = DB5/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.DB5; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; }; name = Release; }; 84F22BE91B52DC2E000060CE /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EEF820242E3E00712EC3 /* DB5Tests_target.xcconfig */; buildSettings = { - CLANG_ENABLE_OBJC_WEAK = YES; - COMBINE_HIDPI_IMAGES = YES; - INFOPLIST_FILE = DB5Tests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.DB5Tests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; }; name = Debug; }; 84F22BEA1B52DC2E000060CE /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EEF820242E3E00712EC3 /* DB5Tests_target.xcconfig */; buildSettings = { - CLANG_ENABLE_OBJC_WEAK = YES; - COMBINE_HIDPI_IMAGES = YES; - INFOPLIST_FILE = DB5Tests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.DB5Tests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; }; name = Release; }; diff --git a/Frameworks/DB5/xcconfig/DB5Tests_target.xcconfig b/Frameworks/DB5/xcconfig/DB5Tests_target.xcconfig new file mode 100644 index 000000000..8bb78cf79 --- /dev/null +++ b/Frameworks/DB5/xcconfig/DB5Tests_target.xcconfig @@ -0,0 +1,15 @@ + +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks +INFOPLIST_FILE = DB5Tests/Info.plist +PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.DB5Tests +PRODUCT_NAME = $(TARGET_NAME) + + + + + + + + + + diff --git a/Frameworks/DB5/xcconfig/DB5_project.xcconfig b/Frameworks/DB5/xcconfig/DB5_project.xcconfig new file mode 100644 index 000000000..77e3c069b --- /dev/null +++ b/Frameworks/DB5/xcconfig/DB5_project.xcconfig @@ -0,0 +1,54 @@ +// CODE_SIGN_IDENTITY = +// CODE_SIGN_STYLE = Automatic +// DEVELOPMENT_TEAM = M8L2WTLA8W + +// See the notes in Evergreen_target.xcconfig on why the +// DeveloperSettings.xcconfig is #included here + +#include? "../../../SharedXcodeSettings/DeveloperSettings.xcconfig" + +SDKROOT = macosx +MACOSX_DEPLOYMENT_TARGET = 10.13 +CLANG_ENABLE_OBJC_WEAK = YES +SWIFT_VERSION = 3.0 +COMBINE_HIDPI_IMAGES = YES + +COPY_PHASE_STRIP = NO +MACOSX_DEPLOYMENT_TARGET = 10.13 +ALWAYS_SEARCH_USER_PATHS = NO +CURRENT_PROJECT_VERSION = 1 +VERSION_INFO_PREFIX = +VERSIONING_SYSTEM = apple-generic +GCC_NO_COMMON_BLOCKS = YES +GCC_C_LANGUAGE_STANDARD = gnu99 +CLANG_CXX_LANGUAGE_STANDARD = gnu++0x +CLANG_CXX_LIBRARY = libc++ +CLANG_ENABLE_MODULES = YES +CLANG_ENABLE_OBJC_ARC = YES +ENABLE_STRICT_OBJC_MSGSEND = YES +CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES +CLANG_WARN_EMPTY_BODY = YES +CLANG_WARN_BOOL_CONVERSION = YES +CLANG_WARN_CONSTANT_CONVERSION = YES +GCC_WARN_64_TO_32_BIT_CONVERSION = YES +CLANG_WARN_ENUM_CONVERSION = YES +CLANG_WARN_INT_CONVERSION = YES +CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES +CLANG_WARN_INFINITE_RECURSION = YES +GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR +CLANG_WARN_STRICT_PROTOTYPES = YES +CLANG_WARN_COMMA = YES +CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE +GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE +CLANG_WARN_UNREACHABLE_CODE = YES +GCC_WARN_UNUSED_FUNCTION = YES +GCC_WARN_UNUSED_VARIABLE = YES +CLANG_WARN_RANGE_LOOP_ANALYSIS = YES +CLANG_WARN_SUSPICIOUS_MOVE = YES +CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +CLANG_WARN_OBJC_LITERAL_CONVERSION = YES +CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES +GCC_WARN_UNDECLARED_SELECTOR = YES +CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR +CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES diff --git a/Frameworks/DB5/xcconfig/DB5_project_debug.xcconfig b/Frameworks/DB5/xcconfig/DB5_project_debug.xcconfig new file mode 100644 index 000000000..83134fa20 --- /dev/null +++ b/Frameworks/DB5/xcconfig/DB5_project_debug.xcconfig @@ -0,0 +1,11 @@ +#include "./DB5_project.xcconfig" + +DEBUG_INFORMATION_FORMAT = dwarf +ENABLE_TESTABILITY = YES +GCC_DYNAMIC_NO_PIC = NO +GCC_OPTIMIZATION_LEVEL = 0 +GCC_PREPROCESSOR_DEFINITIONS = DEBUG=1 $(inherited) + +MTL_ENABLE_DEBUG_INFO = YES +ONLY_ACTIVE_ARCH = YES + diff --git a/Frameworks/DB5/xcconfig/DB5_project_release.xcconfig b/Frameworks/DB5/xcconfig/DB5_project_release.xcconfig new file mode 100644 index 000000000..b9ed4398c --- /dev/null +++ b/Frameworks/DB5/xcconfig/DB5_project_release.xcconfig @@ -0,0 +1,7 @@ +#include "./DB5_project.xcconfig" + +DEBUG_INFORMATION_FORMAT = dwarf-with-dsym +ENABLE_NS_ASSERTIONS = NO + +MTL_ENABLE_DEBUG_INFO = NO + diff --git a/Frameworks/DB5/xcconfig/DB5_target.xcconfig b/Frameworks/DB5/xcconfig/DB5_target.xcconfig new file mode 100644 index 000000000..b5494e7dc --- /dev/null +++ b/Frameworks/DB5/xcconfig/DB5_target.xcconfig @@ -0,0 +1,16 @@ + +INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Frameworks +SKIP_INSTALL = YES +DYLIB_COMPATIBILITY_VERSION = 1 +DYLIB_CURRENT_VERSION = 1 +DYLIB_INSTALL_NAME_BASE = @rpath +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/Frameworks +DEFINES_MODULE = YES +FRAMEWORK_VERSION = A +INFOPLIST_FILE = DB5/Info.plist +PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.DB5 +PRODUCT_NAME = $(TARGET_NAME:c99extidentifier) +CLANG_ENABLE_MODULES = YES +CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES + + diff --git a/Frameworks/Data/Data.xcodeproj/project.pbxproj b/Frameworks/Data/Data.xcodeproj/project.pbxproj index d1164a22a..c6cd8a114 100644 --- a/Frameworks/Data/Data.xcodeproj/project.pbxproj +++ b/Frameworks/Data/Data.xcodeproj/project.pbxproj @@ -66,6 +66,16 @@ 844BEE841F0AB4DB004AB7CD /* ArticleStatus.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ArticleStatus.swift; sourceTree = ""; }; 844BEE9C1F0AB512004AB7CD /* RSCore.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RSCore.xcodeproj; path = ../RSCore/RSCore.xcodeproj; sourceTree = ""; }; 84C490F51F705D5F003131D2 /* RSWeb.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = RSWeb.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D511EEC420242DF400712EC3 /* DataTests_target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DataTests_target.xcconfig; sourceTree = ""; }; + D511EEC520242DF400712EC3 /* Data_project_debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Data_project_debug.xcconfig; sourceTree = ""; }; + D511EEC620242DF400712EC3 /* Data_project.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Data_project.xcconfig; sourceTree = ""; }; + D511EEC720242DF400712EC3 /* Data_target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Data_target.xcconfig; sourceTree = ""; }; + D511EEC820242DF400712EC3 /* Data_project_release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Data_project_release.xcconfig; sourceTree = ""; }; + D511EEE020242DFB00712EC3 /* DataTests_target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DataTests_target.xcconfig; sourceTree = ""; }; + D511EEE120242DFB00712EC3 /* Data_project_debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Data_project_debug.xcconfig; sourceTree = ""; }; + D511EEE220242DFB00712EC3 /* Data_project.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Data_project.xcconfig; sourceTree = ""; }; + D511EEE320242DFB00712EC3 /* Data_target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Data_target.xcconfig; sourceTree = ""; }; + D511EEE420242DFB00712EC3 /* Data_project_release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Data_project_release.xcconfig; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -92,6 +102,7 @@ 844BEE511F0AB3C8004AB7CD = { isa = PBXGroup; children = ( + D511EEC320242DF400712EC3 /* xcconfig */, 844BEE7C1F0AB4C4004AB7CD /* Feed.swift */, 844BEE7E1F0AB4CA004AB7CD /* Article.swift */, 844BEE801F0AB4D0004AB7CD /* Author.swift */, @@ -103,6 +114,7 @@ 844BEE681F0AB3C9004AB7CD /* DataTests */, 844BEE5C1F0AB3C8004AB7CD /* Products */, 844BEEA81F0AB520004AB7CD /* Frameworks */, + D511EEE520242DFB00712EC3 /* xcconfig */, ); sourceTree = ""; }; @@ -143,6 +155,30 @@ name = Frameworks; sourceTree = ""; }; + D511EEC320242DF400712EC3 /* xcconfig */ = { + isa = PBXGroup; + children = ( + D511EEC420242DF400712EC3 /* DataTests_target.xcconfig */, + D511EEC520242DF400712EC3 /* Data_project_debug.xcconfig */, + D511EEC620242DF400712EC3 /* Data_project.xcconfig */, + D511EEC720242DF400712EC3 /* Data_target.xcconfig */, + D511EEC820242DF400712EC3 /* Data_project_release.xcconfig */, + ); + path = xcconfig; + sourceTree = ""; + }; + D511EEE520242DFB00712EC3 /* xcconfig */ = { + isa = PBXGroup; + children = ( + D511EEE220242DFB00712EC3 /* Data_project.xcconfig */, + D511EEE120242DFB00712EC3 /* Data_project_debug.xcconfig */, + D511EEE420242DFB00712EC3 /* Data_project_release.xcconfig */, + D511EEE320242DFB00712EC3 /* Data_target.xcconfig */, + D511EEE020242DFB00712EC3 /* DataTests_target.xcconfig */, + ); + path = xcconfig; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -316,193 +352,43 @@ /* Begin XCBuildConfiguration section */ 844BEE6D1F0AB3C9004AB7CD /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EEC520242DF400712EC3 /* Data_project_debug.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.13; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; }; name = Debug; }; 844BEE6E1F0AB3C9004AB7CD /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EEC820242DF400712EC3 /* Data_project_release.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.13; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = macosx; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; }; name = Release; }; 844BEE701F0AB3C9004AB7CD /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EEC720242DF400712EC3 /* Data_target.xcconfig */; buildSettings = { - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CODE_SIGN_IDENTITY = ""; - COMBINE_HIDPI_IMAGES = YES; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = 9C84TZ7Q6Z; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.Data; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; }; name = Debug; }; 844BEE711F0AB3C9004AB7CD /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EEC720242DF400712EC3 /* Data_target.xcconfig */; buildSettings = { - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CODE_SIGN_IDENTITY = ""; - COMBINE_HIDPI_IMAGES = YES; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = 9C84TZ7Q6Z; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.Data; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; }; name = Release; }; 844BEE731F0AB3C9004AB7CD /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EEC420242DF400712EC3 /* DataTests_target.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = 9C84TZ7Q6Z; - INFOPLIST_FILE = DataTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.DataTests; - PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; }; 844BEE741F0AB3C9004AB7CD /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EEC420242DF400712EC3 /* DataTests_target.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = 9C84TZ7Q6Z; - INFOPLIST_FILE = DataTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.DataTests; - PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; }; diff --git a/Frameworks/Data/xcconfig/DataTests_target.xcconfig b/Frameworks/Data/xcconfig/DataTests_target.xcconfig new file mode 100644 index 000000000..3eb9f511f --- /dev/null +++ b/Frameworks/Data/xcconfig/DataTests_target.xcconfig @@ -0,0 +1,18 @@ +ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks +INFOPLIST_FILE = DataTests/Info.plist +PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.DataTests +PRODUCT_NAME = $(TARGET_NAME) + + + + + + + + + + + + + diff --git a/Frameworks/Data/xcconfig/Data_project.xcconfig b/Frameworks/Data/xcconfig/Data_project.xcconfig new file mode 100644 index 000000000..01aba393d --- /dev/null +++ b/Frameworks/Data/xcconfig/Data_project.xcconfig @@ -0,0 +1,57 @@ +CODE_SIGN_IDENTITY = Mac Developer +CODE_SIGN_STYLE = Automatic +DEVELOPMENT_TEAM = M8L2WTLA8W + +// See the notes in Evergreen_target.xcconfig on why the +// DeveloperSettings.xcconfig is #included here + +#include? "../../../SharedXcodeSettings/DeveloperSettings.xcconfig" + +SDKROOT = macosx +MACOSX_DEPLOYMENT_TARGET = 10.13 +CLANG_ENABLE_OBJC_WEAK = YES +SWIFT_VERSION = 4.0 +COMBINE_HIDPI_IMAGES = YES + +COPY_PHASE_STRIP = NO +MACOSX_DEPLOYMENT_TARGET = 10.13 +ALWAYS_SEARCH_USER_PATHS = NO +CURRENT_PROJECT_VERSION = 1 +VERSION_INFO_PREFIX = +VERSIONING_SYSTEM = apple-generic +GCC_NO_COMMON_BLOCKS = YES +GCC_C_LANGUAGE_STANDARD = gnu11 +CLANG_CXX_LANGUAGE_STANDARD = gnu++14 +CLANG_CXX_LIBRARY = libc++ +CLANG_ENABLE_MODULES = YES +CLANG_ENABLE_OBJC_ARC = YES +ENABLE_STRICT_OBJC_MSGSEND = YES +CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES +CLANG_WARN_DOCUMENTATION_COMMENTS = YES +CLANG_WARN_EMPTY_BODY = YES +CLANG_WARN_BOOL_CONVERSION = YES +CLANG_WARN_CONSTANT_CONVERSION = YES +GCC_WARN_64_TO_32_BIT_CONVERSION = YES +CLANG_WARN_ENUM_CONVERSION = YES +CLANG_WARN_INT_CONVERSION = YES +CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES +CLANG_WARN_INFINITE_RECURSION = YES +GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR +CLANG_WARN_STRICT_PROTOTYPES = YES +CLANG_WARN_COMMA = YES +CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE +GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE +CLANG_WARN_UNREACHABLE_CODE = YES +GCC_WARN_UNUSED_FUNCTION = YES +GCC_WARN_UNUSED_VARIABLE = YES +CLANG_WARN_RANGE_LOOP_ANALYSIS = YES +CLANG_WARN_SUSPICIOUS_MOVE = YES +CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +CLANG_WARN_OBJC_LITERAL_CONVERSION = YES +CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES +GCC_WARN_UNDECLARED_SELECTOR = YES +CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR +CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES +CLANG_ANALYZER_NONNULL = YES +CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE diff --git a/Frameworks/Data/xcconfig/Data_project_debug.xcconfig b/Frameworks/Data/xcconfig/Data_project_debug.xcconfig new file mode 100644 index 000000000..8763d0f0c --- /dev/null +++ b/Frameworks/Data/xcconfig/Data_project_debug.xcconfig @@ -0,0 +1,15 @@ +#include "./Data_project.xcconfig" + +DEBUG_INFORMATION_FORMAT = dwarf +ENABLE_TESTABILITY = YES +GCC_DYNAMIC_NO_PIC = NO +GCC_OPTIMIZATION_LEVEL = 0 +GCC_PREPROCESSOR_DEFINITIONS = DEBUG=1 $(inherited) + +MTL_ENABLE_DEBUG_INFO = YES +SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG +SWIFT_COMPILATION_MODE = singlefile +SWIFT_OPTIMIZATION_LEVEL = -Onone +ONLY_ACTIVE_ARCH = YES + + diff --git a/Frameworks/Data/xcconfig/Data_project_release.xcconfig b/Frameworks/Data/xcconfig/Data_project_release.xcconfig new file mode 100644 index 000000000..07867d541 --- /dev/null +++ b/Frameworks/Data/xcconfig/Data_project_release.xcconfig @@ -0,0 +1,9 @@ +#include "./Data_project.xcconfig" + +DEBUG_INFORMATION_FORMAT = dwarf-with-dsym +ENABLE_NS_ASSERTIONS = NO + +MTL_ENABLE_DEBUG_INFO = NO +SWIFT_OPTIMIZATION_LEVEL = -O + +SWIFT_COMPILATION_MODE = wholemodule diff --git a/Frameworks/Data/xcconfig/Data_target.xcconfig b/Frameworks/Data/xcconfig/Data_target.xcconfig new file mode 100644 index 000000000..ce6d1fb99 --- /dev/null +++ b/Frameworks/Data/xcconfig/Data_target.xcconfig @@ -0,0 +1,14 @@ + +INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Frameworks +SKIP_INSTALL = YES +DYLIB_COMPATIBILITY_VERSION = 1 +DYLIB_CURRENT_VERSION = 1 +DYLIB_INSTALL_NAME_BASE = @rpath +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/Frameworks +DEFINES_MODULE = YES +FRAMEWORK_VERSION = A +INFOPLIST_FILE = Info.plist +PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.Data +PRODUCT_NAME = $(TARGET_NAME) +CLANG_ENABLE_MODULES = YES + diff --git a/Frameworks/Database/Database.xcodeproj/project.pbxproj b/Frameworks/Database/Database.xcodeproj/project.pbxproj index f8bb2e4ff..b4a290ffe 100644 --- a/Frameworks/Database/Database.xcodeproj/project.pbxproj +++ b/Frameworks/Database/Database.xcodeproj/project.pbxproj @@ -141,6 +141,11 @@ 84E157001F0AB89B00F8CC05 /* RSDatabase.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RSDatabase.xcodeproj; path = ../RSDatabase/RSDatabase.xcodeproj; sourceTree = ""; }; 84F20F8E1F180D8700D8E682 /* AuthorsTable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthorsTable.swift; sourceTree = ""; }; 84F20F901F1810DD00D8E682 /* Author+Database.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = "Author+Database.swift"; path = "Extensions/Author+Database.swift"; sourceTree = ""; }; + D511EEE720242E0800712EC3 /* DatabaseTests_target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DatabaseTests_target.xcconfig; sourceTree = ""; }; + D511EEE820242E0800712EC3 /* Database_target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Database_target.xcconfig; sourceTree = ""; }; + D511EEE920242E0800712EC3 /* Database_project.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Database_project.xcconfig; sourceTree = ""; }; + D511EEEA20242E0800712EC3 /* Database_project_debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Database_project_debug.xcconfig; sourceTree = ""; }; + D511EEEB20242E0800712EC3 /* Database_project_release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Database_project_release.xcconfig; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -183,6 +188,7 @@ 844BEE441F0AB3AB004AB7CD /* DatabaseTests */, 844BEE381F0AB3AA004AB7CD /* Products */, 84E156FB1F0AB83A00F8CC05 /* Frameworks */, + D511EEE620242E0800712EC3 /* xcconfig */, ); sourceTree = ""; }; @@ -269,6 +275,18 @@ name = Products; sourceTree = ""; }; + D511EEE620242E0800712EC3 /* xcconfig */ = { + isa = PBXGroup; + children = ( + D511EEE720242E0800712EC3 /* DatabaseTests_target.xcconfig */, + D511EEE820242E0800712EC3 /* Database_target.xcconfig */, + D511EEE920242E0800712EC3 /* Database_project.xcconfig */, + D511EEEA20242E0800712EC3 /* Database_project_debug.xcconfig */, + D511EEEB20242E0800712EC3 /* Database_project_release.xcconfig */, + ); + path = xcconfig; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -514,193 +532,47 @@ /* Begin XCBuildConfiguration section */ 844BEE491F0AB3AB004AB7CD /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EEEA20242E0800712EC3 /* Database_project_debug.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "-"; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.13; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; }; name = Debug; }; 844BEE4A1F0AB3AB004AB7CD /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EEEB20242E0800712EC3 /* Database_project_release.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "-"; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.13; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = macosx; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; }; name = Release; }; 844BEE4C1F0AB3AB004AB7CD /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EEE820242E0800712EC3 /* Database_target.xcconfig */; buildSettings = { - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CODE_SIGN_IDENTITY = ""; - COMBINE_HIDPI_IMAGES = YES; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = 9C84TZ7Q6Z; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.Database; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; }; name = Debug; }; 844BEE4D1F0AB3AB004AB7CD /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EEE820242E0800712EC3 /* Database_target.xcconfig */; buildSettings = { - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CODE_SIGN_IDENTITY = ""; - COMBINE_HIDPI_IMAGES = YES; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = 9C84TZ7Q6Z; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.Database; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; }; name = Release; }; 844BEE4F1F0AB3AB004AB7CD /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EEE720242E0800712EC3 /* DatabaseTests_target.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = 9C84TZ7Q6Z; - INFOPLIST_FILE = DatabaseTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.DatabaseTests; - PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; }; 844BEE501F0AB3AB004AB7CD /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EEE720242E0800712EC3 /* DatabaseTests_target.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = 9C84TZ7Q6Z; - INFOPLIST_FILE = DatabaseTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.DatabaseTests; - PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; }; diff --git a/Frameworks/Database/xcconfig/DatabaseTests_target.xcconfig b/Frameworks/Database/xcconfig/DatabaseTests_target.xcconfig new file mode 100644 index 000000000..cf6b48da7 --- /dev/null +++ b/Frameworks/Database/xcconfig/DatabaseTests_target.xcconfig @@ -0,0 +1,18 @@ +ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks +INFOPLIST_FILE = DatabaseTests/Info.plist +PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.DatabaseTests +PRODUCT_NAME = $(TARGET_NAME) + + + + + + + + + + + + + diff --git a/Frameworks/Database/xcconfig/Database_project.xcconfig b/Frameworks/Database/xcconfig/Database_project.xcconfig new file mode 100644 index 000000000..63ecf06f8 --- /dev/null +++ b/Frameworks/Database/xcconfig/Database_project.xcconfig @@ -0,0 +1,58 @@ +CODE_SIGN_IDENTITY = Mac Developer +CODE_SIGN_STYLE = Automatic +DEVELOPMENT_TEAM = 9C84TZ7Q6Z + +// See the notes in Evergreen_target.xcconfig on why the +// DeveloperSettings.xcconfig is #included here + +#include? "../../../SharedXcodeSettings/DeveloperSettings.xcconfig" + +SDKROOT = macosx +MACOSX_DEPLOYMENT_TARGET = 10.13 +CLANG_ENABLE_OBJC_WEAK = YES +SWIFT_VERSION = 4.0 +COMBINE_HIDPI_IMAGES = YES + +COPY_PHASE_STRIP = NO +MACOSX_DEPLOYMENT_TARGET = 10.13 +ALWAYS_SEARCH_USER_PATHS = NO +CURRENT_PROJECT_VERSION = 1 +VERSION_INFO_PREFIX = +VERSIONING_SYSTEM = apple-generic +GCC_NO_COMMON_BLOCKS = YES +GCC_C_LANGUAGE_STANDARD = gnu99 +CLANG_CXX_LANGUAGE_STANDARD = gnu++0x +CLANG_CXX_LIBRARY = libc++ +CLANG_ENABLE_MODULES = YES +CLANG_ENABLE_OBJC_ARC = YES +ENABLE_STRICT_OBJC_MSGSEND = YES +CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES +CLANG_WARN_DOCUMENTATION_COMMENTS = YES +CLANG_WARN_EMPTY_BODY = YES +CLANG_WARN_BOOL_CONVERSION = YES +CLANG_WARN_CONSTANT_CONVERSION = YES +GCC_WARN_64_TO_32_BIT_CONVERSION = YES +CLANG_WARN_ENUM_CONVERSION = YES +CLANG_WARN_INT_CONVERSION = YES +CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES +CLANG_WARN_INFINITE_RECURSION = YES +GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR +CLANG_WARN_STRICT_PROTOTYPES = YES +CLANG_WARN_COMMA = YES +CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE +GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE +CLANG_WARN_UNREACHABLE_CODE = YES +GCC_WARN_UNUSED_FUNCTION = YES +GCC_WARN_UNUSED_VARIABLE = YES +CLANG_WARN_RANGE_LOOP_ANALYSIS = YES +CLANG_WARN_SUSPICIOUS_MOVE = YES +CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +CLANG_WARN_OBJC_LITERAL_CONVERSION = YES +CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES +GCC_WARN_UNDECLARED_SELECTOR = YES +CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR +CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES +CLANG_ANALYZER_NONNULL = YES +CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE +SWIFT_SWIFT3_OBJC_INFERENCE = Off diff --git a/Frameworks/Database/xcconfig/Database_project_debug.xcconfig b/Frameworks/Database/xcconfig/Database_project_debug.xcconfig new file mode 100644 index 000000000..cef316083 --- /dev/null +++ b/Frameworks/Database/xcconfig/Database_project_debug.xcconfig @@ -0,0 +1,15 @@ +#include "./Database_project.xcconfig" + +DEBUG_INFORMATION_FORMAT = dwarf +ENABLE_TESTABILITY = YES +GCC_DYNAMIC_NO_PIC = NO +GCC_OPTIMIZATION_LEVEL = 0 +GCC_PREPROCESSOR_DEFINITIONS = DEBUG=1 $(inherited) + +MTL_ENABLE_DEBUG_INFO = YES +SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG +SWIFT_COMPILATION_MODE = singlefile +SWIFT_OPTIMIZATION_LEVEL = -Onone +ONLY_ACTIVE_ARCH = YES + + diff --git a/Frameworks/Database/xcconfig/Database_project_release.xcconfig b/Frameworks/Database/xcconfig/Database_project_release.xcconfig new file mode 100644 index 000000000..f28860d07 --- /dev/null +++ b/Frameworks/Database/xcconfig/Database_project_release.xcconfig @@ -0,0 +1,9 @@ +#include "./Database_project.xcconfig" + +DEBUG_INFORMATION_FORMAT = dwarf-with-dsym +ENABLE_NS_ASSERTIONS = NO + +MTL_ENABLE_DEBUG_INFO = NO +SWIFT_OPTIMIZATION_LEVEL = -O + +SWIFT_COMPILATION_MODE = wholemodule diff --git a/Frameworks/Database/xcconfig/Database_target.xcconfig b/Frameworks/Database/xcconfig/Database_target.xcconfig new file mode 100644 index 000000000..3c1e45c05 --- /dev/null +++ b/Frameworks/Database/xcconfig/Database_target.xcconfig @@ -0,0 +1,16 @@ +CODE_SIGN_IDENTITY = +// DEVELOPMENT_TEAM = 9C84TZ7Q6Z + +INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Frameworks +SKIP_INSTALL = YES +DYLIB_COMPATIBILITY_VERSION = 1 +DYLIB_CURRENT_VERSION = 1 +DYLIB_INSTALL_NAME_BASE = @rpath +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/Frameworks +DEFINES_MODULE = YES +FRAMEWORK_VERSION = A +INFOPLIST_FILE = Info.plist +PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.Database +PRODUCT_NAME = $(TARGET_NAME) +CLANG_ENABLE_MODULES = YES + diff --git a/Frameworks/RSCore/RSCore.xcodeproj/project.pbxproj b/Frameworks/RSCore/RSCore.xcodeproj/project.pbxproj index b036c6a16..4512910e0 100755 --- a/Frameworks/RSCore/RSCore.xcodeproj/project.pbxproj +++ b/Frameworks/RSCore/RSCore.xcodeproj/project.pbxproj @@ -280,6 +280,15 @@ 84FE9FC11C00453900081CE9 /* NSStoryboard+RSCore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSStoryboard+RSCore.h"; sourceTree = ""; }; 84FE9FC21C00453900081CE9 /* NSStoryboard+RSCore.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSStoryboard+RSCore.m"; sourceTree = ""; }; 84FEB4AB1D19D7F4004727E5 /* Date+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Date+Extensions.swift"; sourceTree = ""; }; + D511EEFD20242E4C00712EC3 /* RSCore_target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSCore_target.xcconfig; sourceTree = ""; }; + D511EEFE20242E4C00712EC3 /* RSCore_project.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSCore_project.xcconfig; sourceTree = ""; }; + D511EEFF20242E4C00712EC3 /* RSCoreTests_target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSCoreTests_target.xcconfig; sourceTree = ""; }; + D511EF0020242E4C00712EC3 /* RSCore_project_release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSCore_project_release.xcconfig; sourceTree = ""; }; + D511EF0120242E4C00712EC3 /* RSCore_project_debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSCore_project_debug.xcconfig; sourceTree = ""; }; + D511EF2620243B6300712EC3 /* RSCore_mac_target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSCore_mac_target.xcconfig; sourceTree = ""; }; + D511EF2720243B6300712EC3 /* RSCore_ios_target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSCore_ios_target.xcconfig; sourceTree = ""; }; + D511EF2A202446E300712EC3 /* RSCore_ios_target_debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSCore_ios_target_debug.xcconfig; sourceTree = ""; }; + D511EF2B202446E300712EC3 /* RSCore_ios_target_release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSCore_ios_target_release.xcconfig; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -360,6 +369,7 @@ 84CFF5031AC3C69700CEA6C8 /* RSCoreTests */, 842DD7BD1E14993900E061EB /* RSCoreiOS */, 84CFF4F51AC3C69700CEA6C8 /* Products */, + D511EEFC20242E4C00712EC3 /* xcconfig */, ); sourceTree = ""; }; @@ -486,6 +496,22 @@ path = RSCore; sourceTree = ""; }; + D511EEFC20242E4C00712EC3 /* xcconfig */ = { + isa = PBXGroup; + children = ( + D511EEFE20242E4C00712EC3 /* RSCore_project.xcconfig */, + D511EF0120242E4C00712EC3 /* RSCore_project_debug.xcconfig */, + D511EF0020242E4C00712EC3 /* RSCore_project_release.xcconfig */, + D511EEFD20242E4C00712EC3 /* RSCore_target.xcconfig */, + D511EF2620243B6300712EC3 /* RSCore_mac_target.xcconfig */, + D511EF2720243B6300712EC3 /* RSCore_ios_target.xcconfig */, + D511EF2A202446E300712EC3 /* RSCore_ios_target_debug.xcconfig */, + D511EF2B202446E300712EC3 /* RSCore_ios_target_release.xcconfig */, + D511EEFF20242E4C00712EC3 /* RSCoreTests_target.xcconfig */, + ); + path = xcconfig; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -818,294 +844,57 @@ /* Begin XCBuildConfiguration section */ 842DD7C21E14993900E061EB /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF2A202446E300712EC3 /* RSCore_ios_target_debug.xcconfig */; buildSettings = { - CLANG_ANALYZER_NONNULL = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - DEBUG_INFORMATION_FORMAT = dwarf; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = 9C84TZ7Q6Z; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_TESTABILITY = YES; - GCC_NO_COMMON_BLOCKS = YES; - INFOPLIST_FILE = RSCoreiOS/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.2; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSCoreiOS; - PRODUCT_NAME = RSCore; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; 842DD7C31E14993900E061EB /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF2B202446E300712EC3 /* RSCore_ios_target_release.xcconfig */; buildSettings = { - CLANG_ANALYZER_NONNULL = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = 9C84TZ7Q6Z; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_NO_COMMON_BLOCKS = YES; - INFOPLIST_FILE = RSCoreiOS/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.2; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSCoreiOS; - PRODUCT_NAME = RSCore; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; }; name = Release; }; 84CFF5081AC3C69700CEA6C8 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF0120242E4C00712EC3 /* RSCore_project_debug.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES; - CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES; - CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_STATIC_ANALYZER_MODE = deep; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; - GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES; - GCC_TREAT_WARNINGS_AS_ERRORS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES; - GCC_WARN_ABOUT_MISSING_NEWLINE = YES; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES; - GCC_WARN_SHADOW = YES; - GCC_WARN_SIGN_COMPARE = YES; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNKNOWN_PRAGMAS = YES; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_LABEL = YES; - GCC_WARN_UNUSED_PARAMETER = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.13; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - RUN_CLANG_STATIC_ANALYZER = YES; - SDKROOT = macosx; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_TREAT_WARNINGS_AS_ERRORS = YES; - SWIFT_VERSION = 4.0; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; }; name = Debug; }; 84CFF5091AC3C69700CEA6C8 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF0020242E4C00712EC3 /* RSCore_project_release.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES; - CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES; - CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_STATIC_ANALYZER_MODE = deep; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; - GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES; - GCC_TREAT_WARNINGS_AS_ERRORS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES; - GCC_WARN_ABOUT_MISSING_NEWLINE = YES; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES; - GCC_WARN_SHADOW = YES; - GCC_WARN_SIGN_COMPARE = YES; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNKNOWN_PRAGMAS = YES; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_LABEL = YES; - GCC_WARN_UNUSED_PARAMETER = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.13; - MTL_ENABLE_DEBUG_INFO = NO; - RUN_CLANG_STATIC_ANALYZER = YES; - SDKROOT = macosx; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_TREAT_WARNINGS_AS_ERRORS = YES; - SWIFT_VERSION = 4.0; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; }; name = Release; }; 84CFF50B1AC3C69700CEA6C8 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF2620243B6300712EC3 /* RSCore_mac_target.xcconfig */; buildSettings = { - CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; - CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES; - CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES; - CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - COMBINE_HIDPI_IMAGES = YES; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - INFOPLIST_FILE = RSCore/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "com.ranchero.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; }; name = Debug; }; 84CFF50C1AC3C69700CEA6C8 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF2620243B6300712EC3 /* RSCore_mac_target.xcconfig */; buildSettings = { - CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; - CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES; - CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES; - CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - COMBINE_HIDPI_IMAGES = YES; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - INFOPLIST_FILE = RSCore/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "com.ranchero.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; }; name = Release; }; 84CFF50E1AC3C69700CEA6C8 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EEFF20242E4C00712EC3 /* RSCoreTests_target.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - COMBINE_HIDPI_IMAGES = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(DEVELOPER_FRAMEWORKS_DIR)", - "$(inherited)", - ); - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - INFOPLIST_FILE = RSCoreTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "com.ranchero.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; }; 84CFF50F1AC3C69700CEA6C8 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EEFF20242E4C00712EC3 /* RSCoreTests_target.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - COMBINE_HIDPI_IMAGES = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(DEVELOPER_FRAMEWORKS_DIR)", - "$(inherited)", - ); - INFOPLIST_FILE = RSCoreTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "com.ranchero.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; }; diff --git a/Frameworks/RSCore/xcconfig/RSCoreTests_target.xcconfig b/Frameworks/RSCore/xcconfig/RSCoreTests_target.xcconfig new file mode 100644 index 000000000..7e792d6c3 --- /dev/null +++ b/Frameworks/RSCore/xcconfig/RSCoreTests_target.xcconfig @@ -0,0 +1,19 @@ +ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks +INFOPLIST_FILE = RSCoreTests/Info.plist +PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.$(PRODUCT_NAME:rfc1034identifier) +PRODUCT_NAME = $(TARGET_NAME) +FRAMEWORK_SEARCH_PATHS = $(DEVELOPER_FRAMEWORKS_DIR) $(inherited) +CLANG_ENABLE_OBJC_WEAK = YES + + + + + + + + + + + + diff --git a/Frameworks/RSCore/xcconfig/RSCore_ios_target.xcconfig b/Frameworks/RSCore/xcconfig/RSCore_ios_target.xcconfig new file mode 100644 index 000000000..cf9723564 --- /dev/null +++ b/Frameworks/RSCore/xcconfig/RSCore_ios_target.xcconfig @@ -0,0 +1,24 @@ +#include "./RSCore_target.xcconfig" + +CODE_SIGN_IDENTITY = +DEVELOPMENT_TEAM = 9C84TZ7Q6Z + +// See the notes in Evergreen_target.xcconfig on why the +// DeveloperSettings.xcconfig is #included here + +#include? "../../../SharedXcodeSettings/DeveloperSettings.xcconfig" + +SDKROOT = iphoneos +TARGETED_DEVICE_FAMILY = 1,2 +IPHONEOS_DEPLOYMENT_TARGET = 10.2 + +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @loader_path/Frameworks +INFOPLIST_FILE = RSCoreiOS/Info.plist +PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSCoreiOS +PRODUCT_NAME = RSCore +GCC_NO_COMMON_BLOCKS = YES + +CLANG_WARN_DOCUMENTATION_COMMENTS = YES +CLANG_WARN_INFINITE_RECURSION = YES +CLANG_WARN_SUSPICIOUS_MOVE = YES +CLANG_ANALYZER_NONNULL = YES diff --git a/Frameworks/RSCore/xcconfig/RSCore_ios_target_debug.xcconfig b/Frameworks/RSCore/xcconfig/RSCore_ios_target_debug.xcconfig new file mode 100644 index 000000000..4f16b0515 --- /dev/null +++ b/Frameworks/RSCore/xcconfig/RSCore_ios_target_debug.xcconfig @@ -0,0 +1,5 @@ +#include "./RSCore_ios_target.xcconfig" + +VALIDATE_PRODUCT = NO + + diff --git a/Frameworks/RSCore/xcconfig/RSCore_ios_target_release.xcconfig b/Frameworks/RSCore/xcconfig/RSCore_ios_target_release.xcconfig new file mode 100644 index 000000000..9d410f676 --- /dev/null +++ b/Frameworks/RSCore/xcconfig/RSCore_ios_target_release.xcconfig @@ -0,0 +1,4 @@ +#include "./RSCore_ios_target.xcconfig" + +VALIDATE_PRODUCT = YES + diff --git a/Frameworks/RSCore/xcconfig/RSCore_mac_target.xcconfig b/Frameworks/RSCore/xcconfig/RSCore_mac_target.xcconfig new file mode 100644 index 000000000..27da5ac24 --- /dev/null +++ b/Frameworks/RSCore/xcconfig/RSCore_mac_target.xcconfig @@ -0,0 +1,17 @@ +#include "./RSCore_target.xcconfig" + +CODE_SIGN_IDENTITY = +DEVELOPMENT_TEAM = 9C84TZ7Q6Z + +// See the notes in Evergreen_target.xcconfig on why the +// DeveloperSettings.xcconfig is #included here + +#include? "../../../SharedXcodeSettings/DeveloperSettings.xcconfig" + +INFOPLIST_FILE = RSCore/Info.plist +PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.$(PRODUCT_NAME:rfc1034identifier) + +CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES +CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES diff --git a/Frameworks/RSCore/xcconfig/RSCore_project.xcconfig b/Frameworks/RSCore/xcconfig/RSCore_project.xcconfig new file mode 100644 index 000000000..8ffc6663d --- /dev/null +++ b/Frameworks/RSCore/xcconfig/RSCore_project.xcconfig @@ -0,0 +1,64 @@ + +SDKROOT = macosx +MACOSX_DEPLOYMENT_TARGET = 10.13 +CLANG_ENABLE_OBJC_WEAK = YES +SWIFT_VERSION = 4.0 +COMBINE_HIDPI_IMAGES = YES + +COPY_PHASE_STRIP = NO +MACOSX_DEPLOYMENT_TARGET = 10.13 +ALWAYS_SEARCH_USER_PATHS = NO +CURRENT_PROJECT_VERSION = 1 +VERSION_INFO_PREFIX = +VERSIONING_SYSTEM = apple-generic +GCC_NO_COMMON_BLOCKS = YES +GCC_C_LANGUAGE_STANDARD = gnu99 +CLANG_CXX_LANGUAGE_STANDARD = gnu++11 +CLANG_CXX_LIBRARY = libc++ +CLANG_ENABLE_MODULES = YES +CLANG_ENABLE_OBJC_ARC = YES +ENABLE_STRICT_OBJC_MSGSEND = YES +CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES +CLANG_WARN_EMPTY_BODY = YES +GCC_WARN_SHADOW = YES +CLANG_WARN_BOOL_CONVERSION = YES +CLANG_WARN_CONSTANT_CONVERSION = YES +GCC_WARN_64_TO_32_BIT_CONVERSION = YES +CLANG_WARN_ENUM_CONVERSION = YES +CLANG_WARN_INT_CONVERSION = YES +CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES +CLANG_WARN_INFINITE_RECURSION = YES +GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES +GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR +GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES +GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES +GCC_WARN_ABOUT_MISSING_NEWLINE = YES +GCC_WARN_SIGN_COMPARE = YES +CLANG_WARN_STRICT_PROTOTYPES = YES +CLANG_WARN_COMMA = YES +CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES +GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES +GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES +CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE +GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE +GCC_WARN_UNKNOWN_PRAGMAS = YES +CLANG_WARN_UNREACHABLE_CODE = YES +GCC_WARN_UNUSED_FUNCTION = YES +GCC_WARN_UNUSED_LABEL = YES +GCC_WARN_UNUSED_PARAMETER = YES +GCC_WARN_UNUSED_VARIABLE = YES +CLANG_WARN_RANGE_LOOP_ANALYSIS = YES +CLANG_WARN_SUSPICIOUS_MOVE = YES +CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES +GCC_WARN_UNDECLARED_SELECTOR = YES +CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR +CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES +CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES +RUN_CLANG_STATIC_ANALYZER = YES +CLANG_STATIC_ANALYZER_MODE = deep +CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES +SWIFT_TREAT_WARNINGS_AS_ERRORS = YES diff --git a/Frameworks/RSCore/xcconfig/RSCore_project_debug.xcconfig b/Frameworks/RSCore/xcconfig/RSCore_project_debug.xcconfig new file mode 100644 index 000000000..53f4ce95f --- /dev/null +++ b/Frameworks/RSCore/xcconfig/RSCore_project_debug.xcconfig @@ -0,0 +1,16 @@ +#include "./RSCore_project.xcconfig" + +DEBUG_INFORMATION_FORMAT = dwarf +ENABLE_TESTABILITY = YES +GCC_SYMBOLS_PRIVATE_EXTERN = NO +GCC_DYNAMIC_NO_PIC = NO +GCC_OPTIMIZATION_LEVEL = 0 +GCC_PREPROCESSOR_DEFINITIONS = DEBUG=1 $(inherited) +GCC_TREAT_WARNINGS_AS_ERRORS = YES + +MTL_ENABLE_DEBUG_INFO = YES +SWIFT_COMPILATION_MODE = singlefile +SWIFT_OPTIMIZATION_LEVEL = -Onone +ONLY_ACTIVE_ARCH = YES + + diff --git a/Frameworks/RSCore/xcconfig/RSCore_project_release.xcconfig b/Frameworks/RSCore/xcconfig/RSCore_project_release.xcconfig new file mode 100644 index 000000000..b140b367e --- /dev/null +++ b/Frameworks/RSCore/xcconfig/RSCore_project_release.xcconfig @@ -0,0 +1,9 @@ +#include "./RSCore_project.xcconfig" + +DEBUG_INFORMATION_FORMAT = dwarf-with-dsym +ENABLE_NS_ASSERTIONS = NO + +MTL_ENABLE_DEBUG_INFO = NO +SWIFT_OPTIMIZATION_LEVEL = -O + +SWIFT_COMPILATION_MODE = wholemodule diff --git a/Frameworks/RSCore/xcconfig/RSCore_target.xcconfig b/Frameworks/RSCore/xcconfig/RSCore_target.xcconfig new file mode 100644 index 000000000..b985fc205 --- /dev/null +++ b/Frameworks/RSCore/xcconfig/RSCore_target.xcconfig @@ -0,0 +1,12 @@ + +INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Frameworks +SKIP_INSTALL = YES +DYLIB_COMPATIBILITY_VERSION = 1 +DYLIB_CURRENT_VERSION = 1 +DYLIB_INSTALL_NAME_BASE = @rpath +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/Frameworks +DEFINES_MODULE = YES +FRAMEWORK_VERSION = A +PRODUCT_NAME = $(TARGET_NAME) +CLANG_ENABLE_MODULES = YES + diff --git a/Frameworks/RSDatabase/RSDatabase.xcodeproj/project.pbxproj b/Frameworks/RSDatabase/RSDatabase.xcodeproj/project.pbxproj index 6b4768de7..d6018dec3 100755 --- a/Frameworks/RSDatabase/RSDatabase.xcodeproj/project.pbxproj +++ b/Frameworks/RSDatabase/RSDatabase.xcodeproj/project.pbxproj @@ -51,6 +51,10 @@ 84F22C591B52E0D9000060CE /* RSDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = 84F22C581B52E0D9000060CE /* RSDatabase.h */; settings = {ATTRIBUTES = (Public, ); }; }; 84F22C601B52E0D9000060CE /* RSDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84F22C551B52E0D9000060CE /* RSDatabase.framework */; }; 84F22C651B52E0D9000060CE /* RSDatabaseTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 84F22C641B52E0D9000060CE /* RSDatabaseTests.m */; }; + D511EF2E20244E8900712EC3 /* DatabaseObjectCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84314F491F68ECC600F710B2 /* DatabaseObjectCache.swift */; }; + D511EF2F20244E9A00712EC3 /* DatabaseObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84C6DD001F395C13009AFB47 /* DatabaseObject.swift */; }; + D511EF3020244EA400712EC3 /* RelatedObjectsMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848E22551F6652C70031D7C5 /* RelatedObjectsMap.swift */; }; + D511EF3120244EAE00712EC3 /* RelatedObjectIDsMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 848E22571F6653960031D7C5 /* RelatedObjectIDsMap.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -95,6 +99,15 @@ 84F22C5F1B52E0D9000060CE /* RSDatabaseTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RSDatabaseTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 84F22C641B52E0D9000060CE /* RSDatabaseTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RSDatabaseTests.m; sourceTree = ""; }; 84F22C661B52E0D9000060CE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + D511EF0320242E6400712EC3 /* RSDatabase_project_release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSDatabase_project_release.xcconfig; sourceTree = ""; }; + D511EF0420242E6400712EC3 /* RSDatabaseTests_target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSDatabaseTests_target.xcconfig; sourceTree = ""; }; + D511EF0520242E6400712EC3 /* RSDatabase_target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSDatabase_target.xcconfig; sourceTree = ""; }; + D511EF0620242E6400712EC3 /* RSDatabase_project_debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSDatabase_project_debug.xcconfig; sourceTree = ""; }; + D511EF0720242E6400712EC3 /* RSDatabase_project.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSDatabase_project.xcconfig; sourceTree = ""; }; + D511EF28202444E000712EC3 /* RSDatabase_mac_target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSDatabase_mac_target.xcconfig; sourceTree = ""; }; + D511EF29202444E000712EC3 /* RSDatabase_ios_target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSDatabase_ios_target.xcconfig; sourceTree = ""; }; + D511EF2C20244AFF00712EC3 /* RSDatabase_ios_target_release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSDatabase_ios_target_release.xcconfig; sourceTree = ""; }; + D511EF2D20244B0000712EC3 /* RSDatabase_ios_target_debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSDatabase_ios_target_debug.xcconfig; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -189,6 +202,7 @@ 8400ABF81E0CFBD800AA7C57 /* RSDatabaseiOS */, 84F22C561B52E0D9000060CE /* Products */, 8400AC0D1E0CFC5500AA7C57 /* Frameworks */, + D511EF0220242E6400712EC3 /* xcconfig */, ); sourceTree = ""; }; @@ -211,6 +225,22 @@ path = RSDatabaseTests; sourceTree = ""; }; + D511EF0220242E6400712EC3 /* xcconfig */ = { + isa = PBXGroup; + children = ( + D511EF0720242E6400712EC3 /* RSDatabase_project.xcconfig */, + D511EF0620242E6400712EC3 /* RSDatabase_project_debug.xcconfig */, + D511EF0320242E6400712EC3 /* RSDatabase_project_release.xcconfig */, + D511EF0520242E6400712EC3 /* RSDatabase_target.xcconfig */, + D511EF29202444E000712EC3 /* RSDatabase_ios_target.xcconfig */, + D511EF2D20244B0000712EC3 /* RSDatabase_ios_target_debug.xcconfig */, + D511EF2C20244AFF00712EC3 /* RSDatabase_ios_target_release.xcconfig */, + D511EF28202444E000712EC3 /* RSDatabase_mac_target.xcconfig */, + D511EF0420242E6400712EC3 /* RSDatabaseTests_target.xcconfig */, + ); + path = xcconfig; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -373,9 +403,12 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + D511EF3120244EAE00712EC3 /* RelatedObjectIDsMap.swift in Sources */, 848E22541F6652990031D7C5 /* DatabaseRelatedObjectsTable.swift in Sources */, 8400AC001E0CFC0700AA7C57 /* RSDatabaseQueue.m in Sources */, + D511EF2E20244E8900712EC3 /* DatabaseObjectCache.swift in Sources */, 8400AC061E0CFC0700AA7C57 /* NSString+RSDatabase.m in Sources */, + D511EF3020244EA400712EC3 /* RelatedObjectsMap.swift in Sources */, 84ABC1D21F364B07000DCC55 /* DatabaseLookupTable.swift in Sources */, 8400AC0C1E0CFC3100AA7C57 /* FMResultSet.m in Sources */, 840405DC1F1C15EA00DF0296 /* DatabaseTable.swift in Sources */, @@ -383,6 +416,7 @@ 8400AC081E0CFC2000AA7C57 /* FMDatabase.m in Sources */, 8400AC041E0CFC0700AA7C57 /* FMResultSet+RSExtras.m in Sources */, 8400AC0A1E0CFC2900AA7C57 /* FMDatabaseAdditions.m in Sources */, + D511EF2F20244E9A00712EC3 /* DatabaseObject.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -428,240 +462,57 @@ /* Begin XCBuildConfiguration section */ 8400ABFC1E0CFBD800AA7C57 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF2D20244B0000712EC3 /* RSDatabase_ios_target_debug.xcconfig */; buildSettings = { - CLANG_ANALYZER_NONNULL = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = 9C84TZ7Q6Z; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = RSDatabaseiOS/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.2; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSDatabaseiOS; - PRODUCT_MODULE_NAME = RSDatabase; - PRODUCT_NAME = RSDatabase; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; 8400ABFD1E0CFBD800AA7C57 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF2C20244AFF00712EC3 /* RSDatabase_ios_target_release.xcconfig */; buildSettings = { - CLANG_ANALYZER_NONNULL = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = 9C84TZ7Q6Z; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = RSDatabaseiOS/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.2; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSDatabaseiOS; - PRODUCT_MODULE_NAME = RSDatabase; - PRODUCT_NAME = RSDatabase; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; }; name = Release; }; 84F22C671B52E0D9000060CE /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF0620242E6400712EC3 /* RSDatabase_project_debug.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.13; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; }; name = Debug; }; 84F22C681B52E0D9000060CE /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF0320242E6400712EC3 /* RSDatabase_project_release.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.13; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = macosx; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; }; name = Release; }; 84F22C6A1B52E0D9000060CE /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF28202444E000712EC3 /* RSDatabase_mac_target.xcconfig */; buildSettings = { - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - COMBINE_HIDPI_IMAGES = YES; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - INFOPLIST_FILE = RSDatabase/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - OTHER_SWIFT_FLAGS = "-Xfrontend -warn-long-function-bodies=300"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSDatabase; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; }; name = Debug; }; 84F22C6B1B52E0D9000060CE /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF28202444E000712EC3 /* RSDatabase_mac_target.xcconfig */; buildSettings = { - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - COMBINE_HIDPI_IMAGES = YES; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - INFOPLIST_FILE = RSDatabase/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - OTHER_SWIFT_FLAGS = "-Xfrontend -warn-long-function-bodies=300"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSDatabase; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; }; name = Release; }; 84F22C6D1B52E0D9000060CE /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF0420242E6400712EC3 /* RSDatabaseTests_target.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - COMBINE_HIDPI_IMAGES = YES; - INFOPLIST_FILE = RSDatabaseTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSDatabaseTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; }; name = Debug; }; 84F22C6E1B52E0D9000060CE /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF0420242E6400712EC3 /* RSDatabaseTests_target.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - COMBINE_HIDPI_IMAGES = YES; - INFOPLIST_FILE = RSDatabaseTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSDatabaseTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; }; name = Release; }; diff --git a/Frameworks/RSDatabase/xcconfig/RSDatabaseTests_target.xcconfig b/Frameworks/RSDatabase/xcconfig/RSDatabaseTests_target.xcconfig new file mode 100644 index 000000000..5dbc31942 --- /dev/null +++ b/Frameworks/RSDatabase/xcconfig/RSDatabaseTests_target.xcconfig @@ -0,0 +1,18 @@ +ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks +INFOPLIST_FILE = RSDatabaseTests/Info.plist +PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSDatabaseTests +PRODUCT_NAME = $(TARGET_NAME) +CLANG_ENABLE_OBJC_WEAK = YES +SWIFT_VERSION = 3.0 + + + + + + + + + + + diff --git a/Frameworks/RSDatabase/xcconfig/RSDatabase_ios_target.xcconfig b/Frameworks/RSDatabase/xcconfig/RSDatabase_ios_target.xcconfig new file mode 100644 index 000000000..dd85ffbce --- /dev/null +++ b/Frameworks/RSDatabase/xcconfig/RSDatabase_ios_target.xcconfig @@ -0,0 +1,24 @@ +#include "./RSDatabase_target.xcconfig" + +CODE_SIGN_IDENTITY = +DEVELOPMENT_TEAM = 9C84TZ7Q6Z + +// See the notes in Evergreen_target.xcconfig on why the +// DeveloperSettings.xcconfig is #included here + +// #include? "../../../SharedXcodeSettings/DeveloperSettings.xcconfig" + +SDKROOT = iphoneos +TARGETED_DEVICE_FAMILY = 1,2 +IPHONEOS_DEPLOYMENT_TARGET = 10.2 + +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @loader_path/Frameworks +INFOPLIST_FILE = RSDatabaseiOS/Info.plist +PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSDatabaseiOS +PRODUCT_MODULE_NAME = RSDatabase +PRODUCT_NAME = RSDatabase + +CLANG_WARN_DOCUMENTATION_COMMENTS = YES +CLANG_WARN_INFINITE_RECURSION = YES +CLANG_WARN_SUSPICIOUS_MOVE = YES +CLANG_ANALYZER_NONNULL = YES diff --git a/Frameworks/RSDatabase/xcconfig/RSDatabase_ios_target_debug.xcconfig b/Frameworks/RSDatabase/xcconfig/RSDatabase_ios_target_debug.xcconfig new file mode 100644 index 000000000..f45b9afd3 --- /dev/null +++ b/Frameworks/RSDatabase/xcconfig/RSDatabase_ios_target_debug.xcconfig @@ -0,0 +1,5 @@ +#include "./RSDatabase_ios_target.xcconfig" + +VALIDATE_PRODUCT = NO + + diff --git a/Frameworks/RSDatabase/xcconfig/RSDatabase_ios_target_release.xcconfig b/Frameworks/RSDatabase/xcconfig/RSDatabase_ios_target_release.xcconfig new file mode 100644 index 000000000..2b9186494 --- /dev/null +++ b/Frameworks/RSDatabase/xcconfig/RSDatabase_ios_target_release.xcconfig @@ -0,0 +1,4 @@ +#include "./RSDatabase_ios_target.xcconfig" + +VALIDATE_PRODUCT = YES + diff --git a/Frameworks/RSDatabase/xcconfig/RSDatabase_mac_target.xcconfig b/Frameworks/RSDatabase/xcconfig/RSDatabase_mac_target.xcconfig new file mode 100644 index 000000000..f0dd02cb1 --- /dev/null +++ b/Frameworks/RSDatabase/xcconfig/RSDatabase_mac_target.xcconfig @@ -0,0 +1,15 @@ +#include "./RSDatabase_target.xcconfig" + +CODE_SIGN_IDENTITY = +DEVELOPMENT_TEAM = 9C84TZ7Q6Z + +// See the notes in Evergreen_target.xcconfig on why the +// DeveloperSettings.xcconfig is #included here + +#include? "../../../SharedXcodeSettings/DeveloperSettings.xcconfig" + +INFOPLIST_FILE = RSDatabase/Info.plist +PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSDatabase + +OTHER_SWIFT_FLAGS = -Xfrontend -warn-long-function-bodies=300 + diff --git a/Frameworks/RSDatabase/xcconfig/RSDatabase_project.xcconfig b/Frameworks/RSDatabase/xcconfig/RSDatabase_project.xcconfig new file mode 100644 index 000000000..0b9920a1f --- /dev/null +++ b/Frameworks/RSDatabase/xcconfig/RSDatabase_project.xcconfig @@ -0,0 +1,49 @@ + +SDKROOT = macosx +COPY_PHASE_STRIP = NO +MACOSX_DEPLOYMENT_TARGET = 10.13 +ALWAYS_SEARCH_USER_PATHS = NO +CURRENT_PROJECT_VERSION = 1 +VERSION_INFO_PREFIX = +VERSIONING_SYSTEM = apple-generic +GCC_NO_COMMON_BLOCKS = YES +GCC_C_LANGUAGE_STANDARD = gnu99 +CLANG_CXX_LANGUAGE_STANDARD = gnu++0x +CLANG_CXX_LIBRARY = libc++ +CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES +CLANG_ENABLE_MODULES = YES +CLANG_ENABLE_OBJC_ARC = YES +ENABLE_STRICT_OBJC_MSGSEND = YES +CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES +CLANG_WARN_EMPTY_BODY = YES +CLANG_WARN_BOOL_CONVERSION = YES +CLANG_WARN_CONSTANT_CONVERSION = YES +GCC_WARN_64_TO_32_BIT_CONVERSION = YES +CLANG_WARN_ENUM_CONVERSION = YES +CLANG_WARN_INT_CONVERSION = YES +CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES +CLANG_WARN_INFINITE_RECURSION = YES +GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR +CLANG_WARN_STRICT_PROTOTYPES = YES +CLANG_WARN_COMMA = YES +CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE +GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE +CLANG_WARN_UNREACHABLE_CODE = YES +GCC_WARN_UNUSED_FUNCTION = YES +GCC_WARN_UNUSED_VARIABLE = YES +CLANG_WARN_RANGE_LOOP_ANALYSIS = YES +CLANG_WARN_SUSPICIOUS_MOVE = YES +CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +CLANG_WARN_OBJC_LITERAL_CONVERSION = YES +CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES +GCC_WARN_UNDECLARED_SELECTOR = YES +CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR +CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES +SWIFT_SWIFT3_OBJC_INFERENCE = Off + +CLANG_ENABLE_OBJC_WEAK = YES +SWIFT_VERSION = 4.0 +COMBINE_HIDPI_IMAGES = YES + + diff --git a/Frameworks/RSDatabase/xcconfig/RSDatabase_project_debug.xcconfig b/Frameworks/RSDatabase/xcconfig/RSDatabase_project_debug.xcconfig new file mode 100644 index 000000000..d74bff530 --- /dev/null +++ b/Frameworks/RSDatabase/xcconfig/RSDatabase_project_debug.xcconfig @@ -0,0 +1,15 @@ +#include "./RSDatabase_project.xcconfig" + +DEBUG_INFORMATION_FORMAT = dwarf +ENABLE_TESTABILITY = YES +GCC_DYNAMIC_NO_PIC = NO +GCC_OPTIMIZATION_LEVEL = 0 +GCC_PREPROCESSOR_DEFINITIONS = DEBUG=1 $(inherited) +GCC_TREAT_WARNINGS_AS_ERRORS = YES + +MTL_ENABLE_DEBUG_INFO = YES +SWIFT_COMPILATION_MODE = singlefile +SWIFT_OPTIMIZATION_LEVEL = -Onone +ONLY_ACTIVE_ARCH = YES + + diff --git a/Frameworks/RSDatabase/xcconfig/RSDatabase_project_release.xcconfig b/Frameworks/RSDatabase/xcconfig/RSDatabase_project_release.xcconfig new file mode 100644 index 000000000..1be219352 --- /dev/null +++ b/Frameworks/RSDatabase/xcconfig/RSDatabase_project_release.xcconfig @@ -0,0 +1,9 @@ +#include "./RSDatabase_project.xcconfig" + +DEBUG_INFORMATION_FORMAT = dwarf-with-dsym +ENABLE_NS_ASSERTIONS = NO + +MTL_ENABLE_DEBUG_INFO = NO +SWIFT_OPTIMIZATION_LEVEL = -O + +SWIFT_COMPILATION_MODE = wholemodule diff --git a/Frameworks/RSDatabase/xcconfig/RSDatabase_target.xcconfig b/Frameworks/RSDatabase/xcconfig/RSDatabase_target.xcconfig new file mode 100644 index 000000000..b985fc205 --- /dev/null +++ b/Frameworks/RSDatabase/xcconfig/RSDatabase_target.xcconfig @@ -0,0 +1,12 @@ + +INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Frameworks +SKIP_INSTALL = YES +DYLIB_COMPATIBILITY_VERSION = 1 +DYLIB_CURRENT_VERSION = 1 +DYLIB_INSTALL_NAME_BASE = @rpath +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/Frameworks +DEFINES_MODULE = YES +FRAMEWORK_VERSION = A +PRODUCT_NAME = $(TARGET_NAME) +CLANG_ENABLE_MODULES = YES + diff --git a/Frameworks/RSFeedFinder/RSFeedFinder.xcodeproj/project.pbxproj b/Frameworks/RSFeedFinder/RSFeedFinder.xcodeproj/project.pbxproj index 2f18d02a7..6da537d74 100644 --- a/Frameworks/RSFeedFinder/RSFeedFinder.xcodeproj/project.pbxproj +++ b/Frameworks/RSFeedFinder/RSFeedFinder.xcodeproj/project.pbxproj @@ -57,6 +57,11 @@ 84E697E71C8E6C16009C585A /* RSXML.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RSXML.framework; path = ../RSXML/build/Debug/RSXML.framework; sourceTree = ""; }; 84E697E91C8E6C20009C585A /* RSWeb.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RSWeb.framework; path = ../RSWeb/build/Debug/RSWeb.framework; sourceTree = ""; }; 84F466561F03523100225386 /* RSParser.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RSParser.framework; path = ../RSParser/build/Debug/RSParser.framework; sourceTree = ""; }; + D511EF0920242E7A00712EC3 /* RSFeedFinder_project.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSFeedFinder_project.xcconfig; sourceTree = ""; }; + D511EF0A20242E7A00712EC3 /* RSFeedFinder_target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSFeedFinder_target.xcconfig; sourceTree = ""; }; + D511EF0B20242E7A00712EC3 /* RSFeedFinder_project_release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSFeedFinder_project_release.xcconfig; sourceTree = ""; }; + D511EF0C20242E7A00712EC3 /* RSFeedFinderTests_target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSFeedFinderTests_target.xcconfig; sourceTree = ""; }; + D511EF0D20242E7A00712EC3 /* RSFeedFinder_project_debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSFeedFinder_project_debug.xcconfig; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -106,6 +111,7 @@ 84BAAE2D1C8E6B3B009F5239 /* RSFeedFinderTests */, 84BAAE201C8E6B3B009F5239 /* Products */, 84B06FED1ED3808E00F0B54B /* Frameworks */, + D511EF0820242E7A00712EC3 /* xcconfig */, ); sourceTree = ""; }; @@ -133,6 +139,18 @@ path = RSFeedFinderTests; sourceTree = ""; }; + D511EF0820242E7A00712EC3 /* xcconfig */ = { + isa = PBXGroup; + children = ( + D511EF0920242E7A00712EC3 /* RSFeedFinder_project.xcconfig */, + D511EF0D20242E7A00712EC3 /* RSFeedFinder_project_debug.xcconfig */, + D511EF0B20242E7A00712EC3 /* RSFeedFinder_project_release.xcconfig */, + D511EF0A20242E7A00712EC3 /* RSFeedFinder_target.xcconfig */, + D511EF0C20242E7A00712EC3 /* RSFeedFinderTests_target.xcconfig */, + ); + path = xcconfig; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -275,180 +293,43 @@ /* Begin XCBuildConfiguration section */ 84BAAE311C8E6B3B009F5239 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF0D20242E7A00712EC3 /* RSFeedFinder_project_debug.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.13; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; }; name = Debug; }; 84BAAE321C8E6B3B009F5239 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF0B20242E7A00712EC3 /* RSFeedFinder_project_release.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.13; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = macosx; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; }; name = Release; }; 84BAAE341C8E6B3B009F5239 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF0A20242E7A00712EC3 /* RSFeedFinder_target.xcconfig */; buildSettings = { - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - COMBINE_HIDPI_IMAGES = YES; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - INFOPLIST_FILE = RSFeedFinder/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSFeedFinder; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; }; name = Debug; }; 84BAAE351C8E6B3B009F5239 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF0A20242E7A00712EC3 /* RSFeedFinder_target.xcconfig */; buildSettings = { - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - COMBINE_HIDPI_IMAGES = YES; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - INFOPLIST_FILE = RSFeedFinder/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSFeedFinder; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; }; name = Release; }; 84BAAE371C8E6B3B009F5239 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF0C20242E7A00712EC3 /* RSFeedFinderTests_target.xcconfig */; buildSettings = { - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - COMBINE_HIDPI_IMAGES = YES; - INFOPLIST_FILE = RSFeedFinderTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSFeedFinderTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; }; name = Debug; }; 84BAAE381C8E6B3B009F5239 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF0C20242E7A00712EC3 /* RSFeedFinderTests_target.xcconfig */; buildSettings = { - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - COMBINE_HIDPI_IMAGES = YES; - INFOPLIST_FILE = RSFeedFinderTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSFeedFinderTests; - PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; }; diff --git a/Frameworks/RSFeedFinder/xcconfig/RSFeedFinderTests_target.xcconfig b/Frameworks/RSFeedFinder/xcconfig/RSFeedFinderTests_target.xcconfig new file mode 100644 index 000000000..6a9c5c16b --- /dev/null +++ b/Frameworks/RSFeedFinder/xcconfig/RSFeedFinderTests_target.xcconfig @@ -0,0 +1,18 @@ +ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks +INFOPLIST_FILE = RSFeedFinderTests/Info.plist +PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSFeedFinderTests +PRODUCT_NAME = $(TARGET_NAME) + + + + + + + + + + + + + diff --git a/Frameworks/RSFeedFinder/xcconfig/RSFeedFinder_project.xcconfig b/Frameworks/RSFeedFinder/xcconfig/RSFeedFinder_project.xcconfig new file mode 100644 index 000000000..258ba13b6 --- /dev/null +++ b/Frameworks/RSFeedFinder/xcconfig/RSFeedFinder_project.xcconfig @@ -0,0 +1,58 @@ +CODE_SIGN_IDENTITY = +CODE_SIGN_STYLE = Automatic +DEVELOPMENT_TEAM = M8L2WTLA8W + +// See the notes in Evergreen_target.xcconfig on why the +// DeveloperSettings.xcconfig is #included here + +#include? "../../../SharedXcodeSettings/DeveloperSettings.xcconfig" + +SDKROOT = macosx +MACOSX_DEPLOYMENT_TARGET = 10.13 +CLANG_ENABLE_OBJC_WEAK = YES +SWIFT_VERSION = 4.0 +COMBINE_HIDPI_IMAGES = YES + +COPY_PHASE_STRIP = NO +MACOSX_DEPLOYMENT_TARGET = 10.13 +ALWAYS_SEARCH_USER_PATHS = NO +CURRENT_PROJECT_VERSION = 1 +VERSION_INFO_PREFIX = +VERSIONING_SYSTEM = apple-generic +GCC_NO_COMMON_BLOCKS = YES +GCC_C_LANGUAGE_STANDARD = gnu99 +CLANG_CXX_LANGUAGE_STANDARD = gnu++0x +CLANG_CXX_LIBRARY = libc++ +CLANG_ENABLE_MODULES = YES +CLANG_ENABLE_OBJC_ARC = YES +ENABLE_STRICT_OBJC_MSGSEND = YES +CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES +CLANG_WARN_DOCUMENTATION_COMMENTS = YES +CLANG_WARN_EMPTY_BODY = YES +CLANG_WARN_BOOL_CONVERSION = YES +CLANG_WARN_CONSTANT_CONVERSION = YES +GCC_WARN_64_TO_32_BIT_CONVERSION = YES +CLANG_WARN_ENUM_CONVERSION = YES +CLANG_WARN_INT_CONVERSION = YES +CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES +CLANG_WARN_INFINITE_RECURSION = YES +GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR +CLANG_WARN_STRICT_PROTOTYPES = YES +CLANG_WARN_COMMA = YES +CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE +GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE +CLANG_WARN_UNREACHABLE_CODE = YES +GCC_WARN_UNUSED_FUNCTION = YES +GCC_WARN_UNUSED_VARIABLE = YES +CLANG_WARN_RANGE_LOOP_ANALYSIS = YES +CLANG_WARN_SUSPICIOUS_MOVE = YES +CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +CLANG_WARN_OBJC_LITERAL_CONVERSION = YES +CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES +GCC_WARN_UNDECLARED_SELECTOR = YES +CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR +CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES +CLANG_ANALYZER_NONNULL = YES +CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE +SWIFT_SWIFT3_OBJC_INFERENCE = Off diff --git a/Frameworks/RSFeedFinder/xcconfig/RSFeedFinder_project_debug.xcconfig b/Frameworks/RSFeedFinder/xcconfig/RSFeedFinder_project_debug.xcconfig new file mode 100644 index 000000000..cc5fe82e8 --- /dev/null +++ b/Frameworks/RSFeedFinder/xcconfig/RSFeedFinder_project_debug.xcconfig @@ -0,0 +1,15 @@ +#include "./RSFeedFinder_project.xcconfig" + +DEBUG_INFORMATION_FORMAT = dwarf +ENABLE_TESTABILITY = YES +GCC_DYNAMIC_NO_PIC = NO +GCC_OPTIMIZATION_LEVEL = 0 +GCC_PREPROCESSOR_DEFINITIONS = DEBUG=1 $(inherited) + +MTL_ENABLE_DEBUG_INFO = YES +SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG +SWIFT_COMPILATION_MODE = singlefile +SWIFT_OPTIMIZATION_LEVEL = -Onone +ONLY_ACTIVE_ARCH = YES + + diff --git a/Frameworks/RSFeedFinder/xcconfig/RSFeedFinder_project_release.xcconfig b/Frameworks/RSFeedFinder/xcconfig/RSFeedFinder_project_release.xcconfig new file mode 100644 index 000000000..1b3df8a4d --- /dev/null +++ b/Frameworks/RSFeedFinder/xcconfig/RSFeedFinder_project_release.xcconfig @@ -0,0 +1,9 @@ +#include "./RSFeedFinder_project.xcconfig" + +DEBUG_INFORMATION_FORMAT = dwarf-with-dsym +ENABLE_NS_ASSERTIONS = NO + +MTL_ENABLE_DEBUG_INFO = NO +SWIFT_OPTIMIZATION_LEVEL = -O + +SWIFT_COMPILATION_MODE = wholemodule diff --git a/Frameworks/RSFeedFinder/xcconfig/RSFeedFinder_target.xcconfig b/Frameworks/RSFeedFinder/xcconfig/RSFeedFinder_target.xcconfig new file mode 100644 index 000000000..51f45f1c3 --- /dev/null +++ b/Frameworks/RSFeedFinder/xcconfig/RSFeedFinder_target.xcconfig @@ -0,0 +1,14 @@ + +INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Frameworks +SKIP_INSTALL = YES +DYLIB_COMPATIBILITY_VERSION = 1 +DYLIB_CURRENT_VERSION = 1 +DYLIB_INSTALL_NAME_BASE = @rpath +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/Frameworks +DEFINES_MODULE = YES +FRAMEWORK_VERSION = A +INFOPLIST_FILE = RSFeedFinder/Info.plist +PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSFeedFinder +PRODUCT_NAME = $(TARGET_NAME) + + diff --git a/Frameworks/RSParser/RSParser.xcodeproj/project.pbxproj b/Frameworks/RSParser/RSParser.xcodeproj/project.pbxproj index ca86404f4..21da20431 100644 --- a/Frameworks/RSParser/RSParser.xcodeproj/project.pbxproj +++ b/Frameworks/RSParser/RSParser.xcodeproj/project.pbxproj @@ -224,6 +224,11 @@ 84FF5F841EFA285800C15A01 /* RSParser.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RSParser.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 84FF5F8D1EFA285800C15A01 /* RSParserTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RSParserTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 84FF5F941EFA285800C15A01 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + D511EF0F20242E8700712EC3 /* RSParser_project_release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSParser_project_release.xcconfig; sourceTree = ""; }; + D511EF1020242E8700712EC3 /* RSParser_project.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSParser_project.xcconfig; sourceTree = ""; }; + D511EF1120242E8700712EC3 /* RSParserTests_target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSParserTests_target.xcconfig; sourceTree = ""; }; + D511EF1220242E8700712EC3 /* RSParser_target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSParser_target.xcconfig; sourceTree = ""; }; + D511EF1320242E8700712EC3 /* RSParser_project_debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSParser_project_debug.xcconfig; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -430,6 +435,7 @@ 84FF5F911EFA285800C15A01 /* RSParserTests */, 84FF5F851EFA285800C15A01 /* Products */, 84285AAD1F006BC0002E8708 /* Frameworks */, + D511EF0E20242E8700712EC3 /* xcconfig */, ); sourceTree = ""; }; @@ -461,6 +467,18 @@ path = RSParserTests; sourceTree = ""; }; + D511EF0E20242E8700712EC3 /* xcconfig */ = { + isa = PBXGroup; + children = ( + D511EF1020242E8700712EC3 /* RSParser_project.xcconfig */, + D511EF1320242E8700712EC3 /* RSParser_project_debug.xcconfig */, + D511EF0F20242E8700712EC3 /* RSParser_project_release.xcconfig */, + D511EF1220242E8700712EC3 /* RSParser_target.xcconfig */, + D511EF1120242E8700712EC3 /* RSParserTests_target.xcconfig */, + ); + path = xcconfig; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -691,250 +709,43 @@ /* Begin XCBuildConfiguration section */ 84FF5F961EFA285800C15A01 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF1320242E8700712EC3 /* RSParser_project_debug.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_LOCALIZABILITY_EMPTY_CONTEXT = YES; - CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES; - CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES; - CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_STATIC_ANALYZER_MODE = deep; - CLANG_WARN_ASSIGN_ENUM = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "Mac Developer"; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; - GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES; - GCC_TREAT_WARNINGS_AS_ERRORS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES; - GCC_WARN_ABOUT_MISSING_NEWLINE = YES; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES; - GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES; - GCC_WARN_SHADOW = YES; - GCC_WARN_SIGN_COMPARE = YES; - GCC_WARN_STRICT_SELECTOR_MATCH = YES; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNKNOWN_PRAGMAS = YES; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_LABEL = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.13; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - RUN_CLANG_STATIC_ANALYZER = YES; - SDKROOT = macosx; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_TREAT_WARNINGS_AS_ERRORS = YES; - SWIFT_VERSION = 4.0; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; }; name = Debug; }; 84FF5F971EFA285800C15A01 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF0F20242E8700712EC3 /* RSParser_project_release.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_LOCALIZABILITY_EMPTY_CONTEXT = YES; - CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES; - CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES; - CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_STATIC_ANALYZER_MODE = deep; - CLANG_WARN_ASSIGN_ENUM = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "Mac Developer"; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_NO_COMMON_BLOCKS = YES; - GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; - GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES; - GCC_TREAT_WARNINGS_AS_ERRORS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES; - GCC_WARN_ABOUT_MISSING_NEWLINE = YES; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES; - GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES; - GCC_WARN_SHADOW = YES; - GCC_WARN_SIGN_COMPARE = YES; - GCC_WARN_STRICT_SELECTOR_MATCH = YES; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNKNOWN_PRAGMAS = YES; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_LABEL = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.13; - MTL_ENABLE_DEBUG_INFO = NO; - RUN_CLANG_STATIC_ANALYZER = YES; - SDKROOT = macosx; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_TREAT_WARNINGS_AS_ERRORS = YES; - SWIFT_VERSION = 4.0; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; }; name = Release; }; 84FF5F991EFA285800C15A01 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF1220242E8700712EC3 /* RSParser_target.xcconfig */; buildSettings = { - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CODE_SIGN_IDENTITY = ""; - COMBINE_HIDPI_IMAGES = YES; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = M8L2WTLA8W; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - HEADER_SEARCH_PATHS = "${SDKROOT}/usr/include/libxml2"; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSParser; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; }; name = Debug; }; 84FF5F9A1EFA285800C15A01 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF1220242E8700712EC3 /* RSParser_target.xcconfig */; buildSettings = { - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CODE_SIGN_IDENTITY = ""; - COMBINE_HIDPI_IMAGES = YES; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = M8L2WTLA8W; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - HEADER_SEARCH_PATHS = "${SDKROOT}/usr/include/libxml2"; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSParser; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SKIP_INSTALL = YES; - SWIFT_VERSION = 4.0; }; name = Release; }; 84FF5F9C1EFA285800C15A01 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF1120242E8700712EC3 /* RSParserTests_target.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = M8L2WTLA8W; - INFOPLIST_FILE = RSParserTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSParserTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; }; name = Debug; }; 84FF5F9D1EFA285800C15A01 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF1120242E8700712EC3 /* RSParserTests_target.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = M8L2WTLA8W; - INFOPLIST_FILE = RSParserTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSParserTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; }; name = Release; }; diff --git a/Frameworks/RSParser/xcconfig/RSParserTests_target.xcconfig b/Frameworks/RSParser/xcconfig/RSParserTests_target.xcconfig new file mode 100644 index 000000000..056fc8823 --- /dev/null +++ b/Frameworks/RSParser/xcconfig/RSParserTests_target.xcconfig @@ -0,0 +1,18 @@ +ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks +INFOPLIST_FILE = RSParserTests/Info.plist +PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSParserTests +PRODUCT_NAME = $(TARGET_NAME) + + + + + + + + + + + + + diff --git a/Frameworks/RSParser/xcconfig/RSParser_project.xcconfig b/Frameworks/RSParser/xcconfig/RSParser_project.xcconfig new file mode 100644 index 000000000..8c1517bf7 --- /dev/null +++ b/Frameworks/RSParser/xcconfig/RSParser_project.xcconfig @@ -0,0 +1,84 @@ +CODE_SIGN_IDENTITY = Mac Developer +CODE_SIGN_STYLE = Automatic +DEVELOPMENT_TEAM = M8L2WTLA8W + +// See the notes in Evergreen_target.xcconfig on why the +// DeveloperSettings.xcconfig is #included here + +#include? "../../../SharedXcodeSettings/DeveloperSettings.xcconfig" + +SDKROOT = macosx +MACOSX_DEPLOYMENT_TARGET = 10.13 +CLANG_ENABLE_OBJC_WEAK = YES +SWIFT_VERSION = 4.0 +COMBINE_HIDPI_IMAGES = YES + +COPY_PHASE_STRIP = NO +MACOSX_DEPLOYMENT_TARGET = 10.13 +ALWAYS_SEARCH_USER_PATHS = NO +CURRENT_PROJECT_VERSION = 1 +VERSION_INFO_PREFIX = +VERSIONING_SYSTEM = apple-generic +GCC_NO_COMMON_BLOCKS = YES +GCC_C_LANGUAGE_STANDARD = gnu11 +CLANG_CXX_LANGUAGE_STANDARD = gnu++14 +CLANG_CXX_LIBRARY = libc++ +CLANG_ENABLE_MODULES = YES +CLANG_ENABLE_OBJC_ARC = YES +ENABLE_STRICT_OBJC_MSGSEND = YES +GCC_TREAT_WARNINGS_AS_ERRORS = YES +CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES +CLANG_WARN_DOCUMENTATION_COMMENTS = YES +CLANG_WARN_EMPTY_BODY = YES +GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES +GCC_WARN_SHADOW = YES +CLANG_WARN_BOOL_CONVERSION = YES +CLANG_WARN_CONSTANT_CONVERSION = YES +GCC_WARN_64_TO_32_BIT_CONVERSION = YES +CLANG_WARN_ENUM_CONVERSION = YES +CLANG_WARN_INT_CONVERSION = YES +CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES +CLANG_WARN_INFINITE_RECURSION = YES +GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES +GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR +GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES +GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES +GCC_WARN_ABOUT_MISSING_NEWLINE = YES +CLANG_WARN_ASSIGN_ENUM = YES +GCC_WARN_SIGN_COMPARE = YES +CLANG_WARN_STRICT_PROTOTYPES = YES +CLANG_WARN_COMMA = YES +CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES +GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES +GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES +CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE +GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE +GCC_WARN_UNKNOWN_PRAGMAS = YES +CLANG_WARN_UNREACHABLE_CODE = YES +GCC_WARN_UNUSED_FUNCTION = YES +GCC_WARN_UNUSED_LABEL = YES +GCC_WARN_UNUSED_VARIABLE = YES +CLANG_WARN_RANGE_LOOP_ANALYSIS = YES +CLANG_WARN_SUSPICIOUS_MOVE = YES +CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +CLANG_WARN_OBJC_LITERAL_CONVERSION = YES +CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES +CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES +GCC_WARN_UNDECLARED_SELECTOR = YES +CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR +CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES +RUN_CLANG_STATIC_ANALYZER = YES +CLANG_STATIC_ANALYZER_MODE = deep +CLANG_ANALYZER_NONNULL = YES +CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES +CLANG_ANALYZER_LOCALIZABILITY_EMPTY_CONTEXT = YES +CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE +CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES +SWIFT_SWIFT3_OBJC_INFERENCE = Off +SWIFT_VERSION = 4.0 +SWIFT_TREAT_WARNINGS_AS_ERRORS = YES + + diff --git a/Frameworks/RSParser/xcconfig/RSParser_project_debug.xcconfig b/Frameworks/RSParser/xcconfig/RSParser_project_debug.xcconfig new file mode 100644 index 000000000..af2aa7a64 --- /dev/null +++ b/Frameworks/RSParser/xcconfig/RSParser_project_debug.xcconfig @@ -0,0 +1,14 @@ +#include "./RSParser_project.xcconfig" + +DEBUG_INFORMATION_FORMAT = dwarf +ENABLE_TESTABILITY = YES +GCC_DYNAMIC_NO_PIC = NO +GCC_OPTIMIZATION_LEVEL = 0 +GCC_PREPROCESSOR_DEFINITIONS = DEBUG=1 $(inherited) + +MTL_ENABLE_DEBUG_INFO = YES +SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG +SWIFT_COMPILATION_MODE = singlefile +SWIFT_OPTIMIZATION_LEVEL = -Onone +ONLY_ACTIVE_ARCH = YES + diff --git a/Frameworks/RSParser/xcconfig/RSParser_project_release.xcconfig b/Frameworks/RSParser/xcconfig/RSParser_project_release.xcconfig new file mode 100644 index 000000000..3518d68ee --- /dev/null +++ b/Frameworks/RSParser/xcconfig/RSParser_project_release.xcconfig @@ -0,0 +1,9 @@ +#include "./RSParser_project.xcconfig" + +DEBUG_INFORMATION_FORMAT = dwarf-with-dsym +ENABLE_NS_ASSERTIONS = NO + +MTL_ENABLE_DEBUG_INFO = NO +SWIFT_OPTIMIZATION_LEVEL = -O + +SWIFT_COMPILATION_MODE = wholemodule diff --git a/Frameworks/RSParser/xcconfig/RSParser_target.xcconfig b/Frameworks/RSParser/xcconfig/RSParser_target.xcconfig new file mode 100644 index 000000000..bc0dc2149 --- /dev/null +++ b/Frameworks/RSParser/xcconfig/RSParser_target.xcconfig @@ -0,0 +1,15 @@ + +INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Frameworks +SKIP_INSTALL = YES +DYLIB_COMPATIBILITY_VERSION = 1 +DYLIB_CURRENT_VERSION = 1 +DYLIB_INSTALL_NAME_BASE = @rpath +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/Frameworks +HEADER_SEARCH_PATHS = ${SDKROOT}/usr/include/libxml2 +DEFINES_MODULE = YES +FRAMEWORK_VERSION = A +INFOPLIST_FILE = Info.plist +PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSParser +PRODUCT_NAME = $(TARGET_NAME:c99extidentifier) +CLANG_ENABLE_MODULES = YES + diff --git a/Frameworks/RSTextDrawing/RSTextDrawing.xcodeproj/project.pbxproj b/Frameworks/RSTextDrawing/RSTextDrawing.xcodeproj/project.pbxproj index e45ce85be..8f4524a59 100644 --- a/Frameworks/RSTextDrawing/RSTextDrawing.xcodeproj/project.pbxproj +++ b/Frameworks/RSTextDrawing/RSTextDrawing.xcodeproj/project.pbxproj @@ -53,6 +53,11 @@ 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 */ @@ -94,6 +99,7 @@ 8439DA091C8937C800E5E4B4 /* RSTextDrawingTests */, 8439D9FC1C8937C800E5E4B4 /* Products */, 84E697E31C8E6C01009C585A /* RSCore.framework */, + D511EF1420242EB900712EC3 /* xcconfig */, ); sourceTree = ""; }; @@ -115,6 +121,18 @@ 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 */ @@ -260,175 +278,45 @@ /* Begin XCBuildConfiguration section */ 8439DA0D1C8937C800E5E4B4 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF1720242EB900712EC3 /* RSTextDrawing_project_debug.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "-"; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.13; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; }; name = Debug; }; 8439DA0E1C8937C800E5E4B4 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF1520242EB900712EC3 /* RSTextDrawing_project_release.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "-"; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.13; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = macosx; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; }; name = Release; }; 8439DA101C8937C800E5E4B4 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF1920242EB900712EC3 /* RSTextDrawing_target.xcconfig */; buildSettings = { - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - COMBINE_HIDPI_IMAGES = YES; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - INFOPLIST_FILE = RSTextDrawing/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSTextDrawing; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; }; name = Debug; }; 8439DA111C8937C800E5E4B4 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF1920242EB900712EC3 /* RSTextDrawing_target.xcconfig */; buildSettings = { - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - COMBINE_HIDPI_IMAGES = YES; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - INFOPLIST_FILE = RSTextDrawing/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSTextDrawing; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; }; name = Release; }; 8439DA131C8937C800E5E4B4 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF1620242EB900712EC3 /* RSTextDrawingTests_target.xcconfig */; buildSettings = { - CLANG_ENABLE_OBJC_WEAK = YES; - COMBINE_HIDPI_IMAGES = YES; - INFOPLIST_FILE = RSTextDrawingTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSTextDrawingTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; }; name = Debug; }; 8439DA141C8937C800E5E4B4 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF1620242EB900712EC3 /* RSTextDrawingTests_target.xcconfig */; buildSettings = { - CLANG_ENABLE_OBJC_WEAK = YES; - COMBINE_HIDPI_IMAGES = YES; - INFOPLIST_FILE = RSTextDrawingTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSTextDrawingTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; }; name = Release; }; diff --git a/Frameworks/RSTextDrawing/xcconfig/RSTextDrawingTests_target.xcconfig b/Frameworks/RSTextDrawing/xcconfig/RSTextDrawingTests_target.xcconfig new file mode 100644 index 000000000..561ddbdf4 --- /dev/null +++ b/Frameworks/RSTextDrawing/xcconfig/RSTextDrawingTests_target.xcconfig @@ -0,0 +1,18 @@ +ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks +INFOPLIST_FILE = RSTextDrawingTests/Info.plist +PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSTextDrawingTests +PRODUCT_NAME = $(TARGET_NAME) + + + + + + + + + + + + + diff --git a/Frameworks/RSTextDrawing/xcconfig/RSTextDrawing_project.xcconfig b/Frameworks/RSTextDrawing/xcconfig/RSTextDrawing_project.xcconfig new file mode 100644 index 000000000..46c45296d --- /dev/null +++ b/Frameworks/RSTextDrawing/xcconfig/RSTextDrawing_project.xcconfig @@ -0,0 +1,55 @@ +CODE_SIGN_IDENTITY = +//CODE_SIGN_STYLE = Automatic +//DEVELOPMENT_TEAM = M8L2WTLA8W + +// See the notes in Evergreen_target.xcconfig on why the +// DeveloperSettings.xcconfig is #included here + +#include? "../../../SharedXcodeSettings/DeveloperSettings.xcconfig" + +SDKROOT = macosx +MACOSX_DEPLOYMENT_TARGET = 10.13 +CLANG_ENABLE_OBJC_WEAK = YES +SWIFT_VERSION = 3.0 +COMBINE_HIDPI_IMAGES = YES + +COPY_PHASE_STRIP = NO +MACOSX_DEPLOYMENT_TARGET = 10.13 +ALWAYS_SEARCH_USER_PATHS = NO +CURRENT_PROJECT_VERSION = 1 +VERSION_INFO_PREFIX = +VERSIONING_SYSTEM = apple-generic +GCC_NO_COMMON_BLOCKS = YES +GCC_C_LANGUAGE_STANDARD = gnu99 +CLANG_CXX_LANGUAGE_STANDARD = gnu++0x +CLANG_CXX_LIBRARY = libc++ +CLANG_ENABLE_MODULES = YES +CLANG_ENABLE_OBJC_ARC = YES +ENABLE_STRICT_OBJC_MSGSEND = YES +CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES +CLANG_WARN_EMPTY_BODY = YES +CLANG_WARN_BOOL_CONVERSION = YES +CLANG_WARN_CONSTANT_CONVERSION = YES +GCC_WARN_64_TO_32_BIT_CONVERSION = YES +CLANG_WARN_ENUM_CONVERSION = YES +CLANG_WARN_INT_CONVERSION = YES +CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES +CLANG_WARN_INFINITE_RECURSION = YES +GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR +CLANG_WARN_STRICT_PROTOTYPES = YES +CLANG_WARN_COMMA = YES +CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE +GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE +CLANG_WARN_UNREACHABLE_CODE = YES +GCC_WARN_UNUSED_FUNCTION = YES +GCC_WARN_UNUSED_VARIABLE = YES +CLANG_WARN_RANGE_LOOP_ANALYSIS = YES +CLANG_WARN_SUSPICIOUS_MOVE = YES +CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +CLANG_WARN_OBJC_LITERAL_CONVERSION = YES +CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES +GCC_WARN_UNDECLARED_SELECTOR = YES +CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR +CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES + diff --git a/Frameworks/RSTextDrawing/xcconfig/RSTextDrawing_project_debug.xcconfig b/Frameworks/RSTextDrawing/xcconfig/RSTextDrawing_project_debug.xcconfig new file mode 100644 index 000000000..3ea6eb8ca --- /dev/null +++ b/Frameworks/RSTextDrawing/xcconfig/RSTextDrawing_project_debug.xcconfig @@ -0,0 +1,15 @@ +#include "./RSTextDrawing_project.xcconfig" + +DEBUG_INFORMATION_FORMAT = dwarf +ENABLE_TESTABILITY = YES +GCC_DYNAMIC_NO_PIC = NO +GCC_OPTIMIZATION_LEVEL = 0 +GCC_PREPROCESSOR_DEFINITIONS = DEBUG=1 $(inherited) + +MTL_ENABLE_DEBUG_INFO = YES +SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG +SWIFT_COMPILATION_MODE = singlefile +SWIFT_OPTIMIZATION_LEVEL = -Onone +ONLY_ACTIVE_ARCH = YES + + diff --git a/Frameworks/RSTextDrawing/xcconfig/RSTextDrawing_project_release.xcconfig b/Frameworks/RSTextDrawing/xcconfig/RSTextDrawing_project_release.xcconfig new file mode 100644 index 000000000..547be4572 --- /dev/null +++ b/Frameworks/RSTextDrawing/xcconfig/RSTextDrawing_project_release.xcconfig @@ -0,0 +1,9 @@ +#include "./RSTextDrawing_project.xcconfig" + +DEBUG_INFORMATION_FORMAT = dwarf-with-dsym +ENABLE_NS_ASSERTIONS = NO + +MTL_ENABLE_DEBUG_INFO = NO +SWIFT_OPTIMIZATION_LEVEL = -O + +SWIFT_COMPILATION_MODE = wholemodule diff --git a/Frameworks/RSTextDrawing/xcconfig/RSTextDrawing_target.xcconfig b/Frameworks/RSTextDrawing/xcconfig/RSTextDrawing_target.xcconfig new file mode 100644 index 000000000..68808be46 --- /dev/null +++ b/Frameworks/RSTextDrawing/xcconfig/RSTextDrawing_target.xcconfig @@ -0,0 +1,14 @@ + +INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Frameworks +SKIP_INSTALL = YES +DYLIB_COMPATIBILITY_VERSION = 1 +DYLIB_CURRENT_VERSION = 1 +DYLIB_INSTALL_NAME_BASE = @rpath +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/Frameworks +DEFINES_MODULE = YES +FRAMEWORK_VERSION = A +INFOPLIST_FILE = RSTextDrawing/Info.plist +PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSTextDrawing +PRODUCT_NAME = $(TARGET_NAME) +CLANG_ENABLE_MODULES = YES + diff --git a/Frameworks/RSTree/RSTree.xcodeproj/project.pbxproj b/Frameworks/RSTree/RSTree.xcodeproj/project.pbxproj index 30533f757..aab2bf0f1 100644 --- a/Frameworks/RSTree/RSTree.xcodeproj/project.pbxproj +++ b/Frameworks/RSTree/RSTree.xcodeproj/project.pbxproj @@ -39,6 +39,11 @@ 84C567C91CFCBA0E005B711B /* TreeController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; name = TreeController.swift; path = RSTree/TreeController.swift; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; 84C567CB1CFCBA16005B711B /* Node.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; name = Node.swift; path = RSTree/Node.swift; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; 84FEB30C1D7DE284008A237C /* NodePath.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = NodePath.swift; path = RSTree/NodePath.swift; sourceTree = ""; }; + D511EF1B20242EC900712EC3 /* RSTreeTests_target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSTreeTests_target.xcconfig; sourceTree = ""; }; + D511EF1C20242EC900712EC3 /* RSTree_project.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSTree_project.xcconfig; sourceTree = ""; }; + D511EF1D20242EC900712EC3 /* RSTree_target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSTree_target.xcconfig; sourceTree = ""; }; + D511EF1E20242EC900712EC3 /* RSTree_project_debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSTree_project_debug.xcconfig; sourceTree = ""; }; + D511EF1F20242EC900712EC3 /* RSTree_project_release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSTree_project_release.xcconfig; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -72,6 +77,7 @@ 842A0BE61CFCB9BC00BF746C /* Info.plist */, 842A0BEF1CFCB9BC00BF746C /* RSTreeTests */, 842A0BE21CFCB9BC00BF746C /* Products */, + D511EF1A20242EC900712EC3 /* xcconfig */, ); sourceTree = ""; }; @@ -93,6 +99,18 @@ path = RSTreeTests; sourceTree = ""; }; + D511EF1A20242EC900712EC3 /* xcconfig */ = { + isa = PBXGroup; + children = ( + D511EF1C20242EC900712EC3 /* RSTree_project.xcconfig */, + D511EF1E20242EC900712EC3 /* RSTree_project_debug.xcconfig */, + D511EF1F20242EC900712EC3 /* RSTree_project_release.xcconfig */, + D511EF1D20242EC900712EC3 /* RSTree_target.xcconfig */, + D511EF1B20242EC900712EC3 /* RSTreeTests_target.xcconfig */, + ); + path = xcconfig; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -232,182 +250,43 @@ /* Begin XCBuildConfiguration section */ 842A0BF31CFCB9BC00BF746C /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF1E20242EC900712EC3 /* RSTree_project_debug.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.13; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; }; name = Debug; }; 842A0BF41CFCB9BC00BF746C /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF1F20242EC900712EC3 /* RSTree_project_release.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.13; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = macosx; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; }; name = Release; }; 842A0BF61CFCB9BC00BF746C /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF1D20242EC900712EC3 /* RSTree_target.xcconfig */; buildSettings = { - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - COMBINE_HIDPI_IMAGES = YES; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - INFOPLIST_FILE = RSTree/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSTree; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; }; name = Debug; }; 842A0BF71CFCB9BC00BF746C /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF1D20242EC900712EC3 /* RSTree_target.xcconfig */; buildSettings = { - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - COMBINE_HIDPI_IMAGES = YES; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - INFOPLIST_FILE = RSTree/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSTree; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; }; name = Release; }; 842A0BF91CFCB9BC00BF746C /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF1B20242EC900712EC3 /* RSTreeTests_target.xcconfig */; buildSettings = { - CLANG_ENABLE_OBJC_WEAK = YES; - COMBINE_HIDPI_IMAGES = YES; - INFOPLIST_FILE = RSTreeTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSTreeTests; - PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; }; 842A0BFA1CFCB9BC00BF746C /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF1B20242EC900712EC3 /* RSTreeTests_target.xcconfig */; buildSettings = { - CLANG_ENABLE_OBJC_WEAK = YES; - COMBINE_HIDPI_IMAGES = YES; - INFOPLIST_FILE = RSTreeTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSTreeTests; - PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; }; diff --git a/Frameworks/RSTree/xcconfig/RSTreeTests_target.xcconfig b/Frameworks/RSTree/xcconfig/RSTreeTests_target.xcconfig new file mode 100644 index 000000000..6d286a342 --- /dev/null +++ b/Frameworks/RSTree/xcconfig/RSTreeTests_target.xcconfig @@ -0,0 +1,18 @@ + +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks +INFOPLIST_FILE = RSTreeTests/Info.plist +PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSTreeTests +PRODUCT_NAME = $(TARGET_NAME) + + + + + + + + + + + + + diff --git a/Frameworks/RSTree/xcconfig/RSTree_project.xcconfig b/Frameworks/RSTree/xcconfig/RSTree_project.xcconfig new file mode 100644 index 000000000..0dec0ffb9 --- /dev/null +++ b/Frameworks/RSTree/xcconfig/RSTree_project.xcconfig @@ -0,0 +1,54 @@ +CODE_SIGN_IDENTITY = + +// See the notes in Evergreen_target.xcconfig on why the +// DeveloperSettings.xcconfig is #included here + +#include? "../../../SharedXcodeSettings/DeveloperSettings.xcconfig" + +SDKROOT = macosx +MACOSX_DEPLOYMENT_TARGET = 10.13 +CLANG_ENABLE_OBJC_WEAK = YES +SWIFT_VERSION = 4.0 +COMBINE_HIDPI_IMAGES = YES + +COPY_PHASE_STRIP = NO +MACOSX_DEPLOYMENT_TARGET = 10.13 +ALWAYS_SEARCH_USER_PATHS = NO +CURRENT_PROJECT_VERSION = 1 +VERSION_INFO_PREFIX = +VERSIONING_SYSTEM = apple-generic +GCC_NO_COMMON_BLOCKS = YES +GCC_C_LANGUAGE_STANDARD = gnu99 +CLANG_CXX_LANGUAGE_STANDARD = gnu++0x +CLANG_CXX_LIBRARY = libc++ +CLANG_ENABLE_MODULES = YES +CLANG_ENABLE_OBJC_ARC = YES +ENABLE_STRICT_OBJC_MSGSEND = YES +CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES +CLANG_WARN_EMPTY_BODY = YES +CLANG_WARN_BOOL_CONVERSION = YES +CLANG_WARN_CONSTANT_CONVERSION = YES +GCC_WARN_64_TO_32_BIT_CONVERSION = YES +CLANG_WARN_ENUM_CONVERSION = YES +CLANG_WARN_INT_CONVERSION = YES +CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES +CLANG_WARN_INFINITE_RECURSION = YES +GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR +CLANG_WARN_STRICT_PROTOTYPES = YES +CLANG_WARN_COMMA = YES +CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE +GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE +CLANG_WARN_UNREACHABLE_CODE = YES +GCC_WARN_UNUSED_FUNCTION = YES +GCC_WARN_UNUSED_VARIABLE = YES +CLANG_WARN_RANGE_LOOP_ANALYSIS = YES +CLANG_WARN_SUSPICIOUS_MOVE = YES +CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +CLANG_WARN_OBJC_LITERAL_CONVERSION = YES +CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES +GCC_WARN_UNDECLARED_SELECTOR = YES +CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR +CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES +CLANG_ANALYZER_NONNULL = YES +SWIFT_SWIFT3_OBJC_INFERENCE = Off diff --git a/Frameworks/RSTree/xcconfig/RSTree_project_debug.xcconfig b/Frameworks/RSTree/xcconfig/RSTree_project_debug.xcconfig new file mode 100644 index 000000000..23eda384f --- /dev/null +++ b/Frameworks/RSTree/xcconfig/RSTree_project_debug.xcconfig @@ -0,0 +1,15 @@ +#include "./RSTree_project.xcconfig" + +DEBUG_INFORMATION_FORMAT = dwarf +ENABLE_TESTABILITY = YES +GCC_DYNAMIC_NO_PIC = NO +GCC_OPTIMIZATION_LEVEL = 0 +GCC_PREPROCESSOR_DEFINITIONS = DEBUG=1 $(inherited) + +MTL_ENABLE_DEBUG_INFO = YES + +SWIFT_COMPILATION_MODE = singlefile +SWIFT_OPTIMIZATION_LEVEL = -Onone +ONLY_ACTIVE_ARCH = YES + + diff --git a/Frameworks/RSTree/xcconfig/RSTree_project_release.xcconfig b/Frameworks/RSTree/xcconfig/RSTree_project_release.xcconfig new file mode 100644 index 000000000..67adb7e4e --- /dev/null +++ b/Frameworks/RSTree/xcconfig/RSTree_project_release.xcconfig @@ -0,0 +1,9 @@ +#include "./RSTree_project.xcconfig" + +DEBUG_INFORMATION_FORMAT = dwarf-with-dsym +ENABLE_NS_ASSERTIONS = NO + +MTL_ENABLE_DEBUG_INFO = NO +SWIFT_OPTIMIZATION_LEVEL = -O + +SWIFT_COMPILATION_MODE = wholemodule diff --git a/Frameworks/RSTree/xcconfig/RSTree_target.xcconfig b/Frameworks/RSTree/xcconfig/RSTree_target.xcconfig new file mode 100644 index 000000000..cf977fa2c --- /dev/null +++ b/Frameworks/RSTree/xcconfig/RSTree_target.xcconfig @@ -0,0 +1,14 @@ + +INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Frameworks +SKIP_INSTALL = YES +DYLIB_COMPATIBILITY_VERSION = 1 +DYLIB_CURRENT_VERSION = 1 +DYLIB_INSTALL_NAME_BASE = @rpath +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/Frameworks +DEFINES_MODULE = YES +FRAMEWORK_VERSION = A +INFOPLIST_FILE = RSTree/Info.plist +PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSTree +PRODUCT_NAME = $(TARGET_NAME) +CLANG_ENABLE_MODULES = YES + diff --git a/Frameworks/RSWeb/RSWeb.xcodeproj/project.pbxproj b/Frameworks/RSWeb/RSWeb.xcodeproj/project.pbxproj index d082e7398..15e588f21 100755 --- a/Frameworks/RSWeb/RSWeb.xcodeproj/project.pbxproj +++ b/Frameworks/RSWeb/RSWeb.xcodeproj/project.pbxproj @@ -96,6 +96,15 @@ 849C08C61E0CAC86006B03FA /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 849C08D51E0CACA3006B03FA /* RSWeb.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RSWeb.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 849C08D81E0CACA3006B03FA /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + D511EF2120242EDA00712EC3 /* RSWeb_project_debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSWeb_project_debug.xcconfig; sourceTree = ""; }; + D511EF2220242EDA00712EC3 /* RSWeb_project.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSWeb_project.xcconfig; sourceTree = ""; }; + D511EF2320242EDA00712EC3 /* RSWeb_target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSWeb_target.xcconfig; sourceTree = ""; }; + D511EF2420242EDA00712EC3 /* RSWeb_project_release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSWeb_project_release.xcconfig; sourceTree = ""; }; + D511EF2520242EDA00712EC3 /* RSWebTests_target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSWebTests_target.xcconfig; sourceTree = ""; }; + D511EF32202464A100712EC3 /* RSWeb_mac_target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSWeb_mac_target.xcconfig; sourceTree = ""; }; + D511EF33202464A200712EC3 /* RSWeb_ios_target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSWeb_ios_target.xcconfig; sourceTree = ""; }; + D511EF34202464A200712EC3 /* RSWeb_ios_target_release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSWeb_ios_target_release.xcconfig; sourceTree = ""; }; + D511EF35202464A200712EC3 /* RSWeb_ios_target_debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = RSWeb_ios_target_debug.xcconfig; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -162,6 +171,7 @@ 849C08C31E0CAC86006B03FA /* RSWebTests */, 849C08D61E0CACA3006B03FA /* RSWebiOS */, 849C08B71E0CAC85006B03FA /* Products */, + D511EF2020242EDA00712EC3 /* xcconfig */, ); sourceTree = ""; }; @@ -218,6 +228,22 @@ name = Downloading; sourceTree = ""; }; + D511EF2020242EDA00712EC3 /* xcconfig */ = { + isa = PBXGroup; + children = ( + D511EF2220242EDA00712EC3 /* RSWeb_project.xcconfig */, + D511EF2120242EDA00712EC3 /* RSWeb_project_debug.xcconfig */, + D511EF2420242EDA00712EC3 /* RSWeb_project_release.xcconfig */, + D511EF2320242EDA00712EC3 /* RSWeb_target.xcconfig */, + D511EF33202464A200712EC3 /* RSWeb_ios_target.xcconfig */, + D511EF35202464A200712EC3 /* RSWeb_ios_target_debug.xcconfig */, + D511EF34202464A200712EC3 /* RSWeb_ios_target_release.xcconfig */, + D511EF32202464A100712EC3 /* RSWeb_mac_target.xcconfig */, + D511EF2520242EDA00712EC3 /* RSWebTests_target.xcconfig */, + ); + path = xcconfig; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -443,283 +469,57 @@ /* Begin XCBuildConfiguration section */ 849C08C81E0CAC86006B03FA /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF2120242EDA00712EC3 /* RSWeb_project_debug.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES; - CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES; - CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_STATIC_ANALYZER_MODE = deep; - CLANG_WARN_ASSIGN_ENUM = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; - GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES; - GCC_TREAT_WARNINGS_AS_ERRORS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES; - GCC_WARN_ABOUT_MISSING_NEWLINE = YES; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES; - GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES; - GCC_WARN_SHADOW = YES; - GCC_WARN_SIGN_COMPARE = YES; - GCC_WARN_STRICT_SELECTOR_MATCH = YES; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNKNOWN_PRAGMAS = YES; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_LABEL = YES; - GCC_WARN_UNUSED_PARAMETER = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.13; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - RUN_CLANG_STATIC_ANALYZER = YES; - SDKROOT = macosx; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_TREAT_WARNINGS_AS_ERRORS = YES; - SWIFT_VERSION = 4.0; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; }; name = Debug; }; 849C08C91E0CAC86006B03FA /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF2420242EDA00712EC3 /* RSWeb_project_release.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES; - CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES; - CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_STATIC_ANALYZER_MODE = deep; - CLANG_WARN_ASSIGN_ENUM = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; - GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES; - GCC_TREAT_WARNINGS_AS_ERRORS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES; - GCC_WARN_ABOUT_MISSING_NEWLINE = YES; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES; - GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES; - GCC_WARN_SHADOW = YES; - GCC_WARN_SIGN_COMPARE = YES; - GCC_WARN_STRICT_SELECTOR_MATCH = YES; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNKNOWN_PRAGMAS = YES; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_LABEL = YES; - GCC_WARN_UNUSED_PARAMETER = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.13; - MTL_ENABLE_DEBUG_INFO = NO; - RUN_CLANG_STATIC_ANALYZER = YES; - SDKROOT = macosx; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_TREAT_WARNINGS_AS_ERRORS = YES; - SWIFT_VERSION = 4.0; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; }; name = Release; }; 849C08CB1E0CAC86006B03FA /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF32202464A100712EC3 /* RSWeb_mac_target.xcconfig */; buildSettings = { - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CODE_SIGN_IDENTITY = ""; - COMBINE_HIDPI_IMAGES = YES; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = 9C84TZ7Q6Z; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - INFOPLIST_FILE = RSWeb/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSWeb; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; }; name = Debug; }; 849C08CC1E0CAC86006B03FA /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF32202464A100712EC3 /* RSWeb_mac_target.xcconfig */; buildSettings = { - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CODE_SIGN_IDENTITY = ""; - COMBINE_HIDPI_IMAGES = YES; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = 9C84TZ7Q6Z; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - INFOPLIST_FILE = RSWeb/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSWeb; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; }; name = Release; }; 849C08CE1E0CAC86006B03FA /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF2520242EDA00712EC3 /* RSWebTests_target.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = 9C84TZ7Q6Z; - INFOPLIST_FILE = RSWebTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSWebTests; - PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; }; 849C08CF1E0CAC86006B03FA /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF2520242EDA00712EC3 /* RSWebTests_target.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = 9C84TZ7Q6Z; - INFOPLIST_FILE = RSWebTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSWebTests; - PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; }; 849C08DB1E0CACA3006B03FA /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF35202464A200712EC3 /* RSWeb_ios_target_debug.xcconfig */; buildSettings = { - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = 9C84TZ7Q6Z; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = RSWebiOS/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.2; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSWebiOS; - PRODUCT_NAME = RSWeb; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; 849C08DC1E0CACA3006B03FA /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D511EF34202464A200712EC3 /* RSWeb_ios_target_release.xcconfig */; buildSettings = { - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = 9C84TZ7Q6Z; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = RSWebiOS/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.2; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSWebiOS; - PRODUCT_NAME = RSWeb; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; }; name = Release; }; diff --git a/Frameworks/RSWeb/xcconfig/RSWebTests_target.xcconfig b/Frameworks/RSWeb/xcconfig/RSWebTests_target.xcconfig new file mode 100644 index 000000000..46f243c09 --- /dev/null +++ b/Frameworks/RSWeb/xcconfig/RSWebTests_target.xcconfig @@ -0,0 +1,18 @@ +ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks +INFOPLIST_FILE = RSWebTests/Info.plist +PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSWebTests +PRODUCT_NAME = $(TARGET_NAME) +CLANG_ENABLE_OBJC_WEAK = YES + + + + + + + + + + + + diff --git a/Frameworks/RSWeb/xcconfig/RSWeb_ios_target.xcconfig b/Frameworks/RSWeb/xcconfig/RSWeb_ios_target.xcconfig new file mode 100644 index 000000000..a21cb1615 --- /dev/null +++ b/Frameworks/RSWeb/xcconfig/RSWeb_ios_target.xcconfig @@ -0,0 +1,19 @@ +#include "./RSWeb_target.xcconfig" + +CODE_SIGN_IDENTITY = +DEVELOPMENT_TEAM = 9C84TZ7Q6Z + +// See the notes in Evergreen_target.xcconfig on why the +// DeveloperSettings.xcconfig is #included here + +#include? "../../../SharedXcodeSettings/DeveloperSettings.xcconfig" + +SDKROOT = iphoneos +TARGETED_DEVICE_FAMILY = 1,2 +IPHONEOS_DEPLOYMENT_TARGET = 10.2 + +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @loader_path/Frameworks +INFOPLIST_FILE = RSWebiOS/Info.plist +PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSWebiOS +PRODUCT_NAME = RSWeb +CLANG_ENABLE_MODULES = YES diff --git a/Frameworks/RSWeb/xcconfig/RSWeb_ios_target_debug.xcconfig b/Frameworks/RSWeb/xcconfig/RSWeb_ios_target_debug.xcconfig new file mode 100644 index 000000000..c2bb0d048 --- /dev/null +++ b/Frameworks/RSWeb/xcconfig/RSWeb_ios_target_debug.xcconfig @@ -0,0 +1,5 @@ +#include "./RSWeb_ios_target.xcconfig" + +VALIDATE_PRODUCT = NO + + diff --git a/Frameworks/RSWeb/xcconfig/RSWeb_ios_target_release.xcconfig b/Frameworks/RSWeb/xcconfig/RSWeb_ios_target_release.xcconfig new file mode 100644 index 000000000..a675c5cef --- /dev/null +++ b/Frameworks/RSWeb/xcconfig/RSWeb_ios_target_release.xcconfig @@ -0,0 +1,4 @@ +#include "./RSWeb_ios_target.xcconfig" + +VALIDATE_PRODUCT = YES + diff --git a/Frameworks/RSWeb/xcconfig/RSWeb_mac_target.xcconfig b/Frameworks/RSWeb/xcconfig/RSWeb_mac_target.xcconfig new file mode 100644 index 000000000..555c8c174 --- /dev/null +++ b/Frameworks/RSWeb/xcconfig/RSWeb_mac_target.xcconfig @@ -0,0 +1,13 @@ +#include "./RSWeb_target.xcconfig" + +CODE_SIGN_IDENTITY = +DEVELOPMENT_TEAM = 9C84TZ7Q6Z + +// See the notes in Evergreen_target.xcconfig on why the +// DeveloperSettings.xcconfig is #included here + +#include? "../../../SharedXcodeSettings/DeveloperSettings.xcconfig" + +INFOPLIST_FILE = RSWeb/Info.plist +PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSWeb + diff --git a/Frameworks/RSWeb/xcconfig/RSWeb_project.xcconfig b/Frameworks/RSWeb/xcconfig/RSWeb_project.xcconfig new file mode 100644 index 000000000..602fc34ce --- /dev/null +++ b/Frameworks/RSWeb/xcconfig/RSWeb_project.xcconfig @@ -0,0 +1,69 @@ +CODE_SIGN_IDENTITY = + +SDKROOT = macosx +MACOSX_DEPLOYMENT_TARGET = 10.13 +CLANG_ENABLE_OBJC_WEAK = YES +SWIFT_VERSION = 4.0 +COMBINE_HIDPI_IMAGES = YES + +COPY_PHASE_STRIP = NO +MACOSX_DEPLOYMENT_TARGET = 10.13 +ALWAYS_SEARCH_USER_PATHS = NO +CURRENT_PROJECT_VERSION = 1 +VERSION_INFO_PREFIX = +VERSIONING_SYSTEM = apple-generic +GCC_NO_COMMON_BLOCKS = YES +GCC_C_LANGUAGE_STANDARD = gnu99 +CLANG_CXX_LANGUAGE_STANDARD = gnu++0x +CLANG_CXX_LIBRARY = libc++ +CLANG_ENABLE_MODULES = YES +CLANG_ENABLE_OBJC_ARC = YES +ENABLE_STRICT_OBJC_MSGSEND = YES +CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES +CLANG_WARN_DOCUMENTATION_COMMENTS = YES +CLANG_WARN_EMPTY_BODY = YES +GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES +GCC_WARN_SHADOW = YES +CLANG_WARN_BOOL_CONVERSION = YES +CLANG_WARN_CONSTANT_CONVERSION = YES +GCC_WARN_64_TO_32_BIT_CONVERSION = YES +CLANG_WARN_ENUM_CONVERSION = YES +CLANG_WARN_INT_CONVERSION = YES +CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES +CLANG_WARN_INFINITE_RECURSION = YES +GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES +GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR +GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES +GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES +GCC_WARN_ABOUT_MISSING_NEWLINE = YES +CLANG_WARN_ASSIGN_ENUM = YES +GCC_WARN_SIGN_COMPARE = YES +CLANG_WARN_STRICT_PROTOTYPES = YES +CLANG_WARN_COMMA = YES +CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES +GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES +GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES +CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE +GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE +GCC_WARN_UNKNOWN_PRAGMAS = YES +CLANG_WARN_UNREACHABLE_CODE = YES +GCC_WARN_UNUSED_FUNCTION = YES +GCC_WARN_UNUSED_LABEL = YES +GCC_WARN_UNUSED_PARAMETER = YES +GCC_WARN_UNUSED_VARIABLE = YES +CLANG_WARN_RANGE_LOOP_ANALYSIS = YES +CLANG_WARN_SUSPICIOUS_MOVE = YES +CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES +GCC_WARN_STRICT_SELECTOR_MATCH = YES +GCC_WARN_UNDECLARED_SELECTOR = YES +CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR +CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES +RUN_CLANG_STATIC_ANALYZER = YES +CLANG_STATIC_ANALYZER_MODE = deep +CLANG_ANALYZER_NONNULL = YES +CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES +SWIFT_TREAT_WARNINGS_AS_ERRORS = YES diff --git a/Frameworks/RSWeb/xcconfig/RSWeb_project_debug.xcconfig b/Frameworks/RSWeb/xcconfig/RSWeb_project_debug.xcconfig new file mode 100644 index 000000000..a05a383b8 --- /dev/null +++ b/Frameworks/RSWeb/xcconfig/RSWeb_project_debug.xcconfig @@ -0,0 +1,16 @@ +#include "./RSWeb_project.xcconfig" + +DEBUG_INFORMATION_FORMAT = dwarf +ENABLE_TESTABILITY = YES +GCC_DYNAMIC_NO_PIC = NO +GCC_OPTIMIZATION_LEVEL = 0 +GCC_PREPROCESSOR_DEFINITIONS = DEBUG=1 $(inherited) +GCC_TREAT_WARNINGS_AS_ERRORS = YES + +MTL_ENABLE_DEBUG_INFO = YES +SWIFT_COMPILATION_MODE = singlefile +SWIFT_OPTIMIZATION_LEVEL = -Onone +SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG +ONLY_ACTIVE_ARCH = YES + + diff --git a/Frameworks/RSWeb/xcconfig/RSWeb_project_release.xcconfig b/Frameworks/RSWeb/xcconfig/RSWeb_project_release.xcconfig new file mode 100644 index 000000000..c740f67be --- /dev/null +++ b/Frameworks/RSWeb/xcconfig/RSWeb_project_release.xcconfig @@ -0,0 +1,9 @@ +#include "./RSWeb_project.xcconfig" + +DEBUG_INFORMATION_FORMAT = dwarf-with-dsym +ENABLE_NS_ASSERTIONS = NO + +MTL_ENABLE_DEBUG_INFO = NO +SWIFT_OPTIMIZATION_LEVEL = -O + +SWIFT_COMPILATION_MODE = wholemodule diff --git a/Frameworks/RSWeb/xcconfig/RSWeb_target.xcconfig b/Frameworks/RSWeb/xcconfig/RSWeb_target.xcconfig new file mode 100644 index 000000000..b985fc205 --- /dev/null +++ b/Frameworks/RSWeb/xcconfig/RSWeb_target.xcconfig @@ -0,0 +1,12 @@ + +INSTALL_PATH = $(LOCAL_LIBRARY_DIR)/Frameworks +SKIP_INSTALL = YES +DYLIB_COMPATIBILITY_VERSION = 1 +DYLIB_CURRENT_VERSION = 1 +DYLIB_INSTALL_NAME_BASE = @rpath +LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/Frameworks +DEFINES_MODULE = YES +FRAMEWORK_VERSION = A +PRODUCT_NAME = $(TARGET_NAME) +CLANG_ENABLE_MODULES = YES +