From 5b2168ecef5889fdfbdb164c640a9881654d530f Mon Sep 17 00:00:00 2001 From: Ilya Puchka Date: Tue, 1 Nov 2016 14:47:33 +0300 Subject: [PATCH 1/2] fixed broken swift 2.3 api --- Sources/RuntimeArguments_swift2.swift | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Sources/RuntimeArguments_swift2.swift b/Sources/RuntimeArguments_swift2.swift index 4586fee..fbfa603 100644 --- a/Sources/RuntimeArguments_swift2.swift +++ b/Sources/RuntimeArguments_swift2.swift @@ -157,7 +157,7 @@ - seealso: `register(_:tag:factory:)`, `resolve(tag:builder:)` */ - public func resolve(tag: DependencyTagConvertible? = nil, arguments arg1: A) throws -> T { + public func resolve(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(tag: DependencyTagConvertible? = nil, arguments arg1: A, _ arg2: B) throws -> T { + public func resolve(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(tag: DependencyTagConvertible? = nil, arguments arg1: A, _ arg2: B, _ arg3: C) throws -> T { + public func resolve(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(tag: DependencyTagConvertible? = nil, arguments arg1: A, _ arg2: B, _ arg3: C, _ arg4: D) throws -> T { + public func resolve(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(tag: DependencyTagConvertible? = nil, arguments arg1: A, _ arg2: B, _ arg3: C, _ arg4: D, _ arg5: E) throws -> T { + public func resolve(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(tag: DependencyTagConvertible? = nil, arguments arg1: A, _ arg2: B, _ arg3: C, _ arg4: D, _ arg5: E, _ arg6: F) throws -> T { + public func resolve(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) } } From 6b68bea55d21c25141ff4f16ed3433f6c97070c1 Mon Sep 17 00:00:00 2001 From: Ilya Puchka Date: Tue, 1 Nov 2016 14:50:50 +0300 Subject: [PATCH 2/2] bumped version to 5.0.4 --- CHANGELOG.md | 7 +++++++ Dip.podspec | 2 +- Dip/Dip.xcodeproj/project.pbxproj | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0513194..780d973 100644 --- 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 index 5f3daf1..9d17573 100644 --- 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 index 93bcc46..30a8059 100644 --- 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;