diff --git a/.travis.yml b/.travis.yml index 509c32e1..c26bdce4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: objective-c -osx_image: xcode12.5 +osx_image: xcode13.2 cache: - bundler diff --git a/Example/PinLayoutSample.xcodeproj/project.pbxproj b/Example/PinLayoutSample.xcodeproj/project.pbxproj index fb1e2096..a9ade004 100644 --- a/Example/PinLayoutSample.xcodeproj/project.pbxproj +++ b/Example/PinLayoutSample.xcodeproj/project.pbxproj @@ -528,7 +528,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0900; - LastUpgradeCheck = 1220; + LastUpgradeCheck = 1300; ORGANIZATIONNAME = layoutbox; TargetAttributes = { 249EFE3E1E64FAFE00165E39 = { diff --git a/Example/PinLayoutSample.xcodeproj/xcshareddata/xcschemes/PinLayoutSample.xcscheme b/Example/PinLayoutSample.xcodeproj/xcshareddata/xcschemes/PinLayoutSample.xcscheme index d2eed2f5..1f61c387 100644 --- a/Example/PinLayoutSample.xcodeproj/xcshareddata/xcschemes/PinLayoutSample.xcscheme +++ b/Example/PinLayoutSample.xcodeproj/xcshareddata/xcschemes/PinLayoutSample.xcscheme @@ -1,6 +1,6 @@ 0.7) - minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) - tzinfo (~> 1.1) + CFPropertyList (3.0.5) + rexml + activesupport (6.1.4.4) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + addressable (2.8.0) + public_suffix (>= 2.0.2, < 5.0) + algoliasearch (1.27.5) + httpclient (~> 2.8, >= 2.8.3) + json (>= 1.5.1) atomos (0.1.3) - claide (1.0.3) - cocoapods (1.7.5) - activesupport (>= 4.0.2, < 5) + claide (1.1.0) + cocoapods (1.11.2) + addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.7.5) + cocoapods-core (= 1.11.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) - cocoapods-downloader (>= 1.2.2, < 2.0) + cocoapods-downloader (>= 1.4.0, < 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-trunk (>= 1.4.0, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) escape (~> 0.0.4) fourflusher (>= 2.3.0, < 3.0) gh_inspector (~> 1.0) - molinillo (~> 0.6.6) + molinillo (~> 0.8.0) nap (~> 1.0) - ruby-macho (~> 1.4) - xcodeproj (>= 1.10.0, < 2.0) - cocoapods-core (1.7.5) - activesupport (>= 4.0.2, < 6) + ruby-macho (>= 1.0, < 3.0) + xcodeproj (>= 1.21.0, < 2.0) + cocoapods-core (1.11.2) + activesupport (>= 5.0, < 7) + addressable (~> 2.8) + algoliasearch (~> 1.0) + concurrent-ruby (~> 1.1) fuzzy_match (~> 2.0.4) nap (~> 1.0) - cocoapods-deintegrate (1.0.4) - cocoapods-downloader (1.2.2) + netrc (~> 0.11) + public_suffix (~> 4.0) + typhoeus (~> 1.0) + cocoapods-deintegrate (1.0.5) + cocoapods-downloader (1.5.1) cocoapods-plugins (1.0.0) nap - cocoapods-search (1.0.0) - cocoapods-stats (1.1.0) - cocoapods-trunk (1.4.0) + cocoapods-search (1.0.1) + cocoapods-trunk (1.6.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) - cocoapods-try (1.1.0) + cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.1.5) + concurrent-ruby (1.1.9) escape (0.0.4) - ffi (1.11.1) + ethon (0.15.0) + ffi (>= 1.15.0) + ffi (1.15.5) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) - i18n (0.9.5) + httpclient (2.8.3) + i18n (1.9.1) concurrent-ruby (~> 1.0) jazzy (0.9.0) cocoapods (~> 1.0) @@ -60,44 +74,50 @@ GEM sass (~> 3.4) sqlite3 (~> 1.3) xcinvoke (~> 0.3.0) + json (2.6.1) liferaft (0.0.6) - minitest (5.11.3) - molinillo (0.6.6) + minitest (5.15.0) + molinillo (0.8.0) mustache (0.99.8) - nanaimo (0.2.6) + nanaimo (0.3.0) nap (1.1.0) netrc (0.11.0) open4 (1.3.4) - rb-fsevent (0.10.3) - rb-inotify (0.10.0) + public_suffix (4.0.6) + rb-fsevent (0.11.0) + rb-inotify (0.10.1) ffi (~> 1.0) redcarpet (3.5.1) + rexml (3.2.5) rouge (1.11.1) - ruby-macho (1.4.0) + ruby-macho (2.5.1) sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sqlite3 (1.4.1) - thread_safe (0.3.6) - tzinfo (1.2.5) - thread_safe (~> 0.1) + sqlite3 (1.4.2) + typhoeus (1.4.0) + ethon (>= 0.9.0) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) xcinvoke (0.3.0) liferaft (~> 0.0.6) - xcodeproj (1.12.0) + xcodeproj (1.21.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) - nanaimo (~> 0.2.6) + nanaimo (~> 0.3.0) + rexml (~> 3.2.4) xcpretty (0.2.6) rouge (~> 1.8) - xcpretty-travis-formatter (1.0.0) + xcpretty-travis-formatter (1.0.1) xcpretty (~> 0.2, >= 0.0.7) + zeitwerk (2.5.4) PLATFORMS - ruby + universal-darwin-21 DEPENDENCIES cocoapods (~> 1.7) @@ -105,4 +125,4 @@ DEPENDENCIES xcpretty-travis-formatter BUNDLED WITH - 2.1.2 + 2.2.33 diff --git a/PinLayout.xcodeproj/project.pbxproj b/PinLayout.xcodeproj/project.pbxproj index 2aee0507..c70fe3d6 100644 --- a/PinLayout.xcodeproj/project.pbxproj +++ b/PinLayout.xcodeproj/project.pbxproj @@ -647,7 +647,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0930; - LastUpgradeCheck = 1220; + LastUpgradeCheck = 1300; ORGANIZATIONNAME = mcswiftlayyout.mirego.com; TargetAttributes = { 244DF2F71EF46C500090508B = { @@ -1174,7 +1174,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACOSX_DEPLOYMENT_TARGET = 10.9; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -1235,7 +1235,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACOSX_DEPLOYMENT_TARGET = 10.9; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; diff --git a/PinLayout.xcodeproj/xcshareddata/xcschemes/PinLayout-iOS.xcscheme b/PinLayout.xcodeproj/xcshareddata/xcschemes/PinLayout-iOS.xcscheme index 84fc7167..a27693b3 100644 --- a/PinLayout.xcodeproj/xcshareddata/xcschemes/PinLayout-iOS.xcscheme +++ b/PinLayout.xcodeproj/xcshareddata/xcschemes/PinLayout-iOS.xcscheme @@ -1,6 +1,6 @@ Cartfile && carthage update --use-ssh --platform iOS --use-xcframeworks && time xcodebuild clean build -project PinLayout-Carthage-iOS.xcodeproj \ - -scheme PinLayout-Carthage-iOS -sdk iphonesimulator14.5 \ + -scheme PinLayout-Carthage-iOS -sdk iphonesimulator15.2 \ -derivedDataPath $DERIVED_DATA \ - -destination 'platform=iOS Simulator,name=iPhone 8,OS=14.5' \ + -destination 'platform=iOS Simulator,name=iPhone 8,OS=15.2' \ | xcpretty && rm -rf $DERIVED_DATA && rm Cartfile.resolved && @@ -139,8 +139,8 @@ echo "==========================================" cd TestProjects/swift-package-manager/ios rm -rf $DERIVED_DATA rm -rf .build -time xcodebuild clean build -project PinLayout-SPM-iOS.xcodeproj -scheme PinLayout-SPM-iOS -sdk iphonesimulator14.5 -derivedDataPath $DERIVED_DATA \ - -destination 'platform=iOS Simulator,name=iPhone 8,OS=14.5' \ +time xcodebuild clean build -project PinLayout-SPM-iOS.xcodeproj -scheme PinLayout-SPM-iOS -sdk iphonesimulator15.2 -derivedDataPath $DERIVED_DATA \ + -destination 'platform=iOS Simulator,name=iPhone 8,OS=15.2' \ | xcpretty cd ../../..