Merge pull request #135 from relax94/fix/update-image-for-xcode11

Fix/update image for xcode11

.travis.yml

@@ -1,7 +1,7 @@
 # reference: http://www.objc.io/issue-6/travis-ci.html
 
 language: objective-c
-osx_image: xcode10
+osx_image: xcode11
 env:
   global:
     - LC_CTYPE=en_US.UTF-8
@@ -10,30 +10,32 @@ env:
 matrix:
   include:
     - env: JOB="POD_LINT"
-      osx_image: xcode10
+      osx_image: xcode11
       script:
         - bundle exec pod repo update
         - bundle exec pod lib lint
-    - env: JOB="XCODE" DEST="OS=9.3,name=iPhone 6" SCHEME="SwinjectStoryboard-iOS" SDK="iphonesimulator" ACTION="test"
-      osx_image: xcode10
-    - env: JOB="XCODE" DEST="OS=10.3.1,name=iPhone 7 Plus" SCHEME="SwinjectStoryboard-iOS" SDK="iphonesimulator" ACTION="test"
-      osx_image: xcode10
+    - env: JOB="XCODE" DEST="OS=10.3.1,name=iPhone 6" SCHEME="SwinjectStoryboard-iOS" SDK="iphonesimulator" ACTION="test"
+      osx_image: xcode11
+    - env: JOB="XCODE" DEST="OS=11.0.1,name=iPhone 7 Plus" SCHEME="SwinjectStoryboard-iOS" SDK="iphonesimulator" ACTION="test"
+      osx_image: xcode11
     - env: JOB="XCODE" DEST="OS=11.2,name=iPhone 8 Plus" SCHEME="SwinjectStoryboard-iOS" SDK="iphonesimulator" ACTION="test"
-      osx_image: xcode10
+      osx_image: xcode11
     - env: JOB="XCODE" DEST="OS=12.2,name=iPhone X" SCHEME="SwinjectStoryboard-iOS" SDK="iphonesimulator" ACTION="test"
-      osx_image: xcode10.2
+    osx_image: xcode11
+    - env: JOB="XCODE" DEST="OS=13.0,name=iPhone 11 Pro" SCHEME="SwinjectStoryboard-iOS" SDK="iphonesimulator" ACTION="test"
+      osx_image: xcode11
     - env: JOB="XCODE" DEST="arch=x86_64" SCHEME="SwinjectStoryboard-OSX" SDK="macosx" ACTION="test"
-      osx_image: xcode10
+      osx_image: xcode11
     - env: JOB="XCODE" DEST="arch=x86_64" SCHEME="SwinjectStoryboard-OSX" SDK="macosx" ACTION="test"
-      osx_image: xcode10.2
-    - env: JOB="XCODE" DEST="OS=9.2,name=Apple TV 1080p" SCHEME="SwinjectStoryboard-tvOS" SDK="appletvsimulator" ACTION="test"
-      osx_image: xcode10
+      osx_image: xcode11
     - env: JOB="XCODE" DEST="OS=10.2,name=Apple TV 1080p" SCHEME="SwinjectStoryboard-tvOS" SDK="appletvsimulator" ACTION="test"
-      osx_image: xcode10
-    - env: JOB="XCODE" DEST="OS=11.0,name=Apple TV 4K" SCHEME="SwinjectStoryboard-tvOS" SDK="appletvsimulator" ACTION="test"
-      osx_image: xcode10
+      osx_image: xcode11
+    - env: JOB="XCODE" DEST="OS=11.0,name=Apple TV 1080p" SCHEME="SwinjectStoryboard-tvOS" SDK="appletvsimulator" ACTION="test"
+      osx_image: xcode11
+    - env: JOB="XCODE" DEST="OS=13.0,name=Apple TV 4K" SCHEME="SwinjectStoryboard-tvOS" SDK="appletvsimulator" ACTION="test"
+      osx_image: xcode11
 before_install:
-  - curl -L -O https://github.com/Carthage/Carthage/releases/download/0.28.0/Carthage.pkg
+  - curl -L -O https://github.com/Carthage/Carthage/releases/download/0.33.0/Carthage.pkg
   - sudo installer -pkg Carthage.pkg -target /
   - rm Carthage.pkg
   - carthage bootstrap --platform iOS,macOS,tvOS --cache-builds

Cartfile

@@ -1 +1 @@
-github "Swinject/Swinject" ~> 2.4
+github "Swinject/Swinject" ~> 2.7.1

Cartfile.resolved

@@ -1,3 +1,3 @@
-github "Quick/Nimble" "v8.0.1"
-github "Quick/Quick" "v2.0.0"
-github "Swinject/Swinject" "2.6.0"
+github "Quick/Nimble" "v8.0.4"
+github "Quick/Quick" "v2.2.0"
+github "Swinject/Swinject" "2.7.1"

Gemfile

@@ -2,4 +2,4 @@
 
 source "https://rubygems.org"
 
-gem "cocoapods", "1.6.0.beta.1"
+gem "cocoapods", "1.8.1"

Sources/SwinjectStoryboardOption.swift

@@ -10,6 +10,7 @@ import Swinject
 
 #if os(iOS) || os(OSX) || os(tvOS)
 internal struct SwinjectStoryboardOption: ServiceKeyOption {
+
     internal let controllerType: String
 
     internal init(controllerType: Container.Controller.Type) {
@@ -31,5 +32,9 @@ internal struct SwinjectStoryboardOption: ServiceKeyOption {
     internal var description: String {
         return "Storyboard: \(controllerType)"
     }
+
+    func hash(into: inout Hasher) {
+        controllerType.hash(into: &into)
+    }
 }
 #endif

SwinjectStoryboard.podspec

@@ -17,6 +17,6 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '8.0'
   s.osx.deployment_target = '10.10'
   s.tvos.deployment_target = '9.0'
-  s.dependency 'Swinject', '~> 2.6'
+  s.dependency 'Swinject', '~> 2.7.1'
   s.requires_arc = true
 end

SwinjectStoryboard.xcodeproj/project.pbxproj

@@ -797,12 +797,12 @@
 				TargetAttributes = {
 					985904051CDB0AA700275E4A = {
 						CreatedOnToolsVersion = 7.3.1;
-						LastSwiftMigration = 0920;
+						LastSwiftMigration = 1100;
 						ProvisioningStyle = Manual;
 					};
 					9859040F1CDB0AA700275E4A = {
 						CreatedOnToolsVersion = 7.3.1;
-						LastSwiftMigration = 0920;
+						LastSwiftMigration = 1100;
 						ProvisioningStyle = Manual;
 					};
 					98D562771CDB173500DECDC0 = {
@@ -825,10 +825,11 @@
 			};
 			buildConfigurationList = 985904001CDB0AA700275E4A /* Build configuration list for PBXProject "SwinjectStoryboard" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 985903FC1CDB0AA700275E4A;
 			productRefGroup = 985904071CDB0AA700275E4A /* Products */;
@@ -1105,6 +1106,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.el-eleven.SwinjectStoryboard";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -1123,6 +1125,7 @@
 				INFOPLIST_FILE = Sources/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.el-eleven.SwinjectStoryboard";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -1138,6 +1141,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.el-eleven.SwinjectStoryboardTests";
 				PRODUCT_NAME = "$(PROJECT_NAME)Tests";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -1153,6 +1157,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.el-eleven.SwinjectStoryboardTests";
 				PRODUCT_NAME = "$(PROJECT_NAME)Tests";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};