artsy · orta · May 11, 2015 · May 11, 2015 · May 11, 2015 · May 11, 2015
diff --git a/Artsy Tests/Artsy Tests-Prefix.pch b/Artsy Tests/Artsy Tests-Prefix.pch
@@ -1,27 +1,27 @@
-//
-//  Artsy Tests-Prefix.pch
-//  Artsy
-//
-//  Created by Orta Therox on 01/01/2013.
-//  Copyright (c) 2013 Artsy. All rights reserved.
-//
-
 #ifdef __OBJC__
+    // Directly linked pods
     #import <UIKit/UIKit.h>
     #import <Foundation/Foundation.h>
-    #define EXP_SHORTHAND
     #import <Specta/Specta.h>
     #import "SpectaDSL+Sleep.h"
     #import <Expecta/Expecta.h>
-    #import <Expecta+Snapshots/EXPMatchers+FBSnapshotTest.h>
+    #import <Expecta_Snapshots/EXPMatchers+FBSnapshotTest.h>
     #import <OHHTTPStubs/OHHTTPStubs.h>
-    #import <ISO8601DateFormatter/ISO8601DateFormatter.h>
-    #import <UICKeyChainStore/UICKeyChainStore.h>
     #import <OCMock/OCMock.h>
-    #import <UIAlertView+Blocks/UIAlertView+Blocks.h>
+
+    // Pods that come in from the other target
     #import <AFNetworking/AFNetworking.h>
+    #import <ISO8601DateFormatter/ISO8601DateFormatter.h>
+    #import <UIAlertView_Blocks/UIAlertView+Blocks.h>
+    #import <UICKeyChainStore/UICKeyChainStore.h>
     #import <Mantle/Mantle.h>
     #import <Mantle/MTLJSONAdapter.h>
+    #import <ObjectiveSugar/ObjectiveSugar.h>
+    #import <ORStackView/ORStackScrollView.h>
+    #import <ORStackView/ORTagBasedAutoStackView.h>
+    #import <ReactiveCocoa/ReactiveCocoa.h>
+
+    // Headers
     #import "MTLModel+JSON.h"
     #import "MTLModel+Dictionary.h"
     #import "Constants.h"
@@ -31,9 +31,5 @@
     #import "ARTestHelper.h"
     #import "ARAutoLayoutDebugging.h"
     #import "StyledSubclasses.h"
-    #import <ObjectiveSugar/ObjectiveSugar.h>
-    #import <ORStackView/ORStackScrollView.h>
-    #import <ORStackView/ORTagBasedAutoStackView.h>
-    #import <ReactiveCocoa/ReactiveCocoa.h>
     #import "UIViewController+PresentWithFrame.h"
 #endif
diff --git a/Artsy.xcodeproj/project.pbxproj b/Artsy.xcodeproj/project.pbxproj
diff --git a/Artsy.xcodeproj/xcshareddata/xcschemes/Artsy.xcscheme b/Artsy.xcodeproj/xcshareddata/xcschemes/Artsy.xcscheme
@@ -14,8 +14,8 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "4D830D885CE3DB20472E230A"
-               BuildableName = "libPods.a"
+               BlueprintIdentifier = "F82A938C8E623C49A74E330A"
+               BuildableName = "Pods.framework"
                BlueprintName = "Pods"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">
             </BuildableReference>

diff --git a/Artsy/App/Artsy-Prefix.pch b/Artsy/App/Artsy-Prefix.pch
@@ -25,14 +25,14 @@
     #import <Mantle/Mantle.h>
     #import <ObjectiveSugar/ObjectiveSugar.h>
     #import <FLKAutoLayout/UIView+FLKAutoLayout.h>
-    #import <CocoaLumberjack/DDLog.h>
+    #import <CocoaLumberjack/CocoaLumberjack.h>
     #import <ORStackView/ORStackScrollView.h>
     #import <ORStackView/ORTagBasedAutoStackView.h>
     #import <ReactiveCocoa/ReactiveCocoa.h>
     #import <NAMapKit/NAMapView.h>
     #import <EDColor/UIColor+Hex.h>
-    #import <UIView+BooleanAnimations/UIView+BooleanAnimations.h>
-    #import <Artsy-UIButtons/ARButtonSubclasses.h>
+    #import <UIView_BooleanAnimations/UIView+BooleanAnimations.h>
+    #import <Artsy_UIButtons/ARButtonSubclasses.h>
 
     #import "ArtsyAPI.h"
     #import "Models.h"
@@ -55,10 +55,10 @@
     #import <libextobjc/EXTScope.h>
 
     #ifdef DEBUG
-    static const int ddLogLevel = LOG_LEVEL_VERBOSE;
+    static const int ddLogLevel = DDLogLevelVerbose;
     static const int httpLogLevel = AFLoggerLevelInfo;
     #else
-    static const int ddLogLevel = LOG_LEVEL_WARN;
+    static const int ddLogLevel = DDLogLevelWarning;
     static const int httpLogLevel = AFLoggerLevelError;
     #endif
 

diff --git a/Artsy/App/main.m b/Artsy/App/main.m
@@ -9,3 +9,4 @@ int main(int argc, char *argv[]) {
                                  NSStringFromClass([JSDecoupledAppDelegate class]));
     }
 }
+
diff --git a/Artsy/Classes/Categories/Apple/UIFont+ArtsyFonts.h b/Artsy/Classes/Categories/Apple/UIFont+ArtsyFonts.h
diff --git a/Artsy/Classes/Categories/Apple/UIFont+ArtsyFonts.m b/Artsy/Classes/Categories/Apple/UIFont+ArtsyFonts.m
diff --git a/Artsy/Classes/Models/ARUserSettingsViewController.h b/Artsy/Classes/Models/ARUserSettingsViewController.h
@@ -1,4 +1,4 @@
-#import "FODFormViewController.h"
+#import <FODFormKit/FODFormViewController.h>
 
 @interface ARUserSettingsViewController : FODFormViewController <ARMenuAwareViewController>
 

diff --git a/Artsy/Classes/Models/ARUserSettingsViewController.m b/Artsy/Classes/Models/ARUserSettingsViewController.m
@@ -1,5 +1,6 @@
 #import "ARUserSettingsViewController.h"
 
+#import <FODFormKit/FODForm.h>
 #import <FODFormKit/FODFormBuilder.h>
 
 #import "ARUserManager.h"

diff --git a/Artsy/Classes/Utils/ARSharingController.m b/Artsy/Classes/Utils/ARSharingController.m
@@ -2,7 +2,7 @@
 #import "ARURLItemProvider.h"
 #import "ARImageItemProvider.h"
 #import "ARMessageItemProvider.h"
-#import <UIAlertView+Blocks/UIAlertView+Blocks.h>
+#import <UIAlertView_Blocks/UIAlertView+Blocks.h>
 
 @interface ARSharingController ()
 @property (nonatomic, strong) id <ARShareableObject> object;

diff --git a/Artsy/Classes/Utils/ARSwitchBoard.m b/Artsy/Classes/Utils/ARSwitchBoard.m
@@ -1,6 +1,6 @@
 #import "ARRouter.h"
 #import <JLRoutes/JLRoutes.h>
-#import <UIAlertView+Blocks/UIAlertView+Blocks.h>
+#import <UIAlertView_Blocks/UIAlertView+Blocks.h>
 
 // View Controllers
 #import "ARArtworkSetViewController.h"

diff --git a/Artsy/Classes/Utils/ARTrialController.m b/Artsy/Classes/Utils/ARTrialController.m
@@ -1,6 +1,6 @@
 #import "ARUserManager.h"
 #import "ARAppDelegate.h"
-#import <UIAlertView+Blocks/UIAlertView+Blocks.h>
+#import <UIAlertView_Blocks/UIAlertView+Blocks.h>
 
 static ARTrialController *instance;
 

diff --git a/Artsy/Classes/Utils/Logging/ARLogFormatter.m b/Artsy/Classes/Utils/Logging/ARLogFormatter.m
@@ -29,10 +29,10 @@ - (instancetype)init
 
 - (NSString *)formatLogMessage:(DDLogMessage *)logMessage
 {
-    NSString *dateAndTime = [self.dateFormatter stringFromDate:(logMessage->timestamp)];
-    NSString *logMsg = logMessage->logMsg;
+    NSString *dateAndTime = [self.dateFormatter stringFromDate:(logMessage->_timestamp)];
+    NSString *logMsg = logMessage->_message;
 
-    return [NSString stringWithFormat:@"%@ [%@] | %@\n", dateAndTime, [contextMap[@(logMessage->logContext)] uppercaseString], logMsg];
+    return [NSString stringWithFormat:@"%@ [%@] | %@\n", dateAndTime, [contextMap[@(logMessage->_context)] uppercaseString], logMsg];
 
     return nil;
 }

diff --git a/Artsy/Classes/Utils/Logging/ARLogger.h b/Artsy/Classes/Utils/Logging/ARLogger.h
@@ -1,3 +1,5 @@
+#import <CocoaLumberjack/DDLegacyMacros.h>
+
 // If you update this enum, update `contextMap` in the implementation too please
 typedef NS_ENUM(NSInteger, ARLogContext) {
     // starting at 1 because 0 is the default
@@ -22,11 +24,12 @@ typedef NS_ENUM(NSInteger, ARLogContext) {
 // server. To log specifically formatted text errors after a failed request, use ARLogContextNetwork
 // logs. These macros are used by ARHTTPRequestOperationLogger. This logger has its own log level so
 // that you may log only failed requests without affecting the global log level of ARLogger.
-#define ARHTTPRequestOperationDebugLog(frmt, ...)  ASYNC_LOG_OBJC_MAYBE(ddLogLevel, LOG_FLAG_DEBUG, ARLogContextRequestOperation, frmt, ##__VA_ARGS__)
-#define ARHTTPRequestOperationSuccessLog(frmt, ...)  ASYNC_LOG_OBJC_MAYBE(ddLogLevel, LOG_FLAG_INFO, ARLogContextRequestOperation, frmt, ##__VA_ARGS__)
-#define ARHTTPRequestOperationFailureLog(frmt, ...)  ASYNC_LOG_OBJC_MAYBE(ddLogLevel, LOG_FLAG_ERROR, ARLogContextRequestOperation, frmt, ##__VA_ARGS__)
+
+#define ARHTTPRequestOperationDebugLog(frmt, ...)  LOG_OBJC_MAYBE(YES, ddLogLevel, LOG_FLAG_DEBUG, ARLogContextRequestOperation, frmt, ##__VA_ARGS__)
+#define ARHTTPRequestOperationSuccessLog(frmt, ...)  LOG_OBJC_MAYBE(YES, ddLogLevel, LOG_FLAG_INFO, ARLogContextRequestOperation, frmt, ##__VA_ARGS__)
+#define ARHTTPRequestOperationFailureLog(frmt, ...)  LOG_OBJC_MAYBE(YES, ddLogLevel, LOG_FLAG_ERROR, ARLogContextRequestOperation, frmt, ##__VA_ARGS__)
 
 // For logging human-readable Activity and Errors:
-#define ARInfoLog(frmt, ...)  ASYNC_LOG_OBJC_MAYBE(ddLogLevel, LOG_FLAG_INFO, ARLogContextInfo, frmt, ##__VA_ARGS__)
-#define ARActionLog(frmt, ...)  ASYNC_LOG_OBJC_MAYBE(ddLogLevel, LOG_FLAG_DEBUG, ARLogContextAction, frmt, ##__VA_ARGS__)
-#define ARErrorLog(frmt, ...)  ASYNC_LOG_OBJC_MAYBE(ddLogLevel, LOG_FLAG_ERROR, ARLogContextError, frmt, ##__VA_ARGS__)
+#define ARInfoLog(frmt, ...)  LOG_OBJC_MAYBE(YES, ddLogLevel, LOG_FLAG_INFO, ARLogContextInfo, frmt, ##__VA_ARGS__)
+#define ARActionLog(frmt, ...)  LOG_OBJC_MAYBE(YES, ddLogLevel, LOG_FLAG_DEBUG, ARLogContextAction, frmt, ##__VA_ARGS__)
+#define ARErrorLog(frmt, ...)  LOG_OBJC_MAYBE(YES, ddLogLevel, LOG_FLAG_ERROR, ARLogContextError, frmt, ##__VA_ARGS__)
diff --git a/Artsy/Classes/View Controllers/ARFairMapPreviewButton.h b/Artsy/Classes/View Controllers/ARFairMapPreviewButton.h
@@ -1,4 +1,4 @@
-#import <Artsy-UIButtons/ARButtonSubclasses.h>
+#import <Artsy_UIButtons/ARButtonSubclasses.h>
 
 @class ARFairMapPreview, Map;
 

diff --git a/Artsy/Classes/View Controllers/ARLoginViewController.m b/Artsy/Classes/View Controllers/ARLoginViewController.m
@@ -3,7 +3,7 @@
 #import "AROnboardingNavBarView.h"
 #import "ARAuthProviders.h"
 #import "UIViewController+FullScreenLoading.h"
-#import <UIAlertView+Blocks/UIAlertView+Blocks.h>
+#import <UIAlertView_Blocks/UIAlertView+Blocks.h>
 #import "ARTextFieldWithPlaceholder.h"
 #import "ARSecureTextFieldWithPlaceholder.h"
 #import "UIView+HitTestExpansion.h"

diff --git a/Artsy/Classes/View Controllers/AROnboardingMoreInfoViewController.m b/Artsy/Classes/View Controllers/AROnboardingMoreInfoViewController.m
@@ -5,7 +5,7 @@
 #import "ARUserManager.h"
 #import "AROnboardingViewController.h"
 #import "UIViewController+FullScreenLoading.h"
-#import <UIAlertView+Blocks/UIAlertView+Blocks.h>
+#import <UIAlertView_Blocks/UIAlertView+Blocks.h>
 #import "UIView+HitTestExpansion.h"
 
 //sigh

diff --git a/Artsy/Classes/View Controllers/ARParallaxHeaderViewController.m b/Artsy/Classes/View Controllers/ARParallaxHeaderViewController.m
@@ -1,5 +1,5 @@
 #import "ARParallaxHeaderViewController.h"
-#import <UIImageView+WebCache.h>
+#import <SDWebImage/UIImageView+WebCache.h>
 
 const CGFloat ARParallaxHeaderViewBannerImageMissingImageHeight = 60.0;
 const CGFloat ARParallaxHeaderViewBannerImageHeight = 180.0;

diff --git a/Artsy/Classes/View Controllers/ARSignUpSplashViewController.m b/Artsy/Classes/View Controllers/ARSignUpSplashViewController.m
@@ -1,7 +1,7 @@
 #import "ARSignUpSplashViewController.h"
 #import "ARAppDelegate.h"
 #import "ARCrossfadingImageView.h"
-#import <UIAlertView+Blocks/UIAlertView+Blocks.h>
+#import <UIAlertView_Blocks/UIAlertView+Blocks.h>
 #import "UIView+HitTestExpansion.h"
 
 @interface ARSignUpSplashTextViewController : UIViewController

diff --git a/Artsy/Classes/Views/ARAuctionBidderStateLabel.m b/Artsy/Classes/Views/ARAuctionBidderStateLabel.m
@@ -1,5 +1,5 @@
 #import "ARAuctionBidderStateLabel.h"
-#import <Artsy+UILabels/NSNumberFormatter+ARCurrency.h>
+#import <Artsy_UILabels/NSNumberFormatter+ARCurrency.h>
 
 @implementation ARAuctionBidderStateLabel
 

diff --git a/Artsy/Classes/Views/StyledSubclasses.h b/Artsy/Classes/Views/StyledSubclasses.h
@@ -1,4 +1,4 @@
-#import <Artsy+UILabels/ARLabelSubclasses.h>
-#import <Artsy-UIButtons/ARButtonSubclasses.h>
+#import <Artsy_UILabels/ARLabelSubclasses.h>
+#import <Artsy_UIButtons/ARButtonSubclasses.h>
 #import "ARSeparatorViews.h"
 #import "ARCustomEigenLabels.h"
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'cocoapods'
 gem "cocoapods-keys", :git => 'https://github.com/alloy/cocoapods-keys.git', :branch => 'retrieve-keys-from-env'
 
 group :test do
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,3 +9,4 @@ int main(int argc, char *argv[]) {
		NSStringFromClass([JSDecoupledAppDelegate class]));
		}
		}