Skip to content
This repository has been archived by the owner on Dec 13, 2017. It is now read-only.

Commit

Permalink
Merge pull request #750 from wordpress-mobile/try/cocoalumberjack-update
Browse files Browse the repository at this point in the history
Update to CocoaLumberjack 2.2.0
  • Loading branch information
koke committed Nov 26, 2015
2 parents d25e21b + 18627de commit f139926
Show file tree
Hide file tree
Showing 36 changed files with 1,256 additions and 661 deletions.
2 changes: 1 addition & 1 deletion Classes/WPImageMeta.m
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#import "WPImageMeta.h"
#import "NSObject+SafeExpectations.h"
#import <NSObject-SafeExpectations/NSObject+SafeExpectations.h>

static NSString *const MetaKeyAlign = @"align";
static NSString *const MetaKeyAlt = @"alt";
Expand Down
4 changes: 2 additions & 2 deletions Example/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ use_frameworks!

target 'EditorDemo' do
pod 'WordPress-iOS-Editor', :path => '../'
pod 'CocoaLumberjack', '~>2.0.0', :inhibit_warnings => true
pod 'CocoaLumberjack', '~>2.2.0', :inhibit_warnings => true
pod 'WordPress-iOS-Shared', '~>0.5.0', :inhibit_warnings => true
pod 'WordPressCom-Analytics-iOS', '~>0.1.0', :inhibit_warnings => true
end

target 'EditorDemoTests' do
# pod 'Expecta'
pod 'CocoaLumberjack', '~>2.0.0', :inhibit_warnings => true
pod 'CocoaLumberjack', '~>2.2.0', :inhibit_warnings => true
end

28 changes: 14 additions & 14 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -20,41 +20,41 @@ PODS:
- AFNetworking/UIKit (2.6.3):
- AFNetworking/NSURLConnection
- AFNetworking/NSURLSession
- CocoaLumberjack (2.0.0):
- CocoaLumberjack/Default (= 2.0.0)
- CocoaLumberjack/Extensions (= 2.0.0)
- CocoaLumberjack/Core (2.0.0)
- CocoaLumberjack/Default (2.0.0):
- CocoaLumberjack (2.2.0):
- CocoaLumberjack/Default (= 2.2.0)
- CocoaLumberjack/Extensions (= 2.2.0)
- CocoaLumberjack/Core (2.2.0)
- CocoaLumberjack/Default (2.2.0):
- CocoaLumberjack/Core
- CocoaLumberjack/Extensions (2.0.0):
- CocoaLumberjack/Extensions (2.2.0):
- CocoaLumberjack/Default
- NSObject-SafeExpectations (0.0.2)
- WordPress-iOS-Editor (1.1):
- CocoaLumberjack (= 2.0.0)
- CocoaLumberjack (~> 2.2.0)
- NSObject-SafeExpectations (~> 0.0.2)
- WordPress-iOS-Shared (~> 0.5.0)
- WordPressCom-Analytics-iOS (~> 0.1.0)
- WordPress-iOS-Shared (0.5.0):
- WordPress-iOS-Shared (0.5.1):
- AFNetworking (~> 2.5)
- CocoaLumberjack (= 2.0.0)
- CocoaLumberjack (~> 2.2.0)
- WordPressCom-Analytics-iOS (0.1.0)

DEPENDENCIES:
- CocoaLumberjack (~> 2.0.0)
- CocoaLumberjack (~> 2.2.0)
- WordPress-iOS-Editor (from `../`)
- WordPress-iOS-Shared (~> 0.5.0)
- WordPressCom-Analytics-iOS (~> 0.1.0)

EXTERNAL SOURCES:
WordPress-iOS-Editor:
:path: "../"
:path: ../

SPEC CHECKSUMS:
AFNetworking: cb8d14a848e831097108418f5d49217339d4eb60
CocoaLumberjack: a6f77d987d65dc7ba86b0f84db7d0b9084f77bcb
CocoaLumberjack: 17fe8581f84914d5d7e6360f7c70022b173c3ae0
NSObject-SafeExpectations: 7d7f48df90df4e11da7cfe86b64f45eff7a7f521
WordPress-iOS-Editor: 71a7112d49e5d2ad817914bc72e50928901dd21f
WordPress-iOS-Shared: 5480e7b5c9c55158ea22c89ff44fca5597852224
WordPress-iOS-Editor: 56cf09ada5b5f7637b232199b34aa642b0adebc8
WordPress-iOS-Shared: ced218039d88c91572f3205882832f7a05c61f97
WordPressCom-Analytics-iOS: 355b8c6cf1d50d64ca7667e6f9e94c989e466775

COCOAPODS: 0.39.0
66 changes: 33 additions & 33 deletions Example/Pods/CocoaLumberjack/Classes/CocoaLumberjack.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 17 additions & 1 deletion Example/Pods/CocoaLumberjack/Classes/DDASLLogCapture.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

49 changes: 26 additions & 23 deletions Example/Pods/CocoaLumberjack/Classes/DDASLLogCapture.m

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 12 additions & 2 deletions Example/Pods/CocoaLumberjack/Classes/DDASLLogger.h
100755 → 100644

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion Example/Pods/CocoaLumberjack/Classes/DDASLLogger.m

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit f139926

Please sign in to comment.