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

Commit f139926

Browse files
committed
Merge pull request #750 from wordpress-mobile/try/cocoalumberjack-update
Update to CocoaLumberjack 2.2.0
2 parents d25e21b + 18627de commit f139926

36 files changed

Lines changed: 1256 additions & 661 deletions

Classes/WPImageMeta.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#import "WPImageMeta.h"
2-
#import "NSObject+SafeExpectations.h"
2+
#import <NSObject-SafeExpectations/NSObject+SafeExpectations.h>
33

44
static NSString *const MetaKeyAlign = @"align";
55
static NSString *const MetaKeyAlt = @"alt";

Example/Podfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ use_frameworks!
55

66
target 'EditorDemo' do
77
pod 'WordPress-iOS-Editor', :path => '../'
8-
pod 'CocoaLumberjack', '~>2.0.0', :inhibit_warnings => true
8+
pod 'CocoaLumberjack', '~>2.2.0', :inhibit_warnings => true
99
pod 'WordPress-iOS-Shared', '~>0.5.0', :inhibit_warnings => true
1010
pod 'WordPressCom-Analytics-iOS', '~>0.1.0', :inhibit_warnings => true
1111
end
1212

1313
target 'EditorDemoTests' do
1414
# pod 'Expecta'
15-
pod 'CocoaLumberjack', '~>2.0.0', :inhibit_warnings => true
15+
pod 'CocoaLumberjack', '~>2.2.0', :inhibit_warnings => true
1616
end
1717

Example/Podfile.lock

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,41 +20,41 @@ PODS:
2020
- AFNetworking/UIKit (2.6.3):
2121
- AFNetworking/NSURLConnection
2222
- AFNetworking/NSURLSession
23-
- CocoaLumberjack (2.0.0):
24-
- CocoaLumberjack/Default (= 2.0.0)
25-
- CocoaLumberjack/Extensions (= 2.0.0)
26-
- CocoaLumberjack/Core (2.0.0)
27-
- CocoaLumberjack/Default (2.0.0):
23+
- CocoaLumberjack (2.2.0):
24+
- CocoaLumberjack/Default (= 2.2.0)
25+
- CocoaLumberjack/Extensions (= 2.2.0)
26+
- CocoaLumberjack/Core (2.2.0)
27+
- CocoaLumberjack/Default (2.2.0):
2828
- CocoaLumberjack/Core
29-
- CocoaLumberjack/Extensions (2.0.0):
29+
- CocoaLumberjack/Extensions (2.2.0):
3030
- CocoaLumberjack/Default
3131
- NSObject-SafeExpectations (0.0.2)
3232
- WordPress-iOS-Editor (1.1):
33-
- CocoaLumberjack (= 2.0.0)
33+
- CocoaLumberjack (~> 2.2.0)
3434
- NSObject-SafeExpectations (~> 0.0.2)
3535
- WordPress-iOS-Shared (~> 0.5.0)
3636
- WordPressCom-Analytics-iOS (~> 0.1.0)
37-
- WordPress-iOS-Shared (0.5.0):
37+
- WordPress-iOS-Shared (0.5.1):
3838
- AFNetworking (~> 2.5)
39-
- CocoaLumberjack (= 2.0.0)
39+
- CocoaLumberjack (~> 2.2.0)
4040
- WordPressCom-Analytics-iOS (0.1.0)
4141

4242
DEPENDENCIES:
43-
- CocoaLumberjack (~> 2.0.0)
43+
- CocoaLumberjack (~> 2.2.0)
4444
- WordPress-iOS-Editor (from `../`)
4545
- WordPress-iOS-Shared (~> 0.5.0)
4646
- WordPressCom-Analytics-iOS (~> 0.1.0)
4747

4848
EXTERNAL SOURCES:
4949
WordPress-iOS-Editor:
50-
:path: "../"
50+
:path: ../
5151

5252
SPEC CHECKSUMS:
5353
AFNetworking: cb8d14a848e831097108418f5d49217339d4eb60
54-
CocoaLumberjack: a6f77d987d65dc7ba86b0f84db7d0b9084f77bcb
54+
CocoaLumberjack: 17fe8581f84914d5d7e6360f7c70022b173c3ae0
5555
NSObject-SafeExpectations: 7d7f48df90df4e11da7cfe86b64f45eff7a7f521
56-
WordPress-iOS-Editor: 71a7112d49e5d2ad817914bc72e50928901dd21f
57-
WordPress-iOS-Shared: 5480e7b5c9c55158ea22c89ff44fca5597852224
56+
WordPress-iOS-Editor: 56cf09ada5b5f7637b232199b34aa642b0adebc8
57+
WordPress-iOS-Shared: ced218039d88c91572f3205882832f7a05c61f97
5858
WordPressCom-Analytics-iOS: 355b8c6cf1d50d64ca7667e6f9e94c989e466775
5959

6060
COCOAPODS: 0.39.0

Example/Pods/CocoaLumberjack/Classes/CocoaLumberjack.swift

Lines changed: 33 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/CocoaLumberjack/Classes/DDASLLogCapture.h

Lines changed: 17 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/CocoaLumberjack/Classes/DDASLLogCapture.m

Lines changed: 26 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/CocoaLumberjack/Classes/DDASLLogger.h

100755100644
Lines changed: 12 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/CocoaLumberjack/Classes/DDASLLogger.m

Lines changed: 6 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)