Skip to content

Commit a7738bc

Browse files
author
Justin Martin
authored
Merge pull request #212 from mthole/mthole/ios13-fix
iOS 13 fix: Use updated private method signatures
2 parents 21e6c1f + f750a12 commit a7738bc

File tree

10 files changed

+228
-60
lines changed

10 files changed

+228
-60
lines changed

‎.travis.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
language: objective-c
2-
osx_image: xcode6.4
2+
osx_image: xcode10.3
3+
rvm:
4+
- 2.4.3
35
before_script:
46
- bundle install
57
script:
68
- xcodebuild -project Objc/PonyDebugger.xcodeproj -scheme PonyDebugger -sdk iphonesimulator -configuration Debug -PBXBuildsContinueAfterErrors=0 ACTIVE_ARCH_ONLY=0 build
7-
- pod lib lint --verbose --fail-fast --allow-warnings
9+
- bundle exec pod lib lint --verbose --fail-fast --allow-warnings

‎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', '0.37.2'
3+
gem 'cocoapods'

‎Gemfile.lock‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
GEM
2+
remote: https://rubygems.org/
3+
specs:
4+
CFPropertyList (3.0.1)
5+
activesupport (4.2.11.1)
6+
i18n (~> 0.7)
7+
minitest (~> 5.1)
8+
thread_safe (~> 0.3, >= 0.3.4)
9+
tzinfo (~> 1.1)
10+
atomos (0.1.3)
11+
claide (1.0.3)
12+
cocoapods (1.7.5)
13+
activesupport (>= 4.0.2, < 5)
14+
claide (>= 1.0.2, < 2.0)
15+
cocoapods-core (= 1.7.5)
16+
cocoapods-deintegrate (>= 1.0.3, < 2.0)
17+
cocoapods-downloader (>= 1.2.2, < 2.0)
18+
cocoapods-plugins (>= 1.0.0, < 2.0)
19+
cocoapods-search (>= 1.0.0, < 2.0)
20+
cocoapods-stats (>= 1.0.0, < 2.0)
21+
cocoapods-trunk (>= 1.3.1, < 2.0)
22+
cocoapods-try (>= 1.1.0, < 2.0)
23+
colored2 (~> 3.1)
24+
escape (~> 0.0.4)
25+
fourflusher (>= 2.3.0, < 3.0)
26+
gh_inspector (~> 1.0)
27+
molinillo (~> 0.6.6)
28+
nap (~> 1.0)
29+
ruby-macho (~> 1.4)
30+
xcodeproj (>= 1.10.0, < 2.0)
31+
cocoapods-core (1.7.5)
32+
activesupport (>= 4.0.2, < 6)
33+
fuzzy_match (~> 2.0.4)
34+
nap (~> 1.0)
35+
cocoapods-deintegrate (1.0.4)
36+
cocoapods-downloader (1.2.2)
37+
cocoapods-plugins (1.0.0)
38+
nap
39+
cocoapods-search (1.0.0)
40+
cocoapods-stats (1.1.0)
41+
cocoapods-trunk (1.4.0)
42+
nap (>= 0.8, < 2.0)
43+
netrc (~> 0.11)
44+
cocoapods-try (1.1.0)
45+
colored2 (3.1.2)
46+
concurrent-ruby (1.1.5)
47+
escape (0.0.4)
48+
fourflusher (2.3.1)
49+
fuzzy_match (2.0.4)
50+
gh_inspector (1.1.3)
51+
i18n (0.9.5)
52+
concurrent-ruby (~> 1.0)
53+
minitest (5.11.3)
54+
molinillo (0.6.6)
55+
nanaimo (0.2.6)
56+
nap (1.1.0)
57+
netrc (0.11.0)
58+
ruby-macho (1.4.0)
59+
thread_safe (0.3.6)
60+
tzinfo (1.2.5)
61+
thread_safe (~> 0.1)
62+
xcodeproj (1.12.0)
63+
CFPropertyList (>= 2.3.3, < 4.0)
64+
atomos (~> 0.1.3)
65+
claide (>= 1.0.2, < 2.0)
66+
colored2 (~> 3.1)
67+
nanaimo (~> 0.2.6)
68+
69+
PLATFORMS
70+
ruby
71+
72+
DEPENDENCIES
73+
cocoapods
74+
75+
BUNDLED WITH
76+
1.17.3

‎ObjC/PonyDebugger.xcodeproj/project.pbxproj‎

Lines changed: 75 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -133,27 +133,13 @@
133133
/* End PBXBuildFile section */
134134

135135
/* Begin PBXContainerItemProxy section */
136-
2720E60915E9701F00F7A31F /* PBXContainerItemProxy */ = {
137-
isa = PBXContainerItemProxy;
138-
containerPortal = 3DE2294915D5885C0035A508 /* SocketRocket.xcodeproj */;
139-
proxyType = 1;
140-
remoteGlobalIDString = F6B2082C1450F597009315AF;
141-
remoteInfo = SocketRocket;
142-
};
143136
3D0696B315D58B3B0025D563 /* PBXContainerItemProxy */ = {
144137
isa = PBXContainerItemProxy;
145138
containerPortal = 3DE2294915D5885C0035A508 /* SocketRocket.xcodeproj */;
146139
proxyType = 2;
147140
remoteGlobalIDString = F668C880153E91210044DBAC;
148141
remoteInfo = SocketRocketOSX;
149142
};
150-
3DE2295315D5885D0035A508 /* PBXContainerItemProxy */ = {
151-
isa = PBXContainerItemProxy;
152-
containerPortal = 3DE2294915D5885C0035A508 /* SocketRocket.xcodeproj */;
153-
proxyType = 2;
154-
remoteGlobalIDString = F6B2082D1450F597009315AF;
155-
remoteInfo = SocketRocket;
156-
};
157143
3DE2295515D5885D0035A508 /* PBXContainerItemProxy */ = {
158144
isa = PBXContainerItemProxy;
159145
containerPortal = 3DE2294915D5885C0035A508 /* SocketRocket.xcodeproj */;
@@ -168,6 +154,27 @@
168154
remoteGlobalIDString = F62417E314D52F3C003CE997;
169155
remoteInfo = TestChat;
170156
};
157+
CDA170D3232B1E7400B62B32 /* PBXContainerItemProxy */ = {
158+
isa = PBXContainerItemProxy;
159+
containerPortal = 3DE2294915D5885C0035A508 /* SocketRocket.xcodeproj */;
160+
proxyType = 2;
161+
remoteGlobalIDString = 81D6478D1D2CA78800690609;
162+
remoteInfo = "SocketRocket-iOS";
163+
};
164+
CDA170D5232B1E7400B62B32 /* PBXContainerItemProxy */ = {
165+
isa = PBXContainerItemProxy;
166+
containerPortal = 3DE2294915D5885C0035A508 /* SocketRocket.xcodeproj */;
167+
proxyType = 2;
168+
remoteGlobalIDString = 2D4227621BB4358C000C1A6C;
169+
remoteInfo = "SocketRocket-iOS-Dynamic";
170+
};
171+
CDA170D7232B1E7400B62B32 /* PBXContainerItemProxy */ = {
172+
isa = PBXContainerItemProxy;
173+
containerPortal = 3DE2294915D5885C0035A508 /* SocketRocket.xcodeproj */;
174+
proxyType = 2;
175+
remoteGlobalIDString = 3345DC901C52ACD70083CCB8;
176+
remoteInfo = "SocketRocket-tvOS";
177+
};
171178
/* End PBXContainerItemProxy section */
172179

173180
/* Begin PBXFileReference section */
@@ -503,9 +510,11 @@
503510
3DE2294A15D5885C0035A508 /* Products */ = {
504511
isa = PBXGroup;
505512
children = (
506-
3DE2295415D5885D0035A508 /* libSocketRocket.a */,
513+
CDA170D4232B1E7400B62B32 /* SocketRocket.framework */,
514+
CDA170D6232B1E7400B62B32 /* SocketRocket.framework */,
507515
3D0696B415D58B3B0025D563 /* SocketRocket.framework */,
508-
3DE2295615D5885D0035A508 /* SRWebSocketTests.octest */,
516+
CDA170D8232B1E7400B62B32 /* SocketRocket.framework */,
517+
3DE2295615D5885D0035A508 /* SocketRocketTests-iOS.xctest */,
509518
3DE2295815D5885D0035A508 /* TestChat.app */,
510519
);
511520
name = Products;
@@ -631,7 +640,6 @@
631640
buildRules = (
632641
);
633642
dependencies = (
634-
2720E60A15E9701F00F7A31F /* PBXTargetDependency */,
635643
);
636644
name = PonyDebugger;
637645
productName = PonyDebugger;
@@ -644,11 +652,11 @@
644652
F683ADA314FC1B4C008EBBA7 /* Project object */ = {
645653
isa = PBXProject;
646654
attributes = {
647-
LastUpgradeCheck = 0630;
655+
LastUpgradeCheck = 1030;
648656
};
649657
buildConfigurationList = F683ADA614FC1B4C008EBBA7 /* Build configuration list for PBXProject "PonyDebugger" */;
650658
compatibilityVersion = "Xcode 3.2";
651-
developmentRegion = English;
659+
developmentRegion = en;
652660
hasScannedForEncodings = 0;
653661
knownRegions = (
654662
en,
@@ -677,17 +685,10 @@
677685
remoteRef = 3D0696B315D58B3B0025D563 /* PBXContainerItemProxy */;
678686
sourceTree = BUILT_PRODUCTS_DIR;
679687
};
680-
3DE2295415D5885D0035A508 /* libSocketRocket.a */ = {
681-
isa = PBXReferenceProxy;
682-
fileType = archive.ar;
683-
path = libSocketRocket.a;
684-
remoteRef = 3DE2295315D5885D0035A508 /* PBXContainerItemProxy */;
685-
sourceTree = BUILT_PRODUCTS_DIR;
686-
};
687-
3DE2295615D5885D0035A508 /* SRWebSocketTests.octest */ = {
688+
3DE2295615D5885D0035A508 /* SocketRocketTests-iOS.xctest */ = {
688689
isa = PBXReferenceProxy;
689690
fileType = wrapper.cfbundle;
690-
path = SRWebSocketTests.octest;
691+
path = "SocketRocketTests-iOS.xctest";
691692
remoteRef = 3DE2295515D5885D0035A508 /* PBXContainerItemProxy */;
692693
sourceTree = BUILT_PRODUCTS_DIR;
693694
};
@@ -698,6 +699,27 @@
698699
remoteRef = 3DE2295715D5885D0035A508 /* PBXContainerItemProxy */;
699700
sourceTree = BUILT_PRODUCTS_DIR;
700701
};
702+
CDA170D4232B1E7400B62B32 /* SocketRocket.framework */ = {
703+
isa = PBXReferenceProxy;
704+
fileType = wrapper.framework;
705+
path = SocketRocket.framework;
706+
remoteRef = CDA170D3232B1E7400B62B32 /* PBXContainerItemProxy */;
707+
sourceTree = BUILT_PRODUCTS_DIR;
708+
};
709+
CDA170D6232B1E7400B62B32 /* SocketRocket.framework */ = {
710+
isa = PBXReferenceProxy;
711+
fileType = wrapper.framework;
712+
path = SocketRocket.framework;
713+
remoteRef = CDA170D5232B1E7400B62B32 /* PBXContainerItemProxy */;
714+
sourceTree = BUILT_PRODUCTS_DIR;
715+
};
716+
CDA170D8232B1E7400B62B32 /* SocketRocket.framework */ = {
717+
isa = PBXReferenceProxy;
718+
fileType = wrapper.framework;
719+
path = SocketRocket.framework;
720+
remoteRef = CDA170D7232B1E7400B62B32 /* PBXContainerItemProxy */;
721+
sourceTree = BUILT_PRODUCTS_DIR;
722+
};
701723
/* End PBXReferenceProxy section */
702724

703725
/* Begin PBXSourcesBuildPhase section */
@@ -770,29 +792,33 @@
770792
};
771793
/* End PBXSourcesBuildPhase section */
772794

773-
/* Begin PBXTargetDependency section */
774-
2720E60A15E9701F00F7A31F /* PBXTargetDependency */ = {
775-
isa = PBXTargetDependency;
776-
name = SocketRocket;
777-
targetProxy = 2720E60915E9701F00F7A31F /* PBXContainerItemProxy */;
778-
};
779-
/* End PBXTargetDependency section */
780-
781795
/* Begin XCBuildConfiguration section */
782796
F683ADB714FC1B4D008EBBA7 /* Debug */ = {
783797
isa = XCBuildConfiguration;
784798
buildSettings = {
785799
ALWAYS_SEARCH_USER_PATHS = NO;
800+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
786801
CLANG_ENABLE_OBJC_ARC = YES;
802+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
787803
CLANG_WARN_BOOL_CONVERSION = YES;
804+
CLANG_WARN_COMMA = YES;
788805
CLANG_WARN_CONSTANT_CONVERSION = YES;
806+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
789807
CLANG_WARN_EMPTY_BODY = YES;
790808
CLANG_WARN_ENUM_CONVERSION = YES;
809+
CLANG_WARN_INFINITE_RECURSION = YES;
791810
CLANG_WARN_INT_CONVERSION = YES;
811+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
812+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
813+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
814+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
815+
CLANG_WARN_STRICT_PROTOTYPES = YES;
816+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
792817
CLANG_WARN_UNREACHABLE_CODE = YES;
793818
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
794819
COPY_PHASE_STRIP = NO;
795820
ENABLE_STRICT_OBJC_MSGSEND = YES;
821+
ENABLE_TESTABILITY = YES;
796822
GCC_C_LANGUAGE_STANDARD = gnu99;
797823
GCC_DYNAMIC_NO_PIC = NO;
798824
GCC_NO_COMMON_BLOCKS = YES;
@@ -810,7 +836,7 @@
810836
"\"$(CONFIGURATION_BUILD_DIR)/usr/local/include\"",
811837
./SocketRocket,
812838
);
813-
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
839+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
814840
ONLY_ACTIVE_ARCH = YES;
815841
PUBLIC_HEADERS_FOLDER_PATH = "include/$(PRODUCT_NAME)";
816842
SDKROOT = iphoneos;
@@ -821,12 +847,23 @@
821847
isa = XCBuildConfiguration;
822848
buildSettings = {
823849
ALWAYS_SEARCH_USER_PATHS = NO;
850+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
824851
CLANG_ENABLE_OBJC_ARC = YES;
852+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
825853
CLANG_WARN_BOOL_CONVERSION = YES;
854+
CLANG_WARN_COMMA = YES;
826855
CLANG_WARN_CONSTANT_CONVERSION = YES;
856+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
827857
CLANG_WARN_EMPTY_BODY = YES;
828858
CLANG_WARN_ENUM_CONVERSION = YES;
859+
CLANG_WARN_INFINITE_RECURSION = YES;
829860
CLANG_WARN_INT_CONVERSION = YES;
861+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
862+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
863+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
864+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
865+
CLANG_WARN_STRICT_PROTOTYPES = YES;
866+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
830867
CLANG_WARN_UNREACHABLE_CODE = YES;
831868
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
832869
COPY_PHASE_STRIP = YES;
@@ -846,7 +883,7 @@
846883
"\"$(CONFIGURATION_BUILD_DIR)/usr/local/include\"",
847884
./SocketRocket,
848885
);
849-
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
886+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
850887
PUBLIC_HEADERS_FOLDER_PATH = "include/$(PRODUCT_NAME)";
851888
SDKROOT = iphoneos;
852889
VALIDATE_PRODUCT = YES;

‎ObjC/PonyDebugger.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎ObjC/PonyDebugger.xcodeproj/xcshareddata/xcschemes/PonyDebugger.xcscheme‎

Lines changed: 8 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 = "0630"
3+
LastUpgradeVersion = "1030"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -23,21 +23,24 @@
2323
</BuildActionEntries>
2424
</BuildAction>
2525
<TestAction
26+
buildConfiguration = "Debug"
2627
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2728
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
28-
shouldUseLaunchSchemeArgsEnv = "YES"
29-
buildConfiguration = "Debug">
29+
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
3131
</Testables>
32+
<AdditionalOptions>
33+
</AdditionalOptions>
3234
</TestAction>
3335
<LaunchAction
36+
buildConfiguration = "Debug"
3437
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3538
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
3639
launchStyle = "0"
3740
useCustomWorkingDirectory = "NO"
38-
buildConfiguration = "Debug"
3941
ignoresPersistentStateOnLaunch = "NO"
4042
debugDocumentVersioning = "YES"
43+
debugServiceExtension = "internal"
4144
allowLocationSimulation = "YES">
4245
<MacroExpansion>
4346
<BuildableReference
@@ -52,10 +55,10 @@
5255
</AdditionalOptions>
5356
</LaunchAction>
5457
<ProfileAction
58+
buildConfiguration = "Release"
5559
shouldUseLaunchSchemeArgsEnv = "YES"
5660
savedToolIdentifier = ""
5761
useCustomWorkingDirectory = "NO"
58-
buildConfiguration = "Release"
5962
debugDocumentVersioning = "YES">
6063
</ProfileAction>
6164
<AnalyzeAction

‎ObjC/PonyDebugger/PDDefinitions.m‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@
136136
case NSUndefinedAttributeType:
137137
case NSBinaryDataAttributeType:
138138
case NSObjectIDAttributeType:
139+
case NSUUIDAttributeType:
140+
case NSURIAttributeType:
139141
// Undefined.
140142
break;
141143
}

0 commit comments

Comments
 (0)