diff --git a/.swift-version b/.swift-version new file mode 100644 index 0000000..bf77d54 --- /dev/null +++ b/.swift-version @@ -0,0 +1 @@ +4.2 diff --git a/.travis.yml b/.travis.yml index 06e8dd6..ba12943 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,35 +6,38 @@ env: global: - LC_CTYPE=en_US.UTF-8 - LANG=en_US.UTF-8 - - PROJECT=SwinjectPropertyLoader.xcodeproj - - IOS_SDK=iphonesimulator12.0 - - OSX_SDK=macosx10.14 - - TVOS_SDK=appletvsimulator12.0 - - WATCHOS_SDK=watchsimulator5.0 - matrix: -## The iOS 8.4 simulator is commented out because it does not start. It looks a problem of the simulator. -## Uncomment the following line after the simulator problem is fixed. -# - DESTINATION="OS=8.4,name=iPhone 5S" SCHEME="SwinjectPropertyLoader-iOS" SDK="$IOS_SDK" PLATFORM="iOS" POD_LINT="NO" ACTION="test" - - DESTINATION="OS=11.4,name=iPhone X" SCHEME="SwinjectPropertyLoader-iOS" SDK="$IOS_SDK" PLATFORM="iOS" POD_LINT="NO" ACTION="test" - - DESTINATION="OS=12.0,name=iPhone XS Max" SCHEME="SwinjectPropertyLoader-iOS" SDK="$IOS_SDK" PLATFORM="iOS" POD_LINT="YES" ACTION="test" - - DESTINATION="arch=x86_64" SCHEME="SwinjectPropertyLoader-OSX" SDK="$OSX_SDK" PLATFORM="Mac" POD_LINT="NO" ACTION="test" ACTION="test" - - DESTINATION="OS=11.4,name=Apple TV" SCHEME="SwinjectPropertyLoader-tvOS" SDK="$TVOS_SDK" PLATFORM="tvOS" POD_LINT="NO" ACTION="test" - - DESTINATION="OS=12.0,name=Apple TV 4K" SCHEME="SwinjectPropertyLoader-tvOS" SDK="$TVOS_SDK" PLATFORM="tvOS" POD_LINT="NO" ACTION="test" - - DESTINATION="OS=4.2,name=Apple Watch Series 3 - 42mm" SCHEME="SwinjectPropertyLoader-watchOS" SDK="$WATCHOS_SDK" PLATFORM="watchOS" POD_LINT="NO" ACTION="build" - - DESTINATION="OS=5.0,name=Apple Watch Series 4 - 44mm" SCHEME="SwinjectPropertyLoader-watchOS" SDK="$WATCHOS_SDK" PLATFORM="watchOS" POD_LINT="NO" ACTION="build" - + - PROJECT=SwinjectPropertyLoader.xcodeproj +matrix: + include: + - env: JOB="POD_LINT" + osx_image: xcode10 + script: + - pod repo update + - pod lib lint + - env: JOB="XCODE" DEST="OS=9.3,name=iPhone 6" SCHEME="SwinjectPropertyLoader-iOS" SDK="iphonesimulator" ACTION="test" + osx_image: xcode10 + - env: JOB="XCODE" DEST="OS=10.3.1,name=iPhone 7 Plus" SCHEME="SwinjectPropertyLoader-iOS" SDK="iphonesimulator" ACTION="test" + osx_image: xcode10 + - env: JOB="XCODE" DEST="OS=11.2,name=iPhone 8 Plus" SCHEME="SwinjectPropertyLoader-iOS" SDK="iphonesimulator" ACTION="test" + osx_image: xcode10 + - env: JOB="XCODE" DEST="OS=12.2,name=iPhone X" SCHEME="SwinjectPropertyLoader-iOS" SDK="iphonesimulator" ACTION="test" + osx_image: xcode10.2 + - env: JOB="XCODE" DEST="arch=x86_64" SCHEME="SwinjectPropertyLoader-OSX" SDK="macosx" ACTION="test" + osx_image: xcode10 + - env: JOB="XCODE" DEST="arch=x86_64" SCHEME="SwinjectPropertyLoader-OSX" SDK="macosx" ACTION="test" + osx_image: xcode10.2 + - env: JOB="XCODE" DEST="OS=9.2,name=Apple TV 1080p" SCHEME="SwinjectPropertyLoader-tvOS" SDK="appletvsimulator" ACTION="test" + osx_image: xcode10 + - env: JOB="XCODE" DEST="OS=10.2,name=Apple TV 1080p" SCHEME="SwinjectPropertyLoader-tvOS" SDK="appletvsimulator" ACTION="test" + osx_image: xcode10 + - env: JOB="XCODE" DEST="OS=11.0,name=Apple TV 4K" SCHEME="SwinjectPropertyLoader-tvOS" SDK="appletvsimulator" ACTION="test" + osx_image: xcode10 before_install: - git submodule update --recursive script: - set -o pipefail - - xcodebuild -version -## The following command is commented out because fails immediately. -# - open -b com.apple.iphonesimulator # Workaround https://github.com/travis-ci/travis-ci/issues/3040 - - xcodebuild -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" - -configuration Release ONLY_ACTIVE_ARCH=NO $ACTION | xcpretty - - if [ $POD_LINT == "YES" ]; then - pod lib lint --quick; - fi + - xcodebuild "$ACTION" -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DEST" -configuration Release ENABLE_TESTABILITY=YES | xcpretty notifications: email: on_success: never + \ No newline at end of file diff --git a/Cartfile.resolved b/Cartfile.resolved index fc99f45..5bc6ebf 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,4 +1,4 @@ -github "Quick/Nimble" "v7.3.3" -github "Quick/Quick" "v1.3.4" -github "Swinject/Swinject" "2.5.0" +github "Quick/Nimble" "v8.0.1" +github "Quick/Quick" "v2.0.0" +github "Swinject/Swinject" "2.6.0" github "jspahrsummers/xcconfigs" "0.12" diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble index 9a281b1..43304bf 160000 --- a/Carthage/Checkouts/Nimble +++ b/Carthage/Checkouts/Nimble @@ -1 +1 @@ -Subproject commit 9a281b1cfa1c53d1e8bd92e1798e4e473af8d263 +Subproject commit 43304bf2b1579fd555f2fdd51742771c1e4f2b98 diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick index f2b5a06..0b4ed6c 160000 --- a/Carthage/Checkouts/Quick +++ b/Carthage/Checkouts/Quick @@ -1 +1 @@ -Subproject commit f2b5a06440ea87eba1a167cab37bf6496646c52e +Subproject commit 0b4ed6c706dd0cce923b5019a605a9bcc6b1b600 diff --git a/Carthage/Checkouts/Swinject b/Carthage/Checkouts/Swinject index 1429e3a..f4cb5ac 160000 --- a/Carthage/Checkouts/Swinject +++ b/Carthage/Checkouts/Swinject @@ -1 +1 @@ -Subproject commit 1429e3a23b7b6b98882f11ea4b94d150dd5fc275 +Subproject commit f4cb5ac942dd8eb7f187e59b8528dec904312495 diff --git a/SwinjectPropertyLoader.podspec b/SwinjectPropertyLoader.podspec index eedec11..bf9cc06 100644 --- a/SwinjectPropertyLoader.podspec +++ b/SwinjectPropertyLoader.podspec @@ -15,6 +15,6 @@ Pod::Spec.new do |s| s.osx.deployment_target = '10.10' s.watchos.deployment_target = '2.0' s.tvos.deployment_target = '9.0' - s.dependency 'Swinject', '~> 2.0.0' + s.dependency 'Swinject', '~> 2.6.0' s.requires_arc = true end diff --git a/SwinjectPropertyLoader.xcodeproj/project.pbxproj b/SwinjectPropertyLoader.xcodeproj/project.pbxproj index eb528a7..9398dff 100644 --- a/SwinjectPropertyLoader.xcodeproj/project.pbxproj +++ b/SwinjectPropertyLoader.xcodeproj/project.pbxproj @@ -678,17 +678,17 @@ isa = PBXGroup; children = ( 98D563911CDB28CE00DECDC0 /* Quick.framework */, - 98D563931CDB28CE00DECDC0 /* Quick-macOSTests.xctest */, - 98D563951CDB28CE00DECDC0 /* QuickFocused-macOSTests.xctest */, - 8FAB6A471E2C44CF005E52F1 /* QuickAfterSuite-macOSTests.xctest */, + 98D563931CDB28CE00DECDC0 /* Quick - macOSTests.xctest */, + 98D563951CDB28CE00DECDC0 /* QuickFocused - macOSTests.xctest */, + 8FAB6A471E2C44CF005E52F1 /* QuickAfterSuite - macOSTests.xctest */, 98D563971CDB28CE00DECDC0 /* Quick.framework */, - 98D563991CDB28CE00DECDC0 /* Quick-iOSTests.xctest */, - 98D5639B1CDB28CE00DECDC0 /* QuickFocused-iOSTests.xctest */, - 8FAB6A491E2C44CF005E52F1 /* QuickAfterSuite-iOSTests.xctest */, + 98D563991CDB28CE00DECDC0 /* Quick - iOSTests.xctest */, + 98D5639B1CDB28CE00DECDC0 /* QuickFocused - iOSTests.xctest */, + 8FAB6A491E2C44CF005E52F1 /* QuickAfterSuite - iOSTests.xctest */, 98D5639D1CDB28CE00DECDC0 /* Quick.framework */, - 98D5639F1CDB28CE00DECDC0 /* Quick-tvOSTests.xctest */, - 98D563A11CDB28CE00DECDC0 /* QuickFocused-tvOSTests.xctest */, - 8FAB6A4B1E2C44CF005E52F1 /* QuickAfterSuite-tvOSTests.xctest */, + 98D5639F1CDB28CE00DECDC0 /* Quick - tvOSTests.xctest */, + 98D563A11CDB28CE00DECDC0 /* QuickFocused - tvOSTests.xctest */, + 8FAB6A4B1E2C44CF005E52F1 /* QuickAfterSuite - tvOSTests.xctest */, ); name = Products; sourceTree = ""; @@ -908,6 +908,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, ); mainGroup = 985903FC1CDB0AA700275E4A; @@ -941,24 +942,24 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - 8FAB6A471E2C44CF005E52F1 /* QuickAfterSuite-macOSTests.xctest */ = { + 8FAB6A471E2C44CF005E52F1 /* QuickAfterSuite - macOSTests.xctest */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; - path = "QuickAfterSuite-macOSTests.xctest"; + path = "QuickAfterSuite - macOSTests.xctest"; remoteRef = 8FAB6A461E2C44CF005E52F1 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 8FAB6A491E2C44CF005E52F1 /* QuickAfterSuite-iOSTests.xctest */ = { + 8FAB6A491E2C44CF005E52F1 /* QuickAfterSuite - iOSTests.xctest */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; - path = "QuickAfterSuite-iOSTests.xctest"; + path = "QuickAfterSuite - iOSTests.xctest"; remoteRef = 8FAB6A481E2C44CF005E52F1 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 8FAB6A4B1E2C44CF005E52F1 /* QuickAfterSuite-tvOSTests.xctest */ = { + 8FAB6A4B1E2C44CF005E52F1 /* QuickAfterSuite - tvOSTests.xctest */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; - path = "QuickAfterSuite-tvOSTests.xctest"; + path = "QuickAfterSuite - tvOSTests.xctest"; remoteRef = 8FAB6A4A1E2C44CF005E52F1 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -1060,17 +1061,17 @@ remoteRef = 98D563901CDB28CE00DECDC0 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 98D563931CDB28CE00DECDC0 /* Quick-macOSTests.xctest */ = { + 98D563931CDB28CE00DECDC0 /* Quick - macOSTests.xctest */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; - path = "Quick-macOSTests.xctest"; + path = "Quick - macOSTests.xctest"; remoteRef = 98D563921CDB28CE00DECDC0 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 98D563951CDB28CE00DECDC0 /* QuickFocused-macOSTests.xctest */ = { + 98D563951CDB28CE00DECDC0 /* QuickFocused - macOSTests.xctest */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; - path = "QuickFocused-macOSTests.xctest"; + path = "QuickFocused - macOSTests.xctest"; remoteRef = 98D563941CDB28CE00DECDC0 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -1081,17 +1082,17 @@ remoteRef = 98D563961CDB28CE00DECDC0 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 98D563991CDB28CE00DECDC0 /* Quick-iOSTests.xctest */ = { + 98D563991CDB28CE00DECDC0 /* Quick - iOSTests.xctest */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; - path = "Quick-iOSTests.xctest"; + path = "Quick - iOSTests.xctest"; remoteRef = 98D563981CDB28CE00DECDC0 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 98D5639B1CDB28CE00DECDC0 /* QuickFocused-iOSTests.xctest */ = { + 98D5639B1CDB28CE00DECDC0 /* QuickFocused - iOSTests.xctest */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; - path = "QuickFocused-iOSTests.xctest"; + path = "QuickFocused - iOSTests.xctest"; remoteRef = 98D5639A1CDB28CE00DECDC0 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -1102,17 +1103,17 @@ remoteRef = 98D5639C1CDB28CE00DECDC0 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 98D5639F1CDB28CE00DECDC0 /* Quick-tvOSTests.xctest */ = { + 98D5639F1CDB28CE00DECDC0 /* Quick - tvOSTests.xctest */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; - path = "Quick-tvOSTests.xctest"; + path = "Quick - tvOSTests.xctest"; remoteRef = 98D5639E1CDB28CE00DECDC0 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 98D563A11CDB28CE00DECDC0 /* QuickFocused-tvOSTests.xctest */ = { + 98D563A11CDB28CE00DECDC0 /* QuickFocused - tvOSTests.xctest */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; - path = "QuickFocused-tvOSTests.xctest"; + path = "QuickFocused - tvOSTests.xctest"; remoteRef = 98D563A01CDB28CE00DECDC0 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -1363,7 +1364,6 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.el-eleven.SwinjectPropertyLoader"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = 4; }; name = Debug; @@ -1379,7 +1379,6 @@ INFOPLIST_FILE = Sources/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.el-eleven.SwinjectPropertyLoader"; - SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = 4; }; name = Release; @@ -1394,7 +1393,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = YES; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; TVOS_DEPLOYMENT_TARGET = 9.0; VERSIONING_SYSTEM = "apple-generic"; @@ -1412,7 +1411,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; TVOS_DEPLOYMENT_TARGET = 9.0; VERSIONING_SYSTEM = "apple-generic"; @@ -1457,7 +1456,6 @@ INFOPLIST_FILE = Tests/Info.plist; PRODUCT_BUNDLE_IDENTIFIER = "com.el-eleven.SwinjectPropertyLoaderTests"; PRODUCT_NAME = "$(PROJECT_NAME)Tests"; - SWIFT_VERSION = 3.0; }; name = Debug; }; @@ -1468,7 +1466,6 @@ INFOPLIST_FILE = Tests/Info.plist; PRODUCT_BUNDLE_IDENTIFIER = "com.el-eleven.SwinjectPropertyLoaderTests"; PRODUCT_NAME = "$(PROJECT_NAME)Tests"; - SWIFT_VERSION = 3.0; }; name = Release; }; @@ -1484,7 +1481,6 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.el-eleven.SwinjectPropertyLoader"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; }; name = Debug; }; @@ -1499,7 +1495,6 @@ INFOPLIST_FILE = Sources/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.el-eleven.SwinjectPropertyLoader"; - SWIFT_VERSION = 3.0; }; name = Release; }; @@ -1535,7 +1530,6 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.el-eleven.SwinjectPropertyLoader"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = 3; }; name = Debug; @@ -1551,7 +1545,6 @@ INFOPLIST_FILE = Sources/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.el-eleven.SwinjectPropertyLoader"; - SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = 3; }; name = Release;