- fixes to supported the latest version of ObjectMapper swift-2.0 branch

tristanhimmelman · Sep 1, 2015 · 2fb69bf · 2fb69bf
1 parent 7a1ee1f
commit 2fb69bf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/AlamofireObjectMapperTests/AlamofireObjectMapperTests.swift b/AlamofireObjectMapperTests/AlamofireObjectMapperTests.swift
@@ -123,8 +123,8 @@ class WeatherResponse: Mappable {
 	var location: String?
 	var threeDayForecast: [Forecast]?
 
-	class func newInstance(map: Map) -> Mappable? {
-		return WeatherResponse()
+	required init?(_ map: Map){
+
 	}
 
 	func mapping(map: Map) {
@@ -138,8 +138,8 @@ class Forecast: Mappable {
 	var temperature: Int?
 	var conditions: String?
 
-	class func newInstance(map: Map) -> Mappable? {
-		return Forecast()
+	required init?(_ map: Map){
+
 	}
 
 	func mapping(map: Map) { 

diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,2 +1,2 @@
-github "Alamofire/Alamofire" "0fd77fec2a33e237ab99069c36410eb7101126c6"
-github "Hearst-DD/ObjectMapper" "313328bfbcc27476fdb44cea9bad6eaa38008455"
+github "Alamofire/Alamofire" "1bc35abfa7c167ba54af4e87158af7945cc9984e"
+github "Hearst-DD/ObjectMapper" "a666f2913afd0320fc7f631a3a54098d3b378a8e"