Merge branch 'release/1.0.0'

Author: bbriatte

Cartfile

@@ -0,0 +1,2 @@
+github 'Digipolitan/DependencyInjector' ~> 2.0
+github 'Hearst-DD/ObjectMapper' ~> 2.0

DependencyInjectorObjectMapper.xcodeproj/project.pbxproj

@@ -1356,7 +1356,7 @@
 				INFOPLIST_FILE = Sources/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				PRODUCT_BUNDLE_IDENTIFIER = com.digipolitan.dependencyinjector.objectmapper;
 				PRODUCT_NAME = DependencyInjectorObjectMapper;
 				SDKROOT = macosx;
@@ -1381,7 +1381,7 @@
 				INFOPLIST_FILE = Sources/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				PRODUCT_BUNDLE_IDENTIFIER = com.digipolitan.dependencyinjector.objectmapper;
 				PRODUCT_NAME = DependencyInjectorObjectMapper;
 				SDKROOT = macosx;

Package.swift

@@ -1,7 +1,13 @@
 import PackageDescription
 
 let package = Package(
-    name: "DependencyInjectorObjectMapper",
-    dependencies: [
-    ]
+  name: "DependencyInjectorObjectMapper",
+  dependencies: [
+    .Package(url: "https://github.com/Digipolitan/dependency-injector-swift.git", versions: Version(2, 0, 0)..<Version(3, 0, 0)),
+    .Package(url: "https://github.com/Hearst-DD/ObjectMapper.git", versions: Version(2, 0, 0)..<Version(3, 0, 0))
+  ],
+  exclude: [
+    "Tests",
+    "Samples"
+  ]
 )

README.md

@@ -57,7 +57,7 @@ class UserModel: User, Mappable {
     public convenience required init?(map: Map) {
         guard
             let id: String = try? map.value("id"),
-            let address: Address = try? map.injectedValue("address") else {
+            let address: Address = try? map.injectedValue("address", type: Address.self) else {
                 return nil
         }
         self.init(id: id, address: address)
@@ -66,7 +66,7 @@ class UserModel: User, Mappable {
     public func mapping(map: Map) {
         self.id >>> map["id"]
         self.created <- map["createdAt"]
-        self.address >>> map.inject("address")
+        self.address >>> map.inject("address", type: Address.self)
     }
 }