Skip to content

Commit 18608ea

Browse files
committed
Xcode 12 and SwiftPM enhancements
1 parent 4cac0e9 commit 18608ea

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+20
-49
lines changed

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ let package = Package(
3636
.library(name: "SnapKit", targets: ["SnapKit"]),
3737
],
3838
targets: [
39-
.target(name: "SnapKit", path: "Source"),
39+
.target(name: "SnapKit", path: "Sources"),
4040
.testTarget(name: "SnapKitTests", dependencies: ["SnapKit"]),
4141
],
4242
swiftLanguageVersions: [

SnapKit.xcodeproj/project.pbxproj

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
EE4910991B19A40200A54F1F /* SnapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EEBCC9D819CC627D0083B827 /* SnapKit.framework */; };
4040
EE6087751E4F133E0029CF84 /* ConstraintPriority.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE6087741E4F133E0029CF84 /* ConstraintPriority.swift */; };
4141
EE6898CB1DA7B3A100D47F33 /* LayoutConstraintItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE6898CA1DA7B3A100D47F33 /* LayoutConstraintItem.swift */; };
42-
EECDB3741AC0C9B6006BBC11 /* SnapKit.h in Headers */ = {isa = PBXBuildFile; fileRef = EECDB3661AC0C95C006BBC11 /* SnapKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
4342
EECDB3931AC0CB52006BBC11 /* Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EECDB36A1AC0C95C006BBC11 /* Tests.swift */; };
4443
EEF68F9E1D78492400980C26 /* ConstraintLayoutGuideDSL.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEF68F9D1D78492400980C26 /* ConstraintLayoutGuideDSL.swift */; };
4544
EEF68FA61D784A5300980C26 /* ConstraintDSL.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEF68FA51D784A5300980C26 /* ConstraintDSL.swift */; };
@@ -82,12 +81,11 @@
8281
EE235FC61C5785E200C08960 /* ConstraintView+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ConstraintView+Extensions.swift"; sourceTree = "<group>"; };
8382
EE6087741E4F133E0029CF84 /* ConstraintPriority.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConstraintPriority.swift; sourceTree = "<group>"; };
8483
EE6898CA1DA7B3A100D47F33 /* LayoutConstraintItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LayoutConstraintItem.swift; sourceTree = "<group>"; };
84+
EE6DB559251D9A6B00E0C374 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
8585
EE94F6081AC0F10A008767FF /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
8686
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; };
8787
EEBCC9D819CC627D0083B827 /* SnapKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SnapKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8888
EEBCC9E219CC627E0083B827 /* SnapKit Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SnapKit Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
89-
EECDB3641AC0C95C006BBC11 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
90-
EECDB3661AC0C95C006BBC11 /* SnapKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SnapKit.h; sourceTree = "<group>"; };
9189
EECDB3691AC0C95C006BBC11 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = SnapKitTests/Info.plist; sourceTree = "<group>"; };
9290
EECDB36A1AC0C95C006BBC11 /* Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Tests.swift; path = SnapKitTests/Tests.swift; sourceTree = "<group>"; };
9391
EEF68F9D1D78492400980C26 /* ConstraintLayoutGuideDSL.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConstraintLayoutGuideDSL.swift; sourceTree = "<group>"; };
@@ -120,7 +118,8 @@
120118
DDC9FD8C1981B4DD009612C7 = {
121119
isa = PBXGroup;
122120
children = (
123-
EECDB35D1AC0C95C006BBC11 /* Source */,
121+
EE6DB557251D9A6B00E0C374 /* Supporting Files */,
122+
EECDB35D1AC0C95C006BBC11 /* Sources */,
124123
EE94F60C1AC0F113008767FF /* Frameworks */,
125124
DDC9FD961981B4DD009612C7 /* Products */,
126125
);
@@ -214,6 +213,14 @@
214213
name = Debugging;
215214
sourceTree = "<group>";
216215
};
216+
EE6DB557251D9A6B00E0C374 /* Supporting Files */ = {
217+
isa = PBXGroup;
218+
children = (
219+
EE6DB559251D9A6B00E0C374 /* Info.plist */,
220+
);
221+
path = "Supporting Files";
222+
sourceTree = "<group>";
223+
};
217224
EE94F60C1AC0F113008767FF /* Frameworks */ = {
218225
isa = PBXGroup;
219226
children = (
@@ -224,20 +231,18 @@
224231
name = Frameworks;
225232
sourceTree = "<group>";
226233
};
227-
EECDB35D1AC0C95C006BBC11 /* Source */ = {
234+
EECDB35D1AC0C95C006BBC11 /* Sources */ = {
228235
isa = PBXGroup;
229236
children = (
230-
EECDB3661AC0C95C006BBC11 /* SnapKit.h */,
231237
EE235F581C57858700C08960 /* Extensions */,
232238
EE235F591C57859200C08960 /* DSLs */,
233239
EE235F5A1C57859900C08960 /* Maker */,
234240
EE235F5B1C57859E00C08960 /* Targets */,
235241
EE235F5C1C5785A400C08960 /* Models */,
236242
EE235F5D1C5785AC00C08960 /* Debugging */,
237-
EECDB36B1AC0C967006BBC11 /* Supporting Files */,
238243
EECDB3681AC0C95C006BBC11 /* Tests */,
239244
);
240-
path = Source;
245+
path = Sources;
241246
sourceTree = "<group>";
242247
};
243248
EECDB3681AC0C95C006BBC11 /* Tests */ = {
@@ -250,22 +255,13 @@
250255
path = ../Tests;
251256
sourceTree = "<group>";
252257
};
253-
EECDB36B1AC0C967006BBC11 /* Supporting Files */ = {
254-
isa = PBXGroup;
255-
children = (
256-
EECDB3641AC0C95C006BBC11 /* Info.plist */,
257-
);
258-
name = "Supporting Files";
259-
sourceTree = "<group>";
260-
};
261258
/* End PBXGroup section */
262259

263260
/* Begin PBXHeadersBuildPhase section */
264261
EEBCC9D519CC627D0083B827 /* Headers */ = {
265262
isa = PBXHeadersBuildPhase;
266263
buildActionMask = 2147483647;
267264
files = (
268-
EECDB3741AC0C9B6006BBC11 /* SnapKit.h in Headers */,
269265
);
270266
runOnlyForDeploymentPostprocessing = 0;
271267
};
@@ -314,7 +310,7 @@
314310
isa = PBXProject;
315311
attributes = {
316312
LastSwiftUpdateCheck = 0720;
317-
LastUpgradeCheck = 1100;
313+
LastUpgradeCheck = 1200;
318314
ORGANIZATIONNAME = "SnapKit Team";
319315
TargetAttributes = {
320316
EEBCC9D719CC627D0083B827 = {
@@ -443,6 +439,7 @@
443439
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
444440
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
445441
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
442+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
446443
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
447444
CLANG_WARN_STRICT_PROTOTYPES = YES;
448445
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -503,6 +500,7 @@
503500
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
504501
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
505502
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
503+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
506504
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
507505
CLANG_WARN_STRICT_PROTOTYPES = YES;
508506
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -539,7 +537,7 @@
539537
CURRENT_PROJECT_VERSION = 1.0.0;
540538
DEFINES_MODULE = YES;
541539
DYLIB_INSTALL_NAME_BASE = "@rpath";
542-
INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
540+
INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist";
543541
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
544542
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
545543
MACOSX_DEPLOYMENT_TARGET = 10.11;
@@ -562,7 +560,7 @@
562560
CURRENT_PROJECT_VERSION = 1.0.0;
563561
DEFINES_MODULE = YES;
564562
DYLIB_INSTALL_NAME_BASE = "@rpath";
565-
INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
563+
INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist";
566564
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
567565
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
568566
MACOSX_DEPLOYMENT_TARGET = 10.11;

SnapKit.xcodeproj/xcshareddata/xcschemes/SnapKit.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1100"
3+
LastUpgradeVersion = "1200"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Source/SnapKit.h

Lines changed: 0 additions & 27 deletions
This file was deleted.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)