Merge pull request #135 from AliSoftware/hotfix/swift2.3-api-diff

Hotfix - swift2.3 api diff
AliSoftware · Nov 1, 2016 · 7af8957 · 7af8957
2 parents bdf4477 + 6b68bea
commit 7af8957
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## 5.0.4
+
+#### Fixed
+
+* Fixed broken compatibility for Swift 2.3 API in `resolve(tag:arguments:)` method.
+  [#135](https://github.com/AliSoftware/Dip/issues/135), [@ilyapuchka](https://github.com/ilyapuchka)
+
 ## 5.0.3
 
 * Added Swift 2.3 compatibility. `swift2.3` brunch is no longer maintained.  

diff --git a/Dip.podspec b/Dip.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "Dip"
-  s.version          = "5.0.3"
+  s.version          = "5.0.4"
   s.summary          = "Dependency Injection for Swift made easy."
 
   s.description      = <<-DESC

diff --git a/Dip/Dip.xcodeproj/project.pbxproj b/Dip/Dip.xcodeproj/project.pbxproj
@@ -427,7 +427,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 5.0.3;
+				CURRENT_PROJECT_VERSION = 5.0.4;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -482,7 +482,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 5.0.3;
+				CURRENT_PROJECT_VERSION = 5.0.4;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;

diff --git a/Sources/RuntimeArguments_swift2.swift b/Sources/RuntimeArguments_swift2.swift
@@ -157,7 +157,7 @@
 
      - seealso: `register(_:tag:factory:)`, `resolve(tag:builder:)`
      */
-    public func resolve<T, A>(tag: DependencyTagConvertible? = nil, arguments arg1: A) throws -> T {
+    public func resolve<T, A>(tag tag: DependencyTagConvertible? = nil, arguments arg1: A) throws -> T {
       return try resolve(tag: tag) { factory in try factory(arg1) }
     }
 
@@ -174,7 +174,7 @@
     }
 
     /// - seealso: `resolve(tag:arguments:)`
-    public func resolve<T, A, B>(tag: DependencyTagConvertible? = nil, arguments arg1: A, _ arg2: B) throws -> T {
+    public func resolve<T, A, B>(tag tag: DependencyTagConvertible? = nil, arguments arg1: A, _ arg2: B) throws -> T {
       return try resolve(tag: tag) { factory in try factory(arg1, arg2) }
     }
 
@@ -191,7 +191,7 @@
     }
 
     /// - seealso: `resolve(tag:arguments:)`
-    public func resolve<T, A, B, C>(tag: DependencyTagConvertible? = nil, arguments arg1: A, _ arg2: B, _ arg3: C) throws -> T {
+    public func resolve<T, A, B, C>(tag tag: DependencyTagConvertible? = nil, arguments arg1: A, _ arg2: B, _ arg3: C) throws -> T {
       return try resolve(tag: tag) { factory in try factory(arg1, arg2, arg3) }
     }
 
@@ -208,7 +208,7 @@
     }
 
     /// - seealso: `resolve(tag:arguments:)`
-    public func resolve<T, A, B, C, D>(tag: DependencyTagConvertible? = nil, arguments arg1: A, _ arg2: B, _ arg3: C, _ arg4: D) throws -> T {
+    public func resolve<T, A, B, C, D>(tag tag: DependencyTagConvertible? = nil, arguments arg1: A, _ arg2: B, _ arg3: C, _ arg4: D) throws -> T {
       return try resolve(tag: tag) { factory in try factory(arg1, arg2, arg3, arg4) }
     }
 
@@ -225,7 +225,7 @@
     }
 
     /// - seealso: `resolve(tag:arguments:)`
-    public func resolve<T, A, B, C, D, E>(tag: DependencyTagConvertible? = nil, arguments arg1: A, _ arg2: B, _ arg3: C, _ arg4: D, _ arg5: E) throws -> T {
+    public func resolve<T, A, B, C, D, E>(tag tag: DependencyTagConvertible? = nil, arguments arg1: A, _ arg2: B, _ arg3: C, _ arg4: D, _ arg5: E) throws -> T {
       return try resolve(tag: tag) { factory in try factory(arg1, arg2, arg3, arg4, arg5) }
     }
 
@@ -242,7 +242,7 @@
     }
 
     /// - seealso: `resolve(tag:arguments:)`
-    public func resolve<T, A, B, C, D, E, F>(tag: DependencyTagConvertible? = nil, arguments arg1: A, _ arg2: B, _ arg3: C, _ arg4: D, _ arg5: E, _ arg6: F) throws -> T {
+    public func resolve<T, A, B, C, D, E, F>(tag tag: DependencyTagConvertible? = nil, arguments arg1: A, _ arg2: B, _ arg3: C, _ arg4: D, _ arg5: E, _ arg6: F) throws -> T {
       return try resolve(tag: tag) { factory in try factory(arg1, arg2, arg3, arg4, arg5, arg6) }
     }