Merge pull request #64 from AliSoftware/release/4.3.1

Release 4.3.1

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode7.2
+osx_image: xcode7.3
 
 # cache: cocoapods
 # before_install:

CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 4.3.1
+
+* Fix Swift 2.2 compile errors in tests  
+  [#62](https://github.com/AliSoftware/Dip/pull/62), [@mwoollard](https://github.com/mwoollard)
+
 ## 4.3.0
 
 * Added `DependencyTagConvertible` protocol for better typed tags.  

Dip.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "Dip"
-  s.version          = "4.3.0"
+  s.version          = "4.3.1"
   s.summary          = "A simple Dependency Resolver: Dependency Injection using Protocol resolution."
 
   s.description      = <<-DESC

Dip/Dip.xcodeproj/project.pbxproj

@@ -866,7 +866,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 4.3.0;
+				CURRENT_PROJECT_VERSION = 4.3.1;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -915,7 +915,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 4.3.0;
+				CURRENT_PROJECT_VERSION = 4.3.1;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;

Dip/DipTests/Sources/Utils.swift

@@ -24,26 +24,20 @@
 
 import XCTest
 
-#if os(Linux)
-typealias FileString = StaticString
-#else
-typealias FileString = String
-#endif
-  
 
-func AssertThrows<T>(file: FileString = __FILE__, line: UInt = __LINE__, @autoclosure expression: () throws -> T) {
+func AssertThrows<T>(file: StaticString = #file, line: UInt = #line, @autoclosure expression: () throws -> T) {
   AssertThrows(file, line: line, expression: expression, "")
 }
 
-func AssertThrows<T>(file: FileString = __FILE__, line: UInt = __LINE__, @autoclosure expression: () throws -> T, _ message: String) {
+func AssertThrows<T>(file: StaticString = #file, line: UInt = #line, @autoclosure expression: () throws -> T, _ message: String) {
   AssertThrows(expression: expression, checkError: { _ in true }, message)
 }
 
-func AssertThrows<T>(file: FileString = __FILE__, line: UInt = __LINE__, @autoclosure expression: () throws -> T, checkError: ErrorType -> Bool) {
+func AssertThrows<T>(file: StaticString = #file, line: UInt = #line, @autoclosure expression: () throws -> T, checkError: ErrorType -> Bool) {
   AssertThrows(file, line: line, expression: expression, checkError: checkError, "")
 }
 
-func AssertThrows<T>(file: FileString = __FILE__, line: UInt = __LINE__, @autoclosure expression: () throws -> T, checkError: ErrorType -> Bool, _ message: String) {
+func AssertThrows<T>(file: StaticString = #file, line: UInt = #line, @autoclosure expression: () throws -> T, checkError: ErrorType -> Bool, _ message: String) {
   do {
     try expression()
     XCTFail(message, file: file, line: line)
@@ -53,11 +47,11 @@ func AssertThrows<T>(file: FileString = __FILE__, line: UInt = __LINE__, @autocl
   }
 }
 
-func AssertNoThrow<T>(file: FileString = __FILE__, line: UInt = __LINE__, @autoclosure expression: () throws -> T) {
+func AssertNoThrow<T>(file: StaticString = #file, line: UInt = #line, @autoclosure expression: () throws -> T) {
   AssertNoThrow(file, line: line, expression: expression, "")
 }
 
-func AssertNoThrow<T>(file: FileString = __FILE__, line: UInt = __LINE__, @autoclosure expression: () throws -> T, _ message: String) {
+func AssertNoThrow<T>(file: StaticString = #file, line: UInt = #line, @autoclosure expression: () throws -> T, _ message: String) {
   do {
     try expression()
   }

README.md

@@ -35,6 +35,8 @@ If you want to know more about Dependency Injection in general we recomend you t
 
 ## Installation
 
+Since version 4.3.1 Dip is built with Swift 2.2. The lates version built with Swift 2.1 is 4.3.0.
+
 Dip is available through [CocoaPods](http://cocoapods.org). To install
 it, simply add the following line to your Podfile:
 
@@ -54,7 +56,7 @@ If you use [_Swift Package Manager_](https://swift.org/package-manager/) add Dip
 let package = Package(
   name: "MyPackage",
   dependencies: [
-    .Package(url: "https://github.com/AliSoftware/Dip.git", "4.3.0")
+    .Package(url: "https://github.com/AliSoftware/Dip.git", "4.3.1")
   ]
 )
 ```

SampleApp/DipSampleApp/Cells/BaseCell.swift

@@ -36,6 +36,6 @@ extension BaseCell where Self : UITableViewCell {
 }
 
 protocol FillableCell: BaseCell {
-    typealias ObjectType
+    associatedtype ObjectType
     func fillWithObject(object: ObjectType)
 }

SampleApp/DipSampleApp/ViewControllers/FetchableTrait.swift

@@ -9,7 +9,7 @@
 import UIKit
 
 protocol FetchableTrait: class {
-    typealias ObjectType
+    associatedtype ObjectType
     var objects: [ObjectType]? { get set }
     var batchRequestID: Int { get set }
     var tableView: UITableView! { get }