Merge pull request #239 from layoutBox/update_xcode_13

lucdion · web-flow · commit 29924532174e · 2022-01-31T10:25:30.000-08:00
Update project to iOS 15.2 and Xcode 13.2
diff --git 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
@@ -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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1220"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,55 +1,69 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.1)
-    activesupport (4.2.11.1)
-      i18n (~> 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,49 +74,55 @@ 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)
   jazzy (= 0.9)
   xcpretty-travis-formatter
 
 BUNDLED WITH
-   2.1.2
+   2.2.33
diff --git 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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1220"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/PinLayout.xcodeproj/xcshareddata/xcschemes/PinLayout-macOS.xcscheme b/PinLayout.xcodeproj/xcshareddata/xcschemes/PinLayout-macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1220"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/PinLayout.xcodeproj/xcshareddata/xcschemes/PinLayout-tvOS.xcscheme b/PinLayout.xcodeproj/xcshareddata/xcschemes/PinLayout-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1220"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Podfile.lock b/Podfile.lock
@@ -1,8 +1,8 @@
 PODS:
-  - Nimble (9.2.0)
-  - PinLayout (1.9.4)
+  - Nimble (9.2.1)
+  - PinLayout (1.10.0)
   - Quick (4.0.0)
-  - SwiftLint (0.43.1)
+  - SwiftLint (0.46.2)
 
 DEPENDENCIES:
   - Nimble
@@ -11,7 +11,7 @@ DEPENDENCIES:
   - SwiftLint
 
 SPEC REPOS:
-  https://cdn.cocoapods.org/:
+  trunk:
     - Nimble
     - Quick
     - SwiftLint
@@ -21,11 +21,11 @@ EXTERNAL SOURCES:
     :path: "./"
 
 SPEC CHECKSUMS:
-  Nimble: 4f4a345c80b503b3ea13606a4f98405974ee4d0b
-  PinLayout: 0d73cf5bea456b8112429c984de377839b9ec34c
+  Nimble: e7e615c0335ee4bf5b0d786685451e62746117d5
+  PinLayout: e50e9a748b632905fca6e67043ea4b05d6c92186
   Quick: 6473349e43b9271a8d43839d9ba1c442ed1b7ac4
-  SwiftLint: 99f82d07b837b942dd563c668de129a03fc3fb52
+  SwiftLint: 6bc52a21f0fd44cab9aa2dc8e534fb9f5e3ec507
 
 PODFILE CHECKSUM: 0e4023ca11a146f618714ee6235a6f3a757959e4
 
-COCOAPODS: 1.7.5
+COCOAPODS: 1.11.2
diff --git a/build-ci.sh b/build-ci.sh
@@ -9,16 +9,16 @@ echo "==============================="  &&
 echo "PinLayout-iOS"                    &&
 echo "==============================="  &&
 time xcodebuild build -project PinLayout.xcodeproj -scheme PinLayout-iOS \
-   -derivedDataPath $DERIVED_DATA -sdk iphonesimulator14.5 \
-   -destination 'platform=iOS Simulator,name=iPhone 8,OS=14.5'  \
+   -derivedDataPath $DERIVED_DATA -sdk iphonesimulator15.2 \
+   -destination 'platform=iOS Simulator,name=iPhone 8,OS=15.2'  \
    | xcpretty  &&
 
 echo "==============================="  &&
 echo "PinLayout-tvOS"                   &&
 echo "==============================="  &&
 time xcodebuild build -project PinLayout.xcodeproj -scheme PinLayout-tvOS \
-   -derivedDataPath $DERIVED_DATA -sdk appletvsimulator14.5 \
-   -destination 'platform=tvOS Simulator,name=Apple TV 4K (2nd generation),OS=14.5' \
+   -derivedDataPath $DERIVED_DATA -sdk appletvsimulator15.2 \
+   -destination 'platform=tvOS Simulator,name=Apple TV 4K (2nd generation),OS=15.2' \
    | xcpretty  &&
 
 echo "==============================="  &&
@@ -32,39 +32,39 @@ echo "==============================="  &&
 echo "PinLayoutSample"                  &&
 echo "==============================="  &&
 time xcodebuild build -workspace PinLayout.xcworkspace -scheme PinLayoutSample \
-   -derivedDataPath $DERIVED_DATA -sdk iphonesimulator14.5 \
-   -destination 'platform=iOS Simulator,name=iPhone 8,OS=14.5'  \
+   -derivedDataPath $DERIVED_DATA -sdk iphonesimulator15.2 \
+   -destination 'platform=iOS Simulator,name=iPhone 8,OS=15.2'  \
    | xcpretty  &&
 
 time xcodebuild build -workspace PinLayout.xcworkspace -scheme PinLayoutSample \
-   -derivedDataPath $DERIVED_DATA -sdk iphonesimulator14.5 \
+   -derivedDataPath $DERIVED_DATA -sdk iphonesimulator15.2 \
    -destination 'platform=iOS Simulator,name=iPhone 7,OS=11.4'  \
    | xcpretty  &&
 
 echo "==============================="  &&
 echo "iOS unit test"                    &&
 echo "==============================="  &&
 time  xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS \
-   -derivedDataPath $DERIVED_DATA -sdk iphonesimulator14.5 \
+   -derivedDataPath $DERIVED_DATA -sdk iphonesimulator15.2 \
    -destination 'platform=iOS Simulator,name=iPhone 7,OS=11.4'  \
    | xcpretty  &&
 
 time  xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS \
-   -derivedDataPath $DERIVED_DATA -sdk iphonesimulator14.5 \
+   -derivedDataPath $DERIVED_DATA -sdk iphonesimulator15.2 \
    -destination 'platform=iOS Simulator,name=iPhone 8,OS=13.5' \
    | xcpretty  &&
 
 time  xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS \
-   -derivedDataPath $DERIVED_DATA -sdk iphonesimulator14.5 \
-   -destination 'platform=iOS Simulator,name=iPhone 8,OS=14.5' \
+   -derivedDataPath $DERIVED_DATA -sdk iphonesimulator15.2 \
+   -destination 'platform=iOS Simulator,name=iPhone 8,OS=15.2' \
    | xcpretty  &&
 
 # echo "==============================="
 # echo "tvOS unit test"
 # echo "==============================="
 # time  xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-tvOS \
-#    -derivedDataPath $DERIVED_DATA -sdk appletvos14.5 \
-#    -destination 'platform=tvOS Simulator,name=Apple TV 4K (2nd generation),OS=14.5' \
+#    -derivedDataPath $DERIVED_DATA -sdk appletvos15.2 \
+#    -destination 'platform=tvOS Simulator,name=Apple TV 4K (2nd generation),OS=15.2' \
 #    | xcpretty
 
 
@@ -82,8 +82,8 @@ cd TestProjects/cocoapods/ios  &&
 rm -rf $DERIVED_DATA  &&
 pod install  &&
 time xcodebuild clean build -workspace PinLayout-iOS.xcworkspace -scheme PinLayout-iOS \
-    -sdk iphonesimulator14.5  -derivedDataPath $DERIVED_DATA \
-    -destination 'platform=iOS Simulator,name=iPhone 8,OS=14.5' \
+    -sdk iphonesimulator15.2  -derivedDataPath $DERIVED_DATA \
+    -destination 'platform=iOS Simulator,name=iPhone 8,OS=15.2' \
     | xcpretty  &&
 cd ../../..  &&
 
@@ -108,8 +108,8 @@ cd TestProjects/cocoapods/tvos  &&
 rm -rf $DERIVED_DATA  &&
 pod install  &&
 time xcodebuild clean build -workspace PinLayout-tvOS.xcworkspace -scheme PinLayout-tvOS \
-    -sdk appletvsimulator14.5 -derivedDataPath $DERIVED_DATA \
-    -destination 'platform=tvOS Simulator,name=Apple TV 4K (2nd generation),OS=14.5' \
+    -sdk appletvsimulator15.2 -derivedDataPath $DERIVED_DATA \
+    -destination 'platform=tvOS Simulator,name=Apple TV 4K (2nd generation),OS=15.2' \
     | xcpretty  &&
 rm -rf $DERIVED_DATA  &&
 cd ../../..  &&
@@ -124,9 +124,9 @@ rm Cartfile  &&
 echo "git \"file:///$BASEDIR\"" > 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 ../../..
 
