Skip to content

Commit 98fb989

Browse files
author
Salom, Alexandre
committed
Swift 2.3 support
1 parent 55ddb13 commit 98fb989

File tree

4 files changed

+23
-7
lines changed

4 files changed

+23
-7
lines changed

Dispatcher.xcodeproj/project.pbxproj

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,15 +185,16 @@
185185
attributes = {
186186
LastSwiftMigration = 0700;
187187
LastSwiftUpdateCheck = 0700;
188-
LastUpgradeCheck = 0730;
188+
LastUpgradeCheck = 0800;
189189
ORGANIZATIONNAME = Larson;
190190
TargetAttributes = {
191191
1123A3A619F1404E00BF890F = {
192192
CreatedOnToolsVersion = 6.0;
193+
LastSwiftMigration = 0800;
193194
};
194195
1123A3B019F1404F00BF890F = {
195196
CreatedOnToolsVersion = 6.0;
196-
TestTargetID = 1123A33519F13F6700BF890F;
197+
LastSwiftMigration = 0800;
197198
};
198199
};
199200
};
@@ -279,8 +280,10 @@
279280
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
280281
CLANG_WARN_EMPTY_BODY = YES;
281282
CLANG_WARN_ENUM_CONVERSION = YES;
283+
CLANG_WARN_INFINITE_RECURSION = YES;
282284
CLANG_WARN_INT_CONVERSION = YES;
283285
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
286+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
284287
CLANG_WARN_UNREACHABLE_CODE = YES;
285288
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
286289
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -289,6 +292,7 @@
289292
ENABLE_TESTABILITY = YES;
290293
GCC_C_LANGUAGE_STANDARD = gnu99;
291294
GCC_DYNAMIC_NO_PIC = NO;
295+
GCC_NO_COMMON_BLOCKS = YES;
292296
GCC_OPTIMIZATION_LEVEL = 0;
293297
GCC_PREPROCESSOR_DEFINITIONS = (
294298
"DEBUG=1",
@@ -322,15 +326,18 @@
322326
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
323327
CLANG_WARN_EMPTY_BODY = YES;
324328
CLANG_WARN_ENUM_CONVERSION = YES;
329+
CLANG_WARN_INFINITE_RECURSION = YES;
325330
CLANG_WARN_INT_CONVERSION = YES;
326331
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
332+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
327333
CLANG_WARN_UNREACHABLE_CODE = YES;
328334
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
329335
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
330336
COPY_PHASE_STRIP = YES;
331337
ENABLE_NS_ASSERTIONS = NO;
332338
ENABLE_STRICT_OBJC_MSGSEND = YES;
333339
GCC_C_LANGUAGE_STANDARD = gnu99;
340+
GCC_NO_COMMON_BLOCKS = YES;
334341
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
335342
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
336343
GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -340,6 +347,7 @@
340347
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
341348
MTL_ENABLE_DEBUG_INFO = NO;
342349
SDKROOT = iphoneos;
350+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
343351
VALIDATE_PRODUCT = YES;
344352
};
345353
name = Release;
@@ -348,6 +356,7 @@
348356
isa = XCBuildConfiguration;
349357
buildSettings = {
350358
CLANG_ENABLE_MODULES = YES;
359+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
351360
CURRENT_PROJECT_VERSION = 1;
352361
DEFINES_MODULE = YES;
353362
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -360,9 +369,11 @@
360369
INFOPLIST_FILE = Info.plist;
361370
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
362371
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
372+
PRODUCT_BUNDLE_IDENTIFIER = "larson.$(PRODUCT_NAME:rfc1034identifier)";
363373
PRODUCT_NAME = "$(TARGET_NAME)";
364374
SKIP_INSTALL = YES;
365375
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
376+
SWIFT_VERSION = 2.3;
366377
TARGETED_DEVICE_FAMILY = "1,2";
367378
VERSIONING_SYSTEM = "apple-generic";
368379
VERSION_INFO_PREFIX = "";
@@ -373,6 +384,7 @@
373384
isa = XCBuildConfiguration;
374385
buildSettings = {
375386
CLANG_ENABLE_MODULES = YES;
387+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
376388
CURRENT_PROJECT_VERSION = 1;
377389
DEFINES_MODULE = YES;
378390
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -381,8 +393,10 @@
381393
INFOPLIST_FILE = Info.plist;
382394
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
383395
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
396+
PRODUCT_BUNDLE_IDENTIFIER = "larson.$(PRODUCT_NAME:rfc1034identifier)";
384397
PRODUCT_NAME = "$(TARGET_NAME)";
385398
SKIP_INSTALL = YES;
399+
SWIFT_VERSION = 2.3;
386400
TARGETED_DEVICE_FAMILY = "1,2";
387401
VERSIONING_SYSTEM = "apple-generic";
388402
VERSION_INFO_PREFIX = "";
@@ -402,8 +416,9 @@
402416
);
403417
INFOPLIST_FILE = DispatcherTests/Info.plist;
404418
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
419+
PRODUCT_BUNDLE_IDENTIFIER = "larson.$(PRODUCT_NAME:rfc1034identifier)";
405420
PRODUCT_NAME = "$(TARGET_NAME)";
406-
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/DispatcherExample.app/DispatcherExample";
421+
SWIFT_VERSION = 2.3;
407422
};
408423
name = Debug;
409424
};
@@ -416,8 +431,9 @@
416431
);
417432
INFOPLIST_FILE = DispatcherTests/Info.plist;
418433
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
434+
PRODUCT_BUNDLE_IDENTIFIER = "larson.$(PRODUCT_NAME:rfc1034identifier)";
419435
PRODUCT_NAME = "$(TARGET_NAME)";
420-
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/DispatcherExample.app/DispatcherExample";
436+
SWIFT_VERSION = 2.3;
421437
};
422438
name = Release;
423439
};

Dispatcher.xcodeproj/xcshareddata/xcschemes/Dispatcher.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 = "0730"
3+
LastUpgradeVersion = "0800"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

DispatcherTests/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleExecutable</key>
88
<string>$(EXECUTABLE_NAME)</string>
99
<key>CFBundleIdentifier</key>
10-
<string>larson.$(PRODUCT_NAME:rfc1034identifier)</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundleName</key>

Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleExecutable</key>
88
<string>$(EXECUTABLE_NAME)</string>
99
<key>CFBundleIdentifier</key>
10-
<string>larson.$(PRODUCT_NAME:rfc1034identifier)</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundleName</key>

0 commit comments

Comments
 (0)