Skip to content

Commit 6330deb

Browse files
committed
CI + Updates for OS X 10.10.
1 parent ec8d9d8 commit 6330deb

File tree

9 files changed

+29
-10
lines changed

9 files changed

+29
-10
lines changed

.travis.yml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
language: objective-c
2+
xcode_project: EOSFTPServer.xcodeproj
3+
xcode_scheme: EOSFTPServerDesktop

EOSFTPServer.xcodeproj/project.pbxproj

+16-4
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@
460460
05779EAD14EC655E006C5D55 /* Project object */ = {
461461
isa = PBXProject;
462462
attributes = {
463-
LastUpgradeCheck = 0430;
463+
LastUpgradeCheck = 0600;
464464
ORGANIZATIONNAME = DigiDNA;
465465
};
466466
buildConfigurationList = 05779EB014EC655E006C5D55 /* Build configuration list for PBXProject "EOSFTPServer" */;
@@ -592,17 +592,20 @@
592592
isa = XCBuildConfiguration;
593593
buildSettings = {
594594
ALWAYS_SEARCH_USER_PATHS = NO;
595-
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
596595
CLANG_ANALYZER_DEADCODE_DEADSTORES = YES;
597596
CLANG_ANALYZER_DEADCODE_IDEMPOTENT_OPERATIONS = YES;
598597
CLANG_ANALYZER_OBJC_SELF_INIT = YES;
599598
CLANG_WARN_CXX0X_EXTENSIONS = YES;
600599
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
600+
CLANG_WARN_EMPTY_BODY = YES;
601601
CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
602602
CLANG_WARN_OBJCPP_ARC_ABI = YES;
603603
CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
604604
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
605+
CLANG_WARN_UNREACHABLE_CODE = YES;
606+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
605607
COPY_PHASE_STRIP = NO;
608+
ENABLE_STRICT_OBJC_MSGSEND = YES;
606609
GCC_C_LANGUAGE_STANDARD = c99;
607610
GCC_DYNAMIC_NO_PIC = NO;
608611
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
@@ -647,7 +650,7 @@
647650
GCC_WARN_UNUSED_VALUE = YES;
648651
GCC_WARN_UNUSED_VARIABLE = YES;
649652
MACOSX_DEPLOYMENT_TARGET = 10.7;
650-
ONLY_ACTIVE_ARCH = NO;
653+
ONLY_ACTIVE_ARCH = YES;
651654
SDKROOT = macosx;
652655
};
653656
name = Debug;
@@ -656,18 +659,21 @@
656659
isa = XCBuildConfiguration;
657660
buildSettings = {
658661
ALWAYS_SEARCH_USER_PATHS = NO;
659-
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
660662
CLANG_ANALYZER_DEADCODE_DEADSTORES = YES;
661663
CLANG_ANALYZER_DEADCODE_IDEMPOTENT_OPERATIONS = YES;
662664
CLANG_ANALYZER_OBJC_SELF_INIT = YES;
663665
CLANG_WARN_CXX0X_EXTENSIONS = YES;
664666
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
667+
CLANG_WARN_EMPTY_BODY = YES;
665668
CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
666669
CLANG_WARN_OBJCPP_ARC_ABI = YES;
667670
CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
668671
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
672+
CLANG_WARN_UNREACHABLE_CODE = YES;
673+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
669674
COPY_PHASE_STRIP = YES;
670675
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
676+
ENABLE_STRICT_OBJC_MSGSEND = YES;
671677
GCC_C_LANGUAGE_STANDARD = c99;
672678
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
673679
GCC_OPTIMIZATION_LEVEL = s;
@@ -714,6 +720,7 @@
714720
05779EC814EC655F006C5D55 /* Debug */ = {
715721
isa = XCBuildConfiguration;
716722
buildSettings = {
723+
COMBINE_HIDPI_IMAGES = YES;
717724
GCC_PRECOMPILE_PREFIX_HEADER = YES;
718725
GCC_PREFIX_HEADER = "EOSFTPServer/FTPServer/EOSFTPServer-Prefix.pch";
719726
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -723,6 +730,7 @@
723730
05779EC914EC655F006C5D55 /* Release */ = {
724731
isa = XCBuildConfiguration;
725732
buildSettings = {
733+
COMBINE_HIDPI_IMAGES = YES;
726734
GCC_PRECOMPILE_PREFIX_HEADER = YES;
727735
GCC_PREFIX_HEADER = "EOSFTPServer/FTPServer/EOSFTPServer-Prefix.pch";
728736
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -734,6 +742,7 @@
734742
buildSettings = {
735743
CLANG_WARN_IMPLICIT_SIGN_CONVERSION = NO;
736744
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = NO;
745+
COMBINE_HIDPI_IMAGES = YES;
737746
GCC_PRECOMPILE_PREFIX_HEADER = NO;
738747
GCC_WARN_PEDANTIC = NO;
739748
GCC_WARN_SIGN_COMPARE = NO;
@@ -747,6 +756,7 @@
747756
buildSettings = {
748757
CLANG_WARN_IMPLICIT_SIGN_CONVERSION = NO;
749758
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = NO;
759+
COMBINE_HIDPI_IMAGES = YES;
750760
GCC_PRECOMPILE_PREFIX_HEADER = NO;
751761
GCC_WARN_PEDANTIC = NO;
752762
GCC_WARN_SIGN_COMPARE = NO;
@@ -757,6 +767,7 @@
757767
05F13EFB14EDD210003CDAAB /* Debug */ = {
758768
isa = XCBuildConfiguration;
759769
buildSettings = {
770+
COMBINE_HIDPI_IMAGES = YES;
760771
GCC_PRECOMPILE_PREFIX_HEADER = YES;
761772
GCC_PREFIX_HEADER = "EOSFTPServer/Mac Demo/EOSFTPServerDesktop-Prefix.pch";
762773
INFOPLIST_FILE = "EOSFTPServer/Mac Demo/EOSFTPServerDesktop-Info.plist";
@@ -772,6 +783,7 @@
772783
05F13EFC14EDD210003CDAAB /* Release */ = {
773784
isa = XCBuildConfiguration;
774785
buildSettings = {
786+
COMBINE_HIDPI_IMAGES = YES;
775787
GCC_PRECOMPILE_PREFIX_HEADER = YES;
776788
GCC_PREFIX_HEADER = "EOSFTPServer/Mac Demo/EOSFTPServerDesktop-Prefix.pch";
777789
INFOPLIST_FILE = "EOSFTPServer/Mac Demo/EOSFTPServerDesktop-Info.plist";

EOSFTPServer.xcodeproj/xcuserdata/macmade.xcuserdatad/xcschemes/AsyncSocket.xcscheme EOSFTPServer.xcodeproj/xcshareddata/xcschemes/AsyncSocket.xcscheme

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3+
LastUpgradeVersion = "0600"
34
version = "1.3">
45
<BuildAction
56
parallelizeBuildables = "YES"

EOSFTPServer.xcodeproj/xcuserdata/macmade.xcuserdatad/xcschemes/EOSFTPServer.xcscheme EOSFTPServer.xcodeproj/xcshareddata/xcschemes/EOSFTPServer.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 = "0430"
3+
LastUpgradeVersion = "0600"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

EOSFTPServer.xcodeproj/xcuserdata/macmade.xcuserdatad/xcschemes/EOSFTPServerDesktop.xcscheme EOSFTPServer.xcodeproj/xcshareddata/xcschemes/EOSFTPServerDesktop.xcscheme

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3+
LastUpgradeVersion = "0600"
34
version = "1.3">
45
<BuildAction
56
parallelizeBuildables = "YES"

EOSFTPServer.xcodeproj/xcuserdata/macmade.xcuserdatad/xcschemes/xcschememanagement.plist

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
<dict>
55
<key>SchemeUserState</key>
66
<dict>
7-
<key>AsyncSocket.xcscheme</key>
7+
<key>AsyncSocket.xcscheme_^#shared#^_</key>
88
<dict>
99
<key>orderHint</key>
1010
<integer>0</integer>
1111
</dict>
12-
<key>EOSFTPServer.xcscheme</key>
12+
<key>EOSFTPServer.xcscheme_^#shared#^_</key>
1313
<dict>
1414
<key>orderHint</key>
1515
<integer>1</integer>
1616
</dict>
17-
<key>EOSFTPServerDesktop.xcscheme</key>
17+
<key>EOSFTPServerDesktop.xcscheme_^#shared#^_</key>
1818
<dict>
1919
<key>orderHint</key>
2020
<integer>2</integer>

EOSFTPServer/Warnings.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@
7878
#pragma clang diagnostic fatal "-Wctor-dtor-privacy"
7979
#pragma clang diagnostic fatal "-Wcustom-atomic-properties"
8080
#pragma clang diagnostic fatal "-Wdeclaration-after-statement"
81-
#pragma clang diagnostic fatal "-Wdefault-arg-special-member"
8281
#pragma clang diagnostic fatal "-Wdelegating-ctor-cycles"
8382
#pragma clang diagnostic fatal "-Wdelete-non-virtual-dtor"
8483
#pragma clang diagnostic fatal "-Wdeprecated-declarations"
@@ -154,7 +153,6 @@
154153
#pragma clang diagnostic fatal "-Wpointer-arith"
155154
#pragma clang diagnostic fatal "-Wpointer-to-int-cast"
156155
#pragma clang diagnostic fatal "-Wprotocol"
157-
#pragma clang diagnostic fatal "-Wreadonly-setter-attrs"
158156
#pragma clang diagnostic fatal "-Wredundant-decls"
159157
#pragma clang diagnostic fatal "-Wreorder"
160158
#pragma clang diagnostic fatal "-Wreturn-type"
@@ -209,6 +207,8 @@
209207
/*
210208
* Not recognized by Apple implementation:
211209
*
210+
* #pragma clang diagnostic fatal "-Wdefault-arg-special-member"
211+
* #pragma clang diagnostic fatal "-Wreadonly-setter-attrs"
212212
* #pragma clang diagnostic fatal "-Wauto-import"
213213
* #pragma clang diagnostic fatal "-Wbuiltin-requires-header"
214214
* #pragma clang diagnostic fatal "-Wc++0x-narrowing"

README.md

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
EOSFTPServer
22
============
33

4+
[![Build Status](https://travis-ci.org/macmade/EOSFTPServer.svg?branch=master)](https://travis-ci.org/macmade/EOSFTPServer)
5+
46
About
57
-----
68

0 commit comments

Comments
 (0)