Merge branch 'release/1.0.3'

Author: bbriatte

.swift-version

@@ -0,0 +1 @@
+4.0

.travis.yml

@@ -13,8 +13,6 @@ before_install:
   - gem install bundler
   - brew update
   - bundle install && brew bundle
-  - bundle exec pod repo update
-script:
-  - bundle exec fastlane run_tests
-after_success:
-  - bundle exec fastlane ci_framework_deploy
+install: bundle exec pod install --repo-update --silent
+script: bundle exec fastlane run_tests
+after_success: bundle exec fastlane ci_framework_deploy

CHANGELOG.md

@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
 
 ---
 
+## [1.0.3](https://github.com/Digipolitan/dependency-injector-object-mapper/releases/tag/v1.0.3)
+
+remove pod warning
+update readme
+fix spm4
+update package.swift
+update travis
+remove swiftlint warning
+
+---
+
 ## [1.0.2](https://github.com/Digipolitan/dependency-injector-object-mapper/releases/tag/v1.0.2)
 
 swift 4 support & ObjectMappper 3.0+ & DependencyInjector 2.1

Cartfile

@@ -1,2 +1,2 @@
-github 'Digipolitan/DependencyInjector' ~> 2.1
+github 'Digipolitan/dependency-injector' ~> 2.1
 github 'Hearst-DD/ObjectMapper' ~> 3.0

DependencyInjectorObjectMapper.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 s.name = "DependencyInjectorObjectMapper"
-s.version = "1.0.2"
+s.version = "1.0.3"
 s.summary = "Add Mappable support with dependency injection"
 s.homepage = "https://github.com/Digipolitan/dependency-injector-object-mapper"
 s.authors = "Digipolitan"

DependencyInjectorObjectMapper.xcodeproj/project.pbxproj

@@ -1,13 +1,29 @@
+// swift-tools-version:4.0
+
 import PackageDescription
 
 let package = Package(
-  name: "DependencyInjectorObjectMapper",
-  dependencies: [
-    .Package(url: "https://github.com/Digipolitan/dependency-injector.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"
-  ]
+    name: "DependencyInjectorObjectMapper",
+    products: [
+        .library(name: "DependencyInjectorObjectMapper", targets: ["DependencyInjectorObjectMapper"])
+    ],
+    dependencies: [
+        .package(url: "https://github.com/Digipolitan/dependency-injector.git", from: "2.0.0"),
+        .package(url: "https://github.com/Hearst-DD/ObjectMapper.git", from: "3.0.0")
+    ],
+    targets: [
+        .target(
+            name: "DependencyInjectorObjectMapper",
+            dependencies: [
+                "DependencyInjector",
+                "ObjectMapper"
+            ]
+        ),
+        .testTarget(
+            name: "DependencyInjectorObjectMapperTests",
+            dependencies: [
+                "DependencyInjectorObjectMapper"
+            ]
+        )
+    ]
 )

Package.swift

@@ -1,9 +1,11 @@
 DependencyInjector+ObjectMapper
 =================================
 
+[![Swift Version](https://img.shields.io/badge/swift-4.0-orange.svg?style=flat)](https://developer.apple.com/swift/)
 [![Build Status](https://travis-ci.org/Digipolitan/dependency-injector-object-mapper.svg?branch=master)](https://travis-ci.org/Digipolitan/dependency-injector-object-mapper)
 [![CocoaPods Compatible](https://img.shields.io/cocoapods/v/DependencyInjectorObjectMapper.svg)](https://img.shields.io/cocoapods/v/DependencyInjectorObjectMapper.svg)
-[![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
+[![Carthage Compatible](https://img.shields.io/badge/carthage-compatible-brightgreen.svg?style=flat)](https://github.com/Carthage/Carthage)
+[![Swift Package Manager Compatible](https://img.shields.io/badge/swift%20package%20manager-compatible-brightgreen.svg?style=flat)](https://swift.org/package-manager/)
 [![Platform](https://img.shields.io/cocoapods/p/DependencyInjectorObjectMapper.svg?style=flat)](http://cocoadocs.org/docsets/DependencyInjectorObjectMapper)
 [![Twitter](https://img.shields.io/badge/twitter-@Digipolitan-blue.svg?style=flat)](http://twitter.com/Digipolitan)
 
@@ -13,16 +15,47 @@ Dependency injector Swift compatible with ObjectMapper
 
 ### CocoaPods
 
-To install DependencyInjectorObjectMapper with CocoaPods, add the following lines to your `Podfile`.
+To install DependencyInjector+ObjectMapper with CocoaPods, add the following lines to your `Podfile`.
 
 ```ruby
 source 'https://github.com/CocoaPods/Specs.git'
-platform :ios, '8.0' # or platform :osx, '10.10' if your target is OS X.
+platform :ios, '9.0'
 use_frameworks!
 
 pod 'DependencyInjectorObjectMapper'
 ```
 
+### Carthage
+
+[Carthage](https://github.com/Carthage/Carthage) is a decentralized dependency manager that builds your dependencies and provides you with binary frameworks.
+
+You can install Carthage with [Homebrew](http://brew.sh/) using the following command:
+
+```bash
+$ brew update
+$ brew install carthage
+```
+
+To integrate DependencyInjector+ObjectMapper into your Xcode project using Carthage, specify it in your `Cartfile`:
+
+```
+github 'Digipolitan/dependency-injector-object-mapper' ~> 1.0
+```
+
+Run `carthage update` to build the framework and drag the built `DependencyInjectorObjectMapper.framework` into your Xcode project.
+
+### Swift Package Manager
+
+The [Swift Package Manager](https://swift.org/package-manager/) is a tool for automating the distribution of Swift code and is integrated into the `swift` compiler.
+
+Once you have your Swift package set up, adding DependencyInjector+ObjectMapper as a dependency is as easy as adding it to the `dependencies` value of your `Package.swift`.
+
+```swift
+dependencies: [
+    .package(url: "https://github.com/Digipolitan/dependency-injector-object-mapper.git", from: "1.0.0")
+]
+```
+
 ## How to use ?
 
 First you must create your models conforms to BaseMappable protocol

README.md

@@ -14,11 +14,6 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
     @IBOutlet weak var window: NSWindow!
 
-    func applicationDidFinishLaunching(_ aNotification: Notification) {
-        let t = TemplateClass()
-        print(t)
-    }
-
     func applicationWillTerminate(_ aNotification: Notification) {
         // Insert code here to tear down your application
     }

Samples/DependencyInjectorObjectMapperSample-OSX/DependencyInjectorObjectMapperSample-OSX/AppDelegate.swift

@@ -11,9 +11,4 @@ import DependencyInjectorObjectMapper
 
 class ViewController: UIViewController {
 
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        let t = TemplateClass()
-        print(t)
-    }
 }