Skip to content

Commit 4a1bf60

Browse files
author
Alexey Khokhlov
committed
Swift4
1 parent 1e9e97e commit 4a1bf60

3 files changed

Lines changed: 116 additions & 36 deletions

File tree

‎ProtocolBuffers.xcodeproj/ProtocolBuffers_Info.plist‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
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>CFBundleDevelopmentRegion</key>
6+
<string>en</string>
7+
<key>CFBundleExecutable</key>
8+
<string>$(EXECUTABLE_NAME)</string>
9+
<key>CFBundleIdentifier</key>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
11+
<key>CFBundleInfoDictionaryVersion</key>
12+
<string>6.0</string>
13+
<key>CFBundleName</key>
14+
<string>$(PRODUCT_NAME)</string>
15+
<key>CFBundlePackageType</key>
16+
<string>FMWK</string>
17+
<key>CFBundleShortVersionString</key>
18+
<string>4.0</string>
19+
<key>CFBundleSignature</key>
20+
<string>????</string>
21+
<key>CFBundleVersion</key>
22+
<string>$(CURRENT_PROJECT_VERSION)</string>
23+
<key>NSPrincipalClass</key>
24+
<string></string>
25+
</dict>
26+
</plist>

‎ProtocolBuffers.xcodeproj/project.pbxproj‎

Lines changed: 7 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,14 @@
9292
/* End PBXBuildFile section */
9393

9494
/* Begin PBXContainerItemProxy section */
95-
3F2F4E861FAA3829005FFAFD /* PBXContainerItemProxy */ = {
95+
3F130A3F1FAB2CFA00E29F61 /* PBXContainerItemProxy */ = {
9696
isa = PBXContainerItemProxy;
9797
containerPortal = OBJ_1 /* Project object */;
9898
proxyType = 1;
9999
remoteGlobalIDString = "ProtocolBuffers::ProtocolBuffers";
100100
remoteInfo = ProtocolBuffers;
101101
};
102-
3F2F4E871FAA382A005FFAFD /* PBXContainerItemProxy */ = {
102+
3F130A401FAB2CFB00E29F61 /* PBXContainerItemProxy */ = {
103103
isa = PBXContainerItemProxy;
104104
containerPortal = OBJ_1 /* Project object */;
105105
proxyType = 1;
@@ -109,17 +109,6 @@
109109
/* End PBXContainerItemProxy section */
110110

111111
/* Begin PBXFileReference section */
112-
3F90B9881FAA3D7500097883 /* text_format_unittest_data_oneof_implemented.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = text_format_unittest_data_oneof_implemented.txt; sourceTree = "<group>"; };
113-
3F90B9891FAA3D7500097883 /* text_format_unittest_data.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = text_format_unittest_data.txt; sourceTree = "<group>"; };
114-
3F90B98A1FAA3D7500097883 /* text_format_unittest_data_pointy.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = text_format_unittest_data_pointy.txt; sourceTree = "<group>"; };
115-
3F90B98B1FAA3D7500097883 /* text_format_unittest_extensions_data_pointy.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = text_format_unittest_extensions_data_pointy.txt; sourceTree = "<group>"; };
116-
3F90B98C1FAA3D7500097883 /* delimitedFile.dat */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = delimitedFile.dat; sourceTree = "<group>"; };
117-
3F90B98D1FAA3D7500097883 /* golden_message_oneof_implemented */ = {isa = PBXFileReference; lastKnownFileType = file; path = golden_message_oneof_implemented; sourceTree = "<group>"; };
118-
3F90B98E1FAA3D7500097883 /* bad_utf8_string */ = {isa = PBXFileReference; lastKnownFileType = file; path = bad_utf8_string; sourceTree = "<group>"; };
119-
3F90B98F1FAA3D7500097883 /* text_format_unittest_data_pointy_oneof.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = text_format_unittest_data_pointy_oneof.txt; sourceTree = "<group>"; };
120-
3F90B9901FAA3D7500097883 /* golden_message */ = {isa = PBXFileReference; lastKnownFileType = file; path = golden_message; sourceTree = "<group>"; };
121-
3F90B9911FAA3D7500097883 /* text_format_unittest_extensions_data.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = text_format_unittest_extensions_data.txt; sourceTree = "<group>"; };
122-
3F90B9921FAA3D7500097883 /* golden_packed_fields_message */ = {isa = PBXFileReference; lastKnownFileType = file; path = golden_packed_fields_message; sourceTree = "<group>"; };
123112
OBJ_10 /* CodedInputStream.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodedInputStream.swift; sourceTree = "<group>"; };
124113
OBJ_11 /* CodedOutputStream.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodedOutputStream.swift; sourceTree = "<group>"; };
125114
OBJ_12 /* ConcreateExtensionField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConcreateExtensionField.swift; sourceTree = "<group>"; };
@@ -214,24 +203,6 @@
214203
/* End PBXFrameworksBuildPhase section */
215204

216205
/* Begin PBXGroup section */
217-
3F90B9871FAA3D7500097883 /* testdata */ = {
218-
isa = PBXGroup;
219-
children = (
220-
3F90B9881FAA3D7500097883 /* text_format_unittest_data_oneof_implemented.txt */,
221-
3F90B9891FAA3D7500097883 /* text_format_unittest_data.txt */,
222-
3F90B98A1FAA3D7500097883 /* text_format_unittest_data_pointy.txt */,
223-
3F90B98B1FAA3D7500097883 /* text_format_unittest_extensions_data_pointy.txt */,
224-
3F90B98C1FAA3D7500097883 /* delimitedFile.dat */,
225-
3F90B98D1FAA3D7500097883 /* golden_message_oneof_implemented */,
226-
3F90B98E1FAA3D7500097883 /* bad_utf8_string */,
227-
3F90B98F1FAA3D7500097883 /* text_format_unittest_data_pointy_oneof.txt */,
228-
3F90B9901FAA3D7500097883 /* golden_message */,
229-
3F90B9911FAA3D7500097883 /* text_format_unittest_extensions_data.txt */,
230-
3F90B9921FAA3D7500097883 /* golden_packed_fields_message */,
231-
);
232-
path = testdata;
233-
sourceTree = "<group>";
234-
};
235206
OBJ_32 /* Tests */ = {
236207
isa = PBXGroup;
237208
children = (
@@ -266,7 +237,6 @@
266237
OBJ_48 /* pbTests */ = {
267238
isa = PBXGroup;
268239
children = (
269-
3F90B9871FAA3D7500097883 /* testdata */,
270240
OBJ_49 /* Bar.Foo.proto.swift */,
271241
OBJ_50 /* Baz.Foo.proto.swift */,
272242
OBJ_51 /* Google.Protobuf.NoGenericServicesTest.UnittestNoGenericServices.proto.swift */,
@@ -300,7 +270,7 @@
300270
path = pbTests;
301271
sourceTree = "<group>";
302272
};
303-
OBJ_5 = {
273+
OBJ_5 /* */ = {
304274
isa = PBXGroup;
305275
children = (
306276
OBJ_6 /* Package.swift */,
@@ -312,6 +282,7 @@
312282
OBJ_81 /* DerivedData */,
313283
OBJ_82 /* Products */,
314284
);
285+
name = "";
315286
sourceTree = "<group>";
316287
};
317288
OBJ_7 /* Sources */ = {
@@ -426,7 +397,7 @@
426397
knownRegions = (
427398
en,
428399
);
429-
mainGroup = OBJ_5;
400+
mainGroup = OBJ_5 /* */;
430401
productRefGroup = OBJ_82 /* Products */;
431402
projectDirPath = "";
432403
projectRoot = "";
@@ -534,12 +505,12 @@
534505
OBJ_141 /* PBXTargetDependency */ = {
535506
isa = PBXTargetDependency;
536507
target = "ProtocolBuffers::ProtocolBuffers" /* ProtocolBuffers */;
537-
targetProxy = 3F2F4E861FAA3829005FFAFD /* PBXContainerItemProxy */;
508+
targetProxy = 3F130A3F1FAB2CFA00E29F61 /* PBXContainerItemProxy */;
538509
};
539510
OBJ_175 /* PBXTargetDependency */ = {
540511
isa = PBXTargetDependency;
541512
target = "ProtocolBuffers::ProtocolBufferTests" /* ProtocolBufferTests */;
542-
targetProxy = 3F2F4E871FAA382A005FFAFD /* PBXContainerItemProxy */;
513+
targetProxy = 3F130A401FAB2CFB00E29F61 /* PBXContainerItemProxy */;
543514
};
544515
/* End PBXTargetDependency section */
545516

‎ProtocolBuffers.xcodeproj/xcshareddata/xcschemes/ProtocolBuffers-Package.xcscheme‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "9999"
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 = "ProtocolBuffers::ProtocolBuffers"
18+
BuildableName = "ProtocolBuffers.framework"
19+
BlueprintName = "ProtocolBuffers"
20+
ReferencedContainer = "container:ProtocolBuffers.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+
language = ""
30+
shouldUseLaunchSchemeArgsEnv = "YES">
31+
<Testables>
32+
<TestableReference
33+
skipped = "NO">
34+
<BuildableReference
35+
BuildableIdentifier = "primary"
36+
BlueprintIdentifier = "ProtocolBuffers::ProtocolBufferTests"
37+
BuildableName = "ProtocolBufferTests.xctest"
38+
BlueprintName = "ProtocolBufferTests"
39+
ReferencedContainer = "container:ProtocolBuffers.xcodeproj">
40+
</BuildableReference>
41+
</TestableReference>
42+
</Testables>
43+
<AdditionalOptions>
44+
</AdditionalOptions>
45+
</TestAction>
46+
<LaunchAction
47+
buildConfiguration = "Debug"
48+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
49+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
50+
language = ""
51+
launchStyle = "0"
52+
useCustomWorkingDirectory = "NO"
53+
ignoresPersistentStateOnLaunch = "NO"
54+
debugDocumentVersioning = "YES"
55+
debugServiceExtension = "internal"
56+
allowLocationSimulation = "YES">
57+
<MacroExpansion>
58+
<BuildableReference
59+
BuildableIdentifier = "primary"
60+
BlueprintIdentifier = "ProtocolBuffers::ProtocolBuffers"
61+
BuildableName = "ProtocolBuffers.framework"
62+
BlueprintName = "ProtocolBuffers"
63+
ReferencedContainer = "container:ProtocolBuffers.xcodeproj">
64+
</BuildableReference>
65+
</MacroExpansion>
66+
<AdditionalOptions>
67+
</AdditionalOptions>
68+
</LaunchAction>
69+
<ProfileAction
70+
buildConfiguration = "Release"
71+
shouldUseLaunchSchemeArgsEnv = "YES"
72+
savedToolIdentifier = ""
73+
useCustomWorkingDirectory = "NO"
74+
debugDocumentVersioning = "YES">
75+
</ProfileAction>
76+
<AnalyzeAction
77+
buildConfiguration = "Debug">
78+
</AnalyzeAction>
79+
<ArchiveAction
80+
buildConfiguration = "Release"
81+
revealArchiveInOrganizer = "YES">
82+
</ArchiveAction>
83+
</Scheme>

0 commit comments

Comments
 (0)