diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..09dfede --- /dev/null +++ b/.gitignore @@ -0,0 +1,63 @@ +# Xcode +# +# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore + +## Build generated +build/ +DerivedData/ + +## Various settings +*.pbxuser +!default.pbxuser +*.mode1v3 +!default.mode1v3 +*.mode2v3 +!default.mode2v3 +*.perspectivev3 +!default.perspectivev3 +xcuserdata/ + +## Other +*.moved-aside +*.xccheckout +*.xcscmblueprint + +## Obj-C/Swift specific +*.hmap +*.ipa +*.dSYM.zip +*.dSYM + +# CocoaPods +# +# We recommend against adding the Pods directory to your .gitignore. However +# you should judge for yourself, the pros and cons are mentioned at: +# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control +# +# Pods/ + +# Carthage +# +# Add this line if you want to avoid checking in source code from Carthage dependencies. +# Carthage/Checkouts + +Carthage/Build + +# fastlane +# +# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the +# screenshots whenever they are needed. +# For more information about the recommended setup visit: +# https://docs.fastlane.tools/best-practices/source-control/#source-control + +fastlane/report.xml +fastlane/Preview.html +fastlane/screenshots +fastlane/test_output + +# Code Injection +# +# After new code Injection tools there's a generated folder /iOSInjectionProject +# https://github.com/johnno1962/injectionforxcode + +iOSInjectionProject/ diff --git a/AFJSONRPCClient.podspec b/AFJSONRPCClient.podspec index 36d3d3a..9f2908b 100644 --- a/AFJSONRPCClient.podspec +++ b/AFJSONRPCClient.podspec @@ -1,17 +1,17 @@ Pod::Spec.new do |s| s.name = 'AFJSONRPCClient' - s.version = '2.1.1' + s.version = '2.1.2' s.homepage = 'https://github.com/AFNetworking/AFJSONRPCClient' s.social_media_url = "https://twitter.com/AFNetworking" s.authors = { 'wiistriker' => 'wiistriker@gmail.com', 'Mattt Thompson' => 'm@mattt.me' } s.license = 'MIT' s.summary = 'A JSON-RPC client build on AFNetworking.' - s.source = { :git => 'https://github.com/AFNetworking/AFJSONRPCClient.git', - :tag => '2.1.1' } + s.source = { :git => 'https://github.com/zarochintsev/AFJSONRPCClient.git', + :tag => '2.1.2' } s.source_files = 'AFJSONRPCClient' s.requires_arc = true - s.ios.deployment_target = '6.0' + s.ios.deployment_target = '8.0' s.osx.deployment_target = '10.8' s.dependency 'AFNetworking', '~> 2.1' diff --git a/AFJSONRPCClient/AFJSONRPCClient.m b/AFJSONRPCClient/AFJSONRPCClient.m index 1c98687..d8788dd 100755 --- a/AFJSONRPCClient/AFJSONRPCClient.m +++ b/AFJSONRPCClient/AFJSONRPCClient.m @@ -73,7 +73,7 @@ - (id)initWithEndpointURL:(NSURL *)URL { self.requestSerializer = [AFJSONRequestSerializer serializer]; [self.requestSerializer setValue:@"application/json" forHTTPHeaderField:@"Accept"]; - self.responseSerializer.acceptableContentTypes = [NSSet setWithObjects:@"application/json", @"application/json-rpc", @"application/jsonrequest", nil]; + self.responseSerializer.acceptableContentTypes = [NSSet setWithObjects:@"application/json", @"application/json-rpc", @"application/jsonrequest", @"text/html", nil]; self.endpointURL = URL;