Skip to content

Commit 980b201

Browse files
daltoniamdaltoniam
committed
swift 3
1 parent 0581522 commit 980b201

File tree

4 files changed

+35
-4
lines changed

4 files changed

+35
-4
lines changed

‎JSONJoy.xcodeproj/project.pbxproj

+32-1
Original file line numberDiff line numberDiff line change
@@ -329,30 +329,36 @@
329329
isa = PBXProject;
330330
attributes = {
331331
LastSwiftUpdateCheck = 0720;
332-
LastUpgradeCheck = 0700;
332+
LastUpgradeCheck = 0800;
333333
ORGANIZATIONNAME = Vluxe;
334334
TargetAttributes = {
335335
5C135EEC1C4734BA00AA3A01 = {
336336
CreatedOnToolsVersion = 7.2;
337+
LastSwiftMigration = 0800;
337338
};
338339
5C135EF51C4734BA00AA3A01 = {
339340
CreatedOnToolsVersion = 7.2;
341+
LastSwiftMigration = 0800;
340342
};
341343
5C135FCA1C47392D00AA3A01 = {
342344
CreatedOnToolsVersion = 7.2;
345+
LastSwiftMigration = 0800;
343346
};
344347
6B3E79B619D355CF006071F7 = {
345348
CreatedOnToolsVersion = 6.0.1;
346349
LastSwiftMigration = 0800;
347350
};
348351
6B3E79C119D355CF006071F7 = {
349352
CreatedOnToolsVersion = 6.0.1;
353+
LastSwiftMigration = 0800;
350354
};
351355
D958022D19E6ED8E003C8218 = {
352356
CreatedOnToolsVersion = 6.1;
357+
LastSwiftMigration = 0800;
353358
};
354359
D958023719E6ED8E003C8218 = {
355360
CreatedOnToolsVersion = 6.1;
361+
LastSwiftMigration = 0800;
356362
};
357363
};
358364
};
@@ -507,6 +513,7 @@
507513
5C135EFE1C4734BA00AA3A01 /* Debug */ = {
508514
isa = XCBuildConfiguration;
509515
buildSettings = {
516+
"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
510517
DEBUG_INFORMATION_FORMAT = dwarf;
511518
DEFINES_MODULE = YES;
512519
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -520,6 +527,7 @@
520527
PRODUCT_NAME = JSONJoy;
521528
SDKROOT = appletvos;
522529
SKIP_INSTALL = YES;
530+
SWIFT_VERSION = 3.0;
523531
TARGETED_DEVICE_FAMILY = 3;
524532
TVOS_DEPLOYMENT_TARGET = 9.0;
525533
};
@@ -528,6 +536,7 @@
528536
5C135EFF1C4734BA00AA3A01 /* Release */ = {
529537
isa = XCBuildConfiguration;
530538
buildSettings = {
539+
"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
531540
COPY_PHASE_STRIP = NO;
532541
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
533542
DEFINES_MODULE = YES;
@@ -542,6 +551,7 @@
542551
PRODUCT_NAME = JSONJoy;
543552
SDKROOT = appletvos;
544553
SKIP_INSTALL = YES;
554+
SWIFT_VERSION = 3.0;
545555
TARGETED_DEVICE_FAMILY = 3;
546556
TVOS_DEPLOYMENT_TARGET = 9.0;
547557
};
@@ -557,6 +567,7 @@
557567
PRODUCT_BUNDLE_IDENTIFIER = com.vluxe.JSONJoytvOSTests;
558568
PRODUCT_NAME = "$(TARGET_NAME)";
559569
SDKROOT = appletvos;
570+
SWIFT_VERSION = 3.0;
560571
TVOS_DEPLOYMENT_TARGET = 9.1;
561572
};
562573
name = Debug;
@@ -572,6 +583,7 @@
572583
PRODUCT_BUNDLE_IDENTIFIER = com.vluxe.JSONJoytvOSTests;
573584
PRODUCT_NAME = "$(TARGET_NAME)";
574585
SDKROOT = appletvos;
586+
SWIFT_VERSION = 3.0;
575587
TVOS_DEPLOYMENT_TARGET = 9.1;
576588
};
577589
name = Release;
@@ -580,6 +592,7 @@
580592
isa = XCBuildConfiguration;
581593
buildSettings = {
582594
APPLICATION_EXTENSION_API_ONLY = YES;
595+
"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
583596
DEBUG_INFORMATION_FORMAT = dwarf;
584597
DEFINES_MODULE = YES;
585598
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -593,6 +606,7 @@
593606
PRODUCT_NAME = JSONJoy;
594607
SDKROOT = watchos;
595608
SKIP_INSTALL = YES;
609+
SWIFT_VERSION = 3.0;
596610
TARGETED_DEVICE_FAMILY = 4;
597611
WATCHOS_DEPLOYMENT_TARGET = 2.1;
598612
};
@@ -602,6 +616,7 @@
602616
isa = XCBuildConfiguration;
603617
buildSettings = {
604618
APPLICATION_EXTENSION_API_ONLY = YES;
619+
"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
605620
COPY_PHASE_STRIP = NO;
606621
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
607622
DEFINES_MODULE = YES;
@@ -616,6 +631,7 @@
616631
PRODUCT_NAME = JSONJoy;
617632
SDKROOT = watchos;
618633
SKIP_INSTALL = YES;
634+
SWIFT_VERSION = 3.0;
619635
TARGETED_DEVICE_FAMILY = 4;
620636
WATCHOS_DEPLOYMENT_TARGET = 2.1;
621637
};
@@ -634,8 +650,10 @@
634650
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
635651
CLANG_WARN_EMPTY_BODY = YES;
636652
CLANG_WARN_ENUM_CONVERSION = YES;
653+
CLANG_WARN_INFINITE_RECURSION = YES;
637654
CLANG_WARN_INT_CONVERSION = YES;
638655
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
656+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
639657
CLANG_WARN_UNREACHABLE_CODE = YES;
640658
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
641659
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -645,6 +663,7 @@
645663
ENABLE_TESTABILITY = YES;
646664
GCC_C_LANGUAGE_STANDARD = gnu99;
647665
GCC_DYNAMIC_NO_PIC = NO;
666+
GCC_NO_COMMON_BLOCKS = YES;
648667
GCC_OPTIMIZATION_LEVEL = 0;
649668
GCC_PREPROCESSOR_DEFINITIONS = (
650669
"DEBUG=1",
@@ -681,8 +700,10 @@
681700
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
682701
CLANG_WARN_EMPTY_BODY = YES;
683702
CLANG_WARN_ENUM_CONVERSION = YES;
703+
CLANG_WARN_INFINITE_RECURSION = YES;
684704
CLANG_WARN_INT_CONVERSION = YES;
685705
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
706+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
686707
CLANG_WARN_UNREACHABLE_CODE = YES;
687708
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
688709
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -691,6 +712,7 @@
691712
ENABLE_NS_ASSERTIONS = NO;
692713
ENABLE_STRICT_OBJC_MSGSEND = YES;
693714
GCC_C_LANGUAGE_STANDARD = gnu99;
715+
GCC_NO_COMMON_BLOCKS = YES;
694716
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
695717
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
696718
GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -700,6 +722,7 @@
700722
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
701723
MTL_ENABLE_DEBUG_INFO = NO;
702724
SDKROOT = iphoneos;
725+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
703726
TARGETED_DEVICE_FAMILY = "1,2";
704727
VALIDATE_PRODUCT = YES;
705728
VERSIONING_SYSTEM = "apple-generic";
@@ -712,6 +735,7 @@
712735
buildSettings = {
713736
APPLICATION_EXTENSION_API_ONLY = YES;
714737
CLANG_ENABLE_MODULES = YES;
738+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
715739
DEFINES_MODULE = YES;
716740
DYLIB_COMPATIBILITY_VERSION = 1;
717741
DYLIB_CURRENT_VERSION = 1;
@@ -733,6 +757,7 @@
733757
buildSettings = {
734758
APPLICATION_EXTENSION_API_ONLY = YES;
735759
CLANG_ENABLE_MODULES = YES;
760+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
736761
DEFINES_MODULE = YES;
737762
DYLIB_COMPATIBILITY_VERSION = 1;
738763
DYLIB_CURRENT_VERSION = 1;
@@ -763,6 +788,7 @@
763788
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
764789
PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.$(PRODUCT_NAME:rfc1034identifier)";
765790
PRODUCT_NAME = "$(TARGET_NAME)";
791+
SWIFT_VERSION = 3.0;
766792
};
767793
name = Debug;
768794
};
@@ -777,6 +803,7 @@
777803
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
778804
PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.$(PRODUCT_NAME:rfc1034identifier)";
779805
PRODUCT_NAME = "$(TARGET_NAME)";
806+
SWIFT_VERSION = 3.0;
780807
};
781808
name = Release;
782809
};
@@ -802,6 +829,7 @@
802829
PRODUCT_NAME = JSONJoy;
803830
SDKROOT = macosx;
804831
SKIP_INSTALL = YES;
832+
SWIFT_VERSION = 3.0;
805833
};
806834
name = Debug;
807835
};
@@ -824,6 +852,7 @@
824852
PRODUCT_NAME = JSONJoy;
825853
SDKROOT = macosx;
826854
SKIP_INSTALL = YES;
855+
SWIFT_VERSION = 3.0;
827856
};
828857
name = Release;
829858
};
@@ -845,6 +874,7 @@
845874
PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.$(PRODUCT_NAME:rfc1034identifier)";
846875
PRODUCT_NAME = "$(TARGET_NAME)";
847876
SDKROOT = macosx;
877+
SWIFT_VERSION = 3.0;
848878
};
849879
name = Debug;
850880
};
@@ -863,6 +893,7 @@
863893
PRODUCT_BUNDLE_IDENTIFIER = "com.vluxe.$(PRODUCT_NAME:rfc1034identifier)";
864894
PRODUCT_NAME = "$(TARGET_NAME)";
865895
SDKROOT = macosx;
896+
SWIFT_VERSION = 3.0;
866897
};
867898
name = Release;
868899
};

‎JSONJoy.xcodeproj/xcshareddata/xcschemes/JSONJoy.xcscheme

+1-1
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"

‎JSONJoy.xcodeproj/xcshareddata/xcschemes/JSONJoyOSX.xcscheme

+1-1
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"

‎JSONJoy.xcodeproj/xcshareddata/xcschemes/JSONJoyTests.xcscheme

+1-1
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"

0 commit comments

Comments
 (0)