Skip to content

Commit

Permalink
You should use: pod 'EVReflection/Alamofire'
Browse files Browse the repository at this point in the history
  • Loading branch information
evermeer committed Mar 1, 2017
1 parent 8c6b5e4 commit daf5885
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 13 deletions.
2 changes: 1 addition & 1 deletion AlamofireJsonToObjects.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Pod::Spec.new do |s|
#

s.name = "AlamofireJsonToObjects"
s.version = "2.4.0"
s.version = "2.4.1"
s.summary = "An Alamofire extension which converts JSON response data into swift objects using EVReflection"
s.description = "An Alamofire extension which converts JSON response data into swift objects using EVReflection. "
s.homepage = "https://github.com/evermeer/AlamofireJsonToObjects"
Expand Down
4 changes: 2 additions & 2 deletions AlamofireJsonToObjects/AlamofireJsonToObjects.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ open class EVNetworkingObject: EVObject {
}
}

override open func propertyMapping() -> [(String?, String?)] {
return [("__response_statusCode", nil)]
override open func propertyMapping() -> [(keyInObject: String?, keyInResource: String?)] {
return [(keyInObject: "__response_statusCode", keyInResource: nil)]
}
}

Expand Down
6 changes: 3 additions & 3 deletions AlamofireJsonToObjectsTests/NestedGenericsIssue25.swift
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ class ResponseModel<T: BaseModel>: EVObject, EVGenericsKVC {
}

internal func getGenericType() -> NSObject {
return T() as NSObject
return T() as! NSObject
}
}


class PagerModel<T: BaseModel>: BaseModel, EVGenericsKVC {
required init() {
required override init() {
super.init()
}

Expand All @@ -58,7 +58,7 @@ class PagerModel<T: BaseModel>: BaseModel, EVGenericsKVC {
}

internal func getGenericType() -> NSObject {
return T() as NSObject
return T() as! NSObject
}
}

Expand Down
16 changes: 9 additions & 7 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
PODS:
- Alamofire (4.2.0)
- EVReflection (3.6.0)
- Alamofire (4.4.0)
- EVReflection (4.4.1):
- EVReflection/Core (= 4.4.1)
- EVReflection/Core (4.4.1)

DEPENDENCIES:
- Alamofire (from `https://github.com/Alamofire/Alamofire.git`)
Expand All @@ -14,16 +16,16 @@ EXTERNAL SOURCES:

CHECKOUT OPTIONS:
Alamofire:
:commit: 779930c399307caa3d1afb01fd628754e323ea34
:commit: b03b43cc381ec02eb9855085427186ef89055eef
:git: https://github.com/Alamofire/Alamofire.git
EVReflection:
:commit: 1f060480b76683d63e5df9191bfebc4eeea2cc7e
:commit: 4a228d9995625bc4fa719901519a502833f1a371
:git: https://github.com/evermeer/EVReflection.git

SPEC CHECKSUMS:
Alamofire: 26d8877ec03b4e6e6cbfbf7c03924b4844a2d453
EVReflection: 5593987d8d981fefc018617482dcba16df978bd6
Alamofire: 4c2bf7fa03c4a626163606de0a417568c270575e
EVReflection: c6afc215ed19c9d1cc204c0d970ead9657dd5937

PODFILE CHECKSUM: b23d0f295b1db58b718a1a6c6d39516f37f4e932

COCOAPODS: 1.2.0.beta.1
COCOAPODS: 1.2.0

0 comments on commit daf5885

Please sign in to comment.