Skip to content

Commit 081ba83

Browse files
johndpopejohndpope
authored
⛳️
swift 4/ fixes for zlib
1 parent e435bbf commit 081ba83

File tree

7 files changed

+197
-75
lines changed

7 files changed

+197
-75
lines changed

‎KaitaiStream.xcodeproj/project.pbxproj

+43-9
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,30 @@
88

99
/* Begin PBXBuildFile section */
1010
004838711CCA635300B7D738 /* KaitaiStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 004838701CCA635300B7D738 /* KaitaiStream.swift */; };
11-
0048387E1CCB974500B7D738 /* Deflate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0048387D1CCB974500B7D738 /* Deflate.swift */; };
12-
004838841CCB9E4000B7D738 /* libz.1.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 004838831CCB9E4000B7D738 /* libz.1.tbd */; };
1311
0089C8921CCE40160023CE7C /* KaitaiStruct.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0089C8911CCE40160023CE7C /* KaitaiStruct.swift */; };
1412
0089C8941CCE41530023CE7C /* String+KaitaiStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0089C8931CCE41530023CE7C /* String+KaitaiStream.swift */; };
1513
0089C8961CCE42100023CE7C /* KaitaiSeekableStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0089C8951CCE42100023CE7C /* KaitaiSeekableStream.swift */; };
14+
1765D06E21062C69007F98E0 /* Deflate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1765D06D21062C69007F98E0 /* Deflate.swift */; };
15+
1765D07021062D44007F98E0 /* libz.1.2.8.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 1765D06F21062D43007F98E0 /* libz.1.2.8.tbd */; };
1616
/* End PBXBuildFile section */
1717

1818
/* Begin PBXFileReference section */
1919
004838561CCA633900B7D738 /* KaitaiStream.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = KaitaiStream.framework; sourceTree = BUILT_PRODUCTS_DIR; };
2020
0048385B1CCA633900B7D738 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
2121
004838701CCA635300B7D738 /* KaitaiStream.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KaitaiStream.swift; sourceTree = "<group>"; };
22-
0048387D1CCB974500B7D738 /* Deflate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Deflate.swift; sourceTree = "<group>"; };
23-
004838831CCB9E4000B7D738 /* libz.1.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.1.tbd; path = usr/lib/libz.1.tbd; sourceTree = SDKROOT; };
2422
0089C8911CCE40160023CE7C /* KaitaiStruct.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KaitaiStruct.swift; sourceTree = "<group>"; };
2523
0089C8931CCE41530023CE7C /* String+KaitaiStream.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+KaitaiStream.swift"; sourceTree = "<group>"; };
2624
0089C8951CCE42100023CE7C /* KaitaiSeekableStream.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KaitaiSeekableStream.swift; sourceTree = "<group>"; };
25+
1765D06D21062C69007F98E0 /* Deflate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Deflate.swift; sourceTree = "<group>"; };
26+
1765D06F21062D43007F98E0 /* libz.1.2.8.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.1.2.8.tbd; path = usr/lib/libz.1.2.8.tbd; sourceTree = SDKROOT; };
2727
/* End PBXFileReference section */
2828

2929
/* Begin PBXFrameworksBuildPhase section */
3030
004838521CCA633900B7D738 /* Frameworks */ = {
3131
isa = PBXFrameworksBuildPhase;
3232
buildActionMask = 2147483647;
3333
files = (
34-
004838841CCB9E4000B7D738 /* libz.1.tbd in Frameworks */,
34+
1765D07021062D44007F98E0 /* libz.1.2.8.tbd in Frameworks */,
3535
);
3636
runOnlyForDeploymentPostprocessing = 0;
3737
};
@@ -41,9 +41,9 @@
4141
0048384C1CCA633900B7D738 = {
4242
isa = PBXGroup;
4343
children = (
44-
004838831CCB9E4000B7D738 /* libz.1.tbd */,
4544
004838581CCA633900B7D738 /* KaitaiStream */,
4645
004838571CCA633900B7D738 /* Products */,
46+
1765D05421062646007F98E0 /* Frameworks */,
4747
);
4848
sourceTree = "<group>";
4949
};
@@ -58,7 +58,7 @@
5858
004838581CCA633900B7D738 /* KaitaiStream */ = {
5959
isa = PBXGroup;
6060
children = (
61-
0048387D1CCB974500B7D738 /* Deflate.swift */,
61+
1765D06D21062C69007F98E0 /* Deflate.swift */,
6262
0048385B1CCA633900B7D738 /* Info.plist */,
6363
004838701CCA635300B7D738 /* KaitaiStream.swift */,
6464
0089C8951CCE42100023CE7C /* KaitaiSeekableStream.swift */,
@@ -68,6 +68,14 @@
6868
path = KaitaiStream;
6969
sourceTree = "<group>";
7070
};
71+
1765D05421062646007F98E0 /* Frameworks */ = {
72+
isa = PBXGroup;
73+
children = (
74+
1765D06F21062D43007F98E0 /* libz.1.2.8.tbd */,
75+
);
76+
name = Frameworks;
77+
sourceTree = "<group>";
78+
};
7179
/* End PBXGroup section */
7280

7381
/* Begin PBXHeadersBuildPhase section */
@@ -106,12 +114,14 @@
106114
isa = PBXProject;
107115
attributes = {
108116
LastSwiftUpdateCheck = 0730;
109-
LastUpgradeCheck = 0830;
117+
LastUpgradeCheck = 0940;
110118
ORGANIZATIONNAME = "Dmitry Marochko";
111119
TargetAttributes = {
112120
004838551CCA633900B7D738 = {
113121
CreatedOnToolsVersion = 7.3;
122+
DevelopmentTeam = R4W3U7U9JJ;
114123
LastSwiftMigration = 0830;
124+
ProvisioningStyle = Automatic;
115125
};
116126
};
117127
};
@@ -147,11 +157,11 @@
147157
isa = PBXSourcesBuildPhase;
148158
buildActionMask = 2147483647;
149159
files = (
160+
1765D06E21062C69007F98E0 /* Deflate.swift in Sources */,
150161
0089C8961CCE42100023CE7C /* KaitaiSeekableStream.swift in Sources */,
151162
0089C8921CCE40160023CE7C /* KaitaiStruct.swift in Sources */,
152163
0089C8941CCE41530023CE7C /* String+KaitaiStream.swift in Sources */,
153164
004838711CCA635300B7D738 /* KaitaiStream.swift in Sources */,
154-
0048387E1CCB974500B7D738 /* Deflate.swift in Sources */,
155165
);
156166
runOnlyForDeploymentPostprocessing = 0;
157167
};
@@ -167,14 +177,22 @@
167177
CLANG_CXX_LIBRARY = "libc++";
168178
CLANG_ENABLE_MODULES = YES;
169179
CLANG_ENABLE_OBJC_ARC = YES;
180+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
170181
CLANG_WARN_BOOL_CONVERSION = YES;
182+
CLANG_WARN_COMMA = YES;
171183
CLANG_WARN_CONSTANT_CONVERSION = YES;
184+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
172185
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
173186
CLANG_WARN_EMPTY_BODY = YES;
174187
CLANG_WARN_ENUM_CONVERSION = YES;
175188
CLANG_WARN_INFINITE_RECURSION = YES;
176189
CLANG_WARN_INT_CONVERSION = YES;
190+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
191+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
192+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
177193
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
194+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
195+
CLANG_WARN_STRICT_PROTOTYPES = YES;
178196
CLANG_WARN_SUSPICIOUS_MOVE = YES;
179197
CLANG_WARN_UNREACHABLE_CODE = YES;
180198
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -217,14 +235,22 @@
217235
CLANG_CXX_LIBRARY = "libc++";
218236
CLANG_ENABLE_MODULES = YES;
219237
CLANG_ENABLE_OBJC_ARC = YES;
238+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
220239
CLANG_WARN_BOOL_CONVERSION = YES;
240+
CLANG_WARN_COMMA = YES;
221241
CLANG_WARN_CONSTANT_CONVERSION = YES;
242+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
222243
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
223244
CLANG_WARN_EMPTY_BODY = YES;
224245
CLANG_WARN_ENUM_CONVERSION = YES;
225246
CLANG_WARN_INFINITE_RECURSION = YES;
226247
CLANG_WARN_INT_CONVERSION = YES;
248+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
249+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
250+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
227251
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
252+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
253+
CLANG_WARN_STRICT_PROTOTYPES = YES;
228254
CLANG_WARN_SUSPICIOUS_MOVE = YES;
229255
CLANG_WARN_UNREACHABLE_CODE = YES;
230256
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -255,8 +281,11 @@
255281
isa = XCBuildConfiguration;
256282
buildSettings = {
257283
CLANG_ENABLE_MODULES = YES;
284+
CODE_SIGN_IDENTITY = "Mac Developer";
285+
CODE_SIGN_STYLE = Automatic;
258286
COMBINE_HIDPI_IMAGES = YES;
259287
DEFINES_MODULE = YES;
288+
DEVELOPMENT_TEAM = R4W3U7U9JJ;
260289
DYLIB_COMPATIBILITY_VERSION = 1;
261290
DYLIB_CURRENT_VERSION = 1;
262291
DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -266,6 +295,7 @@
266295
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
267296
PRODUCT_BUNDLE_IDENTIFIER = "com.dmitry-marochko.KaitaiStream";
268297
PRODUCT_NAME = "$(TARGET_NAME)";
298+
PROVISIONING_PROFILE_SPECIFIER = "";
269299
SKIP_INSTALL = YES;
270300
SWIFT_INSTALL_OBJC_HEADER = YES;
271301
SWIFT_OBJC_BRIDGING_HEADER = "";
@@ -278,8 +308,11 @@
278308
isa = XCBuildConfiguration;
279309
buildSettings = {
280310
CLANG_ENABLE_MODULES = YES;
311+
CODE_SIGN_IDENTITY = "Mac Developer";
312+
CODE_SIGN_STYLE = Automatic;
281313
COMBINE_HIDPI_IMAGES = YES;
282314
DEFINES_MODULE = YES;
315+
DEVELOPMENT_TEAM = R4W3U7U9JJ;
283316
DYLIB_COMPATIBILITY_VERSION = 1;
284317
DYLIB_CURRENT_VERSION = 1;
285318
DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -289,6 +322,7 @@
289322
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
290323
PRODUCT_BUNDLE_IDENTIFIER = "com.dmitry-marochko.KaitaiStream";
291324
PRODUCT_NAME = "$(TARGET_NAME)";
325+
PROVISIONING_PROFILE_SPECIFIER = "";
292326
SKIP_INSTALL = YES;
293327
SWIFT_INSTALL_OBJC_HEADER = YES;
294328
SWIFT_OBJC_BRIDGING_HEADER = "";

‎KaitaiStream.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

+8
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>

‎KaitaiStream.xcodeproj/project.xcworkspace/xcuserdata/jpope.xcuserdatad/UserInterfaceState.xcuserstate

32.8 KB
Binary file not shown.

‎KaitaiStream.xcodeproj/xcuserdata/jpope.xcuserdatad/xcschemes/KaitaiStream.xcscheme

+80
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0940"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "004838551CCA633900B7D738"
18+
BuildableName = "KaitaiStream.framework"
19+
BlueprintName = "KaitaiStream"
20+
ReferencedContainer = "container:KaitaiStream.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
<AdditionalOptions>
33+
</AdditionalOptions>
34+
</TestAction>
35+
<LaunchAction
36+
buildConfiguration = "Debug"
37+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
38+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
39+
launchStyle = "0"
40+
useCustomWorkingDirectory = "NO"
41+
ignoresPersistentStateOnLaunch = "NO"
42+
debugDocumentVersioning = "YES"
43+
debugServiceExtension = "internal"
44+
allowLocationSimulation = "YES">
45+
<MacroExpansion>
46+
<BuildableReference
47+
BuildableIdentifier = "primary"
48+
BlueprintIdentifier = "004838551CCA633900B7D738"
49+
BuildableName = "KaitaiStream.framework"
50+
BlueprintName = "KaitaiStream"
51+
ReferencedContainer = "container:KaitaiStream.xcodeproj">
52+
</BuildableReference>
53+
</MacroExpansion>
54+
<AdditionalOptions>
55+
</AdditionalOptions>
56+
</LaunchAction>
57+
<ProfileAction
58+
buildConfiguration = "Release"
59+
shouldUseLaunchSchemeArgsEnv = "YES"
60+
savedToolIdentifier = ""
61+
useCustomWorkingDirectory = "NO"
62+
debugDocumentVersioning = "YES">
63+
<MacroExpansion>
64+
<BuildableReference
65+
BuildableIdentifier = "primary"
66+
BlueprintIdentifier = "004838551CCA633900B7D738"
67+
BuildableName = "KaitaiStream.framework"
68+
BlueprintName = "KaitaiStream"
69+
ReferencedContainer = "container:KaitaiStream.xcodeproj">
70+
</BuildableReference>
71+
</MacroExpansion>
72+
</ProfileAction>
73+
<AnalyzeAction
74+
buildConfiguration = "Debug">
75+
</AnalyzeAction>
76+
<ArchiveAction
77+
buildConfiguration = "Release"
78+
revealArchiveInOrganizer = "YES">
79+
</ArchiveAction>
80+
</Scheme>

‎KaitaiStream.xcodeproj/xcuserdata/jpope.xcuserdatad/xcschemes/xcschememanagement.plist

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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>SchemeUserState</key>
6+
<dict>
7+
<key>KaitaiStream.xcscheme</key>
8+
<dict>
9+
<key>orderHint</key>
10+
<integer>0</integer>
11+
</dict>
12+
</dict>
13+
<key>SuppressBuildableAutocreation</key>
14+
<dict>
15+
<key>004838551CCA633900B7D738</key>
16+
<dict>
17+
<key>primary</key>
18+
<true/>
19+
</dict>
20+
</dict>
21+
</dict>
22+
</plist>

0 commit comments

Comments
 (0)