241 changed files with 10938 additions and 13250 deletions
--- a/Framework/Mac/module.modulemap
+++ b/Framework/Mac/module.modulemap
@ -13,7 +13,6 @@ framework module YapDatabase {
 		header "YapBidirectionalCache.h"
 		header "YapCache.h"
 		header "YapCollectionKey.h"
-		header "YapDatabaseAtomic.h"
 		header "YapDatabaseConnectionConfig.h"
 		header "YapDatabaseQuery.h"
 		header "YapMurmurHash.h"
@ -22,11 +21,7 @@ framework module YapDatabase {
 		header "YapWhitelistBlacklist.h"
 		header "YapMutationStack.h"
 	}
-
-	explicit module YapDatabaseExtensionPrivate {
-		header "YapDatabaseExtensionPrivate.h"
-	}
-
+	
 	// Extension: View

 	explicit module YapDatabaseView {
@ -39,16 +34,16 @@ framework module YapDatabase {
 		header "YapDatabaseViewRangeOptions.h"
 	}

-	// Extension: AutoView
+    // Extension: AutoView

-	explicit module YapDatabaseAutoView {
-		header "YapDatabaseViewTypes.h"
-		header "YapDatabaseAutoView.h"
-		header "YapDatabaseAutoViewConnection.h"
-		header "YapDatabaseAutoViewTransaction.h"
+    explicit module YapDatabaseAutoView {
+        header "YapDatabaseViewTypes.h"
+        header "YapDatabaseAutoView.h"
+        header "YapDatabaseAutoViewConnection.h"
+        header "YapDatabaseAutoViewTransaction.h"

-		export YapDatabaseView
-	}
+        export YapDatabaseView
+    }

 	// Extension: FilteredView
 	
@ -183,13 +178,4 @@ framework module YapDatabase {
 		header "YapDatabaseCloudCorePipeline.h"
 		header "YapDatabaseCloudCoreGraph.h"
 	}
-
-	explicit module YapDatabaseCloudCorePrivate {
-		header "YapDatabaseCloudCorePrivate.h"
-		header "YapDatabaseCloudCoreOperationPrivate.h"
-		header "YapDatabaseCloudCorePipelinePrivate.h"
-		header "YapDatabaseCloudCoreGraphPrivate.h"
-		
-		export YapDatabaseExtensionPrivate
-	}
 }
--- a/Framework/iOS/module.modulemap
+++ b/Framework/iOS/module.modulemap
@ -13,7 +13,6 @@ framework module YapDatabase {
 		header "YapBidirectionalCache.h"
 		header "YapCache.h"
 		header "YapCollectionKey.h"
-		header "YapDatabaseAtomic.h"
 		header "YapDatabaseConnectionConfig.h"
 		header "YapDatabaseQuery.h"
 		header "YapMurmurHash.h"
@ -22,11 +21,7 @@ framework module YapDatabase {
 		header "YapWhitelistBlacklist.h"
 		header "YapMutationStack.h"
 	}
-
-	explicit module YapDatabaseExtensionPrivate {
-		header "YapDatabaseExtensionPrivate.h"
-	}
-
+	
 	// Extension: View
 	
 	explicit module YapDatabaseView {
@ -39,16 +34,16 @@ framework module YapDatabase {
 		header "YapDatabaseViewRangeOptions.h"
 	}

-	// Extension: AutoView
+    // Extension: AutoView

-	explicit module YapDatabaseAutoView {
-		header "YapDatabaseViewTypes.h"
-		header "YapDatabaseAutoView.h"
-		header "YapDatabaseAutoViewConnection.h"
-		header "YapDatabaseAutoViewTransaction.h"
+    explicit module YapDatabaseAutoView {
+        header "YapDatabaseViewTypes.h"
+        header "YapDatabaseAutoView.h"
+        header "YapDatabaseAutoViewConnection.h"
+        header "YapDatabaseAutoViewTransaction.h"

-		export YapDatabaseView
-	}
+        export YapDatabaseView
+    }

 	// Extension: FilteredView
 	
@ -183,13 +178,4 @@ framework module YapDatabase {
 		header "YapDatabaseCloudCorePipeline.h"
 		header "YapDatabaseCloudCoreGraph.h"
 	}
-
-	explicit module YapDatabaseCloudCorePrivate {
-		header "YapDatabaseCloudCorePrivate.h"
-		header "YapDatabaseCloudCoreOperationPrivate.h"
-		header "YapDatabaseCloudCorePipelinePrivate.h"
-		header "YapDatabaseCloudCoreGraphPrivate.h"
-		
-		export YapDatabaseExtensionPrivate
-	}
 }
--- a/Framework/tvOS/module.modulemap
+++ b/Framework/tvOS/module.modulemap
@ -13,7 +13,6 @@ framework module YapDatabase {
 		header "YapBidirectionalCache.h"
 		header "YapCache.h"
 		header "YapCollectionKey.h"
-		header "YapDatabaseAtomic.h"
 		header "YapDatabaseConnectionConfig.h"
 		header "YapDatabaseQuery.h"
 		header "YapMurmurHash.h"
@ -22,11 +21,7 @@ framework module YapDatabase {
 		header "YapWhitelistBlacklist.h"
 		header "YapMutationStack.h"
 	}
-
-	explicit module YapDatabaseExtensionPrivate {
-		header "YapDatabaseExtensionPrivate.h"
-	}
-
+	
 	// Extension: View

 	explicit module YapDatabaseView {
@ -183,13 +178,4 @@ framework module YapDatabase {
 		header "YapDatabaseCloudCorePipeline.h"
 		header "YapDatabaseCloudCoreGraph.h"
 	}
-
-	explicit module YapDatabaseCloudCorePrivate {
-		header "YapDatabaseCloudCorePrivate.h"
-		header "YapDatabaseCloudCoreOperationPrivate.h"
-		header "YapDatabaseCloudCorePipelinePrivate.h"
-		header "YapDatabaseCloudCoreGraphPrivate.h"
-		
-		export YapDatabaseExtensionPrivate
-	}
 }
--- a/Framework/watchOS/module.modulemap
+++ b/Framework/watchOS/module.modulemap
@ -13,7 +13,6 @@ framework module YapDatabase {
 		header "YapBidirectionalCache.h"
 		header "YapCache.h"
 		header "YapCollectionKey.h"
-		header "YapDatabaseAtomic.h"
 		header "YapDatabaseConnectionConfig.h"
 		header "YapDatabaseQuery.h"
 		header "YapMurmurHash.h"
@ -22,11 +21,7 @@ framework module YapDatabase {
 		header "YapWhitelistBlacklist.h"
 		header "YapMutationStack.h"
 	}
-
-	explicit module YapDatabaseExtensionPrivate {
-		header "YapDatabaseExtensionPrivate.h"
-	}
-
+	
 	// Extension: View

 	explicit module YapDatabaseView {
@ -183,13 +178,4 @@ framework module YapDatabase {
 		header "YapDatabaseCloudCorePipeline.h"
 		header "YapDatabaseCloudCoreGraph.h"
 	}
-
-	explicit module YapDatabaseCloudCorePrivate {
-		header "YapDatabaseCloudCorePrivate.h"
-		header "YapDatabaseCloudCoreOperationPrivate.h"
-		header "YapDatabaseCloudCorePipelinePrivate.h"
-		header "YapDatabaseCloudCoreGraphPrivate.h"
-		
-		export YapDatabaseExtensionPrivate
-	}
 }
--- a/Testing/Xcode-desktop/Podfile
+++ b/Testing/Xcode-desktop/Podfile
@ -12,12 +12,3 @@ end
 target 'MultiprocessApp' do
 	pod "YapDatabase", path: '../../'
 end
-
-post_install do |installer|
-	installer.pods_project.targets.each do |target|
-		target.build_configurations.each do |config|
-			config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET'
-			config.build_settings.delete 'MACOSX_DEPLOYMENT_TARGET'
-		end
-	end
-end
--- a/Testing/Xcode-desktop/Podfile.lock
+++ b/Testing/Xcode-desktop/Podfile.lock
@ -1,89 +1,85 @@
 PODS:
-  - CocoaLumberjack (3.4.2):
-    - CocoaLumberjack/Default (= 3.4.2)
-    - CocoaLumberjack/Extensions (= 3.4.2)
-  - CocoaLumberjack/Default (3.4.2)
-  - CocoaLumberjack/Extensions (3.4.2):
+  - CocoaLumberjack (3.4.1):
+    - CocoaLumberjack/Default (= 3.4.1)
+    - CocoaLumberjack/Extensions (= 3.4.1)
+  - CocoaLumberjack/Default (3.4.1)
+  - CocoaLumberjack/Extensions (3.4.1):
    - CocoaLumberjack/Default
-  - YapDatabase (3.1.1):
-    - YapDatabase/Standard (= 3.1.1)
-  - YapDatabase/Standard (3.1.1):
-    - YapDatabase/Standard/Core (= 3.1.1)
-    - YapDatabase/Standard/Extensions (= 3.1.1)
-  - YapDatabase/Standard/Core (3.1.1):
+  - YapDatabase (3.0.2):
+    - YapDatabase/Standard (= 3.0.2)
+  - YapDatabase/Standard (3.0.2):
+    - YapDatabase/Standard/Core (= 3.0.2)
+    - YapDatabase/Standard/Extensions (= 3.0.2)
+  - YapDatabase/Standard/Core (3.0.2):
    - CocoaLumberjack
-  - YapDatabase/Standard/Extensions (3.1.1):
+  - YapDatabase/Standard/Extensions (3.0.2):
    - YapDatabase/Standard/Core
-    - YapDatabase/Standard/Extensions/ActionManager (= 3.1.1)
-    - YapDatabase/Standard/Extensions/AutoView (= 3.1.1)
-    - YapDatabase/Standard/Extensions/CloudCore (= 3.1.1)
-    - YapDatabase/Standard/Extensions/CloudKit (= 3.1.1)
-    - YapDatabase/Standard/Extensions/ConnectionPool (= 3.1.1)
-    - YapDatabase/Standard/Extensions/ConnectionProxy (= 3.1.1)
-    - YapDatabase/Standard/Extensions/CrossProcessNotification (= 3.1.1)
-    - YapDatabase/Standard/Extensions/FilteredView (= 3.1.1)
-    - YapDatabase/Standard/Extensions/FullTextSearch (= 3.1.1)
-    - YapDatabase/Standard/Extensions/Hooks (= 3.1.1)
-    - YapDatabase/Standard/Extensions/ManualView (= 3.1.1)
-    - YapDatabase/Standard/Extensions/Relationships (= 3.1.1)
-    - YapDatabase/Standard/Extensions/RTreeIndex (= 3.1.1)
-    - YapDatabase/Standard/Extensions/SearchResultsView (= 3.1.1)
-    - YapDatabase/Standard/Extensions/SecondaryIndex (= 3.1.1)
-    - YapDatabase/Standard/Extensions/View (= 3.1.1)
-  - YapDatabase/Standard/Extensions/ActionManager (3.1.1):
+    - YapDatabase/Standard/Extensions/ActionManager (= 3.0.2)
+    - YapDatabase/Standard/Extensions/AutoView (= 3.0.2)
+    - YapDatabase/Standard/Extensions/CloudCore (= 3.0.2)
+    - YapDatabase/Standard/Extensions/CloudKit (= 3.0.2)
+    - YapDatabase/Standard/Extensions/ConnectionPool (= 3.0.2)
+    - YapDatabase/Standard/Extensions/ConnectionProxy (= 3.0.2)
+    - YapDatabase/Standard/Extensions/CrossProcessNotification (= 3.0.2)
+    - YapDatabase/Standard/Extensions/FilteredView (= 3.0.2)
+    - YapDatabase/Standard/Extensions/FullTextSearch (= 3.0.2)
+    - YapDatabase/Standard/Extensions/Hooks (= 3.0.2)
+    - YapDatabase/Standard/Extensions/ManualView (= 3.0.2)
+    - YapDatabase/Standard/Extensions/Relationships (= 3.0.2)
+    - YapDatabase/Standard/Extensions/RTreeIndex (= 3.0.2)
+    - YapDatabase/Standard/Extensions/SearchResultsView (= 3.0.2)
+    - YapDatabase/Standard/Extensions/SecondaryIndex (= 3.0.2)
+    - YapDatabase/Standard/Extensions/View (= 3.0.2)
+  - YapDatabase/Standard/Extensions/ActionManager (3.0.2):
    - YapDatabase/Standard/Core
    - YapDatabase/Standard/Extensions/AutoView
-  - YapDatabase/Standard/Extensions/AutoView (3.1.1):
+  - YapDatabase/Standard/Extensions/AutoView (3.0.2):
    - YapDatabase/Standard/Core
    - YapDatabase/Standard/Extensions/View
-  - YapDatabase/Standard/Extensions/CloudCore (3.1.1):
+  - YapDatabase/Standard/Extensions/CloudCore (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/CloudKit (3.1.1):
+  - YapDatabase/Standard/Extensions/CloudKit (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/ConnectionPool (3.1.1):
+  - YapDatabase/Standard/Extensions/ConnectionPool (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/ConnectionProxy (3.1.1):
+  - YapDatabase/Standard/Extensions/ConnectionProxy (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/CrossProcessNotification (3.1.1):
+  - YapDatabase/Standard/Extensions/CrossProcessNotification (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/FilteredView (3.1.1):
+  - YapDatabase/Standard/Extensions/FilteredView (3.0.2):
    - YapDatabase/Standard/Core
    - YapDatabase/Standard/Extensions/View
-  - YapDatabase/Standard/Extensions/FullTextSearch (3.1.1):
+  - YapDatabase/Standard/Extensions/FullTextSearch (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/Hooks (3.1.1):
+  - YapDatabase/Standard/Extensions/Hooks (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/ManualView (3.1.1):
+  - YapDatabase/Standard/Extensions/ManualView (3.0.2):
    - YapDatabase/Standard/Core
    - YapDatabase/Standard/Extensions/View
-  - YapDatabase/Standard/Extensions/Relationships (3.1.1):
+  - YapDatabase/Standard/Extensions/Relationships (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/RTreeIndex (3.1.1):
+  - YapDatabase/Standard/Extensions/RTreeIndex (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/SearchResultsView (3.1.1):
+  - YapDatabase/Standard/Extensions/SearchResultsView (3.0.2):
    - YapDatabase/Standard/Core
    - YapDatabase/Standard/Extensions/AutoView
    - YapDatabase/Standard/Extensions/FullTextSearch
-  - YapDatabase/Standard/Extensions/SecondaryIndex (3.1.1):
+  - YapDatabase/Standard/Extensions/SecondaryIndex (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/View (3.1.1):
+  - YapDatabase/Standard/Extensions/View (3.0.2):
    - YapDatabase/Standard/Core

 DEPENDENCIES:
  - YapDatabase (from `../../`)

-SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
-    - CocoaLumberjack
-
 EXTERNAL SOURCES:
  YapDatabase:
-    :path: "../../"
+    :path: ../../

 SPEC CHECKSUMS:
-  CocoaLumberjack: db7cc9e464771f12054c22ff6947c5a58d43a0fd
-  YapDatabase: 68188358039b289e962ddf55ffea39a336efd0e1
+  CocoaLumberjack: 2e258a064cacc8eb9a2aca318e24d02a0a7fd56d
+  YapDatabase: 972eccb0c997d0dafe8192dccf7f58351914baf1

-PODFILE CHECKSUM: c2d8695a2f756bf50f110a4ad94cf5aa99d53c43
+PODFILE CHECKSUM: 8dceb5c937bc6e9558d8d75103d141eef959b637

-COCOAPODS: 1.6.0.beta.2
+COCOAPODS: 1.4.0
--- a/Testing/Xcode-desktop/Pods/CocoaLumberjack/Classes/DDAbstractDatabaseLogger.m
+++ b/Testing/Xcode-desktop/Pods/CocoaLumberjack/Classes/DDAbstractDatabaseLogger.m
@ -217,7 +217,7 @@

    dispatch_sync(globalLoggingQueue, ^{
        dispatch_sync(self.loggerQueue, ^{
-            result = self->_saveThreshold;
+            result = _saveThreshold;
        });
    });

@ -227,15 +227,15 @@
 - (void)setSaveThreshold:(NSUInteger)threshold {
    dispatch_block_t block = ^{
        @autoreleasepool {
-            if (self->_saveThreshold != threshold) {
-                self->_saveThreshold = threshold;
+            if (_saveThreshold != threshold) {
+                _saveThreshold = threshold;

                // Since the saveThreshold has changed,
                // we check to see if the current unsavedCount has surpassed the new threshold.
                //
                // If it has, we immediately save the log.

-                if ((self->_unsavedCount >= self->_saveThreshold) && (self->_saveThreshold > 0)) {
+                if ((_unsavedCount >= _saveThreshold) && (_saveThreshold > 0)) {
                    [self performSaveAndSuspendSaveTimer];
                }
            }
@ -277,7 +277,7 @@

    dispatch_sync(globalLoggingQueue, ^{
        dispatch_sync(self.loggerQueue, ^{
-            result = self->_saveInterval;
+            result = _saveInterval;
        });
    });

@ -290,8 +290,8 @@
            // C99 recommended floating point comparison macro
            // Read: isLessThanOrGreaterThan(floatA, floatB)

-            if (/* saveInterval != interval */ islessgreater(self->_saveInterval, interval)) {
-                self->_saveInterval = interval;
+            if (/* saveInterval != interval */ islessgreater(_saveInterval, interval)) {
+                _saveInterval = interval;

                // There are several cases we need to handle here.
                //
@ -306,8 +306,8 @@
                // 4. If the saveInterval decreased, then we need to reset the timer so that it fires at an earlier date.
                //    (Plus we might need to do an immediate save.)

-                if (self->_saveInterval > 0.0) {
-                    if (self->_saveTimer == NULL) {
+                if (_saveInterval > 0.0) {
+                    if (_saveTimer == NULL) {
                        // Handles #2
                        //
                        // Since the saveTimer uses the unsavedTime to calculate it's first fireDate,
@ -324,7 +324,7 @@

                        [self updateAndResumeSaveTimer];
                    }
-                } else if (self->_saveTimer) {
+                } else if (_saveTimer) {
                    // Handles #1

                    [self destroySaveTimer];
@ -368,7 +368,7 @@

    dispatch_sync(globalLoggingQueue, ^{
        dispatch_sync(self.loggerQueue, ^{
-            result = self->_maxAge;
+            result = _maxAge;
        });
    });

@ -381,11 +381,11 @@
            // C99 recommended floating point comparison macro
            // Read: isLessThanOrGreaterThan(floatA, floatB)

-            if (/* maxAge != interval */ islessgreater(self->_maxAge, interval)) {
-                NSTimeInterval oldMaxAge = self->_maxAge;
+            if (/* maxAge != interval */ islessgreater(_maxAge, interval)) {
+                NSTimeInterval oldMaxAge = _maxAge;
                NSTimeInterval newMaxAge = interval;

-                self->_maxAge = interval;
+                _maxAge = interval;

                // There are several cases we need to handle here.
                //
@ -420,7 +420,7 @@
                if (shouldDeleteNow) {
                    [self performDelete];

-                    if (self->_deleteTimer) {
+                    if (_deleteTimer) {
                        [self updateDeleteTimer];
                    } else {
                        [self createAndStartDeleteTimer];
@ -465,7 +465,7 @@

    dispatch_sync(globalLoggingQueue, ^{
        dispatch_sync(self.loggerQueue, ^{
-            result = self->_deleteInterval;
+            result = _deleteInterval;
        });
    });

@ -478,8 +478,8 @@
            // C99 recommended floating point comparison macro
            // Read: isLessThanOrGreaterThan(floatA, floatB)

-            if (/* deleteInterval != interval */ islessgreater(self->_deleteInterval, interval)) {
-                self->_deleteInterval = interval;
+            if (/* deleteInterval != interval */ islessgreater(_deleteInterval, interval)) {
+                _deleteInterval = interval;

                // There are several cases we need to handle here.
                //
@ -494,8 +494,8 @@
                // 4. If the deleteInterval decreased, then we need to reset the timer so that it fires at an earlier date.
                //    (Plus we might need to do an immediate delete.)

-                if (self->_deleteInterval > 0.0) {
-                    if (self->_deleteTimer == NULL) {
+                if (_deleteInterval > 0.0) {
+                    if (_deleteTimer == NULL) {
                        // Handles #2
                        //
                        // Since the deleteTimer uses the lastDeleteTime to calculate it's first fireDate,
@ -511,7 +511,7 @@

                        [self updateDeleteTimer];
                    }
-                } else if (self->_deleteTimer) {
+                } else if (_deleteTimer) {
                    // Handles #1

                    [self destroyDeleteTimer];
@ -555,7 +555,7 @@

    dispatch_sync(globalLoggingQueue, ^{
        dispatch_sync(self.loggerQueue, ^{
-            result = self->_deleteOnEverySave;
+            result = _deleteOnEverySave;
        });
    });

@ -564,7 +564,7 @@

 - (void)setDeleteOnEverySave:(BOOL)flag {
    dispatch_block_t block = ^{
-        self->_deleteOnEverySave = flag;
+        _deleteOnEverySave = flag;
    };

    // The design of the setter logic below is taken from the DDAbstractLogger implementation.
--- a/Testing/Xcode-desktop/Pods/CocoaLumberjack/Classes/DDFileLogger.h
+++ b/Testing/Xcode-desktop/Pods/CocoaLumberjack/Classes/DDFileLogger.h
@ -326,11 +326,6 @@ extern unsigned long long const kDDDefaultLogFilesDiskQuota;
 */
 - (void)didLogMessage NS_REQUIRES_SUPER;

-/**
- *  Writes all in-memory log data to the permanent storage. Call super before your implementation.
- */
- (void)flush NS_REQUIRES_SUPER;
-
 /**
 *  Called when the logger checks archive or not current log file. 
 *  Override this method to exdend standart behavior. By default returns NO.
--- a/Testing/Xcode-desktop/Pods/CocoaLumberjack/Classes/DDFileLogger.m
+++ b/Testing/Xcode-desktop/Pods/CocoaLumberjack/Classes/DDFileLogger.m
@ -612,7 +612,7 @@ unsigned long long const kDDDefaultLogFilesDiskQuota   = 20 * 1024 * 1024; // 20
    __block unsigned long long result;

    dispatch_block_t block = ^{
-        result = self->_maximumFileSize;
+        result = _maximumFileSize;
    };

    // The design of this method is taken from the DDAbstractLogger implementation.
@ -640,7 +640,7 @@ unsigned long long const kDDDefaultLogFilesDiskQuota   = 20 * 1024 * 1024; // 20
 - (void)setMaximumFileSize:(unsigned long long)newMaximumFileSize {
    dispatch_block_t block = ^{
        @autoreleasepool {
-            self->_maximumFileSize = newMaximumFileSize;
+            _maximumFileSize = newMaximumFileSize;
            [self maybeRollLogFileDueToSize];
        }
    };
@ -669,7 +669,7 @@ unsigned long long const kDDDefaultLogFilesDiskQuota   = 20 * 1024 * 1024; // 20
    __block NSTimeInterval result;

    dispatch_block_t block = ^{
-        result = self->_rollingFrequency;
+        result = _rollingFrequency;
    };

    // The design of this method is taken from the DDAbstractLogger implementation.
@ -697,7 +697,7 @@ unsigned long long const kDDDefaultLogFilesDiskQuota   = 20 * 1024 * 1024; // 20
 - (void)setRollingFrequency:(NSTimeInterval)newRollingFrequency {
    dispatch_block_t block = ^{
        @autoreleasepool {
-            self->_rollingFrequency = newRollingFrequency;
+            _rollingFrequency = newRollingFrequency;
            [self maybeRollLogFileDueToAge];
        }
    };
@ -1040,10 +1040,6 @@ static int exception_count = 0;
    return @"cocoa.lumberjack.fileLogger";
 }

- (void)flush {
-    [_currentLogFileHandle synchronizeFile];
-}
-
@end

 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--- a/Testing/Xcode-desktop/Pods/CocoaLumberjack/Classes/DDLog.h
+++ b/Testing/Xcode-desktop/Pods/CocoaLumberjack/Classes/DDLog.h
@ -177,7 +177,7 @@ NS_ASSUME_NONNULL_BEGIN
 *
 *  @return the file name
 */
-FOUNDATION_EXTERN NSString * __nullable DDExtractFileNameWithoutExtension(const char *filePath, BOOL copy);
+NSString * __nullable DDExtractFileNameWithoutExtension(const char *filePath, BOOL copy);

 /**
 * The THIS_FILE macro gives you an NSString of the file name.
--- a/Testing/Xcode-desktop/Pods/CocoaLumberjack/Classes/DDLog.m
+++ b/Testing/Xcode-desktop/Pods/CocoaLumberjack/Classes/DDLog.m
@ -629,7 +629,6 @@ static NSUInteger _numProcessors;
        if (numClasses > bufferSize || numClasses == 0) {
            //apparently more classes added between calls (or a problem); try again
            free(classes);
-            classes = NULL;
            numClasses = 0;
        }
    }
@ -1313,8 +1312,8 @@ static __inline__ __attribute__((__always_inline__)) void _dispatch_queue_label_
    __block id <DDLogFormatter> result;

    dispatch_sync(globalLoggingQueue, ^{
-        dispatch_sync(self->_loggerQueue, ^{
-            result = self->_logFormatter;
+        dispatch_sync(_loggerQueue, ^{
+            result = _logFormatter;
        });
    });

@ -1329,17 +1328,17 @@ static __inline__ __attribute__((__always_inline__)) void _dispatch_queue_label_

    dispatch_block_t block = ^{
        @autoreleasepool {
-            if (self->_logFormatter != logFormatter) {
-                if ([self->_logFormatter respondsToSelector:@selector(willRemoveFromLogger:)]) {
-                    [self->_logFormatter willRemoveFromLogger:self];
+            if (_logFormatter != logFormatter) {
+                if ([_logFormatter respondsToSelector:@selector(willRemoveFromLogger:)]) {
+                    [_logFormatter willRemoveFromLogger:self];
                }

-                self->_logFormatter = logFormatter;
+                _logFormatter = logFormatter;
 
-                if ([self->_logFormatter respondsToSelector:@selector(didAddToLogger:inQueue:)]) {
-                    [self->_logFormatter didAddToLogger:self inQueue:self->_loggerQueue];
-                } else if ([self->_logFormatter respondsToSelector:@selector(didAddToLogger:)]) {
-                    [self->_logFormatter didAddToLogger:self];
+                if ([_logFormatter respondsToSelector:@selector(didAddToLogger:inQueue:)]) {
+                    [_logFormatter didAddToLogger:self inQueue:_loggerQueue];
+                } else if ([_logFormatter respondsToSelector:@selector(didAddToLogger:)]) {
+                    [_logFormatter didAddToLogger:self];
                }
            }
        }
@ -1348,7 +1347,7 @@ static __inline__ __attribute__((__always_inline__)) void _dispatch_queue_label_
    dispatch_queue_t globalLoggingQueue = [DDLog loggingQueue];

    dispatch_async(globalLoggingQueue, ^{
-        dispatch_async(self->_loggerQueue, block);
+        dispatch_async(_loggerQueue, block);
    });
 }

--- a/Testing/Xcode-desktop/Pods/CocoaLumberjack/Classes/DDTTYLogger.m
+++ b/Testing/Xcode-desktop/Pods/CocoaLumberjack/Classes/DDTTYLogger.m
@ -900,7 +900,7 @@ static DDTTYLogger *sharedInstance;

    dispatch_sync(globalLoggingQueue, ^{
        dispatch_sync(self.loggerQueue, ^{
-            result = self->_colorsEnabled;
+            result = _colorsEnabled;
        });
    });

@ -910,9 +910,9 @@ static DDTTYLogger *sharedInstance;
 - (void)setColorsEnabled:(BOOL)newColorsEnabled {
    dispatch_block_t block = ^{
        @autoreleasepool {
-            self->_colorsEnabled = newColorsEnabled;
+            _colorsEnabled = newColorsEnabled;

-            if ([self->_colorProfilesArray count] == 0) {
+            if ([_colorProfilesArray count] == 0) {
                [self loadDefaultColorProfiles];
            }
        }
@ -955,7 +955,7 @@ static DDTTYLogger *sharedInstance;

            NSUInteger i = 0;

-            for (DDTTYLoggerColorProfile *colorProfile in self->_colorProfilesArray) {
+            for (DDTTYLoggerColorProfile *colorProfile in _colorProfilesArray) {
                if ((colorProfile->mask == mask) && (colorProfile->context == ctxt)) {
                    break;
                }
@ -963,10 +963,10 @@ static DDTTYLogger *sharedInstance;
                i++;
            }

-            if (i < [self->_colorProfilesArray count]) {
-                self->_colorProfilesArray[i] = newColorProfile;
+            if (i < [_colorProfilesArray count]) {
+                _colorProfilesArray[i] = newColorProfile;
            } else {
-                [self->_colorProfilesArray addObject:newColorProfile];
+                [_colorProfilesArray addObject:newColorProfile];
            }
        }
    };
@ -999,7 +999,7 @@ static DDTTYLogger *sharedInstance;

            NSLogInfo(@"DDTTYLogger: newColorProfile: %@", newColorProfile);

-            self->_colorProfilesDict[tag] = newColorProfile;
+            _colorProfilesDict[tag] = newColorProfile;
        }
    };

@ -1027,7 +1027,7 @@ static DDTTYLogger *sharedInstance;
        @autoreleasepool {
            NSUInteger i = 0;

-            for (DDTTYLoggerColorProfile *colorProfile in self->_colorProfilesArray) {
+            for (DDTTYLoggerColorProfile *colorProfile in _colorProfilesArray) {
                if ((colorProfile->mask == mask) && (colorProfile->context == context)) {
                    break;
                }
@ -1035,8 +1035,8 @@ static DDTTYLogger *sharedInstance;
                i++;
            }

-            if (i < [self->_colorProfilesArray count]) {
-                [self->_colorProfilesArray removeObjectAtIndex:i];
+            if (i < [_colorProfilesArray count]) {
+                [_colorProfilesArray removeObjectAtIndex:i];
            }
        }
    };
@ -1061,7 +1061,7 @@ static DDTTYLogger *sharedInstance;

    dispatch_block_t block = ^{
        @autoreleasepool {
-            [self->_colorProfilesDict removeObjectForKey:tag];
+            [_colorProfilesDict removeObjectForKey:tag];
        }
    };

@ -1083,7 +1083,7 @@ static DDTTYLogger *sharedInstance;
 - (void)clearColorsForAllFlags {
    dispatch_block_t block = ^{
        @autoreleasepool {
-            [self->_colorProfilesArray removeAllObjects];
+            [_colorProfilesArray removeAllObjects];
        }
    };

@ -1105,7 +1105,7 @@ static DDTTYLogger *sharedInstance;
 - (void)clearColorsForAllTags {
    dispatch_block_t block = ^{
        @autoreleasepool {
-            [self->_colorProfilesDict removeAllObjects];
+            [_colorProfilesDict removeAllObjects];
        }
    };

@ -1127,8 +1127,8 @@ static DDTTYLogger *sharedInstance;
 - (void)clearAllColors {
    dispatch_block_t block = ^{
        @autoreleasepool {
-            [self->_colorProfilesArray removeAllObjects];
-            [self->_colorProfilesDict removeAllObjects];
+            [_colorProfilesArray removeAllObjects];
+            [_colorProfilesDict removeAllObjects];
        }
    };

--- a/Testing/Xcode-desktop/Pods/CocoaLumberjack/Classes/Extensions/DDMultiFormatter.m
+++ b/Testing/Xcode-desktop/Pods/CocoaLumberjack/Classes/Extensions/DDMultiFormatter.m
@ -81,7 +81,7 @@
    __block NSString *line = logMessage->_message;

    dispatch_sync(_queue, ^{
-        for (id<DDLogFormatter> formatter in self->_formatters) {
+        for (id<DDLogFormatter> formatter in _formatters) {
            DDLogMessage *message = [self logMessageForLine:line originalMessage:logMessage];
            line = [formatter formatLogMessage:message];

@ -107,7 +107,7 @@
    __block NSArray *formatters;

    dispatch_sync(_queue, ^{
-        formatters = [self->_formatters copy];
+        formatters = [_formatters copy];
    });

    return formatters;
@ -115,19 +115,19 @@

 - (void)addFormatter:(id<DDLogFormatter>)formatter {
    dispatch_barrier_async(_queue, ^{
-        [self->_formatters addObject:formatter];
+        [_formatters addObject:formatter];
    });
 }

 - (void)removeFormatter:(id<DDLogFormatter>)formatter {
    dispatch_barrier_async(_queue, ^{
-        [self->_formatters removeObject:formatter];
+        [_formatters removeObject:formatter];
    });
 }

 - (void)removeAllFormatters {
    dispatch_barrier_async(_queue, ^{
-        [self->_formatters removeAllObjects];
+        [_formatters removeAllObjects];
    });
 }

@ -135,7 +135,7 @@
    __block BOOL hasFormatter;

    dispatch_sync(_queue, ^{
-        hasFormatter = [self->_formatters containsObject:formatter];
+        hasFormatter = [_formatters containsObject:formatter];
    });

    return hasFormatter;
--- a/Testing/Xcode-desktop/Pods/CocoaLumberjack/README.md
+++ b/Testing/Xcode-desktop/Pods/CocoaLumberjack/README.md
@ -48,11 +48,11 @@ DDLog.add(fileLogger)

 ...

-DDLogVerbose("Verbose")
-DDLogDebug("Debug")
-DDLogInfo("Info")
-DDLogWarn("Warn")
-DDLogError("Error")
+DDLogVerbose("Verbose");
+DDLogDebug("Debug");
+DDLogInfo("Info");
+DDLogWarn("Warn");
+DDLogError("Error");
 ```

 ##### Obj-C version via CocoaPods
--- a/Testing/Xcode-desktop/Pods/Headers/Private/YapDatabase/YapDatabaseAtomic.h
+++ b/Testing/Xcode-desktop/Pods/Headers/Private/YapDatabase/YapDatabaseAtomic.h
@ -1 +1 @@
-../../../../../../YapDatabase/Utilities/YapDatabaseAtomic.h
+../../../../../../YapDatabase/Internal/YapDatabaseAtomic.h
--- a/Testing/Xcode-desktop/Pods/Headers/Private/YapDatabase/YapDatabaseCloudCoreGraphPrivate.h
+++ b/Testing/Xcode-desktop/Pods/Headers/Private/YapDatabase/YapDatabaseCloudCoreGraphPrivate.h
@ -1 +0,0 @@
-../../../../../../YapDatabase/Extensions/CloudCore/Internal/YapDatabaseCloudCoreGraphPrivate.h
--- a/Testing/Xcode-desktop/Pods/Headers/Public/YapDatabase/YapDatabaseAtomic.h
+++ b/Testing/Xcode-desktop/Pods/Headers/Public/YapDatabase/YapDatabaseAtomic.h
@ -1 +0,0 @@
-../../../../../../YapDatabase/Utilities/YapDatabaseAtomic.h
--- a/Testing/Xcode-desktop/Pods/Headers/Public/YapDatabase/YapDatabaseCloudCoreGraphPrivate.h
+++ b/Testing/Xcode-desktop/Pods/Headers/Public/YapDatabase/YapDatabaseCloudCoreGraphPrivate.h
@ -1 +0,0 @@
-../../../../../../YapDatabase/Extensions/CloudCore/Internal/YapDatabaseCloudCoreGraphPrivate.h
--- a/Testing/Xcode-desktop/Pods/Headers/Public/YapDatabase/YapDatabaseCloudCoreOperationPrivate.h
+++ b/Testing/Xcode-desktop/Pods/Headers/Public/YapDatabase/YapDatabaseCloudCoreOperationPrivate.h
@ -1 +0,0 @@
-../../../../../../YapDatabase/Extensions/CloudCore/Internal/YapDatabaseCloudCoreOperationPrivate.h
--- a/Testing/Xcode-desktop/Pods/Headers/Public/YapDatabase/YapDatabaseCloudCorePipelinePrivate.h
+++ b/Testing/Xcode-desktop/Pods/Headers/Public/YapDatabase/YapDatabaseCloudCorePipelinePrivate.h
@ -1 +0,0 @@
-../../../../../../YapDatabase/Extensions/CloudCore/Internal/YapDatabaseCloudCorePipelinePrivate.h
--- a/Testing/Xcode-desktop/Pods/Headers/Public/YapDatabase/YapDatabaseCloudCorePrivate.h
+++ b/Testing/Xcode-desktop/Pods/Headers/Public/YapDatabase/YapDatabaseCloudCorePrivate.h
@ -1 +0,0 @@
-../../../../../../YapDatabase/Extensions/CloudCore/Internal/YapDatabaseCloudCorePrivate.h
--- a/Testing/Xcode-desktop/Pods/Headers/Public/YapDatabase/YapDatabaseExtensionPrivate.h
+++ b/Testing/Xcode-desktop/Pods/Headers/Public/YapDatabase/YapDatabaseExtensionPrivate.h
@ -1 +0,0 @@
-../../../../../../YapDatabase/Extensions/Protocol/Internal/YapDatabaseExtensionPrivate.h
--- a/Podspecs/YapDatabase.podspec.json
+++ b/Podspecs/YapDatabase.podspec.json
@ -1,6 +1,6 @@
 {
  "name": "YapDatabase",
-  "version": "3.1.1",
+  "version": "3.0.2",
  "summary": "A key/value store built atop sqlite for iOS & Mac.",
  "homepage": "https://github.com/yapstudios/YapDatabase",
  "license": "MIT",
@ -9,7 +9,7 @@
  },
  "source": {
    "git": "https://github.com/yapstudios/YapDatabase.git",
-    "tag": "3.1.1"
+    "tag": "3.0.2"
  },
  "platforms": {
    "osx": "10.10",
@ -19,18 +19,6 @@
  },
  "libraries": "c++",
  "default_subspecs": "Standard",
-  "osx": {
-    "module_map": "Framework/Mac/module.modulemap"
-  },
-  "ios": {
-    "module_map": "Framework/iOS/module.modulemap"
-  },
-  "tvos": {
-    "module_map": "Framework/tvOS/module.modulemap"
-  },
-  "watchos": {
-    "module_map": "Framework/watchOS/module.modulemap"
-  },
  "subspecs": [
    {
      "name": "Standard",
@ -51,7 +39,10 @@
            "YapDatabase/{Internal,Utilities}/*.{h,m,mm,c}",
            "YapDatabase/Extensions/Protocol/**/*.{h,m,mm,c}"
          ],
-          "private_header_files": "YapDatabase/Internal/*.h"
+          "private_header_files": [
+            "YapDatabase/Internal/*.h",
+            "YapDatabase/Extensions/Protocol/Internal/*.h"
+          ]
        },
        {
          "name": "Extensions",
@ -173,7 +164,8 @@
            },
            {
              "name": "CloudCore",
-              "source_files": "YapDatabase/Extensions/CloudCore/**/*.{h,m,mm,c}"
+              "source_files": "YapDatabase/Extensions/CloudCore/**/*.{h,m,mm,c}",
+              "private_header_files": "YapDatabase/Extensions/CloudCore/Internal/*.h"
            }
          ]
        }
@ -200,7 +192,10 @@
            "YapDatabase/{Internal,Utilities}/*.{h,m,mm,c}",
            "YapDatabase/Extensions/Protocol/**/*.{h,m,mm,c}"
          ],
-          "private_header_files": "YapDatabase/Internal/*.h"
+          "private_header_files": [
+            "YapDatabase/Internal/*.h",
+            "YapDatabase/Extensions/Protocol/Internal/*.h"
+          ]
        },
        {
          "name": "Extensions",
@ -322,7 +317,8 @@
            },
            {
              "name": "CloudCore",
-              "source_files": "YapDatabase/Extensions/CloudCore/**/*.{h,m,mm,c}"
+              "source_files": "YapDatabase/Extensions/CloudCore/**/*.{h,m,mm,c}",
+              "private_header_files": "YapDatabase/Extensions/CloudCore/Internal/*.h"
            }
          ]
        }
--- a/Testing/Xcode-desktop/Pods/Manifest.lock
+++ b/Testing/Xcode-desktop/Pods/Manifest.lock
@ -1,89 +1,85 @@
 PODS:
-  - CocoaLumberjack (3.4.2):
-    - CocoaLumberjack/Default (= 3.4.2)
-    - CocoaLumberjack/Extensions (= 3.4.2)
-  - CocoaLumberjack/Default (3.4.2)
-  - CocoaLumberjack/Extensions (3.4.2):
+  - CocoaLumberjack (3.4.1):
+    - CocoaLumberjack/Default (= 3.4.1)
+    - CocoaLumberjack/Extensions (= 3.4.1)
+  - CocoaLumberjack/Default (3.4.1)
+  - CocoaLumberjack/Extensions (3.4.1):
    - CocoaLumberjack/Default
-  - YapDatabase (3.1.1):
-    - YapDatabase/Standard (= 3.1.1)
-  - YapDatabase/Standard (3.1.1):
-    - YapDatabase/Standard/Core (= 3.1.1)
-    - YapDatabase/Standard/Extensions (= 3.1.1)
-  - YapDatabase/Standard/Core (3.1.1):
+  - YapDatabase (3.0.2):
+    - YapDatabase/Standard (= 3.0.2)
+  - YapDatabase/Standard (3.0.2):
+    - YapDatabase/Standard/Core (= 3.0.2)
+    - YapDatabase/Standard/Extensions (= 3.0.2)
+  - YapDatabase/Standard/Core (3.0.2):
    - CocoaLumberjack
-  - YapDatabase/Standard/Extensions (3.1.1):
+  - YapDatabase/Standard/Extensions (3.0.2):
    - YapDatabase/Standard/Core
-    - YapDatabase/Standard/Extensions/ActionManager (= 3.1.1)
-    - YapDatabase/Standard/Extensions/AutoView (= 3.1.1)
-    - YapDatabase/Standard/Extensions/CloudCore (= 3.1.1)
-    - YapDatabase/Standard/Extensions/CloudKit (= 3.1.1)
-    - YapDatabase/Standard/Extensions/ConnectionPool (= 3.1.1)
-    - YapDatabase/Standard/Extensions/ConnectionProxy (= 3.1.1)
-    - YapDatabase/Standard/Extensions/CrossProcessNotification (= 3.1.1)
-    - YapDatabase/Standard/Extensions/FilteredView (= 3.1.1)
-    - YapDatabase/Standard/Extensions/FullTextSearch (= 3.1.1)
-    - YapDatabase/Standard/Extensions/Hooks (= 3.1.1)
-    - YapDatabase/Standard/Extensions/ManualView (= 3.1.1)
-    - YapDatabase/Standard/Extensions/Relationships (= 3.1.1)
-    - YapDatabase/Standard/Extensions/RTreeIndex (= 3.1.1)
-    - YapDatabase/Standard/Extensions/SearchResultsView (= 3.1.1)
-    - YapDatabase/Standard/Extensions/SecondaryIndex (= 3.1.1)
-    - YapDatabase/Standard/Extensions/View (= 3.1.1)
-  - YapDatabase/Standard/Extensions/ActionManager (3.1.1):
+    - YapDatabase/Standard/Extensions/ActionManager (= 3.0.2)
+    - YapDatabase/Standard/Extensions/AutoView (= 3.0.2)
+    - YapDatabase/Standard/Extensions/CloudCore (= 3.0.2)
+    - YapDatabase/Standard/Extensions/CloudKit (= 3.0.2)
+    - YapDatabase/Standard/Extensions/ConnectionPool (= 3.0.2)
+    - YapDatabase/Standard/Extensions/ConnectionProxy (= 3.0.2)
+    - YapDatabase/Standard/Extensions/CrossProcessNotification (= 3.0.2)
+    - YapDatabase/Standard/Extensions/FilteredView (= 3.0.2)
+    - YapDatabase/Standard/Extensions/FullTextSearch (= 3.0.2)
+    - YapDatabase/Standard/Extensions/Hooks (= 3.0.2)
+    - YapDatabase/Standard/Extensions/ManualView (= 3.0.2)
+    - YapDatabase/Standard/Extensions/Relationships (= 3.0.2)
+    - YapDatabase/Standard/Extensions/RTreeIndex (= 3.0.2)
+    - YapDatabase/Standard/Extensions/SearchResultsView (= 3.0.2)
+    - YapDatabase/Standard/Extensions/SecondaryIndex (= 3.0.2)
+    - YapDatabase/Standard/Extensions/View (= 3.0.2)
+  - YapDatabase/Standard/Extensions/ActionManager (3.0.2):
    - YapDatabase/Standard/Core
    - YapDatabase/Standard/Extensions/AutoView
-  - YapDatabase/Standard/Extensions/AutoView (3.1.1):
+  - YapDatabase/Standard/Extensions/AutoView (3.0.2):
    - YapDatabase/Standard/Core
    - YapDatabase/Standard/Extensions/View
-  - YapDatabase/Standard/Extensions/CloudCore (3.1.1):
+  - YapDatabase/Standard/Extensions/CloudCore (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/CloudKit (3.1.1):
+  - YapDatabase/Standard/Extensions/CloudKit (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/ConnectionPool (3.1.1):
+  - YapDatabase/Standard/Extensions/ConnectionPool (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/ConnectionProxy (3.1.1):
+  - YapDatabase/Standard/Extensions/ConnectionProxy (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/CrossProcessNotification (3.1.1):
+  - YapDatabase/Standard/Extensions/CrossProcessNotification (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/FilteredView (3.1.1):
+  - YapDatabase/Standard/Extensions/FilteredView (3.0.2):
    - YapDatabase/Standard/Core
    - YapDatabase/Standard/Extensions/View
-  - YapDatabase/Standard/Extensions/FullTextSearch (3.1.1):
+  - YapDatabase/Standard/Extensions/FullTextSearch (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/Hooks (3.1.1):
+  - YapDatabase/Standard/Extensions/Hooks (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/ManualView (3.1.1):
+  - YapDatabase/Standard/Extensions/ManualView (3.0.2):
    - YapDatabase/Standard/Core
    - YapDatabase/Standard/Extensions/View
-  - YapDatabase/Standard/Extensions/Relationships (3.1.1):
+  - YapDatabase/Standard/Extensions/Relationships (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/RTreeIndex (3.1.1):
+  - YapDatabase/Standard/Extensions/RTreeIndex (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/SearchResultsView (3.1.1):
+  - YapDatabase/Standard/Extensions/SearchResultsView (3.0.2):
    - YapDatabase/Standard/Core
    - YapDatabase/Standard/Extensions/AutoView
    - YapDatabase/Standard/Extensions/FullTextSearch
-  - YapDatabase/Standard/Extensions/SecondaryIndex (3.1.1):
+  - YapDatabase/Standard/Extensions/SecondaryIndex (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/View (3.1.1):
+  - YapDatabase/Standard/Extensions/View (3.0.2):
    - YapDatabase/Standard/Core

 DEPENDENCIES:
  - YapDatabase (from `../../`)

-SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
-    - CocoaLumberjack
-
 EXTERNAL SOURCES:
  YapDatabase:
-    :path: "../../"
+    :path: ../../

 SPEC CHECKSUMS:
-  CocoaLumberjack: db7cc9e464771f12054c22ff6947c5a58d43a0fd
-  YapDatabase: 68188358039b289e962ddf55ffea39a336efd0e1
+  CocoaLumberjack: 2e258a064cacc8eb9a2aca318e24d02a0a7fd56d
+  YapDatabase: 972eccb0c997d0dafe8192dccf7f58351914baf1

-PODFILE CHECKSUM: c2d8695a2f756bf50f110a4ad94cf5aa99d53c43
+PODFILE CHECKSUM: 8dceb5c937bc6e9558d8d75103d141eef959b637

-COCOAPODS: 1.6.0.beta.2
+COCOAPODS: 1.4.0
--- a/Testing/Xcode-desktop/Pods/Pods.xcodeproj/project.pbxproj
+++ b/Testing/Xcode-desktop/Pods/Pods.xcodeproj/project.pbxproj
--- a/Files/CocoaLumberjack/CocoaLumberjack.xcconfig
+++ b/Files/CocoaLumberjack/CocoaLumberjack.xcconfig
@ -1,6 +1,6 @@
 CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/CocoaLumberjack
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/CocoaLumberjack" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/CocoaLumberjack"
+HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/CocoaLumberjack" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/CocoaLumberjack" "${PODS_ROOT}/Headers/Public/YapDatabase"
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_ROOT = ${SRCROOT}
--- a/Files/Pods-MultiprocessApp/Pods-MultiprocessApp-frameworks.sh
+++ b/Files/Pods-MultiprocessApp/Pods-MultiprocessApp-frameworks.sh
@ -1,18 +1,9 @@
 #!/bin/sh
 set -e
-set -u
-set -o pipefail
-
-if [ -z ${FRAMEWORKS_FOLDER_PATH+x} ]; then
-    # If FRAMEWORKS_FOLDER_PATH is not set, then there's nowhere for us to copy
-    # frameworks to, so exit 0 (signalling the script phase was successful).
-    exit 0
-fi

 echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"

-COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}"
 SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"

 # Used as a return value for each invocation of `strip_invalid_archs` function.
@ -101,10 +92,10 @@ install_dsym() {

 # Signs a framework with the provided identity
 code_sign_if_enabled() {
-  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED:-}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
+  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
    # Use the current code_sign_identitiy
    echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
-    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS:-} --preserve-metadata=identifier,entitlements '$1'"
+    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'"

    if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
      code_sign_cmd="$code_sign_cmd &"
--- a/Files/Pods-MultiprocessApp/Pods-MultiprocessApp-resources.sh
+++ b/Files/Pods-MultiprocessApp/Pods-MultiprocessApp-resources.sh
@ -1,13 +1,5 @@
 #!/bin/sh
 set -e
-set -u
-set -o pipefail
-
-if [ -z ${UNLOCALIZED_RESOURCES_FOLDER_PATH+x} ]; then
-    # If UNLOCALIZED_RESOURCES_FOLDER_PATH is not set, then there's nowhere for us to copy
-    # resources to, so exit 0 (signalling the script phase was successful).
-    exit 0
-fi

 mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"

@ -20,7 +12,7 @@ XCASSET_FILES=()
 # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
 RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")

-case "${TARGETED_DEVICE_FAMILY:-}" in
+case "${TARGETED_DEVICE_FAMILY}" in
  1,2)
    TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone"
    ;;
@ -100,7 +92,7 @@ if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then
 fi
 rm -f "$RESOURCES_TO_COPY"

-if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "${XCASSET_FILES:-}" ]
+if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ]
 then
  # Find all other xcassets (this unfortunately includes those of path pods and other targets).
  OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
@ -110,9 +102,5 @@ then
    fi
  done <<<"$OTHER_XCASSETS"

-  if [ -z ${ASSETCATALOG_COMPILER_APPICON_NAME+x} ]; then
-    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
-  else
-    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" --app-icon "${ASSETCATALOG_COMPILER_APPICON_NAME}" --output-partial-info-plist "${TARGET_TEMP_DIR}/assetcatalog_generated_info_cocoapods.plist"
-  fi
+  printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
 fi
--- a/Files/Pods-MultiprocessApp/Pods-MultiprocessApp.debug.xcconfig
+++ b/Files/Pods-MultiprocessApp/Pods-MultiprocessApp.debug.xcconfig
@ -1,7 +1,7 @@
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/CocoaLumberjack" "${PODS_ROOT}/Headers/Public/YapDatabase"
 LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CocoaLumberjack" "${PODS_CONFIGURATION_BUILD_DIR}/YapDatabase"
-OTHER_CFLAGS = $(inherited) -DYAP_STANDARD_SQLITE
+OTHER_CFLAGS = $(inherited) -DYAP_STANDARD_SQLITE $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/CocoaLumberjack" -isystem "${PODS_ROOT}/Headers/Public/YapDatabase"
 OTHER_LDFLAGS = $(inherited) -ObjC -l"CocoaLumberjack" -l"YapDatabase" -l"c++" -l"sqlite3" -framework "SystemConfiguration"
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
--- a/Files/Pods-MultiprocessApp/Pods-MultiprocessApp.release.xcconfig
+++ b/Files/Pods-MultiprocessApp/Pods-MultiprocessApp.release.xcconfig
@ -1,7 +1,7 @@
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/CocoaLumberjack" "${PODS_ROOT}/Headers/Public/YapDatabase"
 LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CocoaLumberjack" "${PODS_CONFIGURATION_BUILD_DIR}/YapDatabase"
-OTHER_CFLAGS = $(inherited) -DYAP_STANDARD_SQLITE
+OTHER_CFLAGS = $(inherited) -DYAP_STANDARD_SQLITE $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/CocoaLumberjack" -isystem "${PODS_ROOT}/Headers/Public/YapDatabase"
 OTHER_LDFLAGS = $(inherited) -ObjC -l"CocoaLumberjack" -l"YapDatabase" -l"c++" -l"sqlite3" -framework "SystemConfiguration"
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
--- a/Files/Pods-YapDatabase/Pods-YapDatabase-frameworks.sh
+++ b/Files/Pods-YapDatabase/Pods-YapDatabase-frameworks.sh
@ -1,18 +1,9 @@
 #!/bin/sh
 set -e
-set -u
-set -o pipefail
-
-if [ -z ${FRAMEWORKS_FOLDER_PATH+x} ]; then
-    # If FRAMEWORKS_FOLDER_PATH is not set, then there's nowhere for us to copy
-    # frameworks to, so exit 0 (signalling the script phase was successful).
-    exit 0
-fi

 echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"

-COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}"
 SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"

 # Used as a return value for each invocation of `strip_invalid_archs` function.
@ -101,10 +92,10 @@ install_dsym() {

 # Signs a framework with the provided identity
 code_sign_if_enabled() {
-  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED:-}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
+  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
    # Use the current code_sign_identitiy
    echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
-    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS:-} --preserve-metadata=identifier,entitlements '$1'"
+    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'"

    if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
      code_sign_cmd="$code_sign_cmd &"
--- a/Files/Pods-YapDatabase/Pods-YapDatabase-resources.sh
+++ b/Files/Pods-YapDatabase/Pods-YapDatabase-resources.sh
@ -1,13 +1,5 @@
 #!/bin/sh
 set -e
-set -u
-set -o pipefail
-
-if [ -z ${UNLOCALIZED_RESOURCES_FOLDER_PATH+x} ]; then
-    # If UNLOCALIZED_RESOURCES_FOLDER_PATH is not set, then there's nowhere for us to copy
-    # resources to, so exit 0 (signalling the script phase was successful).
-    exit 0
-fi

 mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"

@ -20,7 +12,7 @@ XCASSET_FILES=()
 # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
 RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")

-case "${TARGETED_DEVICE_FAMILY:-}" in
+case "${TARGETED_DEVICE_FAMILY}" in
  1,2)
    TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone"
    ;;
@ -100,7 +92,7 @@ if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then
 fi
 rm -f "$RESOURCES_TO_COPY"

-if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "${XCASSET_FILES:-}" ]
+if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ]
 then
  # Find all other xcassets (this unfortunately includes those of path pods and other targets).
  OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
@ -110,9 +102,5 @@ then
    fi
  done <<<"$OTHER_XCASSETS"

-  if [ -z ${ASSETCATALOG_COMPILER_APPICON_NAME+x} ]; then
-    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
-  else
-    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" --app-icon "${ASSETCATALOG_COMPILER_APPICON_NAME}" --output-partial-info-plist "${TARGET_TEMP_DIR}/assetcatalog_generated_info_cocoapods.plist"
-  fi
+  printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
 fi
--- a/Files/Pods-YapDatabase/Pods-YapDatabase.debug.xcconfig
+++ b/Files/Pods-YapDatabase/Pods-YapDatabase.debug.xcconfig
@ -1,7 +1,7 @@
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/CocoaLumberjack" "${PODS_ROOT}/Headers/Public/YapDatabase"
 LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CocoaLumberjack" "${PODS_CONFIGURATION_BUILD_DIR}/YapDatabase"
-OTHER_CFLAGS = $(inherited) -DYAP_STANDARD_SQLITE
+OTHER_CFLAGS = $(inherited) -DYAP_STANDARD_SQLITE $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/CocoaLumberjack" -isystem "${PODS_ROOT}/Headers/Public/YapDatabase"
 OTHER_LDFLAGS = $(inherited) -ObjC -l"CocoaLumberjack" -l"YapDatabase" -l"c++" -l"sqlite3" -framework "SystemConfiguration"
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
--- a/Files/Pods-YapDatabase/Pods-YapDatabase.release.xcconfig
+++ b/Files/Pods-YapDatabase/Pods-YapDatabase.release.xcconfig
@ -1,7 +1,7 @@
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/CocoaLumberjack" "${PODS_ROOT}/Headers/Public/YapDatabase"
 LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CocoaLumberjack" "${PODS_CONFIGURATION_BUILD_DIR}/YapDatabase"
-OTHER_CFLAGS = $(inherited) -DYAP_STANDARD_SQLITE
+OTHER_CFLAGS = $(inherited) -DYAP_STANDARD_SQLITE $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/CocoaLumberjack" -isystem "${PODS_ROOT}/Headers/Public/YapDatabase"
 OTHER_LDFLAGS = $(inherited) -ObjC -l"CocoaLumberjack" -l"YapDatabase" -l"c++" -l"sqlite3" -framework "SystemConfiguration"
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
--- a/Files/Pods-YapDatabaseTests/Pods-YapDatabaseTests-frameworks.sh
+++ b/Files/Pods-YapDatabaseTests/Pods-YapDatabaseTests-frameworks.sh
@ -1,18 +1,9 @@
 #!/bin/sh
 set -e
-set -u
-set -o pipefail
-
-if [ -z ${FRAMEWORKS_FOLDER_PATH+x} ]; then
-    # If FRAMEWORKS_FOLDER_PATH is not set, then there's nowhere for us to copy
-    # frameworks to, so exit 0 (signalling the script phase was successful).
-    exit 0
-fi

 echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"

-COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}"
 SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"

 # Used as a return value for each invocation of `strip_invalid_archs` function.
@ -101,10 +92,10 @@ install_dsym() {

 # Signs a framework with the provided identity
 code_sign_if_enabled() {
-  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED:-}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
+  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
    # Use the current code_sign_identitiy
    echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
-    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS:-} --preserve-metadata=identifier,entitlements '$1'"
+    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'"

    if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
      code_sign_cmd="$code_sign_cmd &"
--- a/Files/Pods-YapDatabaseTests/Pods-YapDatabaseTests-resources.sh
+++ b/Files/Pods-YapDatabaseTests/Pods-YapDatabaseTests-resources.sh
@ -1,13 +1,5 @@
 #!/bin/sh
 set -e
-set -u
-set -o pipefail
-
-if [ -z ${UNLOCALIZED_RESOURCES_FOLDER_PATH+x} ]; then
-    # If UNLOCALIZED_RESOURCES_FOLDER_PATH is not set, then there's nowhere for us to copy
-    # resources to, so exit 0 (signalling the script phase was successful).
-    exit 0
-fi

 mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"

@ -20,7 +12,7 @@ XCASSET_FILES=()
 # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
 RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")

-case "${TARGETED_DEVICE_FAMILY:-}" in
+case "${TARGETED_DEVICE_FAMILY}" in
  1,2)
    TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone"
    ;;
@ -100,7 +92,7 @@ if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then
 fi
 rm -f "$RESOURCES_TO_COPY"

-if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "${XCASSET_FILES:-}" ]
+if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ]
 then
  # Find all other xcassets (this unfortunately includes those of path pods and other targets).
  OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
@ -110,9 +102,5 @@ then
    fi
  done <<<"$OTHER_XCASSETS"

-  if [ -z ${ASSETCATALOG_COMPILER_APPICON_NAME+x} ]; then
-    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
-  else
-    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" --app-icon "${ASSETCATALOG_COMPILER_APPICON_NAME}" --output-partial-info-plist "${TARGET_TEMP_DIR}/assetcatalog_generated_info_cocoapods.plist"
-  fi
+  printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
 fi
--- a/Files/Pods-YapDatabaseTests/Pods-YapDatabaseTests.debug.xcconfig
+++ b/Files/Pods-YapDatabaseTests/Pods-YapDatabaseTests.debug.xcconfig
@ -1,7 +1,7 @@
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/CocoaLumberjack" "${PODS_ROOT}/Headers/Public/YapDatabase"
 LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CocoaLumberjack" "${PODS_CONFIGURATION_BUILD_DIR}/YapDatabase"
-OTHER_CFLAGS = $(inherited) -DYAP_STANDARD_SQLITE
+OTHER_CFLAGS = $(inherited) -DYAP_STANDARD_SQLITE $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/CocoaLumberjack" -isystem "${PODS_ROOT}/Headers/Public/YapDatabase"
 OTHER_LDFLAGS = $(inherited) -ObjC -l"CocoaLumberjack" -l"YapDatabase" -l"c++" -l"sqlite3" -framework "SystemConfiguration"
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
--- a/Files/Pods-YapDatabaseTests/Pods-YapDatabaseTests.release.xcconfig
+++ b/Files/Pods-YapDatabaseTests/Pods-YapDatabaseTests.release.xcconfig
@ -1,7 +1,7 @@
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/CocoaLumberjack" "${PODS_ROOT}/Headers/Public/YapDatabase"
 LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CocoaLumberjack" "${PODS_CONFIGURATION_BUILD_DIR}/YapDatabase"
-OTHER_CFLAGS = $(inherited) -DYAP_STANDARD_SQLITE
+OTHER_CFLAGS = $(inherited) -DYAP_STANDARD_SQLITE $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/CocoaLumberjack" -isystem "${PODS_ROOT}/Headers/Public/YapDatabase"
 OTHER_LDFLAGS = $(inherited) -ObjC -l"CocoaLumberjack" -l"YapDatabase" -l"c++" -l"sqlite3" -framework "SystemConfiguration"
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
--- a/Files/YapDatabase/YapDatabase.xcconfig
+++ b/Files/YapDatabase/YapDatabase.xcconfig
@ -1,7 +1,9 @@
 CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/YapDatabase
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/YapDatabase" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/CocoaLumberjack" "${PODS_ROOT}/Headers/Public/YapDatabase"
+HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/YapDatabase" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/CocoaLumberjack" "${PODS_ROOT}/Headers/Public/YapDatabase"
+LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CocoaLumberjack"
 OTHER_CFLAGS = $(inherited) -DYAP_STANDARD_SQLITE
+OTHER_LDFLAGS = -l"c++" -l"sqlite3" -framework "SystemConfiguration"
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_ROOT = ${SRCROOT}
--- a/Testing/Xcode-desktop/YapDatabase/AppDelegate.h
+++ b/Testing/Xcode-desktop/YapDatabase/AppDelegate.h
@ -3,7 +3,7 @@

@interface AppDelegate : NSObject <NSApplicationDelegate>

-@property (nonatomic, assign) IBOutlet NSWindow *window;
+@property (assign) IBOutlet NSWindow *window;

@property (nonatomic, strong, readwrite) IBOutlet NSButton *databaseBenchmarksButton;
@property (nonatomic, strong, readwrite) IBOutlet NSButton *cacheBenchmarksButton;
--- a/Testing/Xcode-desktop/YapDatabase/AppDelegate.m
+++ b/Testing/Xcode-desktop/YapDatabase/AppDelegate.m
@ -9,16 +9,14 @@

@implementation AppDelegate

-@synthesize window;
-
-@synthesize databaseBenchmarksButton = databaseBenchmarksButton;
-@synthesize cacheBenchmarksButton = cacheBenchmarksButton;
-
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
 {
 	
 }

+@synthesize databaseBenchmarksButton = databaseBenchmarksButton;
+@synthesize cacheBenchmarksButton = cacheBenchmarksButton;
+
 - (IBAction)runDatabaseBenchmarks:(id)sender
 {
 	databaseBenchmarksButton.enabled = NO;
@ -29,13 +27,9 @@
 	dispatch_after(popTime, dispatch_get_main_queue(), ^(void){
 		
 		[BenchmarkYapDatabase runTestsWithCompletion:^{
-		#pragma clang diagnostic push
-		#pragma clang diagnostic ignored "-Wimplicit-retain-self"
 			
 			databaseBenchmarksButton.enabled = YES;
 			cacheBenchmarksButton.enabled = YES;
-			
-		#pragma clang diagnostic pop
 		}];
 	});
 }
@ -50,13 +44,9 @@
 	dispatch_after(popTime, dispatch_get_main_queue(), ^(void){
 		
 		[BenchmarkYapCache runTestsWithCompletion:^{
-		#pragma clang diagnostic push
-		#pragma clang diagnostic ignored "-Wimplicit-retain-self"
 			
 			databaseBenchmarksButton.enabled = YES;
 			cacheBenchmarksButton.enabled = YES;
-			
-		#pragma clang diagnostic pop
 		}];
 	});
 }
--- a/Testing/Xcode-desktop/YapDatabaseTesting.xcodeproj/project.pbxproj
+++ b/Testing/Xcode-desktop/YapDatabaseTesting.xcodeproj/project.pbxproj
@ -377,6 +377,7 @@
 				98987F7B1C71D79600173D90 /* Sources */,
 				98987F7C1C71D79600173D90 /* Frameworks */,
 				980A1A1E1C73445200AE574D /* CopyFiles */,
+				3F3B1E8341485E819B1ECFB9 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@ -395,6 +396,8 @@
 				DC84FF87175130D2003BFBB2 /* Sources */,
 				DC84FF88175130D2003BFBB2 /* Frameworks */,
 				DC84FF89175130D2003BFBB2 /* Resources */,
+				87068B8ADA8374DE292CA2A9 /* [CP] Embed Pods Frameworks */,
+				54F2B23EDEE349A6675A75AF /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@ -413,6 +416,8 @@
 				DCFBF7001B45F2D700EC6DFF /* Sources */,
 				DCFBF7011B45F2D700EC6DFF /* Frameworks */,
 				DCFBF7021B45F2D700EC6DFF /* Resources */,
+				9ACE8F341C5C45529F0CEF7E /* [CP] Embed Pods Frameworks */,
+				DDAB329B4D08BE3FF60F3C63 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@ -431,7 +436,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastTestingUpgradeCheck = 0510;
-				LastUpgradeCheck = 1010;
+				LastUpgradeCheck = 0910;
 				ORGANIZATIONNAME = "Robbie Hanson";
 				TargetAttributes = {
 					98987F7E1C71D79600173D90 = {
@ -526,6 +531,66 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
+		3F3B1E8341485E819B1ECFB9 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MultiprocessApp/Pods-MultiprocessApp-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		54F2B23EDEE349A6675A75AF /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-YapDatabase/Pods-YapDatabase-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		87068B8ADA8374DE292CA2A9 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-YapDatabase/Pods-YapDatabase-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		9ACE8F341C5C45529F0CEF7E /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-YapDatabaseTests/Pods-YapDatabaseTests-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		CA689FA5101E28C0B10CF1BB /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@ -544,6 +609,21 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
+		DDAB329B4D08BE3FF60F3C63 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-YapDatabaseTests/Pods-YapDatabaseTests-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */

 /* Begin PBXSourcesBuildPhase section */
@ -684,13 +764,11 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = 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_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
@ -733,13 +811,11 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = 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_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
@ -767,8 +843,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 71C1B3CA4D75DBA9CA1F368F /* Pods-YapDatabase.debug.xcconfig */;
 			buildSettings = {
-				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
-				CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "YapDatabase/YapDatabase-Prefix.pch";
@ -790,8 +864,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 588E5E6547945E9906A3C836 /* Pods-YapDatabase.release.xcconfig */;
 			buildSettings = {
-				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
-				CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "YapDatabase/YapDatabase-Prefix.pch";
--- a/Testing/Xcode-desktop/YapDatabaseTesting.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+++ b/Testing/Xcode-desktop/YapDatabaseTesting.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>
--- a/Testing/Xcode-desktop/YapDatabaseTesting.xcodeproj/xcshareddata/xcschemes/MultiprocessApp.xcscheme
+++ b/Testing/Xcode-desktop/YapDatabaseTesting.xcodeproj/xcshareddata/xcschemes/MultiprocessApp.xcscheme
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "0910"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@ -26,6 +26,7 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
      shouldUseLaunchSchemeArgsEnv = "YES">
      <Testables>
      </Testables>
@ -45,6 +46,7 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
--- a/Testing/Xcode-desktop/YapDatabaseTesting.xcodeproj/xcshareddata/xcschemes/YapDatabaseTesting.xcscheme
+++ b/Testing/Xcode-desktop/YapDatabaseTesting.xcodeproj/xcshareddata/xcschemes/YapDatabaseTesting.xcscheme
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "0910"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
--- a/Testing/Xcode-mobile/Podfile
+++ b/Testing/Xcode-mobile/Podfile
@ -1,6 +1,5 @@
 project 'YapDatabaseTesting.xcodeproj'
-platform :ios, '10.0'
-use_modular_headers!
+platform :ios, '8.1'

 target 'YapDatabase' do
 	pod "YapDatabase", path: '../../'
@ -9,12 +8,3 @@ end
 target 'YapDatabaseTests' do
 	pod "YapDatabase", path: '../../'
 end
-
-post_install do |installer|
-	installer.pods_project.targets.each do |target|
-		target.build_configurations.each do |config|
-			config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET'
-			config.build_settings.delete 'MACOSX_DEPLOYMENT_TARGET'
-		end
-	end
-end
--- a/Testing/Xcode-mobile/Podfile.lock
+++ b/Testing/Xcode-mobile/Podfile.lock
@ -1,89 +1,85 @@
 PODS:
-  - CocoaLumberjack (3.4.2):
-    - CocoaLumberjack/Default (= 3.4.2)
-    - CocoaLumberjack/Extensions (= 3.4.2)
-  - CocoaLumberjack/Default (3.4.2)
-  - CocoaLumberjack/Extensions (3.4.2):
+  - CocoaLumberjack (3.4.1):
+    - CocoaLumberjack/Default (= 3.4.1)
+    - CocoaLumberjack/Extensions (= 3.4.1)
+  - CocoaLumberjack/Default (3.4.1)
+  - CocoaLumberjack/Extensions (3.4.1):
    - CocoaLumberjack/Default
-  - YapDatabase (3.1.1):
-    - YapDatabase/Standard (= 3.1.1)
-  - YapDatabase/Standard (3.1.1):
-    - YapDatabase/Standard/Core (= 3.1.1)
-    - YapDatabase/Standard/Extensions (= 3.1.1)
-  - YapDatabase/Standard/Core (3.1.1):
+  - YapDatabase (3.0.2):
+    - YapDatabase/Standard (= 3.0.2)
+  - YapDatabase/Standard (3.0.2):
+    - YapDatabase/Standard/Core (= 3.0.2)
+    - YapDatabase/Standard/Extensions (= 3.0.2)
+  - YapDatabase/Standard/Core (3.0.2):
    - CocoaLumberjack
-  - YapDatabase/Standard/Extensions (3.1.1):
+  - YapDatabase/Standard/Extensions (3.0.2):
    - YapDatabase/Standard/Core
-    - YapDatabase/Standard/Extensions/ActionManager (= 3.1.1)
-    - YapDatabase/Standard/Extensions/AutoView (= 3.1.1)
-    - YapDatabase/Standard/Extensions/CloudCore (= 3.1.1)
-    - YapDatabase/Standard/Extensions/CloudKit (= 3.1.1)
-    - YapDatabase/Standard/Extensions/ConnectionPool (= 3.1.1)
-    - YapDatabase/Standard/Extensions/ConnectionProxy (= 3.1.1)
-    - YapDatabase/Standard/Extensions/CrossProcessNotification (= 3.1.1)
-    - YapDatabase/Standard/Extensions/FilteredView (= 3.1.1)
-    - YapDatabase/Standard/Extensions/FullTextSearch (= 3.1.1)
-    - YapDatabase/Standard/Extensions/Hooks (= 3.1.1)
-    - YapDatabase/Standard/Extensions/ManualView (= 3.1.1)
-    - YapDatabase/Standard/Extensions/Relationships (= 3.1.1)
-    - YapDatabase/Standard/Extensions/RTreeIndex (= 3.1.1)
-    - YapDatabase/Standard/Extensions/SearchResultsView (= 3.1.1)
-    - YapDatabase/Standard/Extensions/SecondaryIndex (= 3.1.1)
-    - YapDatabase/Standard/Extensions/View (= 3.1.1)
-  - YapDatabase/Standard/Extensions/ActionManager (3.1.1):
+    - YapDatabase/Standard/Extensions/ActionManager (= 3.0.2)
+    - YapDatabase/Standard/Extensions/AutoView (= 3.0.2)
+    - YapDatabase/Standard/Extensions/CloudCore (= 3.0.2)
+    - YapDatabase/Standard/Extensions/CloudKit (= 3.0.2)
+    - YapDatabase/Standard/Extensions/ConnectionPool (= 3.0.2)
+    - YapDatabase/Standard/Extensions/ConnectionProxy (= 3.0.2)
+    - YapDatabase/Standard/Extensions/CrossProcessNotification (= 3.0.2)
+    - YapDatabase/Standard/Extensions/FilteredView (= 3.0.2)
+    - YapDatabase/Standard/Extensions/FullTextSearch (= 3.0.2)
+    - YapDatabase/Standard/Extensions/Hooks (= 3.0.2)
+    - YapDatabase/Standard/Extensions/ManualView (= 3.0.2)
+    - YapDatabase/Standard/Extensions/Relationships (= 3.0.2)
+    - YapDatabase/Standard/Extensions/RTreeIndex (= 3.0.2)
+    - YapDatabase/Standard/Extensions/SearchResultsView (= 3.0.2)
+    - YapDatabase/Standard/Extensions/SecondaryIndex (= 3.0.2)
+    - YapDatabase/Standard/Extensions/View (= 3.0.2)
+  - YapDatabase/Standard/Extensions/ActionManager (3.0.2):
    - YapDatabase/Standard/Core
    - YapDatabase/Standard/Extensions/AutoView
-  - YapDatabase/Standard/Extensions/AutoView (3.1.1):
+  - YapDatabase/Standard/Extensions/AutoView (3.0.2):
    - YapDatabase/Standard/Core
    - YapDatabase/Standard/Extensions/View
-  - YapDatabase/Standard/Extensions/CloudCore (3.1.1):
+  - YapDatabase/Standard/Extensions/CloudCore (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/CloudKit (3.1.1):
+  - YapDatabase/Standard/Extensions/CloudKit (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/ConnectionPool (3.1.1):
+  - YapDatabase/Standard/Extensions/ConnectionPool (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/ConnectionProxy (3.1.1):
+  - YapDatabase/Standard/Extensions/ConnectionProxy (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/CrossProcessNotification (3.1.1):
+  - YapDatabase/Standard/Extensions/CrossProcessNotification (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/FilteredView (3.1.1):
+  - YapDatabase/Standard/Extensions/FilteredView (3.0.2):
    - YapDatabase/Standard/Core
    - YapDatabase/Standard/Extensions/View
-  - YapDatabase/Standard/Extensions/FullTextSearch (3.1.1):
+  - YapDatabase/Standard/Extensions/FullTextSearch (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/Hooks (3.1.1):
+  - YapDatabase/Standard/Extensions/Hooks (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/ManualView (3.1.1):
+  - YapDatabase/Standard/Extensions/ManualView (3.0.2):
    - YapDatabase/Standard/Core
    - YapDatabase/Standard/Extensions/View
-  - YapDatabase/Standard/Extensions/Relationships (3.1.1):
+  - YapDatabase/Standard/Extensions/Relationships (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/RTreeIndex (3.1.1):
+  - YapDatabase/Standard/Extensions/RTreeIndex (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/SearchResultsView (3.1.1):
+  - YapDatabase/Standard/Extensions/SearchResultsView (3.0.2):
    - YapDatabase/Standard/Core
    - YapDatabase/Standard/Extensions/AutoView
    - YapDatabase/Standard/Extensions/FullTextSearch
-  - YapDatabase/Standard/Extensions/SecondaryIndex (3.1.1):
+  - YapDatabase/Standard/Extensions/SecondaryIndex (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/View (3.1.1):
+  - YapDatabase/Standard/Extensions/View (3.0.2):
    - YapDatabase/Standard/Core

 DEPENDENCIES:
  - YapDatabase (from `../../`)

-SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
-    - CocoaLumberjack
-
 EXTERNAL SOURCES:
  YapDatabase:
-    :path: "../../"
+    :path: ../../

 SPEC CHECKSUMS:
-  CocoaLumberjack: db7cc9e464771f12054c22ff6947c5a58d43a0fd
-  YapDatabase: 68188358039b289e962ddf55ffea39a336efd0e1
+  CocoaLumberjack: 2e258a064cacc8eb9a2aca318e24d02a0a7fd56d
+  YapDatabase: 972eccb0c997d0dafe8192dccf7f58351914baf1

-PODFILE CHECKSUM: a3d25f1bb5723f2682be762798ccdb8bb5b4eb81
+PODFILE CHECKSUM: 56e0faf7e85fac2003da53b861394c2731e637d4

-COCOAPODS: 1.6.0.beta.2
+COCOAPODS: 1.4.0
--- a/Testing/Xcode-mobile/Pods/CocoaLumberjack/Classes/DDAbstractDatabaseLogger.m
+++ b/Testing/Xcode-mobile/Pods/CocoaLumberjack/Classes/DDAbstractDatabaseLogger.m
@ -217,7 +217,7 @@

    dispatch_sync(globalLoggingQueue, ^{
        dispatch_sync(self.loggerQueue, ^{
-            result = self->_saveThreshold;
+            result = _saveThreshold;
        });
    });

@ -227,15 +227,15 @@
 - (void)setSaveThreshold:(NSUInteger)threshold {
    dispatch_block_t block = ^{
        @autoreleasepool {
-            if (self->_saveThreshold != threshold) {
-                self->_saveThreshold = threshold;
+            if (_saveThreshold != threshold) {
+                _saveThreshold = threshold;

                // Since the saveThreshold has changed,
                // we check to see if the current unsavedCount has surpassed the new threshold.
                //
                // If it has, we immediately save the log.

-                if ((self->_unsavedCount >= self->_saveThreshold) && (self->_saveThreshold > 0)) {
+                if ((_unsavedCount >= _saveThreshold) && (_saveThreshold > 0)) {
                    [self performSaveAndSuspendSaveTimer];
                }
            }
@ -277,7 +277,7 @@

    dispatch_sync(globalLoggingQueue, ^{
        dispatch_sync(self.loggerQueue, ^{
-            result = self->_saveInterval;
+            result = _saveInterval;
        });
    });

@ -290,8 +290,8 @@
            // C99 recommended floating point comparison macro
            // Read: isLessThanOrGreaterThan(floatA, floatB)

-            if (/* saveInterval != interval */ islessgreater(self->_saveInterval, interval)) {
-                self->_saveInterval = interval;
+            if (/* saveInterval != interval */ islessgreater(_saveInterval, interval)) {
+                _saveInterval = interval;

                // There are several cases we need to handle here.
                //
@ -306,8 +306,8 @@
                // 4. If the saveInterval decreased, then we need to reset the timer so that it fires at an earlier date.
                //    (Plus we might need to do an immediate save.)

-                if (self->_saveInterval > 0.0) {
-                    if (self->_saveTimer == NULL) {
+                if (_saveInterval > 0.0) {
+                    if (_saveTimer == NULL) {
                        // Handles #2
                        //
                        // Since the saveTimer uses the unsavedTime to calculate it's first fireDate,
@ -324,7 +324,7 @@

                        [self updateAndResumeSaveTimer];
                    }
-                } else if (self->_saveTimer) {
+                } else if (_saveTimer) {
                    // Handles #1

                    [self destroySaveTimer];
@ -368,7 +368,7 @@

    dispatch_sync(globalLoggingQueue, ^{
        dispatch_sync(self.loggerQueue, ^{
-            result = self->_maxAge;
+            result = _maxAge;
        });
    });

@ -381,11 +381,11 @@
            // C99 recommended floating point comparison macro
            // Read: isLessThanOrGreaterThan(floatA, floatB)

-            if (/* maxAge != interval */ islessgreater(self->_maxAge, interval)) {
-                NSTimeInterval oldMaxAge = self->_maxAge;
+            if (/* maxAge != interval */ islessgreater(_maxAge, interval)) {
+                NSTimeInterval oldMaxAge = _maxAge;
                NSTimeInterval newMaxAge = interval;

-                self->_maxAge = interval;
+                _maxAge = interval;

                // There are several cases we need to handle here.
                //
@ -420,7 +420,7 @@
                if (shouldDeleteNow) {
                    [self performDelete];

-                    if (self->_deleteTimer) {
+                    if (_deleteTimer) {
                        [self updateDeleteTimer];
                    } else {
                        [self createAndStartDeleteTimer];
@ -465,7 +465,7 @@

    dispatch_sync(globalLoggingQueue, ^{
        dispatch_sync(self.loggerQueue, ^{
-            result = self->_deleteInterval;
+            result = _deleteInterval;
        });
    });

@ -478,8 +478,8 @@
            // C99 recommended floating point comparison macro
            // Read: isLessThanOrGreaterThan(floatA, floatB)

-            if (/* deleteInterval != interval */ islessgreater(self->_deleteInterval, interval)) {
-                self->_deleteInterval = interval;
+            if (/* deleteInterval != interval */ islessgreater(_deleteInterval, interval)) {
+                _deleteInterval = interval;

                // There are several cases we need to handle here.
                //
@ -494,8 +494,8 @@
                // 4. If the deleteInterval decreased, then we need to reset the timer so that it fires at an earlier date.
                //    (Plus we might need to do an immediate delete.)

-                if (self->_deleteInterval > 0.0) {
-                    if (self->_deleteTimer == NULL) {
+                if (_deleteInterval > 0.0) {
+                    if (_deleteTimer == NULL) {
                        // Handles #2
                        //
                        // Since the deleteTimer uses the lastDeleteTime to calculate it's first fireDate,
@ -511,7 +511,7 @@

                        [self updateDeleteTimer];
                    }
-                } else if (self->_deleteTimer) {
+                } else if (_deleteTimer) {
                    // Handles #1

                    [self destroyDeleteTimer];
@ -555,7 +555,7 @@

    dispatch_sync(globalLoggingQueue, ^{
        dispatch_sync(self.loggerQueue, ^{
-            result = self->_deleteOnEverySave;
+            result = _deleteOnEverySave;
        });
    });

@ -564,7 +564,7 @@

 - (void)setDeleteOnEverySave:(BOOL)flag {
    dispatch_block_t block = ^{
-        self->_deleteOnEverySave = flag;
+        _deleteOnEverySave = flag;
    };

    // The design of the setter logic below is taken from the DDAbstractLogger implementation.
--- a/Testing/Xcode-mobile/Pods/CocoaLumberjack/Classes/DDFileLogger.h
+++ b/Testing/Xcode-mobile/Pods/CocoaLumberjack/Classes/DDFileLogger.h
@ -326,11 +326,6 @@ extern unsigned long long const kDDDefaultLogFilesDiskQuota;
 */
 - (void)didLogMessage NS_REQUIRES_SUPER;

-/**
- *  Writes all in-memory log data to the permanent storage. Call super before your implementation.
- */
- (void)flush NS_REQUIRES_SUPER;
-
 /**
 *  Called when the logger checks archive or not current log file. 
 *  Override this method to exdend standart behavior. By default returns NO.
--- a/Testing/Xcode-mobile/Pods/CocoaLumberjack/Classes/DDFileLogger.m
+++ b/Testing/Xcode-mobile/Pods/CocoaLumberjack/Classes/DDFileLogger.m
@ -612,7 +612,7 @@ unsigned long long const kDDDefaultLogFilesDiskQuota   = 20 * 1024 * 1024; // 20
    __block unsigned long long result;

    dispatch_block_t block = ^{
-        result = self->_maximumFileSize;
+        result = _maximumFileSize;
    };

    // The design of this method is taken from the DDAbstractLogger implementation.
@ -640,7 +640,7 @@ unsigned long long const kDDDefaultLogFilesDiskQuota   = 20 * 1024 * 1024; // 20
 - (void)setMaximumFileSize:(unsigned long long)newMaximumFileSize {
    dispatch_block_t block = ^{
        @autoreleasepool {
-            self->_maximumFileSize = newMaximumFileSize;
+            _maximumFileSize = newMaximumFileSize;
            [self maybeRollLogFileDueToSize];
        }
    };
@ -669,7 +669,7 @@ unsigned long long const kDDDefaultLogFilesDiskQuota   = 20 * 1024 * 1024; // 20
    __block NSTimeInterval result;

    dispatch_block_t block = ^{
-        result = self->_rollingFrequency;
+        result = _rollingFrequency;
    };

    // The design of this method is taken from the DDAbstractLogger implementation.
@ -697,7 +697,7 @@ unsigned long long const kDDDefaultLogFilesDiskQuota   = 20 * 1024 * 1024; // 20
 - (void)setRollingFrequency:(NSTimeInterval)newRollingFrequency {
    dispatch_block_t block = ^{
        @autoreleasepool {
-            self->_rollingFrequency = newRollingFrequency;
+            _rollingFrequency = newRollingFrequency;
            [self maybeRollLogFileDueToAge];
        }
    };
@ -1040,10 +1040,6 @@ static int exception_count = 0;
    return @"cocoa.lumberjack.fileLogger";
 }

- (void)flush {
-    [_currentLogFileHandle synchronizeFile];
-}
-
@end

 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--- a/Testing/Xcode-mobile/Pods/CocoaLumberjack/Classes/DDLog.h
+++ b/Testing/Xcode-mobile/Pods/CocoaLumberjack/Classes/DDLog.h
@ -177,7 +177,7 @@ NS_ASSUME_NONNULL_BEGIN
 *
 *  @return the file name
 */
-FOUNDATION_EXTERN NSString * __nullable DDExtractFileNameWithoutExtension(const char *filePath, BOOL copy);
+NSString * __nullable DDExtractFileNameWithoutExtension(const char *filePath, BOOL copy);

 /**
 * The THIS_FILE macro gives you an NSString of the file name.
--- a/Testing/Xcode-mobile/Pods/CocoaLumberjack/Classes/DDLog.m
+++ b/Testing/Xcode-mobile/Pods/CocoaLumberjack/Classes/DDLog.m
@ -629,7 +629,6 @@ static NSUInteger _numProcessors;
        if (numClasses > bufferSize || numClasses == 0) {
            //apparently more classes added between calls (or a problem); try again
            free(classes);
-            classes = NULL;
            numClasses = 0;
        }
    }
@ -1313,8 +1312,8 @@ static __inline__ __attribute__((__always_inline__)) void _dispatch_queue_label_
    __block id <DDLogFormatter> result;

    dispatch_sync(globalLoggingQueue, ^{
-        dispatch_sync(self->_loggerQueue, ^{
-            result = self->_logFormatter;
+        dispatch_sync(_loggerQueue, ^{
+            result = _logFormatter;
        });
    });

@ -1329,17 +1328,17 @@ static __inline__ __attribute__((__always_inline__)) void _dispatch_queue_label_

    dispatch_block_t block = ^{
        @autoreleasepool {
-            if (self->_logFormatter != logFormatter) {
-                if ([self->_logFormatter respondsToSelector:@selector(willRemoveFromLogger:)]) {
-                    [self->_logFormatter willRemoveFromLogger:self];
+            if (_logFormatter != logFormatter) {
+                if ([_logFormatter respondsToSelector:@selector(willRemoveFromLogger:)]) {
+                    [_logFormatter willRemoveFromLogger:self];
                }

-                self->_logFormatter = logFormatter;
+                _logFormatter = logFormatter;
 
-                if ([self->_logFormatter respondsToSelector:@selector(didAddToLogger:inQueue:)]) {
-                    [self->_logFormatter didAddToLogger:self inQueue:self->_loggerQueue];
-                } else if ([self->_logFormatter respondsToSelector:@selector(didAddToLogger:)]) {
-                    [self->_logFormatter didAddToLogger:self];
+                if ([_logFormatter respondsToSelector:@selector(didAddToLogger:inQueue:)]) {
+                    [_logFormatter didAddToLogger:self inQueue:_loggerQueue];
+                } else if ([_logFormatter respondsToSelector:@selector(didAddToLogger:)]) {
+                    [_logFormatter didAddToLogger:self];
                }
            }
        }
@ -1348,7 +1347,7 @@ static __inline__ __attribute__((__always_inline__)) void _dispatch_queue_label_
    dispatch_queue_t globalLoggingQueue = [DDLog loggingQueue];

    dispatch_async(globalLoggingQueue, ^{
-        dispatch_async(self->_loggerQueue, block);
+        dispatch_async(_loggerQueue, block);
    });
 }

--- a/Testing/Xcode-mobile/Pods/CocoaLumberjack/Classes/DDTTYLogger.m
+++ b/Testing/Xcode-mobile/Pods/CocoaLumberjack/Classes/DDTTYLogger.m
@ -900,7 +900,7 @@ static DDTTYLogger *sharedInstance;

    dispatch_sync(globalLoggingQueue, ^{
        dispatch_sync(self.loggerQueue, ^{
-            result = self->_colorsEnabled;
+            result = _colorsEnabled;
        });
    });

@ -910,9 +910,9 @@ static DDTTYLogger *sharedInstance;
 - (void)setColorsEnabled:(BOOL)newColorsEnabled {
    dispatch_block_t block = ^{
        @autoreleasepool {
-            self->_colorsEnabled = newColorsEnabled;
+            _colorsEnabled = newColorsEnabled;

-            if ([self->_colorProfilesArray count] == 0) {
+            if ([_colorProfilesArray count] == 0) {
                [self loadDefaultColorProfiles];
            }
        }
@ -955,7 +955,7 @@ static DDTTYLogger *sharedInstance;

            NSUInteger i = 0;

-            for (DDTTYLoggerColorProfile *colorProfile in self->_colorProfilesArray) {
+            for (DDTTYLoggerColorProfile *colorProfile in _colorProfilesArray) {
                if ((colorProfile->mask == mask) && (colorProfile->context == ctxt)) {
                    break;
                }
@ -963,10 +963,10 @@ static DDTTYLogger *sharedInstance;
                i++;
            }

-            if (i < [self->_colorProfilesArray count]) {
-                self->_colorProfilesArray[i] = newColorProfile;
+            if (i < [_colorProfilesArray count]) {
+                _colorProfilesArray[i] = newColorProfile;
            } else {
-                [self->_colorProfilesArray addObject:newColorProfile];
+                [_colorProfilesArray addObject:newColorProfile];
            }
        }
    };
@ -999,7 +999,7 @@ static DDTTYLogger *sharedInstance;

            NSLogInfo(@"DDTTYLogger: newColorProfile: %@", newColorProfile);

-            self->_colorProfilesDict[tag] = newColorProfile;
+            _colorProfilesDict[tag] = newColorProfile;
        }
    };

@ -1027,7 +1027,7 @@ static DDTTYLogger *sharedInstance;
        @autoreleasepool {
            NSUInteger i = 0;

-            for (DDTTYLoggerColorProfile *colorProfile in self->_colorProfilesArray) {
+            for (DDTTYLoggerColorProfile *colorProfile in _colorProfilesArray) {
                if ((colorProfile->mask == mask) && (colorProfile->context == context)) {
                    break;
                }
@ -1035,8 +1035,8 @@ static DDTTYLogger *sharedInstance;
                i++;
            }

-            if (i < [self->_colorProfilesArray count]) {
-                [self->_colorProfilesArray removeObjectAtIndex:i];
+            if (i < [_colorProfilesArray count]) {
+                [_colorProfilesArray removeObjectAtIndex:i];
            }
        }
    };
@ -1061,7 +1061,7 @@ static DDTTYLogger *sharedInstance;

    dispatch_block_t block = ^{
        @autoreleasepool {
-            [self->_colorProfilesDict removeObjectForKey:tag];
+            [_colorProfilesDict removeObjectForKey:tag];
        }
    };

@ -1083,7 +1083,7 @@ static DDTTYLogger *sharedInstance;
 - (void)clearColorsForAllFlags {
    dispatch_block_t block = ^{
        @autoreleasepool {
-            [self->_colorProfilesArray removeAllObjects];
+            [_colorProfilesArray removeAllObjects];
        }
    };

@ -1105,7 +1105,7 @@ static DDTTYLogger *sharedInstance;
 - (void)clearColorsForAllTags {
    dispatch_block_t block = ^{
        @autoreleasepool {
-            [self->_colorProfilesDict removeAllObjects];
+            [_colorProfilesDict removeAllObjects];
        }
    };

@ -1127,8 +1127,8 @@ static DDTTYLogger *sharedInstance;
 - (void)clearAllColors {
    dispatch_block_t block = ^{
        @autoreleasepool {
-            [self->_colorProfilesArray removeAllObjects];
-            [self->_colorProfilesDict removeAllObjects];
+            [_colorProfilesArray removeAllObjects];
+            [_colorProfilesDict removeAllObjects];
        }
    };

--- a/Testing/Xcode-mobile/Pods/CocoaLumberjack/Classes/Extensions/DDMultiFormatter.m
+++ b/Testing/Xcode-mobile/Pods/CocoaLumberjack/Classes/Extensions/DDMultiFormatter.m
@ -81,7 +81,7 @@
    __block NSString *line = logMessage->_message;

    dispatch_sync(_queue, ^{
-        for (id<DDLogFormatter> formatter in self->_formatters) {
+        for (id<DDLogFormatter> formatter in _formatters) {
            DDLogMessage *message = [self logMessageForLine:line originalMessage:logMessage];
            line = [formatter formatLogMessage:message];

@ -107,7 +107,7 @@
    __block NSArray *formatters;

    dispatch_sync(_queue, ^{
-        formatters = [self->_formatters copy];
+        formatters = [_formatters copy];
    });

    return formatters;
@ -115,19 +115,19 @@

 - (void)addFormatter:(id<DDLogFormatter>)formatter {
    dispatch_barrier_async(_queue, ^{
-        [self->_formatters addObject:formatter];
+        [_formatters addObject:formatter];
    });
 }

 - (void)removeFormatter:(id<DDLogFormatter>)formatter {
    dispatch_barrier_async(_queue, ^{
-        [self->_formatters removeObject:formatter];
+        [_formatters removeObject:formatter];
    });
 }

 - (void)removeAllFormatters {
    dispatch_barrier_async(_queue, ^{
-        [self->_formatters removeAllObjects];
+        [_formatters removeAllObjects];
    });
 }

@ -135,7 +135,7 @@
    __block BOOL hasFormatter;

    dispatch_sync(_queue, ^{
-        hasFormatter = [self->_formatters containsObject:formatter];
+        hasFormatter = [_formatters containsObject:formatter];
    });

    return hasFormatter;
--- a/Testing/Xcode-mobile/Pods/CocoaLumberjack/README.md
+++ b/Testing/Xcode-mobile/Pods/CocoaLumberjack/README.md
@ -48,11 +48,11 @@ DDLog.add(fileLogger)

 ...

-DDLogVerbose("Verbose")
-DDLogDebug("Debug")
-DDLogInfo("Info")
-DDLogWarn("Warn")
-DDLogError("Error")
+DDLogVerbose("Verbose");
+DDLogDebug("Debug");
+DDLogInfo("Info");
+DDLogWarn("Warn");
+DDLogError("Error");
 ```

 ##### Obj-C version via CocoaPods
--- a/Testing/Xcode-mobile/Pods/Headers/Private/YapDatabase/YapDatabase.modulemap
+++ b/Testing/Xcode-mobile/Pods/Headers/Private/YapDatabase/YapDatabase.modulemap
@ -1,194 +0,0 @@
-module YapDatabase {
-	
-	header "YapDatabase.h"
-	header "YapDatabaseConnection.h"
-	header "YapDatabaseTransaction.h"
-	header "YapDatabaseOptions.h"
-	header "YapDatabaseExtension.h"
-	header "YapDatabaseExtensionConnection.h"
-	header "YapDatabaseExtensionTransaction.h"
-	header "YapDatabaseExtensionTypes.h"
-	
-	module Utilities {
-		header "YapBidirectionalCache.h"
-		header "YapCache.h"
-		header "YapCollectionKey.h"
-		header "YapDatabaseConnectionConfig.h"
-		header "YapDatabaseQuery.h"
-		header "YapMurmurHash.h"
-		header "YapProxyObject.h"
-		header "YapSet.h"
-		header "YapWhitelistBlacklist.h"
-		header "YapMutationStack.h"
-	}
-
-	explicit module YapDatabaseExtensionPrivate {
-		header "YapDatabaseExtensionPrivate.h"
-	}
-
-	// Extension: View
-	
-	explicit module YapDatabaseView {
-		header "YapDatabaseView.h"
-		header "YapDatabaseViewOptions.h"
-		header "YapDatabaseViewConnection.h"
-		header "YapDatabaseViewTransaction.h"
-		header "YapDatabaseViewMappings.h"
-		header "YapDatabaseViewChange.h"
-		header "YapDatabaseViewRangeOptions.h"
-	}
-
-	// Extension: AutoView
-
-	explicit module YapDatabaseAutoView {
-		header "YapDatabaseViewTypes.h"
-		header "YapDatabaseAutoView.h"
-		header "YapDatabaseAutoViewConnection.h"
-		header "YapDatabaseAutoViewTransaction.h"
-
-		export YapDatabaseView
-	}
-
-	// Extension: FilteredView
-	
-	explicit module YapDatabaseFilteredView {
-		header "YapDatabaseFilteredView.h"
-		header "YapDatabaseFilteredViewTypes.h"
-		header "YapDatabaseFilteredViewConnection.h"
-		header "YapDatabaseFilteredViewTransaction.h"
-		
-		export YapDatabaseView
-	}
-	
-	// Extension: Relationship
-	
-	explicit module YapDatabaseRelationship {
-		header "YapDatabaseRelationship.h"
-		header "YapDatabaseRelationshipNode.h"
-		header "YapDatabaseRelationshipEdge.h"
-		header "YapDatabaseRelationshipOptions.h"
-		header "YapDatabaseRelationshipConnection.h"
-		header "YapDatabaseRelationshipTransaction.h"
-	}
-	
-	// Extension: SecondaryIndex
-
-	explicit module YapDatabaseSecondaryIndex {
-		header "YapDatabaseSecondaryIndex.h"
-		header "YapDatabaseSecondaryIndexSetup.h"
-		header "YapDatabaseSecondaryIndexHandler.h"
-		header "YapDatabaseSecondaryIndexOptions.h"
-		header "YapDatabaseSecondaryIndexConnection.h"
-		header "YapDatabaseSecondaryIndexTransaction.h"
-	}
-	
-	// Extension: FullTextSearch
-	
-	explicit module YapDatabaseFullTextSearch {
-		header "YapDatabaseFullTextSearch.h"
-		header "YapDatabaseFullTextSearchHandler.h"
-		header "YapDatabaseFullTextSearchConnection.h"
-		header "YapDatabaseFullTextSearchTransaction.h"
-		header "YapDatabaseFullTextSearchSnippetOptions.h"
-	}
-	
-	// Extension: SearchResultsView
-	
-	explicit module YapDatabaseSearchResultsView {
-		header "YapDatabaseSearchResultsView.h"
-		header "YapDatabaseSearchResultsViewOptions.h"
-		header "YapDatabaseSearchResultsViewConnection.h"
-		header "YapDatabaseSearchResultsViewTransaction.h"
-		header "YapDatabaseSearchQueue.h"
-		
-		export YapDatabaseView
-		export YapDatabaseFullTextSearch
-	}
-	
-	// Extension: Hooks
-	
-	explicit module YapDatabaseHooks {
-		header "YapDatabaseHooks.h"
-		header "YapDatabaseHooksConnection.h"
-		header "YapDatabaseHooksTransaction.h"
-	}
-	
-	// Extension: CloudKit
-	
-	explicit module YapDatabaseCloudKit {
-		header "YapDatabaseCloudKit.h"
-		header "YapDatabaseCloudKitTypes.h"
-		header "YapDatabaseCloudKitOptions.h"
-		header "YapDatabaseCloudKitConnection.h"
-		header "YapDatabaseCloudKitTransaction.h"
-		header "YDBCKChangeSet.h"
-		header "YDBCKMergeInfo.h"
-		header "YDBCKRecordInfo.h"
-		header "YDBCKRecord.h"
-	}
-	
-	// Extension: RTree
-	
-	explicit module YapDatabaseRTreeIndex {
-		header "YapDatabaseRTreeIndex.h"
-		header "YapDatabaseRTreeIndexSetup.h"
-		header "YapDatabaseRTreeIndexHandler.h"
-		header "YapDatabaseRTreeIndexOptions.h"
-		header "YapDatabaseRTreeIndexConnection.h"
-		header "YapDatabaseRTreeIndexTransaction.h"
-	}
-	
-	// Extension: ConnectionProxy
-	
-	explicit module YapDatabaseConnectionProxy {
-		header "YapDatabaseConnectionProxy.h"
-	}
-	
-	// Extension: ConnectionPool
-	
-	explicit module YapDatabaseConnectionPool {
-		header "YapDatabaseConnectionPool.h"
-	}
-	
-	// Extension: ActionManager
-	
-	explicit module YapDatabaseActionManager {
-		header "YapActionable.h"
-		header "YapActionItem.h"
-		header "YapDatabaseActionManager.h"
-		header "YapDatabaseActionManagerConnection.h"
-		header "YapDatabaseActionManagerTransaction.h"
-		header "YapReachability.h"
-	}
-	
-	// Extension: CrossProcessNotification
-	
-	explicit module YapDatabaseCrossProcessNotification {
-		header "YapDatabaseCrossProcessNotification.h"
-		header "YapDatabaseCrossProcessNotificationConnection.h"
-		header "YapDatabaseCrossProcessNotificationTransaction.h"
-	}
-	
-	// Extension: CloudCore
-	
-	explicit module YapDatabaseCloudCore {
-		header "YapDatabaseCloudCore.h"
-		header "YapDatabaseCloudCoreOptions.h"
-		header "YapDatabaseCloudCoreConnection.h"
-		header "YapDatabaseCloudCoreTransaction.h"
-		header "YapManyToManyCache.h"
-		header "YapDatabaseCloudCoreOperation.h"
-		header "YapDatabaseCloudCorePipelineDelegate.h"
-		header "YapDatabaseCloudCorePipeline.h"
-		header "YapDatabaseCloudCoreGraph.h"
-	}
-
-	explicit module YapDatabaseCloudCorePrivate {
-		header "YapDatabaseCloudCorePrivate.h"
-		header "YapDatabaseCloudCoreOperationPrivate.h"
-		header "YapDatabaseCloudCorePipelinePrivate.h"
-		header "YapDatabaseCloudCoreGraphPrivate.h"
-		
-		export YapDatabaseExtensionPrivate
-	}
-}
--- a/Testing/Xcode-mobile/Pods/Headers/Private/YapDatabase/YapDatabaseAtomic.h
+++ b/Testing/Xcode-mobile/Pods/Headers/Private/YapDatabase/YapDatabaseAtomic.h
@ -1 +1 @@
-../../../../../../YapDatabase/Utilities/YapDatabaseAtomic.h
+../../../../../../YapDatabase/Internal/YapDatabaseAtomic.h
--- a/Testing/Xcode-mobile/Pods/Headers/Private/YapDatabase/YapDatabaseCloudCoreGraphPrivate.h
+++ b/Testing/Xcode-mobile/Pods/Headers/Private/YapDatabase/YapDatabaseCloudCoreGraphPrivate.h
@ -1 +0,0 @@
-../../../../../../YapDatabase/Extensions/CloudCore/Internal/YapDatabaseCloudCoreGraphPrivate.h
--- a/Testing/Xcode-mobile/Pods/Headers/Public/CocoaLumberjack/CocoaLumberjack-umbrella.h
+++ b/Testing/Xcode-mobile/Pods/Headers/Public/CocoaLumberjack/CocoaLumberjack-umbrella.h
@ -1,31 +0,0 @@
-#ifdef __OBJC__
-#import <UIKit/UIKit.h>
-#else
-#ifndef FOUNDATION_EXPORT
-#if defined(__cplusplus)
-#define FOUNDATION_EXPORT extern "C"
-#else
-#define FOUNDATION_EXPORT extern
-#endif
-#endif
-#endif
-
-#import "CocoaLumberjack.h"
-#import "DDAbstractDatabaseLogger.h"
-#import "DDASLLogCapture.h"
-#import "DDASLLogger.h"
-#import "DDAssertMacros.h"
-#import "DDFileLogger.h"
-#import "DDLegacyMacros.h"
-#import "DDLog+LOGV.h"
-#import "DDLog.h"
-#import "DDLogMacros.h"
-#import "DDOSLogger.h"
-#import "DDTTYLogger.h"
-#import "DDContextFilterLogFormatter.h"
-#import "DDDispatchQueueLogFormatter.h"
-#import "DDMultiFormatter.h"
-
-FOUNDATION_EXPORT double CocoaLumberjackVersionNumber;
-FOUNDATION_EXPORT const unsigned char CocoaLumberjackVersionString[];
-
--- a/Testing/Xcode-mobile/Pods/Headers/Public/CocoaLumberjack/CocoaLumberjack.modulemap
+++ b/Testing/Xcode-mobile/Pods/Headers/Public/CocoaLumberjack/CocoaLumberjack.modulemap
@ -1,6 +0,0 @@
-module CocoaLumberjack {
-  umbrella header "CocoaLumberjack-umbrella.h"
-
-  export *
-  module * { export * }
-}
--- a/Testing/Xcode-mobile/Pods/Headers/Public/YapDatabase/YapDatabaseAtomic.h
+++ b/Testing/Xcode-mobile/Pods/Headers/Public/YapDatabase/YapDatabaseAtomic.h
@ -1 +0,0 @@
-../../../../../../YapDatabase/Utilities/YapDatabaseAtomic.h
--- a/Testing/Xcode-mobile/Pods/Headers/Public/YapDatabase/YapDatabaseCloudCoreGraphPrivate.h
+++ b/Testing/Xcode-mobile/Pods/Headers/Public/YapDatabase/YapDatabaseCloudCoreGraphPrivate.h
@ -1 +0,0 @@
-../../../../../../YapDatabase/Extensions/CloudCore/Internal/YapDatabaseCloudCoreGraphPrivate.h
--- a/Testing/Xcode-mobile/Pods/Headers/Public/YapDatabase/YapDatabaseCloudCoreOperationPrivate.h
+++ b/Testing/Xcode-mobile/Pods/Headers/Public/YapDatabase/YapDatabaseCloudCoreOperationPrivate.h
@ -1 +0,0 @@
-../../../../../../YapDatabase/Extensions/CloudCore/Internal/YapDatabaseCloudCoreOperationPrivate.h
--- a/Testing/Xcode-mobile/Pods/Headers/Public/YapDatabase/YapDatabaseCloudCorePipelinePrivate.h
+++ b/Testing/Xcode-mobile/Pods/Headers/Public/YapDatabase/YapDatabaseCloudCorePipelinePrivate.h
@ -1 +0,0 @@
-../../../../../../YapDatabase/Extensions/CloudCore/Internal/YapDatabaseCloudCorePipelinePrivate.h
--- a/Testing/Xcode-mobile/Pods/Headers/Public/YapDatabase/YapDatabaseCloudCorePrivate.h
+++ b/Testing/Xcode-mobile/Pods/Headers/Public/YapDatabase/YapDatabaseCloudCorePrivate.h
@ -1 +0,0 @@
-../../../../../../YapDatabase/Extensions/CloudCore/Internal/YapDatabaseCloudCorePrivate.h
--- a/Testing/Xcode-mobile/Pods/Headers/Public/YapDatabase/YapDatabaseExtensionPrivate.h
+++ b/Testing/Xcode-mobile/Pods/Headers/Public/YapDatabase/YapDatabaseExtensionPrivate.h
@ -1 +0,0 @@
-../../../../../../YapDatabase/Extensions/Protocol/Internal/YapDatabaseExtensionPrivate.h
--- a/Podspecs/YapDatabase.podspec.json
+++ b/Podspecs/YapDatabase.podspec.json
@ -1,6 +1,6 @@
 {
  "name": "YapDatabase",
-  "version": "3.1.1",
+  "version": "3.0.2",
  "summary": "A key/value store built atop sqlite for iOS & Mac.",
  "homepage": "https://github.com/yapstudios/YapDatabase",
  "license": "MIT",
@ -9,7 +9,7 @@
  },
  "source": {
    "git": "https://github.com/yapstudios/YapDatabase.git",
-    "tag": "3.1.1"
+    "tag": "3.0.2"
  },
  "platforms": {
    "osx": "10.10",
@ -19,18 +19,6 @@
  },
  "libraries": "c++",
  "default_subspecs": "Standard",
-  "osx": {
-    "module_map": "Framework/Mac/module.modulemap"
-  },
-  "ios": {
-    "module_map": "Framework/iOS/module.modulemap"
-  },
-  "tvos": {
-    "module_map": "Framework/tvOS/module.modulemap"
-  },
-  "watchos": {
-    "module_map": "Framework/watchOS/module.modulemap"
-  },
  "subspecs": [
    {
      "name": "Standard",
@ -51,7 +39,10 @@
            "YapDatabase/{Internal,Utilities}/*.{h,m,mm,c}",
            "YapDatabase/Extensions/Protocol/**/*.{h,m,mm,c}"
          ],
-          "private_header_files": "YapDatabase/Internal/*.h"
+          "private_header_files": [
+            "YapDatabase/Internal/*.h",
+            "YapDatabase/Extensions/Protocol/Internal/*.h"
+          ]
        },
        {
          "name": "Extensions",
@ -173,7 +164,8 @@
            },
            {
              "name": "CloudCore",
-              "source_files": "YapDatabase/Extensions/CloudCore/**/*.{h,m,mm,c}"
+              "source_files": "YapDatabase/Extensions/CloudCore/**/*.{h,m,mm,c}",
+              "private_header_files": "YapDatabase/Extensions/CloudCore/Internal/*.h"
            }
          ]
        }
@ -200,7 +192,10 @@
            "YapDatabase/{Internal,Utilities}/*.{h,m,mm,c}",
            "YapDatabase/Extensions/Protocol/**/*.{h,m,mm,c}"
          ],
-          "private_header_files": "YapDatabase/Internal/*.h"
+          "private_header_files": [
+            "YapDatabase/Internal/*.h",
+            "YapDatabase/Extensions/Protocol/Internal/*.h"
+          ]
        },
        {
          "name": "Extensions",
@ -322,7 +317,8 @@
            },
            {
              "name": "CloudCore",
-              "source_files": "YapDatabase/Extensions/CloudCore/**/*.{h,m,mm,c}"
+              "source_files": "YapDatabase/Extensions/CloudCore/**/*.{h,m,mm,c}",
+              "private_header_files": "YapDatabase/Extensions/CloudCore/Internal/*.h"
            }
          ]
        }
--- a/Testing/Xcode-mobile/Pods/Manifest.lock
+++ b/Testing/Xcode-mobile/Pods/Manifest.lock
@ -1,89 +1,85 @@
 PODS:
-  - CocoaLumberjack (3.4.2):
-    - CocoaLumberjack/Default (= 3.4.2)
-    - CocoaLumberjack/Extensions (= 3.4.2)
-  - CocoaLumberjack/Default (3.4.2)
-  - CocoaLumberjack/Extensions (3.4.2):
+  - CocoaLumberjack (3.4.1):
+    - CocoaLumberjack/Default (= 3.4.1)
+    - CocoaLumberjack/Extensions (= 3.4.1)
+  - CocoaLumberjack/Default (3.4.1)
+  - CocoaLumberjack/Extensions (3.4.1):
    - CocoaLumberjack/Default
-  - YapDatabase (3.1.1):
-    - YapDatabase/Standard (= 3.1.1)
-  - YapDatabase/Standard (3.1.1):
-    - YapDatabase/Standard/Core (= 3.1.1)
-    - YapDatabase/Standard/Extensions (= 3.1.1)
-  - YapDatabase/Standard/Core (3.1.1):
+  - YapDatabase (3.0.2):
+    - YapDatabase/Standard (= 3.0.2)
+  - YapDatabase/Standard (3.0.2):
+    - YapDatabase/Standard/Core (= 3.0.2)
+    - YapDatabase/Standard/Extensions (= 3.0.2)
+  - YapDatabase/Standard/Core (3.0.2):
    - CocoaLumberjack
-  - YapDatabase/Standard/Extensions (3.1.1):
+  - YapDatabase/Standard/Extensions (3.0.2):
    - YapDatabase/Standard/Core
-    - YapDatabase/Standard/Extensions/ActionManager (= 3.1.1)
-    - YapDatabase/Standard/Extensions/AutoView (= 3.1.1)
-    - YapDatabase/Standard/Extensions/CloudCore (= 3.1.1)
-    - YapDatabase/Standard/Extensions/CloudKit (= 3.1.1)
-    - YapDatabase/Standard/Extensions/ConnectionPool (= 3.1.1)
-    - YapDatabase/Standard/Extensions/ConnectionProxy (= 3.1.1)
-    - YapDatabase/Standard/Extensions/CrossProcessNotification (= 3.1.1)
-    - YapDatabase/Standard/Extensions/FilteredView (= 3.1.1)
-    - YapDatabase/Standard/Extensions/FullTextSearch (= 3.1.1)
-    - YapDatabase/Standard/Extensions/Hooks (= 3.1.1)
-    - YapDatabase/Standard/Extensions/ManualView (= 3.1.1)
-    - YapDatabase/Standard/Extensions/Relationships (= 3.1.1)
-    - YapDatabase/Standard/Extensions/RTreeIndex (= 3.1.1)
-    - YapDatabase/Standard/Extensions/SearchResultsView (= 3.1.1)
-    - YapDatabase/Standard/Extensions/SecondaryIndex (= 3.1.1)
-    - YapDatabase/Standard/Extensions/View (= 3.1.1)
-  - YapDatabase/Standard/Extensions/ActionManager (3.1.1):
+    - YapDatabase/Standard/Extensions/ActionManager (= 3.0.2)
+    - YapDatabase/Standard/Extensions/AutoView (= 3.0.2)
+    - YapDatabase/Standard/Extensions/CloudCore (= 3.0.2)
+    - YapDatabase/Standard/Extensions/CloudKit (= 3.0.2)
+    - YapDatabase/Standard/Extensions/ConnectionPool (= 3.0.2)
+    - YapDatabase/Standard/Extensions/ConnectionProxy (= 3.0.2)
+    - YapDatabase/Standard/Extensions/CrossProcessNotification (= 3.0.2)
+    - YapDatabase/Standard/Extensions/FilteredView (= 3.0.2)
+    - YapDatabase/Standard/Extensions/FullTextSearch (= 3.0.2)
+    - YapDatabase/Standard/Extensions/Hooks (= 3.0.2)
+    - YapDatabase/Standard/Extensions/ManualView (= 3.0.2)
+    - YapDatabase/Standard/Extensions/Relationships (= 3.0.2)
+    - YapDatabase/Standard/Extensions/RTreeIndex (= 3.0.2)
+    - YapDatabase/Standard/Extensions/SearchResultsView (= 3.0.2)
+    - YapDatabase/Standard/Extensions/SecondaryIndex (= 3.0.2)
+    - YapDatabase/Standard/Extensions/View (= 3.0.2)
+  - YapDatabase/Standard/Extensions/ActionManager (3.0.2):
    - YapDatabase/Standard/Core
    - YapDatabase/Standard/Extensions/AutoView
-  - YapDatabase/Standard/Extensions/AutoView (3.1.1):
+  - YapDatabase/Standard/Extensions/AutoView (3.0.2):
    - YapDatabase/Standard/Core
    - YapDatabase/Standard/Extensions/View
-  - YapDatabase/Standard/Extensions/CloudCore (3.1.1):
+  - YapDatabase/Standard/Extensions/CloudCore (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/CloudKit (3.1.1):
+  - YapDatabase/Standard/Extensions/CloudKit (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/ConnectionPool (3.1.1):
+  - YapDatabase/Standard/Extensions/ConnectionPool (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/ConnectionProxy (3.1.1):
+  - YapDatabase/Standard/Extensions/ConnectionProxy (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/CrossProcessNotification (3.1.1):
+  - YapDatabase/Standard/Extensions/CrossProcessNotification (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/FilteredView (3.1.1):
+  - YapDatabase/Standard/Extensions/FilteredView (3.0.2):
    - YapDatabase/Standard/Core
    - YapDatabase/Standard/Extensions/View
-  - YapDatabase/Standard/Extensions/FullTextSearch (3.1.1):
+  - YapDatabase/Standard/Extensions/FullTextSearch (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/Hooks (3.1.1):
+  - YapDatabase/Standard/Extensions/Hooks (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/ManualView (3.1.1):
+  - YapDatabase/Standard/Extensions/ManualView (3.0.2):
    - YapDatabase/Standard/Core
    - YapDatabase/Standard/Extensions/View
-  - YapDatabase/Standard/Extensions/Relationships (3.1.1):
+  - YapDatabase/Standard/Extensions/Relationships (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/RTreeIndex (3.1.1):
+  - YapDatabase/Standard/Extensions/RTreeIndex (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/SearchResultsView (3.1.1):
+  - YapDatabase/Standard/Extensions/SearchResultsView (3.0.2):
    - YapDatabase/Standard/Core
    - YapDatabase/Standard/Extensions/AutoView
    - YapDatabase/Standard/Extensions/FullTextSearch
-  - YapDatabase/Standard/Extensions/SecondaryIndex (3.1.1):
+  - YapDatabase/Standard/Extensions/SecondaryIndex (3.0.2):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/View (3.1.1):
+  - YapDatabase/Standard/Extensions/View (3.0.2):
    - YapDatabase/Standard/Core

 DEPENDENCIES:
  - YapDatabase (from `../../`)

-SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
-    - CocoaLumberjack
-
 EXTERNAL SOURCES:
  YapDatabase:
-    :path: "../../"
+    :path: ../../

 SPEC CHECKSUMS:
-  CocoaLumberjack: db7cc9e464771f12054c22ff6947c5a58d43a0fd
-  YapDatabase: 68188358039b289e962ddf55ffea39a336efd0e1
+  CocoaLumberjack: 2e258a064cacc8eb9a2aca318e24d02a0a7fd56d
+  YapDatabase: 972eccb0c997d0dafe8192dccf7f58351914baf1

-PODFILE CHECKSUM: a3d25f1bb5723f2682be762798ccdb8bb5b4eb81
+PODFILE CHECKSUM: 56e0faf7e85fac2003da53b861394c2731e637d4

-COCOAPODS: 1.6.0.beta.2
+COCOAPODS: 1.4.0
--- a/Testing/Xcode-mobile/Pods/Pods.xcodeproj/project.pbxproj
+++ b/Testing/Xcode-mobile/Pods/Pods.xcodeproj/project.pbxproj
--- a/Files/CocoaLumberjack/CocoaLumberjack-umbrella.h
+++ b/Files/CocoaLumberjack/CocoaLumberjack-umbrella.h
@ -1,31 +0,0 @@
-#ifdef __OBJC__
-#import <UIKit/UIKit.h>
-#else
-#ifndef FOUNDATION_EXPORT
-#if defined(__cplusplus)
-#define FOUNDATION_EXPORT extern "C"
-#else
-#define FOUNDATION_EXPORT extern
-#endif
-#endif
-#endif
-
-#import "CocoaLumberjack.h"
-#import "DDAbstractDatabaseLogger.h"
-#import "DDASLLogCapture.h"
-#import "DDASLLogger.h"
-#import "DDAssertMacros.h"
-#import "DDFileLogger.h"
-#import "DDLegacyMacros.h"
-#import "DDLog+LOGV.h"
-#import "DDLog.h"
-#import "DDLogMacros.h"
-#import "DDOSLogger.h"
-#import "DDTTYLogger.h"
-#import "DDContextFilterLogFormatter.h"
-#import "DDDispatchQueueLogFormatter.h"
-#import "DDMultiFormatter.h"
-
-FOUNDATION_EXPORT double CocoaLumberjackVersionNumber;
-FOUNDATION_EXPORT const unsigned char CocoaLumberjackVersionString[];
-
--- a/Files/CocoaLumberjack/CocoaLumberjack.modulemap
+++ b/Files/CocoaLumberjack/CocoaLumberjack.modulemap
@ -1,6 +0,0 @@
-module CocoaLumberjack {
-  umbrella header "CocoaLumberjack-umbrella.h"
-
-  export *
-  module * { export * }
-}
--- a/Files/CocoaLumberjack/CocoaLumberjack.xcconfig
+++ b/Files/CocoaLumberjack/CocoaLumberjack.xcconfig
@ -1,6 +1,6 @@
 CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/CocoaLumberjack
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/CocoaLumberjack" "${PODS_ROOT}/Headers/Public"
+HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/CocoaLumberjack" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/CocoaLumberjack" "${PODS_ROOT}/Headers/Public/YapDatabase"
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_ROOT = ${SRCROOT}
--- a/Files/Pods-YapDatabase/Pods-YapDatabase-frameworks.sh
+++ b/Files/Pods-YapDatabase/Pods-YapDatabase-frameworks.sh
@ -1,18 +1,9 @@
 #!/bin/sh
 set -e
-set -u
-set -o pipefail
-
-if [ -z ${FRAMEWORKS_FOLDER_PATH+x} ]; then
-    # If FRAMEWORKS_FOLDER_PATH is not set, then there's nowhere for us to copy
-    # frameworks to, so exit 0 (signalling the script phase was successful).
-    exit 0
-fi

 echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"

-COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}"
 SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"

 # Used as a return value for each invocation of `strip_invalid_archs` function.
@ -101,10 +92,10 @@ install_dsym() {

 # Signs a framework with the provided identity
 code_sign_if_enabled() {
-  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED:-}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
+  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
    # Use the current code_sign_identitiy
    echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
-    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS:-} --preserve-metadata=identifier,entitlements '$1'"
+    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'"

    if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
      code_sign_cmd="$code_sign_cmd &"
--- a/Files/Pods-YapDatabase/Pods-YapDatabase-resources.sh
+++ b/Files/Pods-YapDatabase/Pods-YapDatabase-resources.sh
@ -1,13 +1,5 @@
 #!/bin/sh
 set -e
-set -u
-set -o pipefail
-
-if [ -z ${UNLOCALIZED_RESOURCES_FOLDER_PATH+x} ]; then
-    # If UNLOCALIZED_RESOURCES_FOLDER_PATH is not set, then there's nowhere for us to copy
-    # resources to, so exit 0 (signalling the script phase was successful).
-    exit 0
-fi

 mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"

@ -20,7 +12,7 @@ XCASSET_FILES=()
 # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
 RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")

-case "${TARGETED_DEVICE_FAMILY:-}" in
+case "${TARGETED_DEVICE_FAMILY}" in
  1,2)
    TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone"
    ;;
@ -100,7 +92,7 @@ if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then
 fi
 rm -f "$RESOURCES_TO_COPY"

-if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "${XCASSET_FILES:-}" ]
+if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ]
 then
  # Find all other xcassets (this unfortunately includes those of path pods and other targets).
  OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
@ -110,9 +102,5 @@ then
    fi
  done <<<"$OTHER_XCASSETS"

-  if [ -z ${ASSETCATALOG_COMPILER_APPICON_NAME+x} ]; then
-    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
-  else
-    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" --app-icon "${ASSETCATALOG_COMPILER_APPICON_NAME}" --output-partial-info-plist "${TARGET_TEMP_DIR}/assetcatalog_generated_info_cocoapods.plist"
-  fi
+  printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
 fi
--- a/Files/Pods-YapDatabase/Pods-YapDatabase.debug.xcconfig
+++ b/Files/Pods-YapDatabase/Pods-YapDatabase.debug.xcconfig
@ -1,9 +1,8 @@
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/CocoaLumberjack" "${PODS_ROOT}/Headers/Public/YapDatabase"
 LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CocoaLumberjack" "${PODS_CONFIGURATION_BUILD_DIR}/YapDatabase"
-OTHER_CFLAGS = $(inherited) -fmodule-map-file="${PODS_ROOT}/Headers/Private/YapDatabase/YapDatabase.modulemap" -fmodule-map-file="${PODS_ROOT}/Headers/Public/CocoaLumberjack/CocoaLumberjack.modulemap" $(inherited) -DYAP_STANDARD_SQLITE
+OTHER_CFLAGS = $(inherited) -DYAP_STANDARD_SQLITE $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/CocoaLumberjack" -isystem "${PODS_ROOT}/Headers/Public/YapDatabase"
 OTHER_LDFLAGS = $(inherited) -ObjC -l"CocoaLumberjack" -l"YapDatabase" -l"c++" -l"sqlite3" -framework "SystemConfiguration"
-OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS -Xcc -fmodule-map-file="${PODS_ROOT}/Headers/Private/YapDatabase/YapDatabase.modulemap" -Xcc -fmodule-map-file="${PODS_ROOT}/Headers/Public/CocoaLumberjack/CocoaLumberjack.modulemap"
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
--- a/Files/Pods-YapDatabase/Pods-YapDatabase.release.xcconfig
+++ b/Files/Pods-YapDatabase/Pods-YapDatabase.release.xcconfig
@ -1,9 +1,8 @@
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/CocoaLumberjack" "${PODS_ROOT}/Headers/Public/YapDatabase"
 LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CocoaLumberjack" "${PODS_CONFIGURATION_BUILD_DIR}/YapDatabase"
-OTHER_CFLAGS = $(inherited) -fmodule-map-file="${PODS_ROOT}/Headers/Private/YapDatabase/YapDatabase.modulemap" -fmodule-map-file="${PODS_ROOT}/Headers/Public/CocoaLumberjack/CocoaLumberjack.modulemap" $(inherited) -DYAP_STANDARD_SQLITE
+OTHER_CFLAGS = $(inherited) -DYAP_STANDARD_SQLITE $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/CocoaLumberjack" -isystem "${PODS_ROOT}/Headers/Public/YapDatabase"
 OTHER_LDFLAGS = $(inherited) -ObjC -l"CocoaLumberjack" -l"YapDatabase" -l"c++" -l"sqlite3" -framework "SystemConfiguration"
-OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS -Xcc -fmodule-map-file="${PODS_ROOT}/Headers/Private/YapDatabase/YapDatabase.modulemap" -Xcc -fmodule-map-file="${PODS_ROOT}/Headers/Public/CocoaLumberjack/CocoaLumberjack.modulemap"
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
--- a/Files/Pods-YapDatabaseTests/Pods-YapDatabaseTests-frameworks.sh
+++ b/Files/Pods-YapDatabaseTests/Pods-YapDatabaseTests-frameworks.sh
@ -1,18 +1,9 @@
 #!/bin/sh
 set -e
-set -u
-set -o pipefail
-
-if [ -z ${FRAMEWORKS_FOLDER_PATH+x} ]; then
-    # If FRAMEWORKS_FOLDER_PATH is not set, then there's nowhere for us to copy
-    # frameworks to, so exit 0 (signalling the script phase was successful).
-    exit 0
-fi

 echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"

-COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}"
 SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"

 # Used as a return value for each invocation of `strip_invalid_archs` function.
@ -101,10 +92,10 @@ install_dsym() {

 # Signs a framework with the provided identity
 code_sign_if_enabled() {
-  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED:-}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
+  if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
    # Use the current code_sign_identitiy
    echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
-    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS:-} --preserve-metadata=identifier,entitlements '$1'"
+    local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'"

    if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
      code_sign_cmd="$code_sign_cmd &"
--- a/Files/Pods-YapDatabaseTests/Pods-YapDatabaseTests-resources.sh
+++ b/Files/Pods-YapDatabaseTests/Pods-YapDatabaseTests-resources.sh
@ -1,13 +1,5 @@
 #!/bin/sh
 set -e
-set -u
-set -o pipefail
-
-if [ -z ${UNLOCALIZED_RESOURCES_FOLDER_PATH+x} ]; then
-    # If UNLOCALIZED_RESOURCES_FOLDER_PATH is not set, then there's nowhere for us to copy
-    # resources to, so exit 0 (signalling the script phase was successful).
-    exit 0
-fi

 mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"

@ -20,7 +12,7 @@ XCASSET_FILES=()
 # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
 RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")

-case "${TARGETED_DEVICE_FAMILY:-}" in
+case "${TARGETED_DEVICE_FAMILY}" in
  1,2)
    TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone"
    ;;
@ -100,7 +92,7 @@ if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then
 fi
 rm -f "$RESOURCES_TO_COPY"

-if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "${XCASSET_FILES:-}" ]
+if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ]
 then
  # Find all other xcassets (this unfortunately includes those of path pods and other targets).
  OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
@ -110,9 +102,5 @@ then
    fi
  done <<<"$OTHER_XCASSETS"

-  if [ -z ${ASSETCATALOG_COMPILER_APPICON_NAME+x} ]; then
-    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
-  else
-    printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" --app-icon "${ASSETCATALOG_COMPILER_APPICON_NAME}" --output-partial-info-plist "${TARGET_TEMP_DIR}/assetcatalog_generated_info_cocoapods.plist"
-  fi
+  printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
 fi
--- a/Files/Pods-YapDatabaseTests/Pods-YapDatabaseTests.debug.xcconfig
+++ b/Files/Pods-YapDatabaseTests/Pods-YapDatabaseTests.debug.xcconfig
@ -1,9 +1,8 @@
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/CocoaLumberjack" "${PODS_ROOT}/Headers/Public/YapDatabase"
 LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CocoaLumberjack" "${PODS_CONFIGURATION_BUILD_DIR}/YapDatabase"
-OTHER_CFLAGS = $(inherited) -fmodule-map-file="${PODS_ROOT}/Headers/Private/YapDatabase/YapDatabase.modulemap" -fmodule-map-file="${PODS_ROOT}/Headers/Public/CocoaLumberjack/CocoaLumberjack.modulemap" $(inherited) -DYAP_STANDARD_SQLITE
+OTHER_CFLAGS = $(inherited) -DYAP_STANDARD_SQLITE $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/CocoaLumberjack" -isystem "${PODS_ROOT}/Headers/Public/YapDatabase"
 OTHER_LDFLAGS = $(inherited) -ObjC -l"CocoaLumberjack" -l"YapDatabase" -l"c++" -l"sqlite3" -framework "SystemConfiguration"
-OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS -Xcc -fmodule-map-file="${PODS_ROOT}/Headers/Private/YapDatabase/YapDatabase.modulemap" -Xcc -fmodule-map-file="${PODS_ROOT}/Headers/Public/CocoaLumberjack/CocoaLumberjack.modulemap"
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
--- a/Files/Pods-YapDatabaseTests/Pods-YapDatabaseTests.release.xcconfig
+++ b/Files/Pods-YapDatabaseTests/Pods-YapDatabaseTests.release.xcconfig
@ -1,9 +1,8 @@
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/CocoaLumberjack" "${PODS_ROOT}/Headers/Public/YapDatabase"
 LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CocoaLumberjack" "${PODS_CONFIGURATION_BUILD_DIR}/YapDatabase"
-OTHER_CFLAGS = $(inherited) -fmodule-map-file="${PODS_ROOT}/Headers/Private/YapDatabase/YapDatabase.modulemap" -fmodule-map-file="${PODS_ROOT}/Headers/Public/CocoaLumberjack/CocoaLumberjack.modulemap" $(inherited) -DYAP_STANDARD_SQLITE
+OTHER_CFLAGS = $(inherited) -DYAP_STANDARD_SQLITE $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/CocoaLumberjack" -isystem "${PODS_ROOT}/Headers/Public/YapDatabase"
 OTHER_LDFLAGS = $(inherited) -ObjC -l"CocoaLumberjack" -l"YapDatabase" -l"c++" -l"sqlite3" -framework "SystemConfiguration"
-OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS -Xcc -fmodule-map-file="${PODS_ROOT}/Headers/Private/YapDatabase/YapDatabase.modulemap" -Xcc -fmodule-map-file="${PODS_ROOT}/Headers/Public/CocoaLumberjack/CocoaLumberjack.modulemap"
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
--- a/Files/YapDatabase/YapDatabase.modulemap
+++ b/Files/YapDatabase/YapDatabase.modulemap
@ -1,195 +0,0 @@
-module YapDatabase {
-	
-	header "YapDatabase.h"
-	header "YapDatabaseConnection.h"
-	header "YapDatabaseTransaction.h"
-	header "YapDatabaseOptions.h"
-	header "YapDatabaseExtension.h"
-	header "YapDatabaseExtensionConnection.h"
-	header "YapDatabaseExtensionTransaction.h"
-	header "YapDatabaseExtensionTypes.h"
-	
-	module Utilities {
-		header "YapBidirectionalCache.h"
-		header "YapCache.h"
-		header "YapCollectionKey.h"
-		header "YapDatabaseAtomic.h"
-		header "YapDatabaseConnectionConfig.h"
-		header "YapDatabaseQuery.h"
-		header "YapMurmurHash.h"
-		header "YapProxyObject.h"
-		header "YapSet.h"
-		header "YapWhitelistBlacklist.h"
-		header "YapMutationStack.h"
-	}
-
-	explicit module YapDatabaseExtensionPrivate {
-		header "YapDatabaseExtensionPrivate.h"
-	}
-
-	// Extension: View
-	
-	explicit module YapDatabaseView {
-		header "YapDatabaseView.h"
-		header "YapDatabaseViewOptions.h"
-		header "YapDatabaseViewConnection.h"
-		header "YapDatabaseViewTransaction.h"
-		header "YapDatabaseViewMappings.h"
-		header "YapDatabaseViewChange.h"
-		header "YapDatabaseViewRangeOptions.h"
-	}
-
-	// Extension: AutoView
-
-	explicit module YapDatabaseAutoView {
-		header "YapDatabaseViewTypes.h"
-		header "YapDatabaseAutoView.h"
-		header "YapDatabaseAutoViewConnection.h"
-		header "YapDatabaseAutoViewTransaction.h"
-
-		export YapDatabaseView
-	}
-
-	// Extension: FilteredView
-	
-	explicit module YapDatabaseFilteredView {
-		header "YapDatabaseFilteredView.h"
-		header "YapDatabaseFilteredViewTypes.h"
-		header "YapDatabaseFilteredViewConnection.h"
-		header "YapDatabaseFilteredViewTransaction.h"
-		
-		export YapDatabaseView
-	}
-	
-	// Extension: Relationship
-	
-	explicit module YapDatabaseRelationship {
-		header "YapDatabaseRelationship.h"
-		header "YapDatabaseRelationshipNode.h"
-		header "YapDatabaseRelationshipEdge.h"
-		header "YapDatabaseRelationshipOptions.h"
-		header "YapDatabaseRelationshipConnection.h"
-		header "YapDatabaseRelationshipTransaction.h"
-	}
-	
-	// Extension: SecondaryIndex
-
-	explicit module YapDatabaseSecondaryIndex {
-		header "YapDatabaseSecondaryIndex.h"
-		header "YapDatabaseSecondaryIndexSetup.h"
-		header "YapDatabaseSecondaryIndexHandler.h"
-		header "YapDatabaseSecondaryIndexOptions.h"
-		header "YapDatabaseSecondaryIndexConnection.h"
-		header "YapDatabaseSecondaryIndexTransaction.h"
-	}
-	
-	// Extension: FullTextSearch
-	
-	explicit module YapDatabaseFullTextSearch {
-		header "YapDatabaseFullTextSearch.h"
-		header "YapDatabaseFullTextSearchHandler.h"
-		header "YapDatabaseFullTextSearchConnection.h"
-		header "YapDatabaseFullTextSearchTransaction.h"
-		header "YapDatabaseFullTextSearchSnippetOptions.h"
-	}
-	
-	// Extension: SearchResultsView
-	
-	explicit module YapDatabaseSearchResultsView {
-		header "YapDatabaseSearchResultsView.h"
-		header "YapDatabaseSearchResultsViewOptions.h"
-		header "YapDatabaseSearchResultsViewConnection.h"
-		header "YapDatabaseSearchResultsViewTransaction.h"
-		header "YapDatabaseSearchQueue.h"
-		
-		export YapDatabaseView
-		export YapDatabaseFullTextSearch
-	}
-	
-	// Extension: Hooks
-	
-	explicit module YapDatabaseHooks {
-		header "YapDatabaseHooks.h"
-		header "YapDatabaseHooksConnection.h"
-		header "YapDatabaseHooksTransaction.h"
-	}
-	
-	// Extension: CloudKit
-	
-	explicit module YapDatabaseCloudKit {
-		header "YapDatabaseCloudKit.h"
-		header "YapDatabaseCloudKitTypes.h"
-		header "YapDatabaseCloudKitOptions.h"
-		header "YapDatabaseCloudKitConnection.h"
-		header "YapDatabaseCloudKitTransaction.h"
-		header "YDBCKChangeSet.h"
-		header "YDBCKMergeInfo.h"
-		header "YDBCKRecordInfo.h"
-		header "YDBCKRecord.h"
-	}
-	
-	// Extension: RTree
-	
-	explicit module YapDatabaseRTreeIndex {
-		header "YapDatabaseRTreeIndex.h"
-		header "YapDatabaseRTreeIndexSetup.h"
-		header "YapDatabaseRTreeIndexHandler.h"
-		header "YapDatabaseRTreeIndexOptions.h"
-		header "YapDatabaseRTreeIndexConnection.h"
-		header "YapDatabaseRTreeIndexTransaction.h"
-	}
-	
-	// Extension: ConnectionProxy
-	
-	explicit module YapDatabaseConnectionProxy {
-		header "YapDatabaseConnectionProxy.h"
-	}
-	
-	// Extension: ConnectionPool
-	
-	explicit module YapDatabaseConnectionPool {
-		header "YapDatabaseConnectionPool.h"
-	}
-	
-	// Extension: ActionManager
-	
-	explicit module YapDatabaseActionManager {
-		header "YapActionable.h"
-		header "YapActionItem.h"
-		header "YapDatabaseActionManager.h"
-		header "YapDatabaseActionManagerConnection.h"
-		header "YapDatabaseActionManagerTransaction.h"
-		header "YapReachability.h"
-	}
-	
-	// Extension: CrossProcessNotification
-	
-	explicit module YapDatabaseCrossProcessNotification {
-		header "YapDatabaseCrossProcessNotification.h"
-		header "YapDatabaseCrossProcessNotificationConnection.h"
-		header "YapDatabaseCrossProcessNotificationTransaction.h"
-	}
-	
-	// Extension: CloudCore
-	
-	explicit module YapDatabaseCloudCore {
-		header "YapDatabaseCloudCore.h"
-		header "YapDatabaseCloudCoreOptions.h"
-		header "YapDatabaseCloudCoreConnection.h"
-		header "YapDatabaseCloudCoreTransaction.h"
-		header "YapManyToManyCache.h"
-		header "YapDatabaseCloudCoreOperation.h"
-		header "YapDatabaseCloudCorePipelineDelegate.h"
-		header "YapDatabaseCloudCorePipeline.h"
-		header "YapDatabaseCloudCoreGraph.h"
-	}
-
-	explicit module YapDatabaseCloudCorePrivate {
-		header "YapDatabaseCloudCorePrivate.h"
-		header "YapDatabaseCloudCoreOperationPrivate.h"
-		header "YapDatabaseCloudCorePipelinePrivate.h"
-		header "YapDatabaseCloudCoreGraphPrivate.h"
-		
-		export YapDatabaseExtensionPrivate
-	}
-}
--- a/Files/YapDatabase/YapDatabase.xcconfig
+++ b/Files/YapDatabase/YapDatabase.xcconfig
@ -1,7 +1,9 @@
 CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/YapDatabase
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/YapDatabase" "${PODS_ROOT}/Headers/Public"
-OTHER_CFLAGS = $(inherited) -fmodule-map-file="${PODS_ROOT}/Headers/Public/CocoaLumberjack/CocoaLumberjack.modulemap" $(inherited) -DYAP_STANDARD_SQLITE
+HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/YapDatabase" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/CocoaLumberjack" "${PODS_ROOT}/Headers/Public/YapDatabase"
+LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CocoaLumberjack"
+OTHER_CFLAGS = $(inherited) -DYAP_STANDARD_SQLITE
+OTHER_LDFLAGS = -l"c++" -l"sqlite3" -framework "SystemConfiguration"
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_ROOT = ${SRCROOT}
--- a/Testing/Xcode-mobile/YapDatabaseTesting.xcodeproj/project.pbxproj
+++ b/Testing/Xcode-mobile/YapDatabaseTesting.xcodeproj/project.pbxproj
@ -134,11 +134,11 @@
 		DC3D2F2F1674001600DFAFAA /* BenchmarkYapCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BenchmarkYapCache.m; path = ../Benchmarking/BenchmarkYapCache.m; sourceTree = "<group>"; };
 		DC3D2F3D1675657100DFAFAA /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; };
 		DC49735317E90C2F00489267 /* TestYapDatabaseFullTextSearch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TestYapDatabaseFullTextSearch.m; path = ../../UnitTesting/TestYapDatabaseFullTextSearch.m; sourceTree = "<group>"; };
+		DC5BE2691AE61817007E77FD /* LumberjackUser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = LumberjackUser.h; path = Logging/LumberjackUser.h; sourceTree = SOURCE_ROOT; };
 		DC60889B18CFE699009AA946 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
 		DC717A1A1816ED9B00D6E6C8 /* TestYapDatabaseSecondaryIndex.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TestYapDatabaseSecondaryIndex.m; path = ../../UnitTesting/TestYapDatabaseSecondaryIndex.m; sourceTree = "<group>"; };
 		DC8E6042183F0A3D0091633D /* TestYapDatabaseFilteredView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TestYapDatabaseFilteredView.m; path = ../../UnitTesting/TestYapDatabaseFilteredView.m; sourceTree = "<group>"; };
 		DC96D1BC1BA1FE28001B4B08 /* TestYapDatabaseHooks.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TestYapDatabaseHooks.m; path = ../../UnitTesting/TestYapDatabaseHooks.m; sourceTree = "<group>"; };
-		DCAD7D2621C6C05900004CD3 /* LumberjackUser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LumberjackUser.h; sourceTree = "<group>"; };
 		DCAE51E71673FE2600395076 /* YapDatabase.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = YapDatabase.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		DCAE51EA1673FE2600395076 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		DCAE51EC1673FE2600395076 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@ -228,6 +228,15 @@
 			name = Relationships;
 			sourceTree = "<group>";
 		};
+		DC3D2EA91673FF6800DFAFAA /* Logging */ = {
+			isa = PBXGroup;
+			children = (
+				DC5BE2681AE617EE007E77FD /* PerUserLogLevels */,
+			);
+			name = Logging;
+			path = ../../Vendor/CocoaLumberjack;
+			sourceTree = "<group>";
+		};
 		DC3D2F311674002200DFAFAA /* Benchmarking */ = {
 			isa = PBXGroup;
 			children = (
@ -265,6 +274,14 @@
 			name = Views;
 			sourceTree = "<group>";
 		};
+		DC5BE2681AE617EE007E77FD /* PerUserLogLevels */ = {
+			isa = PBXGroup;
+			children = (
+				DC5BE2691AE61817007E77FD /* LumberjackUser.h */,
+			);
+			name = PerUserLogLevels;
+			sourceTree = "<group>";
+		};
 		DC717A0C1815DF9500D6E6C8 /* SecondaryIndexes */ = {
 			isa = PBXGroup;
 			children = (
@ -289,18 +306,10 @@
 			name = Hooks;
 			sourceTree = "<group>";
 		};
-		DCAD7D2521C6C05900004CD3 /* Logging */ = {
-			isa = PBXGroup;
-			children = (
-				DCAD7D2621C6C05900004CD3 /* LumberjackUser.h */,
-			);
-			path = Logging;
-			sourceTree = "<group>";
-		};
 		DCAE51DE1673FE2600395076 = {
 			isa = PBXGroup;
 			children = (
-				DCAD7D2521C6C05900004CD3 /* Logging */,
+				DC3D2EA91673FF6800DFAFAA /* Logging */,
 				DCAE52171673FE2600395076 /* UnitTests */,
 				DC3D2F311674002200DFAFAA /* Benchmarking */,
 				DCAE51F01673FE2600395076 /* App */,
@ -421,6 +430,8 @@
 				DCAE51E31673FE2600395076 /* Sources */,
 				DCAE51E41673FE2600395076 /* Frameworks */,
 				DCAE51E51673FE2600395076 /* Resources */,
+				00DD5F12CD2A7253C34BA712 /* [CP] Embed Pods Frameworks */,
+				402E4718587750E5D76209CF /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@ -439,6 +450,8 @@
 				DCAE520B1673FE2600395076 /* Sources */,
 				DCAE520C1673FE2600395076 /* Frameworks */,
 				DCAE520D1673FE2600395076 /* Resources */,
+				B60F46CD6C06846382E0E84E /* [CP] Embed Pods Frameworks */,
+				3397BBC53BC83C63A5C6FE2F /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@ -469,11 +482,9 @@
 				ORGANIZATIONNAME = "Robbie Hanson";
 				TargetAttributes = {
 					DCAE51E61673FE2600395076 = {
-						DevelopmentTeam = T7839KRU5H;
-						ProvisioningStyle = Automatic;
+						DevelopmentTeam = 4D98PK6HWS;
 					};
 					DCAE520F1673FE2600395076 = {
-						DevelopmentTeam = T7839KRU5H;
 						TestTargetID = DCAE51E61673FE2600395076;
 					};
 				};
@ -521,6 +532,21 @@
 /* End PBXResourcesBuildPhase section */

 /* Begin PBXShellScriptBuildPhase section */
+		00DD5F12CD2A7253C34BA712 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-YapDatabase/Pods-YapDatabase-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		0C85CB082FD551666567B39E /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@ -539,6 +565,51 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
+		3397BBC53BC83C63A5C6FE2F /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-YapDatabaseTests/Pods-YapDatabaseTests-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		402E4718587750E5D76209CF /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-YapDatabase/Pods-YapDatabase-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		B60F46CD6C06846382E0E84E /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-YapDatabaseTests/Pods-YapDatabaseTests-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		DC5BE2611AE61607007E77FD /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@ -550,7 +621,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/bash;
-			shellScript = "${PROJECT_DIR}/Logging/LumberjackUser.bash\n";
+			shellScript = "${PROJECT_DIR}/Logging/LumberjackUser.bash";
 		};
 		FA6394D124023E9A4D4AE454 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
@ -729,7 +800,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@ -764,7 +835,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@ -778,8 +849,6 @@
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = T7839KRU5H;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "YapDatabase/YapDatabase-Prefix.pch";
 				HEADER_SEARCH_PATHS = (
@ -790,10 +859,9 @@
 					"\"${PODS_ROOT}/Headers/Private/YapDatabase\"",
 				);
 				INFOPLIST_FILE = "YapDatabase/YapDatabase-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.deusty.YapDatabaseTesting-mobile";
+				PRODUCT_BUNDLE_IDENTIFIER = com.deusty.YapDatabase;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "";
+				PROVISIONING_PROFILE = "e676a7e8-4553-44e0-a416-5414d0b152eb";
 				WRAPPER_EXTENSION = app;
 			};
 			name = Debug;
@ -804,8 +872,6 @@
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = T7839KRU5H;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "YapDatabase/YapDatabase-Prefix.pch";
 				HEADER_SEARCH_PATHS = (
@ -816,10 +882,9 @@
 					"\"${PODS_ROOT}/Headers/Private/YapDatabase\"",
 				);
 				INFOPLIST_FILE = "YapDatabase/YapDatabase-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.deusty.YapDatabaseTesting-mobile";
+				PRODUCT_BUNDLE_IDENTIFIER = com.deusty.YapDatabase;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "";
+				PROVISIONING_PROFILE = "e676a7e8-4553-44e0-a416-5414d0b152eb";
 				WRAPPER_EXTENSION = app;
 			};
 			name = Release;
@ -829,7 +894,6 @@
 			baseConfigurationReference = 32BD8D48D2094D556DB85673 /* Pods-YapDatabaseTests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
-				DEVELOPMENT_TEAM = T7839KRU5H;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(DEVELOPER_FRAMEWORKS_DIR)",
@ -855,7 +919,6 @@
 			baseConfigurationReference = E0F9A76F890917F8D82EBE09 /* Pods-YapDatabaseTests.release.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
-				DEVELOPMENT_TEAM = T7839KRU5H;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(DEVELOPER_FRAMEWORKS_DIR)",
--- a/Testing/Xcode-mobile/YapDatabaseTesting.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+++ b/Testing/Xcode-mobile/YapDatabaseTesting.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>
--- a/Testing/Xcode-tv/Podfile
+++ b/Testing/Xcode-tv/Podfile
@ -8,12 +8,3 @@ end
 target 'YapDatabaseTests' do
 	pod "YapDatabase", path: '../../'
 end
-
-post_install do |installer|
-	installer.pods_project.targets.each do |target|
-		target.build_configurations.each do |config|
-			config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET'
-			config.build_settings.delete 'MACOSX_DEPLOYMENT_TARGET'
-		end
-	end
-end
--- a/Testing/Xcode-tv/Podfile.lock
+++ b/Testing/Xcode-tv/Podfile.lock
@ -1,89 +1,82 @@
 PODS:
-  - CocoaLumberjack (3.4.2):
-    - CocoaLumberjack/Default (= 3.4.2)
-    - CocoaLumberjack/Extensions (= 3.4.2)
-  - CocoaLumberjack/Default (3.4.2)
-  - CocoaLumberjack/Extensions (3.4.2):
+  - CocoaLumberjack (3.2.0):
+    - CocoaLumberjack/Default (= 3.2.0)
+    - CocoaLumberjack/Extensions (= 3.2.0)
+  - CocoaLumberjack/Default (3.2.0)
+  - CocoaLumberjack/Extensions (3.2.0):
    - CocoaLumberjack/Default
-  - YapDatabase (3.1.1):
-    - YapDatabase/Standard (= 3.1.1)
-  - YapDatabase/Standard (3.1.1):
-    - YapDatabase/Standard/Core (= 3.1.1)
-    - YapDatabase/Standard/Extensions (= 3.1.1)
-  - YapDatabase/Standard/Core (3.1.1):
+  - YapDatabase (3.0):
+    - YapDatabase/Standard (= 3.0)
+  - YapDatabase/Standard (3.0):
+    - YapDatabase/Standard/Core (= 3.0)
+    - YapDatabase/Standard/Extensions (= 3.0)
+  - YapDatabase/Standard/Core (3.0):
    - CocoaLumberjack
-  - YapDatabase/Standard/Extensions (3.1.1):
+  - YapDatabase/Standard/Extensions (3.0):
    - YapDatabase/Standard/Core
-    - YapDatabase/Standard/Extensions/ActionManager (= 3.1.1)
-    - YapDatabase/Standard/Extensions/AutoView (= 3.1.1)
-    - YapDatabase/Standard/Extensions/CloudCore (= 3.1.1)
-    - YapDatabase/Standard/Extensions/CloudKit (= 3.1.1)
-    - YapDatabase/Standard/Extensions/ConnectionPool (= 3.1.1)
-    - YapDatabase/Standard/Extensions/ConnectionProxy (= 3.1.1)
-    - YapDatabase/Standard/Extensions/CrossProcessNotification (= 3.1.1)
-    - YapDatabase/Standard/Extensions/FilteredView (= 3.1.1)
-    - YapDatabase/Standard/Extensions/FullTextSearch (= 3.1.1)
-    - YapDatabase/Standard/Extensions/Hooks (= 3.1.1)
-    - YapDatabase/Standard/Extensions/ManualView (= 3.1.1)
-    - YapDatabase/Standard/Extensions/Relationships (= 3.1.1)
-    - YapDatabase/Standard/Extensions/RTreeIndex (= 3.1.1)
-    - YapDatabase/Standard/Extensions/SearchResultsView (= 3.1.1)
-    - YapDatabase/Standard/Extensions/SecondaryIndex (= 3.1.1)
-    - YapDatabase/Standard/Extensions/View (= 3.1.1)
-  - YapDatabase/Standard/Extensions/ActionManager (3.1.1):
+    - YapDatabase/Standard/Extensions/ActionManager (= 3.0)
+    - YapDatabase/Standard/Extensions/AutoView (= 3.0)
+    - YapDatabase/Standard/Extensions/CloudCore (= 3.0)
+    - YapDatabase/Standard/Extensions/CloudKit (= 3.0)
+    - YapDatabase/Standard/Extensions/ConnectionProxy (= 3.0)
+    - YapDatabase/Standard/Extensions/CrossProcessNotification (= 3.0)
+    - YapDatabase/Standard/Extensions/FilteredView (= 3.0)
+    - YapDatabase/Standard/Extensions/FullTextSearch (= 3.0)
+    - YapDatabase/Standard/Extensions/Hooks (= 3.0)
+    - YapDatabase/Standard/Extensions/ManualView (= 3.0)
+    - YapDatabase/Standard/Extensions/Relationships (= 3.0)
+    - YapDatabase/Standard/Extensions/RTreeIndex (= 3.0)
+    - YapDatabase/Standard/Extensions/SearchResultsView (= 3.0)
+    - YapDatabase/Standard/Extensions/SecondaryIndex (= 3.0)
+    - YapDatabase/Standard/Extensions/View (= 3.0)
+  - YapDatabase/Standard/Extensions/ActionManager (3.0):
    - YapDatabase/Standard/Core
    - YapDatabase/Standard/Extensions/AutoView
-  - YapDatabase/Standard/Extensions/AutoView (3.1.1):
+  - YapDatabase/Standard/Extensions/AutoView (3.0):
    - YapDatabase/Standard/Core
    - YapDatabase/Standard/Extensions/View
-  - YapDatabase/Standard/Extensions/CloudCore (3.1.1):
+  - YapDatabase/Standard/Extensions/CloudCore (3.0):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/CloudKit (3.1.1):
+  - YapDatabase/Standard/Extensions/CloudKit (3.0):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/ConnectionPool (3.1.1):
+  - YapDatabase/Standard/Extensions/ConnectionProxy (3.0):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/ConnectionProxy (3.1.1):
+  - YapDatabase/Standard/Extensions/CrossProcessNotification (3.0):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/CrossProcessNotification (3.1.1):
-    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/FilteredView (3.1.1):
+  - YapDatabase/Standard/Extensions/FilteredView (3.0):
    - YapDatabase/Standard/Core
    - YapDatabase/Standard/Extensions/View
-  - YapDatabase/Standard/Extensions/FullTextSearch (3.1.1):
+  - YapDatabase/Standard/Extensions/FullTextSearch (3.0):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/Hooks (3.1.1):
+  - YapDatabase/Standard/Extensions/Hooks (3.0):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/ManualView (3.1.1):
+  - YapDatabase/Standard/Extensions/ManualView (3.0):
    - YapDatabase/Standard/Core
    - YapDatabase/Standard/Extensions/View
-  - YapDatabase/Standard/Extensions/Relationships (3.1.1):
+  - YapDatabase/Standard/Extensions/Relationships (3.0):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/RTreeIndex (3.1.1):
+  - YapDatabase/Standard/Extensions/RTreeIndex (3.0):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/SearchResultsView (3.1.1):
+  - YapDatabase/Standard/Extensions/SearchResultsView (3.0):
    - YapDatabase/Standard/Core
    - YapDatabase/Standard/Extensions/AutoView
    - YapDatabase/Standard/Extensions/FullTextSearch
-  - YapDatabase/Standard/Extensions/SecondaryIndex (3.1.1):
+  - YapDatabase/Standard/Extensions/SecondaryIndex (3.0):
    - YapDatabase/Standard/Core
-  - YapDatabase/Standard/Extensions/View (3.1.1):
+  - YapDatabase/Standard/Extensions/View (3.0):
    - YapDatabase/Standard/Core

 DEPENDENCIES:
  - YapDatabase (from `../../`)

-SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
-    - CocoaLumberjack
-
 EXTERNAL SOURCES:
  YapDatabase:
-    :path: "../../"
+    :path: ../../

 SPEC CHECKSUMS:
-  CocoaLumberjack: db7cc9e464771f12054c22ff6947c5a58d43a0fd
-  YapDatabase: 68188358039b289e962ddf55ffea39a336efd0e1
+  CocoaLumberjack: 9b4aed7073d242f29cc2f62068d995faf67f703a
+  YapDatabase: 0cef6c79948169c924ae325d430ffcfa8a5231c2

-PODFILE CHECKSUM: 112c50ab02a55bcd6bb49c1d66d6292c93f901d0
+PODFILE CHECKSUM: 71df37363599703c9cfb839d4cad1a2639a6d675

-COCOAPODS: 1.6.0.beta.2
+COCOAPODS: 1.2.1
--- a/Testing/Xcode-tv/Pods/CocoaLumberjack/Classes/CocoaLumberjack.swift
+++ b/Testing/Xcode-tv/Pods/CocoaLumberjack/Classes/CocoaLumberjack.swift
@ -86,10 +86,10 @@ public func DDLogError(_ message: @autoclosure () -> String, level: DDLogLevel =
 public func CurrentFileName(_ fileName: StaticString = #file) -> String {
    var str = String(describing: fileName)
    if let idx = str.range(of: "/", options: .backwards)?.upperBound {
-        str = String(str[idx...])
+        str = str.substring(from: idx)
    }
    if let idx = str.range(of: ".", options: .backwards)?.lowerBound {
-        str = String(str[..<idx])
+        str = str.substring(to: idx)
    }
    return str
 }
--- a/Testing/Xcode-tv/Pods/CocoaLumberjack/Classes/DDAbstractDatabaseLogger.m
+++ b/Testing/Xcode-tv/Pods/CocoaLumberjack/Classes/DDAbstractDatabaseLogger.m
@ -217,7 +217,7 @@

    dispatch_sync(globalLoggingQueue, ^{
        dispatch_sync(self.loggerQueue, ^{
-            result = self->_saveThreshold;
+            result = _saveThreshold;
        });
    });

@ -227,15 +227,15 @@
 - (void)setSaveThreshold:(NSUInteger)threshold {
    dispatch_block_t block = ^{
        @autoreleasepool {
-            if (self->_saveThreshold != threshold) {
-                self->_saveThreshold = threshold;
+            if (_saveThreshold != threshold) {
+                _saveThreshold = threshold;

                // Since the saveThreshold has changed,
                // we check to see if the current unsavedCount has surpassed the new threshold.
                //
                // If it has, we immediately save the log.

-                if ((self->_unsavedCount >= self->_saveThreshold) && (self->_saveThreshold > 0)) {
+                if ((_unsavedCount >= _saveThreshold) && (_saveThreshold > 0)) {
                    [self performSaveAndSuspendSaveTimer];
                }
            }
@ -277,7 +277,7 @@

    dispatch_sync(globalLoggingQueue, ^{
        dispatch_sync(self.loggerQueue, ^{
-            result = self->_saveInterval;
+            result = _saveInterval;
        });
    });

@ -290,8 +290,8 @@
            // C99 recommended floating point comparison macro
            // Read: isLessThanOrGreaterThan(floatA, floatB)

-            if (/* saveInterval != interval */ islessgreater(self->_saveInterval, interval)) {
-                self->_saveInterval = interval;
+            if (/* saveInterval != interval */ islessgreater(_saveInterval, interval)) {
+                _saveInterval = interval;

                // There are several cases we need to handle here.
                //
@ -306,8 +306,8 @@
                // 4. If the saveInterval decreased, then we need to reset the timer so that it fires at an earlier date.
                //    (Plus we might need to do an immediate save.)

-                if (self->_saveInterval > 0.0) {
-                    if (self->_saveTimer == NULL) {
+                if (_saveInterval > 0.0) {
+                    if (_saveTimer == NULL) {
                        // Handles #2
                        //
                        // Since the saveTimer uses the unsavedTime to calculate it's first fireDate,
@ -324,7 +324,7 @@

                        [self updateAndResumeSaveTimer];
                    }
-                } else if (self->_saveTimer) {
+                } else if (_saveTimer) {
                    // Handles #1

                    [self destroySaveTimer];
@ -368,7 +368,7 @@

    dispatch_sync(globalLoggingQueue, ^{
        dispatch_sync(self.loggerQueue, ^{
-            result = self->_maxAge;
+            result = _maxAge;
        });
    });

@ -381,11 +381,11 @@
            // C99 recommended floating point comparison macro
            // Read: isLessThanOrGreaterThan(floatA, floatB)

-            if (/* maxAge != interval */ islessgreater(self->_maxAge, interval)) {
-                NSTimeInterval oldMaxAge = self->_maxAge;
+            if (/* maxAge != interval */ islessgreater(_maxAge, interval)) {
+                NSTimeInterval oldMaxAge = _maxAge;
                NSTimeInterval newMaxAge = interval;

-                self->_maxAge = interval;
+                _maxAge = interval;

                // There are several cases we need to handle here.
                //
@ -420,7 +420,7 @@
                if (shouldDeleteNow) {
                    [self performDelete];

-                    if (self->_deleteTimer) {
+                    if (_deleteTimer) {
                        [self updateDeleteTimer];
                    } else {
                        [self createAndStartDeleteTimer];
@ -465,7 +465,7 @@

    dispatch_sync(globalLoggingQueue, ^{
        dispatch_sync(self.loggerQueue, ^{
-            result = self->_deleteInterval;
+            result = _deleteInterval;
        });
    });

@ -478,8 +478,8 @@
            // C99 recommended floating point comparison macro
            // Read: isLessThanOrGreaterThan(floatA, floatB)

-            if (/* deleteInterval != interval */ islessgreater(self->_deleteInterval, interval)) {
-                self->_deleteInterval = interval;
+            if (/* deleteInterval != interval */ islessgreater(_deleteInterval, interval)) {
+                _deleteInterval = interval;

                // There are several cases we need to handle here.
                //
@ -494,8 +494,8 @@
                // 4. If the deleteInterval decreased, then we need to reset the timer so that it fires at an earlier date.
                //    (Plus we might need to do an immediate delete.)

-                if (self->_deleteInterval > 0.0) {
-                    if (self->_deleteTimer == NULL) {
+                if (_deleteInterval > 0.0) {
+                    if (_deleteTimer == NULL) {
                        // Handles #2
                        //
                        // Since the deleteTimer uses the lastDeleteTime to calculate it's first fireDate,
@ -511,7 +511,7 @@

                        [self updateDeleteTimer];
                    }
-                } else if (self->_deleteTimer) {
+                } else if (_deleteTimer) {
                    // Handles #1

                    [self destroyDeleteTimer];
@ -555,7 +555,7 @@

    dispatch_sync(globalLoggingQueue, ^{
        dispatch_sync(self.loggerQueue, ^{
-            result = self->_deleteOnEverySave;
+            result = _deleteOnEverySave;
        });
    });

@ -564,7 +564,7 @@

 - (void)setDeleteOnEverySave:(BOOL)flag {
    dispatch_block_t block = ^{
-        self->_deleteOnEverySave = flag;
+        _deleteOnEverySave = flag;
    };

    // The design of the setter logic below is taken from the DDAbstractLogger implementation.
--- a/Testing/Xcode-tv/Pods/CocoaLumberjack/Classes/DDFileLogger.h
+++ b/Testing/Xcode-tv/Pods/CocoaLumberjack/Classes/DDFileLogger.h
@ -326,11 +326,6 @@ extern unsigned long long const kDDDefaultLogFilesDiskQuota;
 */
 - (void)didLogMessage NS_REQUIRES_SUPER;

-/**
- *  Writes all in-memory log data to the permanent storage. Call super before your implementation.
- */
- (void)flush NS_REQUIRES_SUPER;
-
 /**
 *  Called when the logger checks archive or not current log file. 
 *  Override this method to exdend standart behavior. By default returns NO.
@ -402,7 +397,7 @@ extern unsigned long long const kDDDefaultLogFilesDiskQuota;
 *  You can optionally force the current log file to be rolled with this method.
 *  CompletionBlock will be called on main queue.
 */
- (void)rollLogFileWithCompletionBlock:(void (^)(void))completionBlock NS_SWIFT_NAME(rollLogFile(withCompletion:));
+- (void)rollLogFileWithCompletionBlock:(void (^)())completionBlock NS_SWIFT_NAME(rollLogFile(withCompletion:));

 /**
 *  Method is deprecated.
--- a/Testing/Xcode-tv/Pods/CocoaLumberjack/Classes/DDFileLogger.m
+++ b/Testing/Xcode-tv/Pods/CocoaLumberjack/Classes/DDFileLogger.m
@ -279,18 +279,47 @@ unsigned long long const kDDDefaultLogFilesDiskQuota   = 20 * 1024 * 1024; // 20
 - (BOOL)isLogFile:(NSString *)fileName {
    NSString *appName = [self applicationName];

-    // We need to add a space to the name as otherwise we could match applications that have the name prefix.
-    BOOL hasProperPrefix = [fileName hasPrefix:[appName stringByAppendingString:@" "]];
+    BOOL hasProperPrefix = [fileName hasPrefix:appName];
    BOOL hasProperSuffix = [fileName hasSuffix:@".log"];
-    
-    return (hasProperPrefix && hasProperSuffix);
+    BOOL hasProperDate = NO;
+
+    if (hasProperPrefix && hasProperSuffix) {
+        NSUInteger lengthOfMiddle = fileName.length - appName.length - @".log".length;
+
+        // Date string should have at least 16 characters - " 2013-12-03 17-14"
+        if (lengthOfMiddle >= 17) {
+            NSRange range = NSMakeRange(appName.length, lengthOfMiddle);
+
+            NSString *middle = [fileName substringWithRange:range];
+            NSArray *components = [middle componentsSeparatedByString:@" "];
+
+            // When creating logfile if there is existing file with the same name, we append attemp number at the end.
+            // Thats why here we can have three or four components. For details see createNewLogFile method.
+            //
+            // Components:
+            //     "", "2013-12-03", "17-14"
+            // or
+            //     "", "2013-12-03", "17-14", "1"
+            if (components.count == 3 || components.count == 4) {
+                NSString *dateString = [NSString stringWithFormat:@"%@ %@", components[1], components[2]];
+                NSDateFormatter *dateFormatter = [self logFileDateFormatter];
+
+                NSDate *date = [dateFormatter dateFromString:dateString];
+
+                if (date) {
+                    hasProperDate = YES;
+                }
+            }
+        }
+    }
+
+    return (hasProperPrefix && hasProperDate && hasProperSuffix);
 }

-// if you change formatter, then change sortedLogFileInfos method also accordingly
 - (NSDateFormatter *)logFileDateFormatter {
    NSMutableDictionary *dictionary = [[NSThread currentThread]
                                       threadDictionary];
-    NSString *dateFormat = @"yyyy'-'MM'-'dd'--'HH'-'mm'-'ss'-'SSS'";
+    NSString *dateFormat = @"yyyy'-'MM'-'dd' 'HH'-'mm'";
    NSString *key = [NSString stringWithFormat:@"logFileDateFormatter.%@", dateFormat];
    NSDateFormatter *dateFormatter = dictionary[key];

@ -388,35 +417,13 @@ unsigned long long const kDDDefaultLogFilesDiskQuota   = 20 * 1024 * 1024; // 20
 }

 - (NSArray *)sortedLogFileInfos {
-    return  [[self unsortedLogFileInfos] sortedArrayUsingComparator:^NSComparisonResult(DDLogFileInfo   * _Nonnull obj1, DDLogFileInfo   * _Nonnull obj2) {
-        NSDate *date1 = [NSDate new];
-        NSDate *date2 = [NSDate new];
-
-        NSArray<NSString *> *arrayComponent = [[obj1 fileName] componentsSeparatedByString:@" "];
-        if (arrayComponent.count > 0) {
-            NSString *stringDate = arrayComponent.lastObject;
-            stringDate = [stringDate stringByReplacingOccurrencesOfString:@".log" withString:@""];
-            stringDate = [stringDate stringByReplacingOccurrencesOfString:@".archived" withString:@""];
-            date1 = [[self logFileDateFormatter] dateFromString:stringDate] ?: [obj1 creationDate];
-        }
-        
-        arrayComponent = [[obj2 fileName] componentsSeparatedByString:@" "];
-        if (arrayComponent.count > 0) {
-            NSString *stringDate = arrayComponent.lastObject;
-            stringDate = [stringDate stringByReplacingOccurrencesOfString:@".log" withString:@""];
-            stringDate = [stringDate stringByReplacingOccurrencesOfString:@".archived" withString:@""];
-            date2 = [[self logFileDateFormatter] dateFromString:stringDate] ?: [obj2 creationDate];
-        }
-        
-        return [date2 compare:date1 ?: [NSDate new]];
-    }];
-
+    return [[self unsortedLogFileInfos] sortedArrayUsingSelector:@selector(reverseCompareByCreationDate:)];
 }

 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma mark Creation
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//if you change newLogFileName , then  change isLogFile method also accordingly
+
 - (NSString *)newLogFileName {
    NSString *appName = [self applicationName];

@ -612,7 +619,7 @@ unsigned long long const kDDDefaultLogFilesDiskQuota   = 20 * 1024 * 1024; // 20
    __block unsigned long long result;

    dispatch_block_t block = ^{
-        result = self->_maximumFileSize;
+        result = _maximumFileSize;
    };

    // The design of this method is taken from the DDAbstractLogger implementation.
@ -640,7 +647,7 @@ unsigned long long const kDDDefaultLogFilesDiskQuota   = 20 * 1024 * 1024; // 20
 - (void)setMaximumFileSize:(unsigned long long)newMaximumFileSize {
    dispatch_block_t block = ^{
        @autoreleasepool {
-            self->_maximumFileSize = newMaximumFileSize;
+            _maximumFileSize = newMaximumFileSize;
            [self maybeRollLogFileDueToSize];
        }
    };
@ -669,7 +676,7 @@ unsigned long long const kDDDefaultLogFilesDiskQuota   = 20 * 1024 * 1024; // 20
    __block NSTimeInterval result;

    dispatch_block_t block = ^{
-        result = self->_rollingFrequency;
+        result = _rollingFrequency;
    };

    // The design of this method is taken from the DDAbstractLogger implementation.
@ -697,7 +704,7 @@ unsigned long long const kDDDefaultLogFilesDiskQuota   = 20 * 1024 * 1024; // 20
 - (void)setRollingFrequency:(NSTimeInterval)newRollingFrequency {
    dispatch_block_t block = ^{
        @autoreleasepool {
-            self->_rollingFrequency = newRollingFrequency;
+            _rollingFrequency = newRollingFrequency;
            [self maybeRollLogFileDueToAge];
        }
    };
@ -772,7 +779,7 @@ unsigned long long const kDDDefaultLogFilesDiskQuota   = 20 * 1024 * 1024; // 20
    [self rollLogFileWithCompletionBlock:nil];
 }

- (void)rollLogFileWithCompletionBlock:(void (^)(void))completionBlock {
+- (void)rollLogFileWithCompletionBlock:(void (^)())completionBlock {
    // This method is public.
    // We need to execute the rolling on our logging thread/queue.

@ -1040,10 +1047,6 @@ static int exception_count = 0;
    return @"cocoa.lumberjack.fileLogger";
 }

- (void)flush {
-    [_currentLogFileHandle synchronizeFile];
-}
-
@end

 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
--- a/Testing/Xcode-tv/Pods/CocoaLumberjack/Classes/DDLog.h
+++ b/Testing/Xcode-tv/Pods/CocoaLumberjack/Classes/DDLog.h
@ -177,7 +177,7 @@ NS_ASSUME_NONNULL_BEGIN
 *
 *  @return the file name
 */
-FOUNDATION_EXTERN NSString * __nullable DDExtractFileNameWithoutExtension(const char *filePath, BOOL copy);
+NSString * __nullable DDExtractFileNameWithoutExtension(const char *filePath, BOOL copy);

 /**
 * The THIS_FILE macro gives you an NSString of the file name.
--- a/Testing/Xcode-tv/Pods/CocoaLumberjack/Classes/DDLog.m
+++ b/Testing/Xcode-tv/Pods/CocoaLumberjack/Classes/DDLog.m
@ -351,16 +351,17 @@ static NSUInteger _numProcessors;
    // Dispatch semaphores call down to the kernel only when the calling thread needs to be blocked.
    // If the calling semaphore does not need to block, no kernel call is made.

+    dispatch_semaphore_wait(_queueSemaphore, DISPATCH_TIME_FOREVER);
+
+    // We've now sure we won't overflow the queue.
+    // It is time to queue our log message.
+
    dispatch_block_t logBlock = ^{
-        dispatch_semaphore_wait(_queueSemaphore, DISPATCH_TIME_FOREVER);
        @autoreleasepool {
            [self lt_log:logMessage];
        }
    };

-    // We've now sure we won't overflow the queue.
-    // It is time to queue our log message.
-
    if (asyncFlag) {
        dispatch_async(_loggingQueue, logBlock);
    } else {
@ -629,7 +630,6 @@ static NSUInteger _numProcessors;
        if (numClasses > bufferSize || numClasses == 0) {
            //apparently more classes added between calls (or a problem); try again
            free(classes);
-            classes = NULL;
            numClasses = 0;
        }
    }
@ -1313,8 +1313,8 @@ static __inline__ __attribute__((__always_inline__)) void _dispatch_queue_label_
    __block id <DDLogFormatter> result;

    dispatch_sync(globalLoggingQueue, ^{
-        dispatch_sync(self->_loggerQueue, ^{
-            result = self->_logFormatter;
+        dispatch_sync(_loggerQueue, ^{
+            result = _logFormatter;
        });
    });

@ -1329,17 +1329,17 @@ static __inline__ __attribute__((__always_inline__)) void _dispatch_queue_label_

    dispatch_block_t block = ^{
        @autoreleasepool {
-            if (self->_logFormatter != logFormatter) {
-                if ([self->_logFormatter respondsToSelector:@selector(willRemoveFromLogger:)]) {
-                    [self->_logFormatter willRemoveFromLogger:self];
+            if (_logFormatter != logFormatter) {
+                if ([_logFormatter respondsToSelector:@selector(willRemoveFromLogger:)]) {
+                    [_logFormatter willRemoveFromLogger:self];
                }

-                self->_logFormatter = logFormatter;
+                _logFormatter = logFormatter;
 
-                if ([self->_logFormatter respondsToSelector:@selector(didAddToLogger:inQueue:)]) {
-                    [self->_logFormatter didAddToLogger:self inQueue:self->_loggerQueue];
-                } else if ([self->_logFormatter respondsToSelector:@selector(didAddToLogger:)]) {
-                    [self->_logFormatter didAddToLogger:self];
+                if ([_logFormatter respondsToSelector:@selector(didAddToLogger:inQueue:)]) {
+                    [_logFormatter didAddToLogger:self inQueue:_loggerQueue];
+                } else if ([_logFormatter respondsToSelector:@selector(didAddToLogger:)]) {
+                    [_logFormatter didAddToLogger:self];
                }
            }
        }
@ -1348,7 +1348,7 @@ static __inline__ __attribute__((__always_inline__)) void _dispatch_queue_label_
    dispatch_queue_t globalLoggingQueue = [DDLog loggingQueue];

    dispatch_async(globalLoggingQueue, ^{
-        dispatch_async(self->_loggerQueue, block);
+        dispatch_async(_loggerQueue, block);
    });
 }

--- a/Testing/Xcode-tv/Pods/CocoaLumberjack/Classes/DDOSLogger.h
+++ b/Testing/Xcode-tv/Pods/CocoaLumberjack/Classes/DDOSLogger.h
@ -25,6 +25,7 @@
 /**
 * This class provides a logger for the Apple os_log facility.
 **/
+API_AVAILABLE(ios(10.0), macos(10.12), tvos(10.0), watchos(3.0))
@interface DDOSLogger : DDAbstractLogger <DDLogger>

 /**
--- a/Testing/Xcode-tv/Pods/CocoaLumberjack/Classes/DDOSLogger.m
+++ b/Testing/Xcode-tv/Pods/CocoaLumberjack/Classes/DDOSLogger.m
@ -48,30 +48,26 @@ static DDOSLogger *sharedInstance;
        return;
    }
    
-    if(@available(iOS 10.0, macOS 10.12, tvOS 10.0, watchOS 3.0, *)) {
+    NSString * message = _logFormatter ? [_logFormatter formatLogMessage:logMessage] : logMessage->_message;
+    
+    if (message) {
+        const char *msg = [message UTF8String];
        
-        NSString * message = _logFormatter ? [_logFormatter formatLogMessage:logMessage] : logMessage->_message;
-        if (message) {
-            const char *msg = [message UTF8String];
-            
-            switch (logMessage->_flag) {
-                case DDLogFlagError     :
-                    os_log_error(OS_LOG_DEFAULT, "%{public}s", msg);
-                    break;
-                case DDLogFlagWarning   :
-                case DDLogFlagInfo      :
-                    os_log_info(OS_LOG_DEFAULT, "%{public}s", msg);
-                    break;
-                case DDLogFlagDebug     :
-                case DDLogFlagVerbose   :
-                default                 :
-                    os_log_debug(OS_LOG_DEFAULT, "%{public}s", msg);
-                    break;
-            }
+        switch (logMessage->_flag) {
+            case DDLogFlagError     :
+                os_log_error(OS_LOG_DEFAULT, msg);
+                break;
+            case DDLogFlagWarning   :
+            case DDLogFlagInfo      :
+                os_log_info(OS_LOG_DEFAULT, msg);
+                break;
+            case DDLogFlagDebug     :
+            case DDLogFlagVerbose   :
+            default                 :
+                os_log_debug(OS_LOG_DEFAULT, msg);
+                break;
        }
-        
    }
-
 }

 - (NSString *)loggerName {
--- a/Testing/Xcode-tv/Pods/CocoaLumberjack/Classes/DDTTYLogger.m
+++ b/Testing/Xcode-tv/Pods/CocoaLumberjack/Classes/DDTTYLogger.m
@ -900,7 +900,7 @@ static DDTTYLogger *sharedInstance;

    dispatch_sync(globalLoggingQueue, ^{
        dispatch_sync(self.loggerQueue, ^{
-            result = self->_colorsEnabled;
+            result = _colorsEnabled;
        });
    });

@ -910,9 +910,9 @@ static DDTTYLogger *sharedInstance;
 - (void)setColorsEnabled:(BOOL)newColorsEnabled {
    dispatch_block_t block = ^{
        @autoreleasepool {
-            self->_colorsEnabled = newColorsEnabled;
+            _colorsEnabled = newColorsEnabled;

-            if ([self->_colorProfilesArray count] == 0) {
+            if ([_colorProfilesArray count] == 0) {
                [self loadDefaultColorProfiles];
            }
        }
@ -955,7 +955,7 @@ static DDTTYLogger *sharedInstance;

            NSUInteger i = 0;

-            for (DDTTYLoggerColorProfile *colorProfile in self->_colorProfilesArray) {
+            for (DDTTYLoggerColorProfile *colorProfile in _colorProfilesArray) {
                if ((colorProfile->mask == mask) && (colorProfile->context == ctxt)) {
                    break;
                }
@ -963,10 +963,10 @@ static DDTTYLogger *sharedInstance;
                i++;
            }

-            if (i < [self->_colorProfilesArray count]) {
-                self->_colorProfilesArray[i] = newColorProfile;
+            if (i < [_colorProfilesArray count]) {
+                _colorProfilesArray[i] = newColorProfile;
            } else {
-                [self->_colorProfilesArray addObject:newColorProfile];
+                [_colorProfilesArray addObject:newColorProfile];
            }
        }
    };
@ -999,7 +999,7 @@ static DDTTYLogger *sharedInstance;

            NSLogInfo(@"DDTTYLogger: newColorProfile: %@", newColorProfile);

-            self->_colorProfilesDict[tag] = newColorProfile;
+            _colorProfilesDict[tag] = newColorProfile;
        }
    };

@ -1027,7 +1027,7 @@ static DDTTYLogger *sharedInstance;
        @autoreleasepool {
            NSUInteger i = 0;

-            for (DDTTYLoggerColorProfile *colorProfile in self->_colorProfilesArray) {
+            for (DDTTYLoggerColorProfile *colorProfile in _colorProfilesArray) {
                if ((colorProfile->mask == mask) && (colorProfile->context == context)) {
                    break;
                }
@ -1035,8 +1035,8 @@ static DDTTYLogger *sharedInstance;
                i++;
            }

-            if (i < [self->_colorProfilesArray count]) {
-                [self->_colorProfilesArray removeObjectAtIndex:i];
+            if (i < [_colorProfilesArray count]) {
+                [_colorProfilesArray removeObjectAtIndex:i];
            }
        }
    };
@ -1061,7 +1061,7 @@ static DDTTYLogger *sharedInstance;

    dispatch_block_t block = ^{
        @autoreleasepool {
-            [self->_colorProfilesDict removeObjectForKey:tag];
+            [_colorProfilesDict removeObjectForKey:tag];
        }
    };

@ -1083,7 +1083,7 @@ static DDTTYLogger *sharedInstance;
 - (void)clearColorsForAllFlags {
    dispatch_block_t block = ^{
        @autoreleasepool {
-            [self->_colorProfilesArray removeAllObjects];
+            [_colorProfilesArray removeAllObjects];
        }
    };

@ -1105,7 +1105,7 @@ static DDTTYLogger *sharedInstance;
 - (void)clearColorsForAllTags {
    dispatch_block_t block = ^{
        @autoreleasepool {
-            [self->_colorProfilesDict removeAllObjects];
+            [_colorProfilesDict removeAllObjects];
        }
    };

@ -1127,8 +1127,8 @@ static DDTTYLogger *sharedInstance;
 - (void)clearAllColors {
    dispatch_block_t block = ^{
        @autoreleasepool {
-            [self->_colorProfilesArray removeAllObjects];
-            [self->_colorProfilesDict removeAllObjects];
+            [_colorProfilesArray removeAllObjects];
+            [_colorProfilesDict removeAllObjects];
        }
    };

--- a/Testing/Xcode-tv/Pods/CocoaLumberjack/Classes/Extensions/DDContextFilterLogFormatter.m
+++ b/Testing/Xcode-tv/Pods/CocoaLumberjack/Classes/Extensions/DDContextFilterLogFormatter.m
@ -14,7 +14,7 @@
 //   prior written permission of Deusty, LLC.

 #import "DDContextFilterLogFormatter.h"
-#import <pthread/pthread.h>
+#import <libkern/OSAtomic.h>

 #if !__has_feature(objc_arc)
 #error This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC).
@ -131,7 +131,7 @@


@interface DDLoggingContextSet () {
-    pthread_mutex_t _mutex;
+    OSSpinLock _lock;
    NSMutableSet *_set;
 }

@ -143,40 +143,36 @@
 - (instancetype)init {
    if ((self = [super init])) {
        _set = [[NSMutableSet alloc] init];
-        pthread_mutex_init(&_mutex, NULL);
+        _lock = OS_SPINLOCK_INIT;
    }

    return self;
 }

- (void)dealloc {
-    pthread_mutex_destroy(&_mutex);
-}
-
 - (void)addToSet:(NSUInteger)loggingContext {
-    pthread_mutex_lock(&_mutex);
+    OSSpinLockLock(&_lock);
    {
        [_set addObject:@(loggingContext)];
    }
-    pthread_mutex_unlock(&_mutex);
+    OSSpinLockUnlock(&_lock);
 }

 - (void)removeFromSet:(NSUInteger)loggingContext {
-    pthread_mutex_lock(&_mutex);
+    OSSpinLockLock(&_lock);
    {
        [_set removeObject:@(loggingContext)];
    }
-    pthread_mutex_unlock(&_mutex);
+    OSSpinLockUnlock(&_lock);
 }

 - (NSArray *)currentSet {
    NSArray *result = nil;

-    pthread_mutex_lock(&_mutex);
+    OSSpinLockLock(&_lock);
    {
        result = [_set allObjects];
    }
-    pthread_mutex_unlock(&_mutex);
+    OSSpinLockUnlock(&_lock);

    return result;
 }
@ -184,11 +180,11 @@
 - (BOOL)isInSet:(NSUInteger)loggingContext {
    BOOL result = NO;

-    pthread_mutex_lock(&_mutex);
+    OSSpinLockLock(&_lock);
    {
        result = [_set containsObject:@(loggingContext)];
    }
-    pthread_mutex_unlock(&_mutex);
+    OSSpinLockUnlock(&_lock);

    return result;
 }
--- a/Testing/Xcode-tv/Pods/CocoaLumberjack/Classes/Extensions/DDDispatchQueueLogFormatter.m
+++ b/Testing/Xcode-tv/Pods/CocoaLumberjack/Classes/Extensions/DDDispatchQueueLogFormatter.m
@ -14,9 +14,10 @@
 //   prior written permission of Deusty, LLC.

 #import "DDDispatchQueueLogFormatter.h"
-#import <pthread/pthread.h>
+#import <libkern/OSAtomic.h>
 #import <objc/runtime.h>

+
 #if !__has_feature(objc_arc)
 #error This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC).
 #endif
@ -28,7 +29,7 @@
    int32_t _atomicLoggerCount;
    NSDateFormatter *_threadUnsafeDateFormatter; // Use [self stringFromDate]
    
-    pthread_mutex_t _mutex;
+    OSSpinLock _lock;
    
    NSUInteger _minQueueLength;           // _prefix == Only access via atomic property
    NSUInteger _maxQueueLength;           // _prefix == Only access via atomic property
@ -62,7 +63,7 @@

        _minQueueLength = 0;
        _maxQueueLength = 0;
-        pthread_mutex_init(&_mutex, NULL);
+        _lock = OS_SPINLOCK_INIT;
        _replacements = [[NSMutableDictionary alloc] init];

        // Set default replacements:
@ -80,10 +81,6 @@
    return self;
 }

- (void)dealloc {
-    pthread_mutex_destroy(&_mutex);
-}
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma mark Configuration
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -94,17 +91,17 @@
 - (NSString *)replacementStringForQueueLabel:(NSString *)longLabel {
    NSString *result = nil;

-    pthread_mutex_lock(&_mutex);
+    OSSpinLockLock(&_lock);
    {
        result = _replacements[longLabel];
    }
-    pthread_mutex_unlock(&_mutex);
+    OSSpinLockUnlock(&_lock);

    return result;
 }

 - (void)setReplacementString:(NSString *)shortLabel forQueueLabel:(NSString *)longLabel {
-    pthread_mutex_lock(&_mutex);
+    OSSpinLockLock(&_lock);
    {
        if (shortLabel) {
            _replacements[longLabel] = shortLabel;
@ -112,7 +109,7 @@
            [_replacements removeObjectForKey:longLabel];
        }
    }
-    pthread_mutex_unlock(&_mutex);
+    OSSpinLockUnlock(&_lock);
 }

 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -217,11 +214,11 @@
            fullLabel = logMessage->_threadName;
        }

-        pthread_mutex_lock(&_mutex);
+        OSSpinLockLock(&_lock);
        {
            abrvLabel = _replacements[fullLabel];
        }
-        pthread_mutex_unlock(&_mutex);
+        OSSpinLockUnlock(&_lock);

        if (abrvLabel) {
            queueThreadLabel = abrvLabel;
--- a/Testing/Xcode-tv/Pods/CocoaLumberjack/Classes/Extensions/DDMultiFormatter.m
+++ b/Testing/Xcode-tv/Pods/CocoaLumberjack/Classes/Extensions/DDMultiFormatter.m
@ -81,7 +81,7 @@
    __block NSString *line = logMessage->_message;

    dispatch_sync(_queue, ^{
-        for (id<DDLogFormatter> formatter in self->_formatters) {
+        for (id<DDLogFormatter> formatter in _formatters) {
            DDLogMessage *message = [self logMessageForLine:line originalMessage:logMessage];
            line = [formatter formatLogMessage:message];

@ -107,7 +107,7 @@
    __block NSArray *formatters;

    dispatch_sync(_queue, ^{
-        formatters = [self->_formatters copy];
+        formatters = [_formatters copy];
    });

    return formatters;
@ -115,19 +115,19 @@

 - (void)addFormatter:(id<DDLogFormatter>)formatter {
    dispatch_barrier_async(_queue, ^{
-        [self->_formatters addObject:formatter];
+        [_formatters addObject:formatter];
    });
 }

 - (void)removeFormatter:(id<DDLogFormatter>)formatter {
    dispatch_barrier_async(_queue, ^{
-        [self->_formatters removeObject:formatter];
+        [_formatters removeObject:formatter];
    });
 }

 - (void)removeAllFormatters {
    dispatch_barrier_async(_queue, ^{
-        [self->_formatters removeAllObjects];
+        [_formatters removeAllObjects];
    });
 }

@ -135,7 +135,7 @@
    __block BOOL hasFormatter;

    dispatch_sync(_queue, ^{
-        hasFormatter = [self->_formatters containsObject:formatter];
+        hasFormatter = [_formatters containsObject:formatter];
    });

    return hasFormatter;
--- a/Testing/Xcode-tv/Pods/CocoaLumberjack/README.md
+++ b/Testing/Xcode-tv/Pods/CocoaLumberjack/README.md
@ -48,11 +48,11 @@ DDLog.add(fileLogger)

 ...

-DDLogVerbose("Verbose")
-DDLogDebug("Debug")
-DDLogInfo("Info")
-DDLogWarn("Warn")
-DDLogError("Error")
+DDLogVerbose("Verbose");
+DDLogDebug("Debug");
+DDLogInfo("Info");
+DDLogWarn("Warn");
+DDLogError("Error");
 ```

 ##### Obj-C version via CocoaPods
@ -151,16 +151,14 @@ Configure your logging however you want. Change log levels per file (perfect for

 ### Requirements 
 The current version of Lumberjack requires:
- Xcode 9 or later
- Swift 4.0 or later
- iOS 6 or later
- OS X 10.8 or later
+- Xcode 8 or later
+- Swift 3.0 or later
+- iOS 5 or later
+- OS X 10.7 or later
 - WatchOS 2 or later
 - TVOS 9 or later

 #### Backwards compability
- for iOS 5 and OS X 10.7, use the 3.3 version
- for Xcode 8 and Swift 3, use the 3.2 version
 - for Xcode 7.3 and Swift 2.3, use the 2.4.0 version
 - for Xcode 7.3 and Swift 2.2, use the 2.3.0 version
 - for Xcode 7.2 and 7.1, use the 2.2.0 version
--- a/Testing/Xcode-tv/Pods/Headers/Private/YapDatabase/YapDatabaseAtomic.h
+++ b/Testing/Xcode-tv/Pods/Headers/Private/YapDatabase/YapDatabaseAtomic.h
@ -1 +1 @@
-../../../../../../YapDatabase/Utilities/YapDatabaseAtomic.h
+../../../../../../YapDatabase/Internal/YapDatabaseAtomic.h
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`../../../../../../YapDatabase/Extensions/CloudCore/Internal/YapDatabaseCloudCoreGraphPrivate.h`
				`@ -1 +0,0 @@`
				`../../../../../../YapDatabase/Utilities/YapDatabaseAtomic.h`