Skip to content
This repository was archived by the owner on Jun 17, 2018. It is now read-only.

Commit 5c1d3d1

Browse files
kitasukekitasuke
authored
Merge pull request #272 from kitasuke/swift2.3
Swift2.3
2 parents ab211f9 + 7026d28 commit 5c1d3d1

File tree

6 files changed

+63
-27
lines changed

6 files changed

+63
-27
lines changed

‎.swift-version‎

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

‎Example/Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
source 'https://rubygems.org'
22

3-
gem 'cocoapods', '1.0.1'
3+
gem 'cocoapods', '1.1.0.rc.2'

‎Example/Gemfile.lock‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,37 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (5.0.0.1)
5-
concurrent-ruby (~> 1.0, >= 1.0.2)
4+
activesupport (4.2.7.1)
65
i18n (~> 0.7)
6+
json (~> 1.7, >= 1.7.7)
77
minitest (~> 5.1)
8+
thread_safe (~> 0.3, >= 0.3.4)
89
tzinfo (~> 1.1)
910
claide (1.0.0)
10-
cocoapods (1.0.1)
11-
activesupport (>= 4.0.2)
11+
cocoapods (1.1.0.rc.2)
12+
activesupport (>= 4.0.2, < 5)
1213
claide (>= 1.0.0, < 2.0)
13-
cocoapods-core (= 1.0.1)
14-
cocoapods-deintegrate (>= 1.0.0, < 2.0)
15-
cocoapods-downloader (>= 1.0.0, < 2.0)
14+
cocoapods-core (= 1.1.0.rc.2)
15+
cocoapods-deintegrate (>= 1.0.1, < 2.0)
16+
cocoapods-downloader (>= 1.1.1, < 2.0)
1617
cocoapods-plugins (>= 1.0.0, < 2.0)
1718
cocoapods-search (>= 1.0.0, < 2.0)
1819
cocoapods-stats (>= 1.0.0, < 2.0)
1920
cocoapods-trunk (>= 1.0.0, < 2.0)
20-
cocoapods-try (>= 1.0.0, < 2.0)
21+
cocoapods-try (>= 1.1.0, < 2.0)
2122
colored (~> 1.2)
2223
escape (~> 0.0.4)
23-
fourflusher (~> 0.3.0)
24-
molinillo (~> 0.4.5)
24+
fourflusher (~> 1.0.1)
25+
gh_inspector (~> 1.0)
26+
molinillo (~> 0.5.1)
2527
nap (~> 1.0)
26-
xcodeproj (>= 1.1.0, < 2.0)
27-
cocoapods-core (1.0.1)
28-
activesupport (>= 4.0.2)
28+
xcodeproj (>= 1.3.1, < 2.0)
29+
cocoapods-core (1.1.0.rc.2)
30+
activesupport (>= 4.0.2, < 5)
2931
fuzzy_match (~> 2.0.4)
3032
nap (~> 1.0)
31-
cocoapods-deintegrate (1.0.0)
32-
cocoapods-downloader (1.1.0)
33+
cocoapods-deintegrate (1.0.1)
34+
cocoapods-downloader (1.1.1)
3335
cocoapods-plugins (1.0.0)
3436
nap
3537
cocoapods-search (1.0.0)
@@ -39,19 +41,20 @@ GEM
3941
netrc (= 0.7.8)
4042
cocoapods-try (1.1.0)
4143
colored (1.2)
42-
concurrent-ruby (1.0.2)
4344
escape (0.0.4)
44-
fourflusher (0.3.2)
45+
fourflusher (1.0.1)
4546
fuzzy_match (2.0.4)
47+
gh_inspector (1.0.2)
4648
i18n (0.7.0)
49+
json (1.8.3)
4750
minitest (5.9.0)
48-
molinillo (0.4.5)
51+
molinillo (0.5.1)
4952
nap (1.1.0)
5053
netrc (0.7.8)
5154
thread_safe (0.3.5)
5255
tzinfo (1.2.2)
5356
thread_safe (~> 0.1)
54-
xcodeproj (1.2.0)
57+
xcodeproj (1.3.1)
5558
activesupport (>= 3)
5659
claide (>= 1.0.0, < 2.0)
5760
colored (~> 1.2)
@@ -60,7 +63,7 @@ PLATFORMS
6063
ruby
6164

6265
DEPENDENCIES
63-
cocoapods (= 1.0.1)
66+
cocoapods (= 1.1.0.rc.2)
6467

6568
BUNDLED WITH
6669
1.12.5

‎Example/PagingMenuControllerDemo.xcodeproj/project.pbxproj‎

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -408,14 +408,16 @@
408408
isa = PBXProject;
409409
attributes = {
410410
LastSwiftUpdateCheck = 0720;
411-
LastUpgradeCheck = 0700;
411+
LastUpgradeCheck = 0800;
412412
ORGANIZATIONNAME = kitasuke;
413413
TargetAttributes = {
414414
707C60DA1AFF822100BDAB0B = {
415415
CreatedOnToolsVersion = 6.3.1;
416+
LastSwiftMigration = 0800;
416417
};
417418
707C60EF1AFF822200BDAB0B = {
418419
CreatedOnToolsVersion = 6.3.1;
420+
LastSwiftMigration = 0800;
419421
TestTargetID = 707C60DA1AFF822100BDAB0B;
420422
};
421423
EC7BA3F61B524BB4007FB8A5 = {
@@ -427,6 +429,7 @@
427429
};
428430
EC96215C1C5B4F1700DA6EE6 = {
429431
CreatedOnToolsVersion = 7.2;
432+
LastSwiftMigration = 0800;
430433
TestTargetID = 707C60DA1AFF822100BDAB0B;
431434
};
432435
};
@@ -511,7 +514,7 @@
511514
);
512515
runOnlyForDeploymentPostprocessing = 0;
513516
shellPath = /bin/sh;
514-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
517+
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
515518
showEnvVarsInLog = 0;
516519
};
517520
229F81CB8BD76DBAF1B4719F /* [CP] Embed Pods Frameworks */ = {
@@ -556,7 +559,7 @@
556559
);
557560
runOnlyForDeploymentPostprocessing = 0;
558561
shellPath = /bin/sh;
559-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
562+
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
560563
showEnvVarsInLog = 0;
561564
};
562565
81D7254A1C3EA86418ABA06D /* [CP] Check Pods Manifest.lock */ = {
@@ -571,7 +574,7 @@
571574
);
572575
runOnlyForDeploymentPostprocessing = 0;
573576
shellPath = /bin/sh;
574-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
577+
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
575578
showEnvVarsInLog = 0;
576579
};
577580
8EBB653436FDCF3C48E9A04C /* [CP] Embed Pods Frameworks */ = {
@@ -748,8 +751,10 @@
748751
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
749752
CLANG_WARN_EMPTY_BODY = YES;
750753
CLANG_WARN_ENUM_CONVERSION = YES;
754+
CLANG_WARN_INFINITE_RECURSION = YES;
751755
CLANG_WARN_INT_CONVERSION = YES;
752756
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
757+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
753758
CLANG_WARN_UNREACHABLE_CODE = YES;
754759
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
755760
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -793,8 +798,10 @@
793798
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
794799
CLANG_WARN_EMPTY_BODY = YES;
795800
CLANG_WARN_ENUM_CONVERSION = YES;
801+
CLANG_WARN_INFINITE_RECURSION = YES;
796802
CLANG_WARN_INT_CONVERSION = YES;
797803
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
804+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
798805
CLANG_WARN_UNREACHABLE_CODE = YES;
799806
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
800807
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -813,6 +820,7 @@
813820
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
814821
MTL_ENABLE_DEBUG_INFO = NO;
815822
SDKROOT = iphoneos;
823+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
816824
VALIDATE_PRODUCT = YES;
817825
};
818826
name = Release;
@@ -821,11 +829,13 @@
821829
isa = XCBuildConfiguration;
822830
baseConfigurationReference = 37DB6C408095AB6AE01575DD /* Pods-PagingMenuControllerDemo.debug.xcconfig */;
823831
buildSettings = {
832+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
824833
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
825834
INFOPLIST_FILE = PagingMenuControllerDemo/Info.plist;
826835
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
827836
PRODUCT_BUNDLE_IDENTIFIER = "com.kitasuke.$(PRODUCT_NAME:rfc1034identifier)";
828837
PRODUCT_NAME = "$(TARGET_NAME)";
838+
SWIFT_VERSION = 2.3;
829839
TARGETED_DEVICE_FAMILY = "1,2";
830840
};
831841
name = Debug;
@@ -834,11 +844,13 @@
834844
isa = XCBuildConfiguration;
835845
baseConfigurationReference = 55CF464B33595E0DB123AF77 /* Pods-PagingMenuControllerDemo.release.xcconfig */;
836846
buildSettings = {
847+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
837848
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
838849
INFOPLIST_FILE = PagingMenuControllerDemo/Info.plist;
839850
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
840851
PRODUCT_BUNDLE_IDENTIFIER = "com.kitasuke.$(PRODUCT_NAME:rfc1034identifier)";
841852
PRODUCT_NAME = "$(TARGET_NAME)";
853+
SWIFT_VERSION = 2.3;
842854
TARGETED_DEVICE_FAMILY = "1,2";
843855
};
844856
name = Release;
@@ -847,6 +859,7 @@
847859
isa = XCBuildConfiguration;
848860
baseConfigurationReference = A77A4C2595FFFC7D39FB9291 /* Pods-PagingMenuControllerDemoTests.debug.xcconfig */;
849861
buildSettings = {
862+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
850863
BUNDLE_LOADER = "$(TEST_HOST)";
851864
FRAMEWORK_SEARCH_PATHS = (
852865
"$(SDKROOT)/Developer/Library/Frameworks",
@@ -860,6 +873,7 @@
860873
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
861874
PRODUCT_BUNDLE_IDENTIFIER = "com.kitasuke.$(PRODUCT_NAME:rfc1034identifier)";
862875
PRODUCT_NAME = "$(TARGET_NAME)";
876+
SWIFT_VERSION = 2.3;
863877
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PagingMenuControllerDemo.app/PagingMenuControllerDemo";
864878
};
865879
name = Debug;
@@ -868,6 +882,7 @@
868882
isa = XCBuildConfiguration;
869883
baseConfigurationReference = 86E133660B679D5777BC191C /* Pods-PagingMenuControllerDemoTests.release.xcconfig */;
870884
buildSettings = {
885+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
871886
BUNDLE_LOADER = "$(TEST_HOST)";
872887
FRAMEWORK_SEARCH_PATHS = (
873888
"$(SDKROOT)/Developer/Library/Frameworks",
@@ -877,6 +892,7 @@
877892
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
878893
PRODUCT_BUNDLE_IDENTIFIER = "com.kitasuke.$(PRODUCT_NAME:rfc1034identifier)";
879894
PRODUCT_NAME = "$(TARGET_NAME)";
895+
SWIFT_VERSION = 2.3;
880896
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PagingMenuControllerDemo.app/PagingMenuControllerDemo";
881897
};
882898
name = Release;
@@ -885,6 +901,7 @@
885901
isa = XCBuildConfiguration;
886902
baseConfigurationReference = 03C427477DB91E6E85218AD2 /* Pods-PagingMenuControllerDemo2.debug.xcconfig */;
887903
buildSettings = {
904+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
888905
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
889906
GCC_PREPROCESSOR_DEFINITIONS = (
890907
"DEBUG=1",
@@ -895,6 +912,7 @@
895912
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
896913
PRODUCT_BUNDLE_IDENTIFIER = "com.yusuke.$(PRODUCT_NAME:rfc1034identifier)";
897914
PRODUCT_NAME = "$(TARGET_NAME)";
915+
SWIFT_VERSION = 2.3;
898916
TARGETED_DEVICE_FAMILY = "1,2";
899917
};
900918
name = Debug;
@@ -903,12 +921,14 @@
903921
isa = XCBuildConfiguration;
904922
baseConfigurationReference = 376ABED07EA31AA4F8DEAD32 /* Pods-PagingMenuControllerDemo2.release.xcconfig */;
905923
buildSettings = {
924+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
906925
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
907926
INFOPLIST_FILE = PagingMenuControllerDemo2/Info.plist;
908927
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
909928
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
910929
PRODUCT_BUNDLE_IDENTIFIER = "com.yusuke.$(PRODUCT_NAME:rfc1034identifier)";
911930
PRODUCT_NAME = "$(TARGET_NAME)";
931+
SWIFT_VERSION = 2.3;
912932
TARGETED_DEVICE_FAMILY = "1,2";
913933
};
914934
name = Release;
@@ -930,6 +950,7 @@
930950
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
931951
PRODUCT_BUNDLE_IDENTIFIER = "com.yusuke.$(PRODUCT_NAME:rfc1034identifier)";
932952
PRODUCT_NAME = "$(TARGET_NAME)";
953+
SWIFT_VERSION = 2.3;
933954
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PagingMenuControllerDemo2.app/PagingMenuControllerDemo2";
934955
};
935956
name = Debug;
@@ -947,6 +968,7 @@
947968
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
948969
PRODUCT_BUNDLE_IDENTIFIER = "com.yusuke.$(PRODUCT_NAME:rfc1034identifier)";
949970
PRODUCT_NAME = "$(TARGET_NAME)";
971+
SWIFT_VERSION = 2.3;
950972
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PagingMenuControllerDemo2.app/PagingMenuControllerDemo2";
951973
};
952974
name = Release;
@@ -960,6 +982,7 @@
960982
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
961983
PRODUCT_BUNDLE_IDENTIFIER = com.kitasuke.PagingMenuControllerDemoUITests;
962984
PRODUCT_NAME = "$(TARGET_NAME)";
985+
SWIFT_VERSION = 2.3;
963986
TEST_TARGET_NAME = PagingMenuControllerDemo;
964987
USES_XCTRUNNER = YES;
965988
};
@@ -973,6 +996,7 @@
973996
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
974997
PRODUCT_BUNDLE_IDENTIFIER = com.kitasuke.PagingMenuControllerDemoUITests;
975998
PRODUCT_NAME = "$(TARGET_NAME)";
999+
SWIFT_VERSION = 2.3;
9761000
TEST_TARGET_NAME = PagingMenuControllerDemo;
9771001
USES_XCTRUNNER = YES;
9781002
};

‎Example/Podfile‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,11 @@ end
1313
target 'PagingMenuControllerDemoTests' do
1414
pod "PagingMenuController", :path => "../"
1515
end
16+
17+
post_install do |installer|
18+
installer.pods_project.targets.each do |target|
19+
target.build_configurations.each do |config|
20+
config.build_settings['SWIFT_VERSION'] = '2.3'
21+
end
22+
end
23+
end

‎Example/Podfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ EXTERNAL SOURCES:
1111
SPEC CHECKSUMS:
1212
PagingMenuController: a47a9669760b95f630cc3ef28bdce104f9107d14
1313

14-
PODFILE CHECKSUM: 182e65100ed4f1fc8683837abd55ef28346367f5
14+
PODFILE CHECKSUM: feeaab97b60472ba8dc5311a64901870d343601f
1515

16-
COCOAPODS: 1.0.1
16+
COCOAPODS: 1.1.0.rc.2

0 commit comments

Comments
 (0)