From 8dd259a1c079273ffc748a113a8b123890c1973c Mon Sep 17 00:00:00 2001 From: Tomas Kohout Date: Mon, 2 Dec 2019 22:38:14 +0100 Subject: [PATCH 1/8] Change version to Swift 5, update travis --- .swift-version | 2 +- .travis.yml | 79 ++++++++----------- Cartfile.resolved | 6 +- SwinjectAutoregistration.podspec | 2 +- .../project.pbxproj | 4 +- 5 files changed, 40 insertions(+), 53 deletions(-) diff --git a/.swift-version b/.swift-version index bf77d54..819e07a 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -4.2 +5.0 diff --git a/.travis.yml b/.travis.yml index 6e54be1..08051aa 100644 --- a/.travis.yml +++ b/.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-macOS" 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=2.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 + - 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 diff --git a/Cartfile.resolved b/Cartfile.resolved index 5125e7e..b8c5114 100644 --- a/Cartfile.resolved +++ b/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" diff --git a/SwinjectAutoregistration.podspec b/SwinjectAutoregistration.podspec index e91f8e6..3ca9e7f 100644 --- a/SwinjectAutoregistration.podspec +++ b/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 diff --git a/SwinjectAutoregistration.xcodeproj/project.pbxproj b/SwinjectAutoregistration.xcodeproj/project.pbxproj index 078e175..2b17be0 100644 --- a/SwinjectAutoregistration.xcodeproj/project.pbxproj +++ b/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; }; From 97e0ce39f471941c9a4d1b78b116150749c6ff1f Mon Sep 17 00:00:00 2001 From: Tomas Kohout Date: Mon, 2 Dec 2019 22:42:54 +0100 Subject: [PATCH 2/8] Fix test file capitalization --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 08051aa..c9d167a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ matrix: before_install: - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)" script: - - mv .Package.Test.swift Package.swift + - mv .Package.test.swift Package.swift - swift build - swift test - env: JOB="POD_LINT" From 2ce98121c04eedf9a984c62aa5023d748cb710b2 Mon Sep 17 00:00:00 2001 From: Tomas Kohout Date: Mon, 2 Dec 2019 23:36:41 +0100 Subject: [PATCH 3/8] Travis fixes --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c9d167a..8e26d2b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,7 @@ matrix: - env: JOB="POD_LINT" osx_image: xcode10.2 before_install: + - gem install cocoapods script: - pod lib lint - env: JOB="XCODE" DEST="OS=10.0,name=iPhone 6" SCHEME="SwinjectAutoregistration-iOS" SDK="iphonesimulator" ACTION="test" PLATFORM="iOS" @@ -36,7 +37,7 @@ before_install: - 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 --verbose --platform $PLATFORM + - 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 From 9ba7dd4b7523213378c88366dfbf27c80b4f10bd Mon Sep 17 00:00:00 2001 From: Tomas Kohout Date: Mon, 2 Dec 2019 23:51:06 +0100 Subject: [PATCH 4/8] Fix OSX travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8e26d2b..7f37b1a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ matrix: - 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-macOS" SDK="macosx" ACTION="test" PLATFORM="OSX" + - 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 From 9ca27fc473718c33a636c7af99b83e7ed40d3873 Mon Sep 17 00:00:00 2001 From: Tomas Kohout Date: Tue, 3 Dec 2019 09:34:32 +0100 Subject: [PATCH 5/8] More build fixes --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7f37b1a..1479d39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,7 @@ matrix: osx_image: xcode10.2 before_install: - gem install cocoapods + - pod setup script: - pod lib lint - env: JOB="XCODE" DEST="OS=10.0,name=iPhone 6" SCHEME="SwinjectAutoregistration-iOS" SDK="iphonesimulator" ACTION="test" PLATFORM="iOS" @@ -30,7 +31,7 @@ matrix: 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=2.2,name=Apple Watch - 42mm" SCHEME="SwinjectAutoregistration-watchOS" SDK="watchsimulator" ACTION="build" PLATFORM="watchOS" + - 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: From a6d65d090ae72742ac8ca60838c70a835d0b3e56 Mon Sep 17 00:00:00 2001 From: Tomas Kohout Date: Tue, 3 Dec 2019 09:38:06 +0100 Subject: [PATCH 6/8] Update swift package manager --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index ab3cfc0..bf00c63 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:4.2 +// swift-tools-version:5.0 import PackageDescription From d265f93903d9f4bbaa8178a10324aee11b6c1a05 Mon Sep 17 00:00:00 2001 From: Tomas Kohout Date: Tue, 3 Dec 2019 10:41:01 +0100 Subject: [PATCH 7/8] Try to fix pod lib lint --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 1479d39..9641e78 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,7 @@ matrix: - env: JOB="POD_LINT" osx_image: xcode10.2 before_install: + - gem uninstall --all - gem install cocoapods - pod setup script: From 6e019e662b1b281ebb3efebb343350b714653293 Mon Sep 17 00:00:00 2001 From: Tomas Kohout Date: Tue, 3 Dec 2019 13:42:39 +0100 Subject: [PATCH 8/8] Remove gemfile --- .travis.yml | 3 --- Gemfile | 5 ---- Gemfile.lock | 76 ---------------------------------------------------- 3 files changed, 84 deletions(-) delete mode 100644 Gemfile delete mode 100644 Gemfile.lock diff --git a/.travis.yml b/.travis.yml index 9641e78..8790b7e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,9 +21,6 @@ matrix: - env: JOB="POD_LINT" osx_image: xcode10.2 before_install: - - gem uninstall --all - - gem install cocoapods - - pod setup script: - pod lib lint - env: JOB="XCODE" DEST="OS=10.0,name=iPhone 6" SCHEME="SwinjectAutoregistration-iOS" SDK="iphonesimulator" ACTION="test" PLATFORM="iOS" diff --git a/Gemfile b/Gemfile deleted file mode 100644 index 5b19c5b..0000000 --- a/Gemfile +++ /dev/null @@ -1,5 +0,0 @@ -# frozen_string_literal: true - -source "https://rubygems.org" - -gem "cocoapods", "1.6.0.beta.1" diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 1e3fa21..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,76 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - CFPropertyList (3.0.0) - activesupport (4.2.10) - i18n (~> 0.7) - minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) - tzinfo (~> 1.1) - atomos (0.1.3) - claide (1.0.2) - cocoapods (1.6.0.beta.1) - activesupport (>= 4.0.2, < 5) - claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.6.0.beta.1) - cocoapods-deintegrate (>= 1.0.2, < 2.0) - cocoapods-downloader (>= 1.2.1, < 2.0) - cocoapods-plugins (>= 1.0.0, < 2.0) - cocoapods-search (>= 1.0.0, < 2.0) - cocoapods-stats (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.3.1, < 2.0) - cocoapods-try (>= 1.1.0, < 2.0) - colored2 (~> 3.1) - escape (~> 0.0.4) - fourflusher (~> 2.0.1) - gh_inspector (~> 1.0) - molinillo (~> 0.6.6) - nap (~> 1.0) - ruby-macho (~> 1.2) - xcodeproj (>= 1.6.0, < 2.0) - cocoapods-core (1.6.0.beta.1) - activesupport (>= 4.0.2, < 6) - fuzzy_match (~> 2.0.4) - nap (~> 1.0) - cocoapods-deintegrate (1.0.2) - cocoapods-downloader (1.2.1) - cocoapods-plugins (1.0.0) - nap - cocoapods-search (1.0.0) - cocoapods-stats (1.0.0) - cocoapods-trunk (1.3.1) - nap (>= 0.8, < 2.0) - netrc (~> 0.11) - cocoapods-try (1.1.0) - colored2 (3.1.2) - concurrent-ruby (1.0.5) - escape (0.0.4) - fourflusher (2.0.1) - fuzzy_match (2.0.4) - gh_inspector (1.1.3) - i18n (0.9.5) - concurrent-ruby (~> 1.0) - minitest (5.11.3) - molinillo (0.6.6) - nanaimo (0.2.6) - nap (1.1.0) - netrc (0.11.0) - ruby-macho (1.2.0) - thread_safe (0.3.6) - tzinfo (1.2.5) - thread_safe (~> 0.1) - xcodeproj (1.6.0) - CFPropertyList (>= 2.3.3, < 4.0) - atomos (~> 0.1.3) - claide (>= 1.0.2, < 2.0) - colored2 (~> 3.1) - nanaimo (~> 0.2.6) - -PLATFORMS - ruby - -DEPENDENCIES - cocoapods (= 1.6.0.beta.1) - -BUNDLED WITH - 1.16.4