diff --git a/RestKit.podspec b/RestKit.podspec index c3f89761..73d079b4 100644 --- a/RestKit.podspec +++ b/RestKit.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'RestKit' - s.version = '0.20.0' + s.version = '0.20.1dev' s.summary = 'RestKit is a framework for consuming and modeling RESTful web resources on iOS and OS X.' s.homepage = 'http://www.restkit.org' s.author = { 'Blake Watters' => 'blakewatters@gmail.com' } @@ -44,7 +44,7 @@ EOS ns.ios.frameworks = 'CFNetwork', 'Security', 'MobileCoreServices', 'SystemConfiguration' ns.osx.frameworks = 'CoreServices', 'Security', 'SystemConfiguration' ns.dependency 'SOCKit' - ns.dependency 'AFNetworking', '1.1.0' + ns.dependency 'AFNetworking', '1.2.0' ns.dependency 'RestKit/ObjectMapping' ns.dependency 'RestKit/Support' end diff --git a/Tests/Logic/Support/RKURLEncodedSerializationTest.m b/Tests/Logic/Support/RKURLEncodedSerializationTest.m index 796f672f..4cfee620 100644 --- a/Tests/Logic/Support/RKURLEncodedSerializationTest.m +++ b/Tests/Logic/Support/RKURLEncodedSerializationTest.m @@ -31,7 +31,7 @@ { NSString *unicode = [NSString stringWithFormat:@"%CNo ser ni%Co, ser b%Cfalo%C%C", (unichar)0x00A1, (unichar)0x00F1, (unichar)0x00FA, (unichar)0x2026, (unichar)0x0021]; NSDictionary *dictionary = [NSDictionary dictionaryWithObject:unicode forKey:@"utf8"]; - NSString *validUnicode = @"utf8=%C2%A1No%20ser%20ni%C3%B1o,%20ser%20b%C3%BAfalo%E2%80%A6%21"; + NSString *validUnicode = @"utf8=%C2%A1No%20ser%20ni%C3%B1o%2C%20ser%20b%C3%BAfalo%E2%80%A6%21"; NSString *encodedString = RKURLEncodedStringFromDictionaryWithEncoding(dictionary, NSUTF8StringEncoding); expect(encodedString).to.equal(validUnicode); } diff --git a/Vendor/AFNetworking b/Vendor/AFNetworking index 121ef7af..feb55db8 160000 --- a/Vendor/AFNetworking +++ b/Vendor/AFNetworking @@ -1 +1 @@ -Subproject commit 121ef7afa8ce1b1cefdc5312f7e9d75f5af65b8d +Subproject commit feb55db8599b43a65adffcf8013bd15a7aca7ecd