Skip to content

Commit 6a5d2d1

Browse files
author
Blake Watters
committed
Update to modernized dependencies
1 parent cdb8146 commit 6a5d2d1

File tree

8 files changed

+36
-38
lines changed

8 files changed

+36
-38
lines changed

Code/ObjectMapping/RKObjectMapping.m

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,12 @@ + (RKObjectMapping *)requestMapping
135135

136136
+ (void)initialize
137137
{
138-
// Add an ISO8601DateFormatter to the transformation stack for backwards compatibility
139-
RKISO8601DateFormatter *dateFormatter = [RKISO8601DateFormatter defaultISO8601DateFormatter];
140-
[[RKValueTransformer defaultValueTransformer] insertValueTransformer:dateFormatter atIndex:0];
138+
static dispatch_once_t onceToken;
139+
dispatch_once(&onceToken, ^{
140+
// Add an ISO8601DateFormatter to the transformation stack for backwards compatibility
141+
RKISO8601DateFormatter *dateFormatter = [RKISO8601DateFormatter defaultISO8601DateFormatter];
142+
[[RKValueTransformer defaultValueTransformer] insertValueTransformer:dateFormatter atIndex:0];
143+
});
141144
}
142145

143146
- (id)initWithClass:(Class)objectClass

Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def import_pods
1111
pod 'Expecta', '0.2.3'
1212

1313
# Used for testing Value Transformer integration
14-
pod 'RKCLLocationValueTransformer', '~> 1.0.0'
14+
pod 'RKCLLocationValueTransformer', '~> 1.1.0'
1515
end
1616

1717
target :ios do

Podfile.lock

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
PODS:
22
- AFNetworking (1.3.4)
33
- Expecta (0.2.3)
4-
- ISO8601DateFormatterValueTransformer (0.5.0):
5-
- RKValueTransformers (~> 1.0.0)
4+
- ISO8601DateFormatterValueTransformer (0.6.0):
5+
- RKValueTransformers (~> 1.1.0)
66
- OCHamcrest (3.0.1)
77
- OCMock (2.2.1)
88
- RestKit (0.22.0):
@@ -18,20 +18,20 @@ PODS:
1818
- RestKit/Support
1919
- SOCKit
2020
- RestKit/ObjectMapping (0.22.0):
21-
- ISO8601DateFormatterValueTransformer (~> 0.5.0)
21+
- ISO8601DateFormatterValueTransformer (~> 0.6.0)
2222
- RestKit/Support
23-
- RKValueTransformers (~> 1.0.1)
23+
- RKValueTransformers (~> 1.1.0)
2424
- RestKit/Search (0.22.0):
2525
- RestKit/CoreData
2626
- RestKit/Support (0.22.0):
27-
- TransitionKit (= 2.0.0)
27+
- TransitionKit (= 2.1.0)
2828
- RestKit/Testing (0.22.0)
29-
- RKCLLocationValueTransformer (1.0.0):
30-
- RKValueTransformers (~> 1.0.0)
31-
- RKValueTransformers (1.0.1)
29+
- RKCLLocationValueTransformer (1.1.0):
30+
- RKValueTransformers (~> 1.1.0)
31+
- RKValueTransformers (1.1.0)
3232
- SOCKit (1.1)
3333
- Specta (0.2.1)
34-
- TransitionKit (2.0.0)
34+
- TransitionKit (2.1.0)
3535

3636
DEPENDENCIES:
3737
- Expecta (= 0.2.3)
@@ -40,7 +40,7 @@ DEPENDENCIES:
4040
- RestKit (from `.`)
4141
- RestKit/Search (from `.`)
4242
- RestKit/Testing (from `.`)
43-
- RKCLLocationValueTransformer (~> 1.0.0)
43+
- RKCLLocationValueTransformer (~> 1.1.0)
4444
- Specta (= 0.2.1)
4545

4646
EXTERNAL SOURCES:
@@ -50,14 +50,14 @@ EXTERNAL SOURCES:
5050
SPEC CHECKSUMS:
5151
AFNetworking: e403d4333a4e1956cb3fe42364c3c879f820c9a0
5252
Expecta: 2434bb2e2b3b1814280ec5d9a11359433d035975
53-
ISO8601DateFormatterValueTransformer: d0af1f50a9df42db72d7418db31938b8473e0af8
53+
ISO8601DateFormatterValueTransformer: db1acb188ffb0f87109a793977f750067c351efe
5454
OCHamcrest: 782c52ae8c673e5d6060a65005cfd26d20d519ba
5555
OCMock: 37ba3d58d9240692975521ea6daec75156f211cd
56-
RestKit: 8aedc01890f52f090ff30f60c709eab072dd14c3
57-
RKCLLocationValueTransformer: e4a127582a78df98035f75b611e48c0545b8884d
58-
RKValueTransformers: 1562d458b9c9d59ce777bfc5982f2e1aef2e9182
56+
RestKit: 39421da3c70da3bc13a891370b9967524271e1d1
57+
RKCLLocationValueTransformer: f5bf039494ae8757e7e6f6bc2aa9fe9ebdc487c7
58+
RKValueTransformers: 286c8280b6f2570032d87d119863f32bc227799b
5959
SOCKit: 8871d058926a6c6cc144f0c5eee82c5d0ec274a3
6060
Specta: 2d06220591110c6d9757d8be8ecf8e63aa40dc2a
61-
TransitionKit: 433284465abacdc07852d7db6dd0cc075010059a
61+
TransitionKit: 60b6a2cd9370e471c960b2cdf23b0b2593867625
6262

6363
COCOAPODS: 0.32.1

RestKit.podspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ EOS
3737
s.subspec 'ObjectMapping' do |os|
3838
os.source_files = 'Code/ObjectMapping.h', 'Code/ObjectMapping'
3939
os.dependency 'RestKit/Support'
40-
os.dependency 'RKValueTransformers', '~> 1.0.1'
41-
os.dependency 'ISO8601DateFormatterValueTransformer', '~> 0.5.0'
40+
os.dependency 'RKValueTransformers', '~> 1.1.0'
41+
os.dependency 'ISO8601DateFormatterValueTransformer', '~> 0.6.0'
4242
end
4343

4444
s.subspec 'Network' do |ns|
@@ -98,6 +98,6 @@ EOS
9898

9999
s.subspec 'Support' do |ss|
100100
ss.source_files = 'Code/RestKit.h', 'Code/Support.h', 'Code/Support', 'Vendor/LibComponentLogging/Core', 'Vendor/LibComponentLogging/NSLog'
101-
ss.dependency 'TransitionKit', '2.0.0'
101+
ss.dependency 'TransitionKit', '2.1.0'
102102
end
103103
end

RestKit.xcodeproj/project.pbxproj

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2075,7 +2075,8 @@
20752075
25160D0D14564E810060A5C5 /* Project object */ = {
20762076
isa = PBXProject;
20772077
attributes = {
2078-
LastUpgradeCheck = 0500;
2078+
LastTestingUpgradeCheck = 0510;
2079+
LastUpgradeCheck = 0510;
20792080
ORGANIZATIONNAME = RestKit;
20802081
};
20812082
buildConfigurationList = 25160D1014564E810060A5C5 /* Build configuration list for PBXProject "RestKit" */;
@@ -2596,7 +2597,6 @@
25962597
isa = XCBuildConfiguration;
25972598
buildSettings = {
25982599
ALWAYS_SEARCH_USER_PATHS = NO;
2599-
ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
26002600
CLANG_ENABLE_OBJC_ARC = YES;
26012601
CLANG_WARN_BOOL_CONVERSION = YES;
26022602
CLANG_WARN_CONSTANT_CONVERSION = YES;
@@ -2633,7 +2633,6 @@
26332633
isa = XCBuildConfiguration;
26342634
buildSettings = {
26352635
ALWAYS_SEARCH_USER_PATHS = NO;
2636-
ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
26372636
CLANG_ENABLE_OBJC_ARC = YES;
26382637
CLANG_WARN_BOOL_CONVERSION = YES;
26392638
CLANG_WARN_CONSTANT_CONVERSION = YES;
@@ -2749,7 +2748,6 @@
27492748
25160E88145651060060A5C5 /* Debug */ = {
27502749
isa = XCBuildConfiguration;
27512750
buildSettings = {
2752-
ARCHS = "$(ARCHS_STANDARD)";
27532751
CLANG_ENABLE_OBJC_ARC = YES;
27542752
COMBINE_HIDPI_IMAGES = YES;
27552753
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2778,7 +2776,6 @@
27782776
25160E89145651060060A5C5 /* Release */ = {
27792777
isa = XCBuildConfiguration;
27802778
buildSettings = {
2781-
ARCHS = "$(ARCHS_STANDARD)";
27822779
CLANG_ENABLE_OBJC_ARC = YES;
27832780
COMBINE_HIDPI_IMAGES = YES;
27842781
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -2808,7 +2805,6 @@
28082805
isa = XCBuildConfiguration;
28092806
baseConfigurationReference = ED192D1B86AB47D7927731B0 /* Pods-osx.xcconfig */;
28102807
buildSettings = {
2811-
ARCHS = "$(ARCHS_STANDARD)";
28122808
CLANG_ENABLE_OBJC_ARC = YES;
28132809
COMBINE_HIDPI_IMAGES = YES;
28142810
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
@@ -2829,7 +2825,6 @@
28292825
isa = XCBuildConfiguration;
28302826
baseConfigurationReference = ED192D1B86AB47D7927731B0 /* Pods-osx.xcconfig */;
28312827
buildSettings = {
2832-
ARCHS = "$(ARCHS_STANDARD)";
28332828
CLANG_ENABLE_OBJC_ARC = YES;
28342829
COMBINE_HIDPI_IMAGES = YES;
28352830
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";

RestKit.xcworkspace/xcshareddata/xcschemes/Build All Examples.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0500"
3+
LastUpgradeVersion = "0510"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Tests/Logic/ObjectMapping/RKObjectMappingNextGenTest.m

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2432,7 +2432,7 @@ - (void)testShouldFailWithAnErrorIfATargetObjectIsProvidedAndTheDynamicMappingRe
24322432
- (void)testShouldAutoConfigureDefaultDateFormatters
24332433
{
24342434
NSArray *dateFormatters = [RKObjectMapping defaultDateFormatters];
2435-
expect(dateFormatters).to.haveCountOf(3);
2435+
expect(dateFormatters).to.haveCountOf(6);
24362436
expect([dateFormatters[2] dateFormat]).to.equal(@"yyyy-MM-dd");
24372437
expect([dateFormatters[1] dateFormat]).to.equal(@"MM/dd/yyyy");
24382438

@@ -2451,10 +2451,10 @@ - (void)testShouldLetYouSetTheDefaultDateFormatters
24512451

24522452
- (void)testShouldLetYouAppendADateFormatterToTheList
24532453
{
2454-
assertThat([RKObjectMapping defaultDateFormatters], hasCountOf(3));
2454+
assertThat([RKObjectMapping defaultDateFormatters], hasCountOf(6));
24552455
NSDateFormatter *dateFormatter = [NSDateFormatter new];
24562456
[RKObjectMapping addDefaultDateFormatter:dateFormatter];
2457-
assertThat([RKObjectMapping defaultDateFormatters], hasCountOf(4));
2457+
assertThat([RKObjectMapping defaultDateFormatters], hasCountOf(7));
24582458
}
24592459

24602460
- (void)testShouldAllowNewlyAddedDateFormatterToRunFirst
@@ -2488,10 +2488,10 @@ - (void)testShouldAllowNewlyAddedDateFormatterToRunFirst
24882488

24892489
- (void)testShouldLetYouConfigureANewDateFormatterFromAStringAndATimeZone
24902490
{
2491-
assertThat([RKObjectMapping defaultDateFormatters], hasCountOf(3));
2491+
assertThat([RKObjectMapping defaultDateFormatters], hasCountOf(6));
24922492
NSTimeZone *EDTTimeZone = [NSTimeZone timeZoneWithAbbreviation:@"EDT"];
24932493
[RKObjectMapping addDefaultDateFormatterForString:@"mm/dd/YYYY" inTimeZone:EDTTimeZone];
2494-
assertThat([RKObjectMapping defaultDateFormatters], hasCountOf(4));
2494+
assertThat([RKObjectMapping defaultDateFormatters], hasCountOf(7));
24952495
NSDateFormatter *dateFormatter = [[RKObjectMapping defaultDateFormatters] objectAtIndex:0];
24962496
assertThat(dateFormatter.timeZone, is(equalTo(EDTTimeZone)));
24972497
}
@@ -2517,9 +2517,9 @@ - (void)testShouldReturnNilForEmptyDateValues
25172517

25182518
- (void)testShouldConfigureANewDateFormatterInTheUTCTimeZoneIfPassedANilTimeZone
25192519
{
2520-
assertThat([RKObjectMapping defaultDateFormatters], hasCountOf(3));
2520+
assertThat([RKObjectMapping defaultDateFormatters], hasCountOf(6));
25212521
[RKObjectMapping addDefaultDateFormatterForString:@"mm/dd/YYYY" inTimeZone:nil];
2522-
assertThat([RKObjectMapping defaultDateFormatters], hasCountOf(4));
2522+
assertThat([RKObjectMapping defaultDateFormatters], hasCountOf(7));
25232523
NSDateFormatter *dateFormatter = [[RKObjectMapping defaultDateFormatters] objectAtIndex:0];
25242524
NSTimeZone *UTCTimeZone = [NSTimeZone timeZoneWithAbbreviation:@"UTC"];
25252525
assertThat(dateFormatter.timeZone, is(equalTo(UTCTimeZone)));

0 commit comments

Comments
 (0)