Merge pull request #54 from Swinject/swift5

Swift 5

.swift-version

@@ -1 +1 @@
-4.2
+5.0

.travis.yml

@@ -1,58 +1,45 @@
 language: objective-c
-osx_image: xcode10
 env:
   global:
-  - LC_CTYPE=en_US.UTF-8
-  - PROJECT=SwinjectAutoregistration.xcodeproj
-  - secure: hm/FXmGDpmasULa06cLteREUdFhJ23oTeYQc5g/QjFwhOdln6RqPkqUGMSi3iKpNh4raqW0dH8Jpq/FmjyJG9M9zmIZQbjQiyLwiTvszGKs6YVi+QFsqGIF0GZ5WfB3OIcpNPOlkXhnay18MP+J3bfEhNcKdGdpQ/LIZ2UKgYDJiD1rhullBg8Rc+PxjEUnG4VrjqEje/TcBdX3uP8l7aULla30CrwxmdAfIxjqrrPZeID26fNVF+T/hcNIpMxjB3j16h6k5994USNdu8BpCbqph8aARxgj2cpbsoh9C3EBoqvLGSKnaHmU6kkRS+TagcyAXo+dlgtnxQxa5L/aFMRNpgLshZEZWP/IxH+Q+AJlTF8InjfkDqSpqrNpwt/nls1m+IJecBBxRhaHY0YOwDlFD+f11usGIwSB+7RO1SPXQI98LMUqQpUNvOVw7CVcLSEBNJ1fJBXLKxuQCnuADEHutwLyQhylYYGIsoU9voLT2nc3aJEGD10kn9vStfhYhRbOgK8k0+ycmvFpBO7oi0muQWfggQR8Ldc2Yb+dN+O+79ZDrOYNE74UpNXcazILbUBwB8NiKbBKJ1Jl2wG+hBI5VHtUfo/kI8J/JukkPGSdJ/QyMyoddG+gdXC9Qv0UihAD87lSVD86QIjx8He3TN5Vk+zzzhqG7YzVdRPkj8Bk=
+    - LC_CTYPE=en_US.UTF-8
+    - PROJECT=SwinjectAutoregistration.xcodeproj
 git:
   submodules: false
 matrix:
   include:
-  - env: JOB="LINUX_SPM"
-    os: linux
-    language: generic
-    sudo: required
-    dist: trusty
-    before_install:
-    - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
-    script:
-    - mv .Package.test.swift Package.swift
-    - swift build
-    - swift test
-  - env: JOB="POD_LINT"
-    script:
-    - bundle exec pod repo update
-    - bundle exec pod lib lint
-  - env: JOB="XCODE" DEST="OS=9.3,name=iPhone 6" SCHEME="SwinjectAutoregistration-iOS"
-      SDK="iphonesimulator" ACTION="test"
-  - env: JOB="XCODE" DEST="OS=10.3.1,name=iPhone 7 Plus" SCHEME="SwinjectAutoregistration-iOS"
-      SDK="iphonesimulator" ACTION="test"
-  - env: JOB="XCODE" DEST="OS=12.0,name=iPhone 8 Plus" SCHEME="SwinjectAutoregistration-iOS"
-      SDK="iphonesimulator" ACTION="test"
-  - env: JOB="XCODE" DEST="arch=x86_64" SCHEME="SwinjectAutoregistration-OSX" SDK="macosx"
-      ACTION="test"
-  - env: JOB="XCODE" DEST="OS=9.2,name=Apple TV 1080p" SCHEME="SwinjectAutoregistration-tvOS"
-      SDK="appletvsimulator" ACTION="test"
-  - env: JOB="XCODE" DEST="OS=10.2,name=Apple TV 1080p" SCHEME="SwinjectAutoregistration-tvOS"
-      SDK="appletvsimulator" ACTION="test"
-  - env: JOB="XCODE" DEST="OS=12.0,name=Apple TV 4K" SCHEME="SwinjectAutoregistration-tvOS"
-      SDK="appletvsimulator" ACTION="test"
-  - env: JOB="XCODE" DEST="OS=3.2,name=Apple Watch - 42mm" SCHEME="SwinjectAutoregistration-watchOS"
-      SDK="watchsimulator" ACTION="build"
-  - env: JOB="XCODE" DEST="OS=4.2,name=Apple Watch - 42mm" SCHEME="SwinjectAutoregistration-watchOS"
-      SDK="watchsimulator" ACTION="build"
-  - env: JOB="XCODE" DEST="OS=5.0,name=Apple Watch Series 2 - 42mm" SCHEME="SwinjectAutoregistration-watchOS"
-      SDK="watchsimulator" ACTION="build"
+    - env: JOB="LINUX_SPM" SWIFT_VERSION="5.0"
+      os: linux
+      language: generic
+      sudo: required
+      dist: trusty
+      before_install:
+        - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
+      script:
+        - mv .Package.test.swift Package.swift
+        - swift build
+        - swift test
+    - env: JOB="POD_LINT"
+      osx_image: xcode10.2
+      before_install:
+      script:
+        - pod lib lint
+    - env: JOB="XCODE" DEST="OS=10.0,name=iPhone 6" SCHEME="SwinjectAutoregistration-iOS" SDK="iphonesimulator" ACTION="test" PLATFORM="iOS"
+      osx_image: xcode10.2
+    - env: JOB="XCODE" DEST="arch=x86_64" SCHEME="SwinjectAutoregistration-OSX" SDK="macosx" ACTION="test" PLATFORM="OSX"
+      osx_image: xcode10.2
+    - env: JOB="XCODE" DEST="OS=10.0,name=Apple TV 1080p" SCHEME="SwinjectAutoregistration-tvOS" SDK="appletvsimulator" ACTION="test" PLATFORM="tvOS"
+      osx_image: xcode10.2
+    - env: JOB="XCODE" DEST="OS=4.2,name=Apple Watch - 42mm" SCHEME="SwinjectAutoregistration-watchOS" SDK="watchsimulator" ACTION="build" PLATFORM="watchOS"
+      osx_image: xcode10.2
+
 before_install:
-- curl -L -O https://github.com/Carthage/Carthage/releases/download/0.28.0/Carthage.pkg
-- sudo installer -pkg Carthage.pkg -target /
-- rm Carthage.pkg
-- carthage update --verbose --cache-builds
+  - curl -L -O https://github.com/Carthage/Carthage/releases/download/0.33.0/Carthage.pkg
+  - sudo installer -pkg Carthage.pkg -target /
+  - rm Carthage.pkg
+  - travis_wait carthage bootstrap --verbose --platform $PLATFORM
 script:
-- set -o pipefail
-- xcodebuild "$ACTION" -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination
-  "$DEST" -configuration Release ENABLE_TESTABILITY=YES | xcpretty
+  - set -o pipefail
+  - xcodebuild "$ACTION" -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DEST" -configuration Release ENABLE_TESTABILITY=YES | xcpretty
 notifications:
   email:
     on_success: never

Cartfile.resolved

@@ -1,3 +1,3 @@
-github "Quick/Nimble" "v8.0.2"
-github "Quick/Quick" "v2.1.0"
-github "Swinject/Swinject" "2.6.2"
+github "Quick/Nimble" "v8.0.4"
+github "Quick/Quick" "v2.2.0"
+github "Swinject/Swinject" "2.7.1"

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:4.2
+// swift-tools-version:5.0
 
 import PackageDescription
 

SwinjectAutoregistration.podspec

@@ -16,7 +16,7 @@ SwinjectAutoregistration is an extension of Swinject that allows to automaticall
   s.watchos.deployment_target = '2.0'
   s.tvos.deployment_target = '9.0'
   s.requires_arc = true
-
+  s.swift_version = '5.0'
   s.source_files = 'Sources/**/*.{swift,h}'
   s.dependency 'Swinject', '~> 2.6'
 end

SwinjectAutoregistration.xcodeproj/project.pbxproj

@@ -847,7 +847,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				OTHER_SWIFT_FLAGS = "-D DEBUG -Xfrontend -debug-time-function-bodies";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -863,7 +863,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};