- some warning fixes

Author: tristanhimmelman

Sources/ImmutableMappable.swift

@@ -214,7 +214,7 @@ public extension Mapper where N: ImmutableMappable {
 	// MARK: Array mapping functions
 
 	public func mapArray(JSONArray: [[String: Any]]) throws -> [N] {
-		return try JSONArray.flatMap(mapOrFail)
+		return try JSONArray.compactMap(mapOrFail)
 	}
 
 	public func mapArray(JSONString: String) throws -> [N] {

Sources/Map.swift

@@ -131,7 +131,7 @@ public final class Map {
 			}
 		} else if value == nil && T.self == [Float].self {
 			if let v = currentValue as? [Double] {
-				return v.flatMap{ Float($0) } as? T
+				return v.compactMap{ Float($0) } as? T
 			}
 		} else if value == nil && T.self == [String:Float].self {
 			if let v = currentValue as? [String:Double] {

Sources/Mapper.swift

@@ -427,7 +427,7 @@ extension Mapper where N: Hashable {
 	/// Maps an Set of JSON dictionary to an array of Mappable objects
 	public func mapSet(JSONArray: [[String: Any]]) -> Set<N> {
 		// map every element in JSON array to type N
-		return Set(JSONArray.flatMap(map))
+		return Set(JSONArray.compactMap(map))
 	}
 
 	///Maps a Set of Objects to a Set of JSON dictionaries [[String : Any]]

Sources/TransformOperators.swift

@@ -458,7 +458,7 @@ public func <- <Transform: TransformType>(left: inout [[Transform.Object]], righ
 		left >>> right
 	case .fromJSON where map.isKeyPresent:
 		guard let original2DArray = map.currentValue as? [[Any]] else { break }
-		let transformed2DArray = original2DArray.flatMap { values in
+		let transformed2DArray = original2DArray.compactMap { values in
 			fromJSONArrayWithTransform(values as Any?, transform: transform)
 		}
 		FromJSON.basicType(&left, object: transformed2DArray)
@@ -470,7 +470,7 @@ public func <- <Transform: TransformType>(left: inout [[Transform.Object]], righ
 public func >>> <Transform: TransformType>(left: [[Transform.Object]], right: (Map, Transform)) {
 	let (map, transform) = right
 	if map.mappingType == .toJSON{
-		let transformed2DArray = left.flatMap { values in
+		let transformed2DArray = left.compactMap { values in
 			toJSONArrayWithTransform(values, transform: transform)
 		}
 		ToJSON.basicType(transformed2DArray, map: map)
@@ -485,7 +485,7 @@ public func <- <Transform: TransformType>(left: inout [[Transform.Object]]?, rig
 		left >>> right
 	case .fromJSON where map.isKeyPresent:
 		guard let original2DArray = map.currentValue as? [[Any]] else { break }
-		let transformed2DArray = original2DArray.flatMap { values in
+		let transformed2DArray = original2DArray.compactMap { values in
 			fromJSONArrayWithTransform(values as Any?, transform: transform)
 		}
 		FromJSON.optionalBasicType(&left, object: transformed2DArray)
@@ -497,7 +497,7 @@ public func <- <Transform: TransformType>(left: inout [[Transform.Object]]?, rig
 public func >>> <Transform: TransformType>(left: [[Transform.Object]]?, right: (Map, Transform)) {
 	let (map, transform) = right
 	if map.mappingType == .toJSON {
-		let transformed2DArray = left?.flatMap { values in
+		let transformed2DArray = left?.compactMap { values in
 			toJSONArrayWithTransform(values, transform: transform)
 		}
 		ToJSON.optionalBasicType(transformed2DArray, map: map)
@@ -513,7 +513,7 @@ public func <- <Transform: TransformType>(left: inout [[Transform.Object]]!, rig
 		left >>> right
 	case .fromJSON where map.isKeyPresent:
 		guard let original2DArray = map.currentValue as? [[Any]] else { break }
-		let transformed2DArray = original2DArray.flatMap { values in
+		let transformed2DArray = original2DArray.compactMap { values in
 			fromJSONArrayWithTransform(values as Any?, transform: transform)
 		}
 		FromJSON.optionalBasicType(&left, object: transformed2DArray)

Tests/ObjectMapperTests/BasicTypesTestsToJSON.swift

@@ -54,8 +54,8 @@ class BasicTypesTestsToJSON: XCTestCase {
 
 		//TODO This test could be improved
 		XCTAssertNotNil(JSONWithNil)
-		XCTAssertTrue((JSONWithNil!.characters.count) > 5)
-		XCTAssertTrue((JSONWithNil!.characters.count) != (JSONWithoutNil!.characters.count))
+		XCTAssertTrue((JSONWithNil!.count) > 5)
+		XCTAssertTrue((JSONWithNil!.count) != (JSONWithoutNil!.count))
 	}
 
 	func testMappingBoolToJSON(){