Skip to content

iOS 13 fix: Use updated private method signatures #212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
justinseanmartin merged 2 commits into from
Sep 13, 2019
Merged

iOS 13 fix: Use updated private method signatures #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0c15b1
iOS 13 fix: Use updated private method signatures
mthole Sep 12, 2019
f750a12
Update to Xcode 10.3, minimum iOS 8 deployment, semi-modern cocoapods…
mthole Sep 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
language: objective-c
osx_image: xcode6.4
osx_image: xcode10.3
rvm:
- 2.4.3
before_script:
- bundle install
script:
- xcodebuild -project Objc/PonyDebugger.xcodeproj -scheme PonyDebugger -sdk iphonesimulator -configuration Debug -PBXBuildsContinueAfterErrors=0 ACTIVE_ARCH_ONLY=0 build
- pod lib lint --verbose --fail-fast --allow-warnings
- bundle exec pod lib lint --verbose --fail-fast --allow-warnings
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source 'https://rubygems.org'

gem 'cocoapods', '0.37.2'
gem 'cocoapods'
76 changes: 76 additions & 0 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.1)
activesupport (4.2.11.1)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
atomos (0.1.3)
claide (1.0.3)
cocoapods (1.7.5)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.7.5)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-stats (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.3.1, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
fourflusher (>= 2.3.0, < 3.0)
gh_inspector (~> 1.0)
molinillo (~> 0.6.6)
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.10.0, < 2.0)
cocoapods-core (1.7.5)
activesupport (>= 4.0.2, < 6)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
cocoapods-deintegrate (1.0.4)
cocoapods-downloader (1.2.2)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
cocoapods-stats (1.1.0)
cocoapods-trunk (1.4.0)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.1.0)
colored2 (3.1.2)
concurrent-ruby (1.1.5)
escape (0.0.4)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
minitest (5.11.3)
molinillo (0.6.6)
nanaimo (0.2.6)
nap (1.1.0)
netrc (0.11.0)
ruby-macho (1.4.0)
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
xcodeproj (1.12.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.2.6)

PLATFORMS
ruby

DEPENDENCIES
cocoapods

BUNDLED WITH
1.17.3
113 changes: 75 additions & 38 deletions ObjC/PonyDebugger.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,27 +133,13 @@
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
2720E60915E9701F00F7A31F /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 3DE2294915D5885C0035A508 /* SocketRocket.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = F6B2082C1450F597009315AF;
remoteInfo = SocketRocket;
};
3D0696B315D58B3B0025D563 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 3DE2294915D5885C0035A508 /* SocketRocket.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = F668C880153E91210044DBAC;
remoteInfo = SocketRocketOSX;
};
3DE2295315D5885D0035A508 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 3DE2294915D5885C0035A508 /* SocketRocket.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = F6B2082D1450F597009315AF;
remoteInfo = SocketRocket;
};
3DE2295515D5885D0035A508 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 3DE2294915D5885C0035A508 /* SocketRocket.xcodeproj */;
Expand All @@ -168,6 +154,27 @@
remoteGlobalIDString = F62417E314D52F3C003CE997;
remoteInfo = TestChat;
};
CDA170D3232B1E7400B62B32 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 3DE2294915D5885C0035A508 /* SocketRocket.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 81D6478D1D2CA78800690609;
remoteInfo = "SocketRocket-iOS";
};
CDA170D5232B1E7400B62B32 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 3DE2294915D5885C0035A508 /* SocketRocket.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 2D4227621BB4358C000C1A6C;
remoteInfo = "SocketRocket-iOS-Dynamic";
};
CDA170D7232B1E7400B62B32 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 3DE2294915D5885C0035A508 /* SocketRocket.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 3345DC901C52ACD70083CCB8;
remoteInfo = "SocketRocket-tvOS";
};
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
Expand Down Expand Up @@ -503,9 +510,11 @@
3DE2294A15D5885C0035A508 /* Products */ = {
isa = PBXGroup;
children = (
3DE2295415D5885D0035A508 /* libSocketRocket.a */,
CDA170D4232B1E7400B62B32 /* SocketRocket.framework */,
CDA170D6232B1E7400B62B32 /* SocketRocket.framework */,
3D0696B415D58B3B0025D563 /* SocketRocket.framework */,
3DE2295615D5885D0035A508 /* SRWebSocketTests.octest */,
CDA170D8232B1E7400B62B32 /* SocketRocket.framework */,
3DE2295615D5885D0035A508 /* SocketRocketTests-iOS.xctest */,
3DE2295815D5885D0035A508 /* TestChat.app */,
);
name = Products;
Expand Down Expand Up @@ -631,7 +640,6 @@
buildRules = (
);
dependencies = (
2720E60A15E9701F00F7A31F /* PBXTargetDependency */,
);
name = PonyDebugger;
productName = PonyDebugger;
Expand All @@ -644,11 +652,11 @@
F683ADA314FC1B4C008EBBA7 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0630;
LastUpgradeCheck = 1030;
};
buildConfigurationList = F683ADA614FC1B4C008EBBA7 /* Build configuration list for PBXProject "PonyDebugger" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Expand Down Expand Up @@ -677,17 +685,10 @@
remoteRef = 3D0696B315D58B3B0025D563 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
3DE2295415D5885D0035A508 /* libSocketRocket.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libSocketRocket.a;
remoteRef = 3DE2295315D5885D0035A508 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
3DE2295615D5885D0035A508 /* SRWebSocketTests.octest */ = {
3DE2295615D5885D0035A508 /* SocketRocketTests-iOS.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = SRWebSocketTests.octest;
path = "SocketRocketTests-iOS.xctest";
remoteRef = 3DE2295515D5885D0035A508 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
Expand All @@ -698,6 +699,27 @@
remoteRef = 3DE2295715D5885D0035A508 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
CDA170D4232B1E7400B62B32 /* SocketRocket.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = SocketRocket.framework;
remoteRef = CDA170D3232B1E7400B62B32 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
CDA170D6232B1E7400B62B32 /* SocketRocket.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = SocketRocket.framework;
remoteRef = CDA170D5232B1E7400B62B32 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
CDA170D8232B1E7400B62B32 /* SocketRocket.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = SocketRocket.framework;
remoteRef = CDA170D7232B1E7400B62B32 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */

/* Begin PBXSourcesBuildPhase section */
Expand Down Expand Up @@ -770,29 +792,33 @@
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
2720E60A15E9701F00F7A31F /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = SocketRocket;
targetProxy = 2720E60915E9701F00F7A31F /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

/* Begin XCBuildConfiguration section */
F683ADB714FC1B4D008EBBA7 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
Expand All @@ -810,7 +836,7 @@
"\"$(CONFIGURATION_BUILD_DIR)/usr/local/include\"",
./SocketRocket,
);
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
ONLY_ACTIVE_ARCH = YES;
PUBLIC_HEADERS_FOLDER_PATH = "include/$(PRODUCT_NAME)";
SDKROOT = iphoneos;
Expand All @@ -821,12 +847,23 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = YES;
Expand All @@ -846,7 +883,7 @@
"\"$(CONFIGURATION_BUILD_DIR)/usr/local/include\"",
./SocketRocket,
);
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
PUBLIC_HEADERS_FOLDER_PATH = "include/$(PRODUCT_NAME)";
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
Expand Down
8 changes: 8 additions & 0 deletions ObjC/PonyDebugger.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
13 changes: 8 additions & 5 deletions ObjC/PonyDebugger.xcodeproj/xcshareddata/xcschemes/PonyDebugger.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0630"
LastUpgradeVersion = "1030"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -23,21 +23,24 @@
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
Expand All @@ -52,10 +55,10 @@
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
Expand Down
2 changes: 2 additions & 0 deletions ObjC/PonyDebugger/PDDefinitions.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@
case NSUndefinedAttributeType:
case NSBinaryDataAttributeType:
case NSObjectIDAttributeType:
case NSUUIDAttributeType:
case NSURIAttributeType:
// Undefined.
break;
}
Expand Down
Loading