From ef1a5ea722a190fc3a2ef2dc42f508db2e2747d8 Mon Sep 17 00:00:00 2001 From: Dmitry Pavlenko Date: Wed, 2 Oct 2019 09:47:26 +0300 Subject: [PATCH 1/4] feature(xcode-11-support): update for xcode 11 and swift 5 --- Cartfile.resolved | 6 +++--- Sources/SwinjectStoryboardOption.swift | 5 +++++ SwinjectStoryboard.xcodeproj/project.pbxproj | 11 ++++++++--- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Cartfile.resolved b/Cartfile.resolved index a12b38b..b8c5114 100644 --- a/Cartfile.resolved +++ b/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" diff --git a/Sources/SwinjectStoryboardOption.swift b/Sources/SwinjectStoryboardOption.swift index f98f5dd..48f9e37 100644 --- a/Sources/SwinjectStoryboardOption.swift +++ b/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) { + // MARK: IMPLEMENT IF NEEDED + } } #endif diff --git a/SwinjectStoryboard.xcodeproj/project.pbxproj b/SwinjectStoryboard.xcodeproj/project.pbxproj index 9412ac8..e76594f 100644 --- a/SwinjectStoryboard.xcodeproj/project.pbxproj +++ b/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; }; From d07808a664cf5004ba3b55b8d95f0304ebd644be Mon Sep 17 00:00:00 2001 From: Dmitry Pavlenko Date: Fri, 4 Oct 2019 08:42:16 +0300 Subject: [PATCH 2/4] fix(version): change version for carhage for travis --- .travis.yml | 2 +- Cartfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a76da76..99f0111 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ matrix: - env: JOB="XCODE" DEST="OS=11.0,name=Apple TV 4K" SCHEME="SwinjectStoryboard-tvOS" SDK="appletvsimulator" ACTION="test" osx_image: xcode10 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 diff --git a/Cartfile b/Cartfile index 2c824ee..4a315ca 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "Swinject/Swinject" ~> 2.4 +github "Swinject/Swinject" ~> 2.7.1 From ff76b3aa999102a46d76025aca2d4d0064041f11 Mon Sep 17 00:00:00 2001 From: Dmitry Pavlenko Date: Fri, 4 Oct 2019 08:52:22 +0300 Subject: [PATCH 3/4] fix(image): change travis os x image --- .travis.yml | 22 +++++++++++----------- Sources/SwinjectStoryboardOption.swift | 2 +- SwinjectStoryboard.podspec | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 99f0111..3fcb09b 100644 --- a/.travis.yml +++ b/.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,28 +10,28 @@ 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 + osx_image: xcode11 - env: JOB="XCODE" DEST="OS=10.3.1,name=iPhone 7 Plus" SCHEME="SwinjectStoryboard-iOS" SDK="iphonesimulator" ACTION="test" - osx_image: xcode10 + 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="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 + osx_image: xcode11 - 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 + osx_image: xcode11 - env: JOB="XCODE" DEST="OS=11.0,name=Apple TV 4K" SCHEME="SwinjectStoryboard-tvOS" SDK="appletvsimulator" ACTION="test" - osx_image: xcode10 + osx_image: xcode11 before_install: - curl -L -O https://github.com/Carthage/Carthage/releases/download/0.33.0/Carthage.pkg - sudo installer -pkg Carthage.pkg -target / diff --git a/Sources/SwinjectStoryboardOption.swift b/Sources/SwinjectStoryboardOption.swift index 48f9e37..7ced76b 100644 --- a/Sources/SwinjectStoryboardOption.swift +++ b/Sources/SwinjectStoryboardOption.swift @@ -34,7 +34,7 @@ internal struct SwinjectStoryboardOption: ServiceKeyOption { } func hash(into: inout Hasher) { - // MARK: IMPLEMENT IF NEEDED + controllerType.hash(into: &into) } } #endif diff --git a/SwinjectStoryboard.podspec b/SwinjectStoryboard.podspec index 7b82ac0..4fd89af 100644 --- a/SwinjectStoryboard.podspec +++ b/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 From 77aec4326003c6cc23c0662706176c73db416003 Mon Sep 17 00:00:00 2001 From: Dmitry Pavlenko Date: Fri, 4 Oct 2019 09:13:59 +0300 Subject: [PATCH 4/4] fix(device-set): fix device set & upgrade cocoapods --- .travis.yml | 12 +++++++----- Gemfile | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3fcb09b..6dfecbd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,23 +14,25 @@ matrix: 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" + - 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=10.3.1,name=iPhone 7 Plus" SCHEME="SwinjectStoryboard-iOS" SDK="iphonesimulator" ACTION="test" + - 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: xcode11 - env: JOB="XCODE" DEST="OS=12.2,name=iPhone X" SCHEME="SwinjectStoryboard-iOS" SDK="iphonesimulator" ACTION="test" + 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: xcode11 - env: JOB="XCODE" DEST="arch=x86_64" SCHEME="SwinjectStoryboard-OSX" SDK="macosx" ACTION="test" osx_image: xcode11 - - env: JOB="XCODE" DEST="OS=9.2,name=Apple TV 1080p" SCHEME="SwinjectStoryboard-tvOS" SDK="appletvsimulator" ACTION="test" - osx_image: xcode11 - env: JOB="XCODE" DEST="OS=10.2,name=Apple TV 1080p" SCHEME="SwinjectStoryboard-tvOS" SDK="appletvsimulator" ACTION="test" osx_image: xcode11 - - env: JOB="XCODE" DEST="OS=11.0,name=Apple TV 4K" SCHEME="SwinjectStoryboard-tvOS" SDK="appletvsimulator" ACTION="test" + - 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.33.0/Carthage.pkg diff --git a/Gemfile b/Gemfile index 5b19c5b..4112902 100644 --- a/Gemfile +++ b/Gemfile @@ -2,4 +2,4 @@ source "https://rubygems.org" -gem "cocoapods", "1.6.0.beta.1" +gem "cocoapods", "1.8.1"