Xcode 12 and SwiftPM enhancements

roman-suvorov-onseo · Sep 25, 2020 · 18608ea · 18608ea
1 parent 4cac0e9
commit 18608ea
Show file tree

Hide file tree

Showing 42 changed files with 20 additions and 49 deletions.
diff --git a/Package.swift b/Package.swift
@@ -36,7 +36,7 @@ let package = Package(
         .library(name: "SnapKit", targets: ["SnapKit"]),
     ],
     targets: [
-        .target(name: "SnapKit", path: "Source"),
+        .target(name: "SnapKit", path: "Sources"),
         .testTarget(name: "SnapKitTests", dependencies: ["SnapKit"]),
     ],
     swiftLanguageVersions: [

diff --git a/SnapKit.xcodeproj/project.pbxproj b/SnapKit.xcodeproj/project.pbxproj
@@ -39,7 +39,6 @@
 		EE4910991B19A40200A54F1F /* SnapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EEBCC9D819CC627D0083B827 /* SnapKit.framework */; };
 		EE6087751E4F133E0029CF84 /* ConstraintPriority.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE6087741E4F133E0029CF84 /* ConstraintPriority.swift */; };
 		EE6898CB1DA7B3A100D47F33 /* LayoutConstraintItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE6898CA1DA7B3A100D47F33 /* LayoutConstraintItem.swift */; };
-		EECDB3741AC0C9B6006BBC11 /* SnapKit.h in Headers */ = {isa = PBXBuildFile; fileRef = EECDB3661AC0C95C006BBC11 /* SnapKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		EECDB3931AC0CB52006BBC11 /* Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EECDB36A1AC0C95C006BBC11 /* Tests.swift */; };
 		EEF68F9E1D78492400980C26 /* ConstraintLayoutGuideDSL.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEF68F9D1D78492400980C26 /* ConstraintLayoutGuideDSL.swift */; };
 		EEF68FA61D784A5300980C26 /* ConstraintDSL.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEF68FA51D784A5300980C26 /* ConstraintDSL.swift */; };
@@ -82,12 +81,11 @@
 		EE235FC61C5785E200C08960 /* ConstraintView+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ConstraintView+Extensions.swift"; sourceTree = "<group>"; };
 		EE6087741E4F133E0029CF84 /* ConstraintPriority.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConstraintPriority.swift; sourceTree = "<group>"; };
 		EE6898CA1DA7B3A100D47F33 /* LayoutConstraintItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LayoutConstraintItem.swift; sourceTree = "<group>"; };
+		EE6DB559251D9A6B00E0C374 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		EE94F6081AC0F10A008767FF /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		EE94F60A1AC0F10F008767FF /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/AppKit.framework; sourceTree = DEVELOPER_DIR; };
 		EEBCC9D819CC627D0083B827 /* SnapKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SnapKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		EEBCC9E219CC627E0083B827 /* SnapKit Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SnapKit Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
-		EECDB3641AC0C95C006BBC11 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		EECDB3661AC0C95C006BBC11 /* SnapKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SnapKit.h; sourceTree = "<group>"; };
 		EECDB3691AC0C95C006BBC11 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = SnapKitTests/Info.plist; sourceTree = "<group>"; };
 		EECDB36A1AC0C95C006BBC11 /* Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Tests.swift; path = SnapKitTests/Tests.swift; sourceTree = "<group>"; };
 		EEF68F9D1D78492400980C26 /* ConstraintLayoutGuideDSL.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConstraintLayoutGuideDSL.swift; sourceTree = "<group>"; };
@@ -120,7 +118,8 @@
 		DDC9FD8C1981B4DD009612C7 = {
 			isa = PBXGroup;
 			children = (
-				EECDB35D1AC0C95C006BBC11 /* Source */,
+				EE6DB557251D9A6B00E0C374 /* Supporting Files */,
+				EECDB35D1AC0C95C006BBC11 /* Sources */,
 				EE94F60C1AC0F113008767FF /* Frameworks */,
 				DDC9FD961981B4DD009612C7 /* Products */,
 			);
@@ -214,6 +213,14 @@
 			name = Debugging;
 			sourceTree = "<group>";
 		};
+		EE6DB557251D9A6B00E0C374 /* Supporting Files */ = {
+			isa = PBXGroup;
+			children = (
+				EE6DB559251D9A6B00E0C374 /* Info.plist */,
+			);
+			path = "Supporting Files";
+			sourceTree = "<group>";
+		};
 		EE94F60C1AC0F113008767FF /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -224,20 +231,18 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		EECDB35D1AC0C95C006BBC11 /* Source */ = {
+		EECDB35D1AC0C95C006BBC11 /* Sources */ = {
 			isa = PBXGroup;
 			children = (
-				EECDB3661AC0C95C006BBC11 /* SnapKit.h */,
 				EE235F581C57858700C08960 /* Extensions */,
 				EE235F591C57859200C08960 /* DSLs */,
 				EE235F5A1C57859900C08960 /* Maker */,
 				EE235F5B1C57859E00C08960 /* Targets */,
 				EE235F5C1C5785A400C08960 /* Models */,
 				EE235F5D1C5785AC00C08960 /* Debugging */,
-				EECDB36B1AC0C967006BBC11 /* Supporting Files */,
 				EECDB3681AC0C95C006BBC11 /* Tests */,
 			);
-			path = Source;
+			path = Sources;
 			sourceTree = "<group>";
 		};
 		EECDB3681AC0C95C006BBC11 /* Tests */ = {
@@ -250,22 +255,13 @@
 			path = ../Tests;
 			sourceTree = "<group>";
 		};
-		EECDB36B1AC0C967006BBC11 /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				EECDB3641AC0C95C006BBC11 /* Info.plist */,
-			);
-			name = "Supporting Files";
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
 		EEBCC9D519CC627D0083B827 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				EECDB3741AC0C9B6006BBC11 /* SnapKit.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -314,7 +310,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 1100;
+				LastUpgradeCheck = 1200;
 				ORGANIZATIONNAME = "SnapKit Team";
 				TargetAttributes = {
 					EEBCC9D719CC627D0083B827 = {
@@ -443,6 +439,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -503,6 +500,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -539,7 +537,7 @@
 				CURRENT_PROJECT_VERSION = 1.0.0;
 				DEFINES_MODULE = YES;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
+				INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
@@ -562,7 +560,7 @@
 				CURRENT_PROJECT_VERSION = 1.0.0;
 				DEFINES_MODULE = YES;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
+				INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;

diff --git a/SnapKit.xcodeproj/xcshareddata/xcschemes/SnapKit.xcscheme b/SnapKit.xcodeproj/xcshareddata/xcschemes/SnapKit.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Source/SnapKit.h b/Source/SnapKit.h
diff --git a/Source/Constraint.swift → Sources/Constraint.swift b/Source/Constraint.swift → Sources/Constraint.swift
diff --git a/Source/ConstraintAttributes.swift → Sources/ConstraintAttributes.swift b/Source/ConstraintAttributes.swift → Sources/ConstraintAttributes.swift
diff --git a/Source/ConstraintConfig.swift → Sources/ConstraintConfig.swift b/Source/ConstraintConfig.swift → Sources/ConstraintConfig.swift
diff --git a/Source/ConstraintConstantTarget.swift → Sources/ConstraintConstantTarget.swift b/Source/ConstraintConstantTarget.swift → Sources/ConstraintConstantTarget.swift
diff --git a/Source/ConstraintDSL.swift → Sources/ConstraintDSL.swift b/Source/ConstraintDSL.swift → Sources/ConstraintDSL.swift
diff --git a/Source/ConstraintDescription.swift → Sources/ConstraintDescription.swift b/Source/ConstraintDescription.swift → Sources/ConstraintDescription.swift
diff --git a/...ce/ConstraintDirectionalInsetTarget.swift → ...es/ConstraintDirectionalInsetTarget.swift b/...ce/ConstraintDirectionalInsetTarget.swift → ...es/ConstraintDirectionalInsetTarget.swift
diff --git a/Source/ConstraintDirectionalInsets.swift → Sources/ConstraintDirectionalInsets.swift b/Source/ConstraintDirectionalInsets.swift → Sources/ConstraintDirectionalInsets.swift
diff --git a/Source/ConstraintInsetTarget.swift → Sources/ConstraintInsetTarget.swift b/Source/ConstraintInsetTarget.swift → Sources/ConstraintInsetTarget.swift
diff --git a/Source/ConstraintInsets.swift → Sources/ConstraintInsets.swift b/Source/ConstraintInsets.swift → Sources/ConstraintInsets.swift
diff --git a/Source/ConstraintItem.swift → Sources/ConstraintItem.swift b/Source/ConstraintItem.swift → Sources/ConstraintItem.swift
diff --git a/...ce/ConstraintLayoutGuide+Extensions.swift → ...es/ConstraintLayoutGuide+Extensions.swift b/...ce/ConstraintLayoutGuide+Extensions.swift → ...es/ConstraintLayoutGuide+Extensions.swift
diff --git a/Source/ConstraintLayoutGuide.swift → Sources/ConstraintLayoutGuide.swift b/Source/ConstraintLayoutGuide.swift → Sources/ConstraintLayoutGuide.swift
diff --git a/Source/ConstraintLayoutGuideDSL.swift → Sources/ConstraintLayoutGuideDSL.swift b/Source/ConstraintLayoutGuideDSL.swift → Sources/ConstraintLayoutGuideDSL.swift
diff --git a/Source/ConstraintLayoutSupport.swift → Sources/ConstraintLayoutSupport.swift b/Source/ConstraintLayoutSupport.swift → Sources/ConstraintLayoutSupport.swift
diff --git a/Source/ConstraintLayoutSupportDSL.swift → Sources/ConstraintLayoutSupportDSL.swift b/Source/ConstraintLayoutSupportDSL.swift → Sources/ConstraintLayoutSupportDSL.swift
diff --git a/Source/ConstraintMaker.swift → Sources/ConstraintMaker.swift b/Source/ConstraintMaker.swift → Sources/ConstraintMaker.swift
diff --git a/Source/ConstraintMakerEditable.swift → Sources/ConstraintMakerEditable.swift b/Source/ConstraintMakerEditable.swift → Sources/ConstraintMakerEditable.swift
diff --git a/Source/ConstraintMakerExtendable.swift → Sources/ConstraintMakerExtendable.swift b/Source/ConstraintMakerExtendable.swift → Sources/ConstraintMakerExtendable.swift
diff --git a/Source/ConstraintMakerFinalizable.swift → Sources/ConstraintMakerFinalizable.swift b/Source/ConstraintMakerFinalizable.swift → Sources/ConstraintMakerFinalizable.swift
diff --git a/Source/ConstraintMakerPriortizable.swift → Sources/ConstraintMakerPriortizable.swift b/Source/ConstraintMakerPriortizable.swift → Sources/ConstraintMakerPriortizable.swift
diff --git a/...ConstraintMakerRelatable+Extensions.swift → ...ConstraintMakerRelatable+Extensions.swift b/...ConstraintMakerRelatable+Extensions.swift → ...ConstraintMakerRelatable+Extensions.swift
diff --git a/Source/ConstraintMakerRelatable.swift → Sources/ConstraintMakerRelatable.swift b/Source/ConstraintMakerRelatable.swift → Sources/ConstraintMakerRelatable.swift
diff --git a/Source/ConstraintMultiplierTarget.swift → Sources/ConstraintMultiplierTarget.swift b/Source/ConstraintMultiplierTarget.swift → Sources/ConstraintMultiplierTarget.swift
diff --git a/Source/ConstraintOffsetTarget.swift → Sources/ConstraintOffsetTarget.swift b/Source/ConstraintOffsetTarget.swift → Sources/ConstraintOffsetTarget.swift
diff --git a/Source/ConstraintPriority.swift → Sources/ConstraintPriority.swift b/Source/ConstraintPriority.swift → Sources/ConstraintPriority.swift
diff --git a/Source/ConstraintPriorityTarget.swift → Sources/ConstraintPriorityTarget.swift b/Source/ConstraintPriorityTarget.swift → Sources/ConstraintPriorityTarget.swift
diff --git a/Source/ConstraintRelatableTarget.swift → Sources/ConstraintRelatableTarget.swift b/Source/ConstraintRelatableTarget.swift → Sources/ConstraintRelatableTarget.swift
diff --git a/Source/ConstraintRelation.swift → Sources/ConstraintRelation.swift b/Source/ConstraintRelation.swift → Sources/ConstraintRelation.swift
diff --git a/Source/ConstraintView+Extensions.swift → Sources/ConstraintView+Extensions.swift b/Source/ConstraintView+Extensions.swift → Sources/ConstraintView+Extensions.swift
diff --git a/Source/ConstraintView.swift → Sources/ConstraintView.swift b/Source/ConstraintView.swift → Sources/ConstraintView.swift
diff --git a/Source/ConstraintViewDSL.swift → Sources/ConstraintViewDSL.swift b/Source/ConstraintViewDSL.swift → Sources/ConstraintViewDSL.swift
diff --git a/Source/Debugging.swift → Sources/Debugging.swift b/Source/Debugging.swift → Sources/Debugging.swift
diff --git a/Source/LayoutConstraint.swift → Sources/LayoutConstraint.swift b/Source/LayoutConstraint.swift → Sources/LayoutConstraint.swift
diff --git a/Source/LayoutConstraintItem.swift → Sources/LayoutConstraintItem.swift b/Source/LayoutConstraintItem.swift → Sources/LayoutConstraintItem.swift
diff --git a/Source/Typealiases.swift → Sources/Typealiases.swift b/Source/Typealiases.swift → Sources/Typealiases.swift
diff --git a/Source/UILayoutSupport+Extensions.swift → Sources/UILayoutSupport+Extensions.swift b/Source/UILayoutSupport+Extensions.swift → Sources/UILayoutSupport+Extensions.swift
diff --git a/Source/Info.plist → Supporting Files/Info.plist b/Source/Info.plist → Supporting Files/Info.plist