Merge branch 'release/1.0.2'

Digipolitan · Oct 2, 2017 · a42304a · a42304a
2 parents 672417e + 2c05b41
commit a42304a
Show file tree

Hide file tree

Showing 19 changed files with 121 additions and 65 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
-osx_image: xcode8.3
+osx_image: xcode9
 language: objective-c
 cache:
   - bundler

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,13 @@
 # Change Log
 
 All notable changes to this project will be documented in this file.
-`dependency-injector-object-mapper-swift` adheres to [Semantic Versioning](http://semver.org/).
+`dependency-injector-object-mapper` adheres to [Semantic Versioning](http://semver.org/).
+
+---
+
+## [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
 
 ---
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,4 +1,4 @@
-# Contributing to dependency-injector-object-mapper-swift
+# Contributing to dependency-injector-object-mapper
 
 First off, thanks for taking the time to contribute! :tada::+1:
 
@@ -43,19 +43,19 @@ Explain the problem and include additional details to help maintainers reproduce
 * **Describe the behavior you observed after following the steps** and point out what exactly is the problem with that behavior.
 * **Explain which behavior you expected to see instead and why.**
 * **Include screenshots and animated GIFs** which show you following the described steps and clearly demonstrate the problem.
-* **If you're reporting that dependency-injector-object-mapper-swift crashed**, include a crash report with a stack trace from the operating system. On iOS, the crash report is available in Xcode, on macOS, the crash report will be available in `Console.app` under "Diagnostic and usage information" > "User diagnostic reports". Include the crash report in the issue in a [code block](https://help.github.com/articles/markdown-basics/#multiple-lines), a [file attachment](https://help.github.com/articles/file-attachments-on-issues-and-pull-requests/), or put it in a [gist](https://gist.github.com/) and provide link to that gist.
+* **If you're reporting that dependency-injector-object-mapper crashed**, include a crash report with a stack trace from the operating system. On iOS, the crash report is available in Xcode, on macOS, the crash report will be available in `Console.app` under "Diagnostic and usage information" > "User diagnostic reports". Include the crash report in the issue in a [code block](https://help.github.com/articles/markdown-basics/#multiple-lines), a [file attachment](https://help.github.com/articles/file-attachments-on-issues-and-pull-requests/), or put it in a [gist](https://gist.github.com/) and provide link to that gist.
 * **If the problem is related to performance**, include a CPU profile capture and a screenshot with your report.
 * **If the problem wasn't triggered by a specific action**, describe what you were doing before the problem happened and share more information using the guidelines below.
 
 Provide more context by answering these questions:
 
-* **Did the problem start happening recently** (e.g. after updating to a new version of dependency-injector-object-mapper-swift) or was this always a problem?
-* If the problem started happening recently, **can you reproduce the problem in an older version of dependency-injector-object-mapper-swift ?** What's the most recent version in which the problem doesn't happen? You can download older versions of dependency-injector-object-mapper-swift from [the releases page](https://github.com/digipolitan/dependency-injector-object-mapper-swift/releases).
+* **Did the problem start happening recently** (e.g. after updating to a new version of dependency-injector-object-mapper) or was this always a problem?
+* If the problem started happening recently, **can you reproduce the problem in an older version of dependency-injector-object-mapper ?** What's the most recent version in which the problem doesn't happen? You can download older versions of dependency-injector-object-mapper from [the releases page](https://github.com/digipolitan/dependency-injector-object-mapper/releases).
 * **Can you reliably reproduce the issue?** If not, provide details about how often the problem happens and under which conditions it normally happens.
 
 Include details about your configuration and environment:
 
-* **Which version of dependency-injector-object-mapper-swift are you using?
+* **Which version of dependency-injector-object-mapper are you using?
 * **What's the name and version of the macOS or iOS you're using**?
 
 #### Template For Submitting Bug Reports
@@ -80,7 +80,7 @@ Include details about your configuration and environment:
 
     ![Screenshots and GIFs which follow reproduction steps to demonstrate the problem](url)
 
-    **dependency-injector-object-mapper-swift version:** [Enter dependency-injector-object-mapper-swift version here]
+    **dependency-injector-object-mapper version:** [Enter dependency-injector-object-mapper version here]
     **OS and version:** [Enter macOS / iOS / linux name and version here]
 
     **Installed packages:**
@@ -89,6 +89,6 @@ Include details about your configuration and environment:
 
     **Additional information:**
 
-    * Problem started happening recently, didn't happen in an older version of dependency-injector-object-mapper-swift: [Yes/No]
+    * Problem started happening recently, didn't happen in an older version of dependency-injector-object-mapper: [Yes/No]
     * Problem can be reliably reproduced, doesn't happen randomly: [Yes/No]
     * Problem happens with all files and projects, not only some files or projects: [Yes/No]
diff --git a/Cartfile b/Cartfile
@@ -1,2 +1,2 @@
-github 'Digipolitan/DependencyInjector' ~> 2.0
-github 'Hearst-DD/ObjectMapper' ~> 2.0
+github 'Digipolitan/DependencyInjector' ~> 2.1
+github 'Hearst-DD/ObjectMapper' ~> 3.0
diff --git a/DependencyInjectorObjectMapper.podspec b/DependencyInjectorObjectMapper.podspec
@@ -1,17 +1,17 @@
 Pod::Spec.new do |s|
 s.name = "DependencyInjectorObjectMapper"
-s.version = "1.0.1"
+s.version = "1.0.2"
 s.summary = "Add Mappable support with dependency injection"
-s.homepage = "https://github.com/Digipolitan/dependency-injector-object-mapper-swift"
+s.homepage = "https://github.com/Digipolitan/dependency-injector-object-mapper"
 s.authors = "Digipolitan"
-s.source = { :git => "https://github.com/Digipolitan/dependency-injector-object-mapper-swift.git", :tag => "v#{s.version}" }
+s.source = { :git => "https://github.com/Digipolitan/dependency-injector-object-mapper.git", :tag => "v#{s.version}" }
 s.license = { :type => "BSD", :file => "LICENSE" }
 s.source_files = 'Sources/**/*.{swift,h}'
 s.ios.deployment_target = '8.0'
 s.watchos.deployment_target = '2.0'
 s.tvos.deployment_target = '9.0'
 s.osx.deployment_target = '10.10'
 s.requires_arc = true
-s.dependency 'DependencyInjector', '~> 2.0'
-s.dependency 'ObjectMapper', '~> 2.0'
+s.dependency 'DependencyInjector', '~> 2.1'
+s.dependency 'ObjectMapper', '~> 3.0'
 end
diff --git a/DependencyInjectorObjectMapper.xcodeproj/project.pbxproj b/DependencyInjectorObjectMapper.xcodeproj/project.pbxproj
@@ -475,7 +475,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0810;
-				LastUpgradeCheck = 0820;
+				LastUpgradeCheck = 0900;
 				ORGANIZATIONNAME = Digipolitan;
 				TargetAttributes = {
 					A3169DAF1DE05E8300BABAFD = {
@@ -1057,15 +1057,21 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
@@ -1095,7 +1101,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -1110,15 +1116,21 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
@@ -1140,7 +1152,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -1166,7 +1178,6 @@
 				PRODUCT_NAME = DependencyInjectorObjectMapper;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -1187,15 +1198,13 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.digipolitan.dependencyinjector.objectmapper;
 				PRODUCT_NAME = DependencyInjectorObjectMapper;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
 		A3169DC81DE05E8300BABAFD /* Debug */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 3781EF40D354030A6E0F2336 /* Pods-Tests-DependencyInjectorObjectMapperTests-iOS.debug.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 582762VK3P;
 				INFOPLIST_FILE = Tests/Info.plist;
@@ -1209,7 +1218,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = DD9608F15704DFB1C62767D1 /* Pods-Tests-DependencyInjectorObjectMapperTests-iOS.release.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 582762VK3P;
 				INFOPLIST_FILE = Tests/Info.plist;
@@ -1238,7 +1246,6 @@
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = 4;
 				WATCHOS_DEPLOYMENT_TARGET = 2.0;
 			};
@@ -1262,7 +1269,6 @@
 				PRODUCT_NAME = DependencyInjectorObjectMapper;
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = 4;
 				WATCHOS_DEPLOYMENT_TARGET = 2.0;
 			};
@@ -1286,7 +1292,6 @@
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -1309,7 +1314,6 @@
 				PRODUCT_NAME = DependencyInjectorObjectMapper;
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -1319,7 +1323,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 98C3B8F6A46232CBE82D7AB9 /* Pods-Tests-DependencyInjectorObjectMapperTests-tvOS.debug.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 582762VK3P;
 				INFOPLIST_FILE = Tests/Info.plist;
@@ -1335,7 +1338,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = FFFFB4E5C4127E4A95CF710E /* Pods-Tests-DependencyInjectorObjectMapperTests-tvOS.release.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 582762VK3P;
 				INFOPLIST_FILE = Tests/Info.plist;
@@ -1368,7 +1370,6 @@
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -1392,15 +1393,13 @@
 				PRODUCT_NAME = DependencyInjectorObjectMapper;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
 		A3169E211DE072C800BABAFD /* Debug */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = A93CCF480FC175F07743D64A /* Pods-Tests-DependencyInjectorObjectMapperTests-OSX.debug.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 582762VK3P;
@@ -1417,7 +1416,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = CA019E8C38EC9FB3647284BD /* Pods-Tests-DependencyInjectorObjectMapperTests-OSX.release.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 582762VK3P;

diff --git a/...ObjectMapper.xcodeproj/xcshareddata/xcschemes/DependencyInjectorObjectMapper-OSX.xcscheme b/...ObjectMapper.xcodeproj/xcshareddata/xcschemes/DependencyInjectorObjectMapper-OSX.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -55,6 +56,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/...ObjectMapper.xcodeproj/xcshareddata/xcschemes/DependencyInjectorObjectMapper-iOS.xcscheme b/...ObjectMapper.xcodeproj/xcshareddata/xcschemes/DependencyInjectorObjectMapper-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES"
       codeCoverageEnabled = "YES">
       <Testables>
@@ -56,6 +57,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/...bjectMapper.xcodeproj/xcshareddata/xcschemes/DependencyInjectorObjectMapper-tvOS.xcscheme b/...bjectMapper.xcodeproj/xcshareddata/xcschemes/DependencyInjectorObjectMapper-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -55,6 +56,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/...ctMapper.xcodeproj/xcshareddata/xcschemes/DependencyInjectorObjectMapper-watchOS.xcscheme b/...ctMapper.xcodeproj/xcshareddata/xcschemes/DependencyInjectorObjectMapper-watchOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -36,6 +37,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/Package.swift b/Package.swift
@@ -3,7 +3,7 @@ import PackageDescription
 let package = Package(
   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/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: [