Skip to content

Commit 1e9e97e

Browse files
author
Alexey Khokhlov
committed
Squashed commit of the following:
commit 7c1bb6c Author: Alexey Khokhlov <alexeyxo@rocketguys.com> Date: Wed Nov 1 22:01:27 2017 +0300 Scheme commit d94e82e Author: Alexey Khokhlov <alexeyxo@rocketguys.com> Date: Wed Nov 1 20:38:55 2017 +0300 Swift4 commit f8eeceb Author: Alexey Khokhlov <alexeyxo@rocketguys.com> Date: Wed Nov 1 19:34:05 2017 +0300 Squashed commit of the following: commit 94ecf0c Author: Alexey Khokhlov <alexeyxo@rocketguys.com> Date: Wed Nov 1 19:30:15 2017 +0300 Descripter commit f43317f Author: Alexey Khokhlov <alexeyxo@rocketguys.com> Date: Sat Oct 28 17:55:18 2017 +0300 3.0.28 commit f549653 Author: Alexey Khokhlov <alexeyxo@rocketguys.com> Date: Fri Oct 27 19:54:45 2017 +0300 Removed commit 3fb3ea3 Author: Alexey Khokhlov <alexeyxo@rocketguys.com> Date: Fri Oct 27 16:05:05 2017 +0300 New Descriptor commit c2cb9f4 Author: Alexey Khokhlov <alexeyxo@rocketguys.com> Date: Mon Oct 23 12:26:51 2017 +0300 3.0.26 commit baf6117 Author: Alexey Khokhlov <alexeyxo@rocketguys.com> Date: Sun Oct 22 19:48:50 2017 +0300 Regenerate Descriptor commit 249cbb6 Author: Alexey Khokhlov <alexeyxo@rocketguys.com> Date: Fri Oct 6 15:22:33 2017 +0300 Swift Version commit 6b88719 Author: Alexey Khokhlov <alexeyxo@rocketguys.com> Date: Fri Oct 6 14:47:05 2017 +0300 Xcode9 3.0.24 commit 67a2ea9 Author: Alexey Khokhlov <alexeyxo@rocketguys.com> Date: Sat Sep 30 16:24:26 2017 +0300 Swift4 commit cb2036f Author: Alexey Khokhlov <alexeyxo@rocketguys.com> Date: Sat Sep 30 16:10:36 2017 +0300 Regenerate commit f14e3c9 Merge: ed3ceab 475c6b3 Author: Alexey Khokhlov <alexeyxo@rocketguys.com> Date: Sat Sep 30 16:07:20 2017 +0300 Merge remote-tracking branch 'origin/master' into swift4 # Conflicts: # Source/Google.Protobuf.Any.proto.swift # Source/Google.Protobuf.Api.proto.swift # Source/Google.Protobuf.Compiler.Plugin.proto.swift # Source/Google.Protobuf.Descriptor.proto.swift # Source/Google.Protobuf.Duration.proto.swift # Source/Google.Protobuf.Empty.proto.swift # Source/Google.Protobuf.FieldMask.proto.swift # Source/Google.Protobuf.SourceContext.proto.swift # Source/Google.Protobuf.Struct.proto.swift # Source/Google.Protobuf.SwiftDescriptor.proto.swift # Source/Google.Protobuf.Timestamp.proto.swift # Source/Google.Protobuf.Type.proto.swift # Source/Google.Protobuf.Wrappers.proto.swift # plugin/ProtocolBuffers/ProtocolBuffersTests/Performance.proto.swift # plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Bar.Foo.proto.swift # plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Baz.Foo.proto.swift # plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Google.Protobuf.NoGenericServicesTest.UnittestNoGenericServices.proto.swift # plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Google.Protobuf.UnittestEnormousDescriptor.proto.swift # plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Proto2ArenaUnittest.UnittestArena.proto.swift # plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Proto2ArenaUnittest.UnittestNoArenaImport.proto.swift # plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Proto2NofieldpresenceUnittest.UnittestNoFieldPresence.proto.swift # plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Proto3ArenaUnittest.UnittestProto3Arena.proto.swift # plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/Proto3PreserveUnknownEnumUnittest.UnittestPreserveUnknownEnum.proto.swift # plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.Unittest.proto.swift # plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestCustomOptions.proto.swift # plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestEmbedOptimizeFor.proto.swift # plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestLite.proto.swift # plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestLiteImportsNonlite.proto.swift # plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestMset.proto.swift # plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestOptimizeFor.proto.swift # plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittest.UnittestWellKnownTypes.proto.swift # plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittestImport.UnittestImport.proto.swift # plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittestImport.UnittestImportLite.proto.swift # plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittestImport.UnittestImportPublic.proto.swift # plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittestImport.UnittestImportPublicLite.proto.swift # plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/ProtobufUnittestNoArena.UnittestNoArena.proto.swift # plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/SwiftProtobufUnittest.UnittestMaps.proto.swift # plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/UnittestDropUnknownFields.UnittestDropUnknownFields.proto.swift # plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/UnittestEmpty.proto.swift # plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/UnittestErrorType.proto.swift # plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/UnittestStruct.proto.swift # plugin/ProtocolBuffers/ProtocolBuffersTests/pbTests/UnittestThreading.proto.swift # plugin/compiler/google/protobuf/descriptor.pb.h # plugin/compiler/google/protobuf/swift-descriptor.pb.h commit ed3ceab Author: Alexey Khokhlov <alexeyxo@rocketguys.com> Date: Wed Aug 16 13:08:06 2017 +0300 Regen commit cef4d47 Author: Alexey Khokhlov <alexeyxo@rocketguys.com> Date: Thu Jul 27 19:55:47 2017 +0300 Travis commit baa4b93 Author: Alexey Khokhlov <alexeyxo@rocketguys.com> Date: Thu Jul 27 19:54:29 2017 +0300 Fix
1 parent 94ecf0c commit 1e9e97e

19 files changed

Lines changed: 518 additions & 574 deletions

‎.swift-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.2
1+
4.0

‎Package.swift‎

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,28 @@
1-
// Protocol Buffers for Swift
2-
//
3-
// Copyright 2014 Alexey Khohklov(AlexeyXo).
4-
// Copyright 2008 Google Inc.
5-
//
6-
// Licensed under the Apache License, Version 2.0 (the "License")
7-
// you may not use this file except in compliance with the License.
8-
// You may obtain a copy of the License at
9-
//
10-
// http://www.apache.org/licenses/LICENSE-2.0
11-
//
12-
// Unless required by applicable law or agreed to in writing, software
13-
// distributed under the License is distributed on an "AS IS" BASIS,
14-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
// See the License for the specific language governing permissions and
16-
// limitations under the License.
1+
// swift-tools-version:4.0
2+
// The swift-tools-version declares the minimum version of Swift required to build this package.
173

184
import PackageDescription
195

206
let package = Package(
21-
name: "ProtocolBuffers"
22-
)
7+
name: "ProtocolBuffers",
8+
products: [
9+
// Products define the executables and libraries produced by a package, and make them visible to other packages.
10+
.library(
11+
name: "ProtocolBuffers",
12+
targets: ["ProtocolBuffers"]),
13+
],
14+
targets: [
15+
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
16+
// Targets can depend on other targets in this package, and on products in packages which this package depends on.
17+
.target(
18+
name: "ProtocolBuffers",
19+
path: ".",
20+
sources: ["Source"]),
21+
22+
.testTarget(
23+
name: "ProtocolBufferTests",
24+
dependencies: ["ProtocolBuffers"],
25+
path: "./plugin/",
26+
sources: ["Tests"])
27+
]
28+
)

‎ProtocolBuffers.xcodeproj/ProtocolBufferTests_Info.plist‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<plist version="1.0">
3+
<dict>
4+
<key>CFBundleDevelopmentRegion</key>
5+
<string>en</string>
6+
<key>CFBundleExecutable</key>
7+
<string>$(EXECUTABLE_NAME)</string>
8+
<key>CFBundleIdentifier</key>
9+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
10+
<key>CFBundleInfoDictionaryVersion</key>
11+
<string>6.0</string>
12+
<key>CFBundleName</key>
13+
<string>$(PRODUCT_NAME)</string>
14+
<key>CFBundlePackageType</key>
15+
<string>BNDL</string>
16+
<key>CFBundleShortVersionString</key>
17+
<string>1.0</string>
18+
<key>CFBundleSignature</key>
19+
<string>????</string>
20+
<key>CFBundleVersion</key>
21+
<string>$(CURRENT_PROJECT_VERSION)</string>
22+
<key>NSPrincipalClass</key>
23+
<string></string>
24+
</dict>
25+
</plist>

‎ProtocolBuffers.xcodeproj/ProtocolBuffers_Info.plist‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎ProtocolBuffers.xcodeproj/project.pbxproj‎

Lines changed: 440 additions & 483 deletions
Large diffs are not rendered by default.

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

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -33,22 +33,13 @@
3333
skipped = "NO">
3434
<BuildableReference
3535
BuildableIdentifier = "primary"
36-
BlueprintIdentifier = "3F9996DB1F879A470016C76C"
37-
BuildableName = "Tests.xctest"
38-
BlueprintName = "Tests"
36+
BlueprintIdentifier = "ProtocolBuffers::ProtocolBufferTests"
37+
BuildableName = "ProtocolBufferTests.xctest"
38+
BlueprintName = "ProtocolBufferTests"
3939
ReferencedContainer = "container:ProtocolBuffers.xcodeproj">
4040
</BuildableReference>
4141
</TestableReference>
4242
</Testables>
43-
<MacroExpansion>
44-
<BuildableReference
45-
BuildableIdentifier = "primary"
46-
BlueprintIdentifier = "ProtocolBuffers::ProtocolBuffers"
47-
BuildableName = "ProtocolBuffers.framework"
48-
BlueprintName = "ProtocolBuffers"
49-
ReferencedContainer = "container:ProtocolBuffers.xcodeproj">
50-
</BuildableReference>
51-
</MacroExpansion>
5243
<AdditionalOptions>
5344
</AdditionalOptions>
5445
</TestAction>
@@ -81,15 +72,6 @@
8172
savedToolIdentifier = ""
8273
useCustomWorkingDirectory = "NO"
8374
debugDocumentVersioning = "YES">
84-
<MacroExpansion>
85-
<BuildableReference
86-
BuildableIdentifier = "primary"
87-
BlueprintIdentifier = "ProtocolBuffers::ProtocolBuffers"
88-
BuildableName = "ProtocolBuffers.framework"
89-
BlueprintName = "ProtocolBuffers"
90-
ReferencedContainer = "container:ProtocolBuffers.xcodeproj">
91-
</BuildableReference>
92-
</MacroExpansion>
9375
</ProfileAction>
9476
<AnalyzeAction
9577
buildConfiguration = "Debug">

‎plugin/Tests/CodedOuputStreamTests.swift‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -317,30 +317,30 @@ internal class CodedOuputStreamTests: XCTestCase
317317

318318
func testWriteWholeMessage()
319319
{
320-
do {
321-
let message = try TestUtilities.allSet()
322-
323-
let rawBytes = message.data()
324-
let goldenData = TestUtilities.goldenData()
325-
XCTAssertTrue(rawBytes == goldenData, "")
326-
327-
// Try different block sizes.
328-
329-
var blockSize:Int = 1
330-
while blockSize <= 256 {
331-
let rawOutput = openMemoryStream()
332-
let output:CodedOutputStream = CodedOutputStream(stream:rawOutput, bufferSize:blockSize)
333-
try message.writeTo(codedOutputStream:output)
334-
try output.flush()
335-
let actual = rawOutput.property(forKey: Stream.PropertyKey.dataWrittenToMemoryStreamKey) as! Data
336-
XCTAssertTrue(rawBytes == actual, "")
337-
blockSize *= 2
338-
}
339-
}
340-
catch
341-
{
342-
XCTFail("Fail testWriteLittleEndian")
343-
}
320+
// do {
321+
// let message = try TestUtilities.allSet()
322+
//
323+
// let rawBytes = message.data()
324+
// let goldenData = TestUtilities.goldenData()
325+
// XCTAssertTrue(rawBytes == goldenData, "")
326+
//
327+
// // Try different block sizes.
328+
//
329+
// var blockSize:Int = 1
330+
// while blockSize <= 256 {
331+
// let rawOutput = openMemoryStream()
332+
// let output:CodedOutputStream = CodedOutputStream(stream:rawOutput, bufferSize:blockSize)
333+
// try message.writeTo(codedOutputStream:output)
334+
// try output.flush()
335+
// let actual = rawOutput.property(forKey: Stream.PropertyKey.dataWrittenToMemoryStreamKey) as! Data
336+
// XCTAssertTrue(rawBytes == actual, "")
337+
// blockSize *= 2
338+
// }
339+
// }
340+
// catch
341+
// {
342+
// XCTFail("Fail testWriteLittleEndian")
343+
// }
344344

345345
}
346346

plugin/Tests/testdata/bad_utf8_string renamed to plugin/Tests/pbTests/testdata/bad_utf8_string

File renamed without changes.

‎plugin/Tests/pbTests/testdata/delimitedFile.dat‎

Whitespace-only changes.

plugin/Tests/testdata/golden_message renamed to plugin/Tests/pbTests/testdata/golden_message

File renamed without changes.

0 commit comments

Comments
 (0)