Skip to content

Commit 21f24e0

Browse files
devxouldevxoul
authored
Merge pull request #2 from devxoul/swift-3.0
Let's Swift 3.0
2 parents ffe8beb + 06f7692 commit 21f24e0

9 files changed

Lines changed: 258 additions & 41 deletions

File tree

‎.swift-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.0

‎.travis.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: objective-c
2-
osx_image: xcode7
2+
osx_image: xcode8
33
script:
4-
- xctool -scheme 'SafeIndex-iOS' -sdk iphonesimulator CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO test -parallelize
5-
- xctool -scheme 'SafeIndex-OSX' test -parallelize
4+
- xcodebuild -scheme 'SafeIndex' -sdk iphonesimulator CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO test | xcpretty -c
5+
- xcodebuild -scheme 'SafeIndex-OSX' test | xcpretty -c

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SafeIndex
22
=========
33

4-
![Swift](https://img.shields.io/badge/Swift-2.2-orange.svg)
4+
![Swift](https://img.shields.io/badge/Swift-3.0-orange.svg)
55
[![Build Status](https://travis-ci.org/devxoul/SafeIndex.svg)](https://travis-ci.org/devxoul/SafeIndex)
66
[![CocoaPods](http://img.shields.io/cocoapods/v/SafeIndex.svg)](https://cocoapods.org/pods/SafeIndex)
77
[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
@@ -50,10 +50,10 @@ Installation
5050
import PackageDescription
5151
5252
let package = Package(
53-
name: "MyAwesomeApp",
54-
dependencies: [
55-
.Package(url: "https://github.com/devxoul/SafeIndex", "0.2.0"),
56-
]
53+
name: "MyAwesomeApp",
54+
dependencies: [
55+
.Package(url: "https://github.com/devxoul/SafeIndex", "0.2.0"),
56+
]
5757
)
5858
```
5959

‎SafeIndex.xcodeproj/project.pbxproj‎

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -306,26 +306,32 @@
306306
isa = PBXProject;
307307
attributes = {
308308
LastSwiftUpdateCheck = 0720;
309-
LastUpgradeCheck = 0720;
309+
LastUpgradeCheck = 0800;
310310
ORGANIZATIONNAME = "Suyeol Jeon";
311311
TargetAttributes = {
312312
03C2FAFD1C75B85A00C6E738 = {
313313
CreatedOnToolsVersion = 7.2.1;
314+
LastSwiftMigration = 0800;
314315
};
315316
03C2FB141C75BB3E00C6E738 = {
316317
CreatedOnToolsVersion = 7.2.1;
318+
LastSwiftMigration = 0800;
317319
};
318320
03C2FB281C75BD8A00C6E738 = {
319321
CreatedOnToolsVersion = 7.2.1;
322+
LastSwiftMigration = 0800;
320323
};
321324
03C2FB351C75BD9A00C6E738 = {
322325
CreatedOnToolsVersion = 7.2.1;
326+
LastSwiftMigration = 0800;
323327
};
324328
03C2FB5D1C75BE4B00C6E738 = {
325329
CreatedOnToolsVersion = 7.2.1;
330+
LastSwiftMigration = 0800;
326331
};
327332
03C2FB6C1C75BE6100C6E738 = {
328333
CreatedOnToolsVersion = 7.2.1;
334+
LastSwiftMigration = 0800;
329335
};
330336
};
331337
};
@@ -481,8 +487,10 @@
481487
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
482488
CLANG_WARN_EMPTY_BODY = YES;
483489
CLANG_WARN_ENUM_CONVERSION = YES;
490+
CLANG_WARN_INFINITE_RECURSION = YES;
484491
CLANG_WARN_INT_CONVERSION = YES;
485492
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
493+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
486494
CLANG_WARN_UNREACHABLE_CODE = YES;
487495
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
488496
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -529,8 +537,10 @@
529537
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
530538
CLANG_WARN_EMPTY_BODY = YES;
531539
CLANG_WARN_ENUM_CONVERSION = YES;
540+
CLANG_WARN_INFINITE_RECURSION = YES;
532541
CLANG_WARN_INT_CONVERSION = YES;
533542
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
543+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
534544
CLANG_WARN_UNREACHABLE_CODE = YES;
535545
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
536546
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -550,6 +560,7 @@
550560
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
551561
MTL_ENABLE_DEBUG_INFO = NO;
552562
SDKROOT = iphoneos;
563+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
553564
TARGETED_DEVICE_FAMILY = "1,2";
554565
VALIDATE_PRODUCT = YES;
555566
VERSIONING_SYSTEM = "apple-generic";
@@ -561,6 +572,7 @@
561572
isa = XCBuildConfiguration;
562573
buildSettings = {
563574
CLANG_ENABLE_MODULES = YES;
575+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
564576
DEFINES_MODULE = YES;
565577
DYLIB_COMPATIBILITY_VERSION = 1;
566578
DYLIB_CURRENT_VERSION = 1;
@@ -572,13 +584,15 @@
572584
PRODUCT_NAME = SafeIndex;
573585
SKIP_INSTALL = YES;
574586
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
587+
SWIFT_VERSION = 3.0;
575588
};
576589
name = Debug;
577590
};
578591
03C2FB081C75B85A00C6E738 /* Release */ = {
579592
isa = XCBuildConfiguration;
580593
buildSettings = {
581594
CLANG_ENABLE_MODULES = YES;
595+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
582596
DEFINES_MODULE = YES;
583597
DYLIB_COMPATIBILITY_VERSION = 1;
584598
DYLIB_CURRENT_VERSION = 1;
@@ -589,6 +603,7 @@
589603
PRODUCT_BUNDLE_IDENTIFIER = kr.xoul.SafeIndex;
590604
PRODUCT_NAME = SafeIndex;
591605
SKIP_INSTALL = YES;
606+
SWIFT_VERSION = 3.0;
592607
};
593608
name = Release;
594609
};
@@ -600,6 +615,7 @@
600615
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
601616
PRODUCT_BUNDLE_IDENTIFIER = "kr.xoul.SafeIndex-iOS-Tests";
602617
PRODUCT_NAME = "$(TARGET_NAME)";
618+
SWIFT_VERSION = 3.0;
603619
};
604620
name = Debug;
605621
};
@@ -611,13 +627,14 @@
611627
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
612628
PRODUCT_BUNDLE_IDENTIFIER = "kr.xoul.SafeIndex-iOS-Tests";
613629
PRODUCT_NAME = "$(TARGET_NAME)";
630+
SWIFT_VERSION = 3.0;
614631
};
615632
name = Release;
616633
};
617634
03C2FB2F1C75BD8A00C6E738 /* Debug */ = {
618635
isa = XCBuildConfiguration;
619636
buildSettings = {
620-
CODE_SIGN_IDENTITY = "-";
637+
CODE_SIGN_IDENTITY = "";
621638
COMBINE_HIDPI_IMAGES = YES;
622639
DEFINES_MODULE = YES;
623640
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -632,13 +649,14 @@
632649
PRODUCT_NAME = SafeIndex;
633650
SDKROOT = macosx;
634651
SKIP_INSTALL = YES;
652+
SWIFT_VERSION = 3.0;
635653
};
636654
name = Debug;
637655
};
638656
03C2FB301C75BD8A00C6E738 /* Release */ = {
639657
isa = XCBuildConfiguration;
640658
buildSettings = {
641-
CODE_SIGN_IDENTITY = "-";
659+
CODE_SIGN_IDENTITY = "";
642660
COMBINE_HIDPI_IMAGES = YES;
643661
DEFINES_MODULE = YES;
644662
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -653,12 +671,14 @@
653671
PRODUCT_NAME = SafeIndex;
654672
SDKROOT = macosx;
655673
SKIP_INSTALL = YES;
674+
SWIFT_VERSION = 3.0;
656675
};
657676
name = Release;
658677
};
659678
03C2FB3C1C75BD9A00C6E738 /* Debug */ = {
660679
isa = XCBuildConfiguration;
661680
buildSettings = {
681+
"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
662682
DEFINES_MODULE = YES;
663683
DYLIB_COMPATIBILITY_VERSION = 1;
664684
DYLIB_CURRENT_VERSION = 1;
@@ -670,6 +690,7 @@
670690
PRODUCT_NAME = SafeIndex;
671691
SDKROOT = appletvos;
672692
SKIP_INSTALL = YES;
693+
SWIFT_VERSION = 3.0;
673694
TARGETED_DEVICE_FAMILY = 3;
674695
TVOS_DEPLOYMENT_TARGET = 9.0;
675696
};
@@ -678,6 +699,7 @@
678699
03C2FB3D1C75BD9A00C6E738 /* Release */ = {
679700
isa = XCBuildConfiguration;
680701
buildSettings = {
702+
"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
681703
DEFINES_MODULE = YES;
682704
DYLIB_COMPATIBILITY_VERSION = 1;
683705
DYLIB_CURRENT_VERSION = 1;
@@ -689,6 +711,7 @@
689711
PRODUCT_NAME = SafeIndex;
690712
SDKROOT = appletvos;
691713
SKIP_INSTALL = YES;
714+
SWIFT_VERSION = 3.0;
692715
TARGETED_DEVICE_FAMILY = 3;
693716
TVOS_DEPLOYMENT_TARGET = 9.0;
694717
};
@@ -702,6 +725,7 @@
702725
PRODUCT_BUNDLE_IDENTIFIER = "kr.xoul.SafeIndex-tvOS-Tests";
703726
PRODUCT_NAME = "$(TARGET_NAME)";
704727
SDKROOT = appletvos;
728+
SWIFT_VERSION = 3.0;
705729
TVOS_DEPLOYMENT_TARGET = 9.1;
706730
};
707731
name = Debug;
@@ -714,6 +738,7 @@
714738
PRODUCT_BUNDLE_IDENTIFIER = "kr.xoul.SafeIndex-tvOS-Tests";
715739
PRODUCT_NAME = "$(TARGET_NAME)";
716740
SDKROOT = appletvos;
741+
SWIFT_VERSION = 3.0;
717742
TVOS_DEPLOYMENT_TARGET = 9.1;
718743
};
719744
name = Release;
@@ -729,6 +754,7 @@
729754
PRODUCT_BUNDLE_IDENTIFIER = "kr.xoul.SafeIndex-OSX-Tests";
730755
PRODUCT_NAME = "$(TARGET_NAME)";
731756
SDKROOT = macosx;
757+
SWIFT_VERSION = 3.0;
732758
};
733759
name = Debug;
734760
};
@@ -743,6 +769,7 @@
743769
PRODUCT_BUNDLE_IDENTIFIER = "kr.xoul.SafeIndex-OSX-Tests";
744770
PRODUCT_NAME = "$(TARGET_NAME)";
745771
SDKROOT = macosx;
772+
SWIFT_VERSION = 3.0;
746773
};
747774
name = Release;
748775
};
@@ -774,6 +801,7 @@
774801
03C2FB1F1C75BB3E00C6E738 /* Release */,
775802
);
776803
defaultConfigurationIsVisible = 0;
804+
defaultConfigurationName = Release;
777805
};
778806
03C2FB2E1C75BD8A00C6E738 /* Build configuration list for PBXNativeTarget "SafeIndex-OSX" */ = {
779807
isa = XCConfigurationList;
@@ -782,6 +810,7 @@
782810
03C2FB301C75BD8A00C6E738 /* Release */,
783811
);
784812
defaultConfigurationIsVisible = 0;
813+
defaultConfigurationName = Release;
785814
};
786815
03C2FB3B1C75BD9A00C6E738 /* Build configuration list for PBXNativeTarget "SafeIndex-tvOS" */ = {
787816
isa = XCConfigurationList;
@@ -790,6 +819,7 @@
790819
03C2FB3D1C75BD9A00C6E738 /* Release */,
791820
);
792821
defaultConfigurationIsVisible = 0;
822+
defaultConfigurationName = Release;
793823
};
794824
03C2FB661C75BE4B00C6E738 /* Build configuration list for PBXNativeTarget "SafeIndex-tvOS-Tests" */ = {
795825
isa = XCConfigurationList;
@@ -798,6 +828,7 @@
798828
03C2FB681C75BE4B00C6E738 /* Release */,
799829
);
800830
defaultConfigurationIsVisible = 0;
831+
defaultConfigurationName = Release;
801832
};
802833
03C2FB751C75BE6100C6E738 /* Build configuration list for PBXNativeTarget "SafeIndex-OSX-Tests" */ = {
803834
isa = XCConfigurationList;
@@ -806,6 +837,7 @@
806837
03C2FB771C75BE6100C6E738 /* Release */,
807838
);
808839
defaultConfigurationIsVisible = 0;
840+
defaultConfigurationName = Release;
809841
};
810842
/* End XCConfigurationList section */
811843
};

‎SafeIndex.xcodeproj/xcshareddata/xcschemes/SafeIndex-OSX.xcscheme‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0720"
3+
LastUpgradeVersion = "0800"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -15,7 +15,7 @@
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
1717
BlueprintIdentifier = "03C2FB281C75BD8A00C6E738"
18-
BuildableName = "SafeIndex-OSX.framework"
18+
BuildableName = "SafeIndex.framework"
1919
BlueprintName = "SafeIndex-OSX"
2020
ReferencedContainer = "container:SafeIndex.xcodeproj">
2121
</BuildableReference>
@@ -43,7 +43,7 @@
4343
<BuildableReference
4444
BuildableIdentifier = "primary"
4545
BlueprintIdentifier = "03C2FB281C75BD8A00C6E738"
46-
BuildableName = "SafeIndex-OSX.framework"
46+
BuildableName = "SafeIndex.framework"
4747
BlueprintName = "SafeIndex-OSX"
4848
ReferencedContainer = "container:SafeIndex.xcodeproj">
4949
</BuildableReference>
@@ -65,7 +65,7 @@
6565
<BuildableReference
6666
BuildableIdentifier = "primary"
6767
BlueprintIdentifier = "03C2FB281C75BD8A00C6E738"
68-
BuildableName = "SafeIndex-OSX.framework"
68+
BuildableName = "SafeIndex.framework"
6969
BlueprintName = "SafeIndex-OSX"
7070
ReferencedContainer = "container:SafeIndex.xcodeproj">
7171
</BuildableReference>
@@ -83,7 +83,7 @@
8383
<BuildableReference
8484
BuildableIdentifier = "primary"
8585
BlueprintIdentifier = "03C2FB281C75BD8A00C6E738"
86-
BuildableName = "SafeIndex-OSX.framework"
86+
BuildableName = "SafeIndex.framework"
8787
BlueprintName = "SafeIndex-OSX"
8888
ReferencedContainer = "container:SafeIndex.xcodeproj">
8989
</BuildableReference>

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

‎SafeIndex.xcodeproj/xcshareddata/xcschemes/SafeIndex-tvOS.xcscheme‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0720"
3+
LastUpgradeVersion = "0800"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -15,7 +15,7 @@
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
1717
BlueprintIdentifier = "03C2FB351C75BD9A00C6E738"
18-
BuildableName = "SafeIndex-tvOS.framework"
18+
BuildableName = "SafeIndex.framework"
1919
BlueprintName = "SafeIndex-tvOS"
2020
ReferencedContainer = "container:SafeIndex.xcodeproj">
2121
</BuildableReference>
@@ -43,7 +43,7 @@
4343
<BuildableReference
4444
BuildableIdentifier = "primary"
4545
BlueprintIdentifier = "03C2FB351C75BD9A00C6E738"
46-
BuildableName = "SafeIndex-tvOS.framework"
46+
BuildableName = "SafeIndex.framework"
4747
BlueprintName = "SafeIndex-tvOS"
4848
ReferencedContainer = "container:SafeIndex.xcodeproj">
4949
</BuildableReference>
@@ -65,7 +65,7 @@
6565
<BuildableReference
6666
BuildableIdentifier = "primary"
6767
BlueprintIdentifier = "03C2FB351C75BD9A00C6E738"
68-
BuildableName = "SafeIndex-tvOS.framework"
68+
BuildableName = "SafeIndex.framework"
6969
BlueprintName = "SafeIndex-tvOS"
7070
ReferencedContainer = "container:SafeIndex.xcodeproj">
7171
</BuildableReference>
@@ -83,7 +83,7 @@
8383
<BuildableReference
8484
BuildableIdentifier = "primary"
8585
BlueprintIdentifier = "03C2FB351C75BD9A00C6E738"
86-
BuildableName = "SafeIndex-tvOS.framework"
86+
BuildableName = "SafeIndex.framework"
8787
BlueprintName = "SafeIndex-tvOS"
8888
ReferencedContainer = "container:SafeIndex.xcodeproj">
8989
</BuildableReference>

0 commit comments

Comments
 (0)