Skip to content

Commit 7a61a35

Browse files
committed
代码适配 Swift 4
1 parent 4fec150 commit 7a61a35

File tree

2 files changed

+27
-15
lines changed

2 files changed

+27
-15
lines changed

tools/main.swift

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,12 @@ class ParsingDelegate: NSObject, XMLParserDelegate {
143143
let url = URL(fileURLWithPath: cwd).deletingLastPathComponent().appendingPathComponent("download.md")
144144
do {
145145
try out.write(to: url, atomically: true, encoding: .utf8)
146-
NSWorkspace.shared().activateFileViewerSelecting([url])
146+
#if swift(>=4)
147+
let workspace = NSWorkspace.shared
148+
#else
149+
let workspace = NSWorkspace.shared()
150+
#endif
151+
workspace.activateFileViewerSelecting([url])
147152
} catch {
148153
print(out)
149154
}

tools/update.xcodeproj/project.pbxproj

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
522CA1FB1E75E64B00EE2E2F = {
4242
isa = PBXGroup;
4343
children = (
44-
522CA2061E75E64B00EE2E2F /* update */,
44+
52D71C3A1E7612ED0036EE1C /* main.swift */,
4545
522CA2051E75E64B00EE2E2F /* Products */,
4646
);
4747
sourceTree = "<group>";
@@ -54,14 +54,6 @@
5454
name = Products;
5555
sourceTree = "<group>";
5656
};
57-
522CA2061E75E64B00EE2E2F /* update */ = {
58-
isa = PBXGroup;
59-
children = (
60-
52D71C3A1E7612ED0036EE1C /* main.swift */,
61-
);
62-
path = update;
63-
sourceTree = "<group>";
64-
};
6557
/* End PBXGroup section */
6658

6759
/* Begin PBXNativeTarget section */
@@ -89,12 +81,13 @@
8981
isa = PBXProject;
9082
attributes = {
9183
LastSwiftUpdateCheck = 0820;
92-
LastUpgradeCheck = 0830;
84+
LastUpgradeCheck = 0900;
9385
ORGANIZATIONNAME = WWITDC;
9486
TargetAttributes = {
9587
522CA2031E75E64B00EE2E2F = {
9688
CreatedOnToolsVersion = 8.2.1;
9789
DevelopmentTeam = 2H866F22W7;
90+
LastSwiftMigration = 0900;
9891
ProvisioningStyle = Automatic;
9992
};
10093
};
@@ -137,15 +130,21 @@
137130
CLANG_CXX_LIBRARY = "libc++";
138131
CLANG_ENABLE_MODULES = YES;
139132
CLANG_ENABLE_OBJC_ARC = YES;
133+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
140134
CLANG_WARN_BOOL_CONVERSION = YES;
135+
CLANG_WARN_COMMA = YES;
141136
CLANG_WARN_CONSTANT_CONVERSION = YES;
142137
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
143138
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
144139
CLANG_WARN_EMPTY_BODY = YES;
145140
CLANG_WARN_ENUM_CONVERSION = YES;
146141
CLANG_WARN_INFINITE_RECURSION = YES;
147142
CLANG_WARN_INT_CONVERSION = YES;
143+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
144+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
148145
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
146+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
147+
CLANG_WARN_STRICT_PROTOTYPES = YES;
149148
CLANG_WARN_SUSPICIOUS_MOVE = YES;
150149
CLANG_WARN_UNREACHABLE_CODE = YES;
151150
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -168,7 +167,7 @@
168167
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
169168
GCC_WARN_UNUSED_FUNCTION = YES;
170169
GCC_WARN_UNUSED_VARIABLE = YES;
171-
MACOSX_DEPLOYMENT_TARGET = 10.12;
170+
MACOSX_DEPLOYMENT_TARGET = 10.9;
172171
MTL_ENABLE_DEBUG_INFO = YES;
173172
ONLY_ACTIVE_ARCH = YES;
174173
SDKROOT = macosx;
@@ -185,15 +184,21 @@
185184
CLANG_CXX_LIBRARY = "libc++";
186185
CLANG_ENABLE_MODULES = YES;
187186
CLANG_ENABLE_OBJC_ARC = YES;
187+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
188188
CLANG_WARN_BOOL_CONVERSION = YES;
189+
CLANG_WARN_COMMA = YES;
189190
CLANG_WARN_CONSTANT_CONVERSION = YES;
190191
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
191192
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
192193
CLANG_WARN_EMPTY_BODY = YES;
193194
CLANG_WARN_ENUM_CONVERSION = YES;
194195
CLANG_WARN_INFINITE_RECURSION = YES;
195196
CLANG_WARN_INT_CONVERSION = YES;
197+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
198+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
196199
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
200+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
201+
CLANG_WARN_STRICT_PROTOTYPES = YES;
197202
CLANG_WARN_SUSPICIOUS_MOVE = YES;
198203
CLANG_WARN_UNREACHABLE_CODE = YES;
199204
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -210,7 +215,7 @@
210215
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
211216
GCC_WARN_UNUSED_FUNCTION = YES;
212217
GCC_WARN_UNUSED_VARIABLE = YES;
213-
MACOSX_DEPLOYMENT_TARGET = 10.12;
218+
MACOSX_DEPLOYMENT_TARGET = 10.9;
214219
MTL_ENABLE_DEBUG_INFO = NO;
215220
SDKROOT = macosx;
216221
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -223,7 +228,8 @@
223228
CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/$(CONFIGURATION)";
224229
DEVELOPMENT_TEAM = 2H866F22W7;
225230
PRODUCT_NAME = "$(TARGET_NAME)";
226-
SWIFT_VERSION = 3.0;
231+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
232+
SWIFT_VERSION = 4.0;
227233
};
228234
name = Debug;
229235
};
@@ -233,7 +239,8 @@
233239
CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/$(CONFIGURATION)";
234240
DEVELOPMENT_TEAM = 2H866F22W7;
235241
PRODUCT_NAME = "$(TARGET_NAME)";
236-
SWIFT_VERSION = 3.0;
242+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
243+
SWIFT_VERSION = 4.0;
237244
};
238245
name = Release;
239246
};

0 commit comments

Comments
 (0)