Update for xcode 12.5

lucdion · lucdion · commit 2325ee6e1736 · 2021-05-16T09:06:01.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode12.2
+osx_image: xcode12.5
 
 cache:
   - bundler
diff --git a/Example/PinLayoutSample/UI/Menu/MenuView.swift b/Example/PinLayoutSample/UI/Menu/MenuView.swift
@@ -20,7 +20,7 @@
 import UIKit
 import PinLayout
 
-protocol MenuViewDelegate: class {
+protocol MenuViewDelegate: AnyObject {
     func didSelect(pageType: PageType)
 }
 
diff --git a/Podfile.lock b/Podfile.lock
@@ -22,7 +22,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Nimble: 3b4ec3fd40f1dc178058e0981107721c615643d8
-  PinLayout: 74164770108206c3db7aa60c8f87c21132a06f8c
+  PinLayout: 45d8413afa778da892f6c2d4f898fb8de88c8e29
   Quick: 6d9559f40647bc4d510103842ef2fdd882d753e2
   SwiftLint: 4fa9579c63416865179bc416f0a92d55f009600d
 
diff --git a/TestProjects/carthage/ios/PinLayout-Carthage-iOS.xcodeproj/project.pbxproj b/TestProjects/carthage/ios/PinLayout-Carthage-iOS.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 52;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -13,8 +13,8 @@
 		24C873041EE2D113007BFE47 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 24C873021EE2D113007BFE47 /* Main.storyboard */; };
 		24C873061EE2D113007BFE47 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 24C873051EE2D113007BFE47 /* Assets.xcassets */; };
 		24C873091EE2D113007BFE47 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 24C873071EE2D113007BFE47 /* LaunchScreen.storyboard */; };
-		DF98DA62208B566100C86E2D /* PinLayout.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF98DA60208B565400C86E2D /* PinLayout.framework */; };
-		DF98DA63208B566100C86E2D /* PinLayout.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = DF98DA60208B565400C86E2D /* PinLayout.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		DFEB52C326514E1A00E952CE /* PinLayout.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = DFEB52C226514E1A00E952CE /* PinLayout.xcframework */; };
+		DFEB52C426514E1A00E952CE /* PinLayout.xcframework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = DFEB52C226514E1A00E952CE /* PinLayout.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -24,7 +24,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				DF98DA63208B566100C86E2D /* PinLayout.framework in Copy Frameworks */,
+				DFEB52C426514E1A00E952CE /* PinLayout.xcframework in Copy Frameworks */,
 			);
 			name = "Copy Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -42,14 +42,15 @@
 		24C873081EE2D113007BFE47 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		24C8730A1EE2D113007BFE47 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		DF98DA60208B565400C86E2D /* PinLayout.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PinLayout.framework; path = Carthage/Build/iOS/PinLayout.framework; sourceTree = SOURCE_ROOT; };
+		DFEB52C226514E1A00E952CE /* PinLayout.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = PinLayout.xcframework; path = Carthage/Build/PinLayout.xcframework; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		24C872F81EE2D113007BFE47 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				DF98DA62208B566100C86E2D /* PinLayout.framework in Frameworks */,
+				DFEB52C326514E1A00E952CE /* PinLayout.xcframework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -91,6 +92,7 @@
 		DF98DA59208B538700C86E2D /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				DFEB52C226514E1A00E952CE /* PinLayout.xcframework */,
 				DF98DA60208B565400C86E2D /* PinLayout.framework */,
 			);
 			path = Frameworks;
@@ -249,7 +251,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.5;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -305,10 +307,11 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.5;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
@@ -320,13 +323,16 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = X2BTQWMK8M;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Carthage/Build/iOS",
 				);
 				INFOPLIST_FILE = "PinLayout-Carthage-iOS/Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.layoutbox.project.PinLayout-Carthage-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "PinLayout-Carthage-iOS/PinLayout-Carthage-iOS-Bridging-Header.h";
@@ -340,13 +346,16 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = X2BTQWMK8M;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Carthage/Build/iOS",
 				);
 				INFOPLIST_FILE = "PinLayout-Carthage-iOS/Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = "com.layoutbox.project.PinLayout-Carthage-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "PinLayout-Carthage-iOS/PinLayout-Carthage-iOS-Bridging-Header.h";
diff --git a/TestProjects/carthage/ios/PinLayout-Carthage-iOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/TestProjects/carthage/ios/PinLayout-Carthage-iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -2,67 +2,97 @@
   "images" : [
     {
       "idiom" : "iphone",
-      "size" : "29x29",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
       "idiom" : "iphone",
-      "size" : "29x29",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "20x20"
     },
     {
       "idiom" : "iphone",
-      "size" : "40x40",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
       "idiom" : "iphone",
-      "size" : "40x40",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "29x29"
     },
     {
       "idiom" : "iphone",
-      "size" : "60x60",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "40x40"
     },
     {
       "idiom" : "iphone",
-      "size" : "60x60",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "20x20"
     },
     {
       "idiom" : "ipad",
-      "size" : "29x29",
-      "scale" : "1x"
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
       "idiom" : "ipad",
-      "size" : "29x29",
-      "scale" : "2x"
+      "scale" : "1x",
+      "size" : "29x29"
     },
     {
       "idiom" : "ipad",
-      "size" : "40x40",
-      "scale" : "1x"
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
       "idiom" : "ipad",
-      "size" : "40x40",
-      "scale" : "2x"
+      "scale" : "1x",
+      "size" : "40x40"
     },
     {
       "idiom" : "ipad",
-      "size" : "76x76",
-      "scale" : "1x"
+      "scale" : "2x",
+      "size" : "40x40"
     },
     {
       "idiom" : "ipad",
-      "size" : "76x76",
-      "scale" : "2x"
+      "scale" : "1x",
+      "size" : "76x76"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}
diff --git a/TestProjects/cocoapods/ios/Podfile.lock b/TestProjects/cocoapods/ios/Podfile.lock
@@ -33,9 +33,9 @@ EXTERNAL SOURCES:
     :path: "../../.."
 
 SPEC CHECKSUMS:
-  PinLayout: 74164770108206c3db7aa60c8f87c21132a06f8c
+  PinLayout: 45d8413afa778da892f6c2d4f898fb8de88c8e29
   SwifterSwift: 96f90594b370802f01647c2b1229c74a84ffafee
 
-PODFILE CHECKSUM: 0a7937525b5b2e43e75becef489afdd364e0e4ff
+PODFILE CHECKSUM: c982140b0cd5bfe70429dbe53e838e301e7b0022
 
 COCOAPODS: 1.7.5
diff --git a/build-ci.sh b/build-ci.sh

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`import UIKit`
`21`	`21`	`import PinLayout`
`22`	`22`
`23`		`-protocol MenuViewDelegate: class {`
	`23`	`+protocol MenuViewDelegate: AnyObject {`
`24`	`24`	`func didSelect(pageType: PageType)`
`25`	`25`	`}`
`26`	`26`