Skip to content

Commit 6b88719

Browse files
author
Alexey Khokhlov
committed
Xcode9 3.0.24
1 parent 475c6b3 commit 6b88719

71 files changed

Lines changed: 851 additions & 1650 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: objective-c
2-
osx_image: xcode8.3
2+
osx_image: xcode9
33
before_install:
44
- brew update
55
- brew install protobuf
@@ -10,7 +10,7 @@ install:
1010
- scripts/build.sh
1111
- scripts/makeTests.sh
1212
script:
13-
- xcodebuild test -project ./plugin/ProtocolBuffers/ProtocolBuffers.xcodeproj -scheme "ProtocolBuffers(OSX)" -destination 'platform=macos'
13+
- xcodebuild test -project ./ProtocolBuffers.xcodeproj -scheme "ProtocolBuffers" -destination 'platform=macos'
1414
# - xctool -project ./plugin/ProtocolBuffers/ProtocolBuffers.xcodeproj -sdk iphonesimulator -scheme ProtocolBuffers build test
1515
# - xctool -project ./plugin/ProtocolBuffers/ProtocolBuffers.xcodeproj -scheme "ProtocolBuffers(OSX)" build test
1616
# - xctool -project ./plugin/ProtocolBuffers/ProtocolBuffers.xcodeproj -sdk appletvsimulator -scheme "ProtocolBuffers(tvOS)" build test

plugin/ProtocolBuffers/ProtocolBuffersTests/Info.plist renamed to Info.plist

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<plist version="1.0">
44
<dict>
55
<key>CFBundleDevelopmentRegion</key>
6-
<string>en</string>
6+
<string>$(DEVELOPMENT_LANGUAGE)</string>
77
<key>CFBundleExecutable</key>
88
<string>$(EXECUTABLE_NAME)</string>
99
<key>CFBundleIdentifier</key>
@@ -16,8 +16,6 @@
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
1818
<string>1.0</string>
19-
<key>CFBundleSignature</key>
20-
<string>????</string>
2119
<key>CFBundleVersion</key>
2220
<string>1</string>
2321
</dict>

‎ProtocolBuffers-Swift.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "ProtocolBuffers-Swift"
3-
s.version = "3.0.23"
3+
s.version = "3.0.24"
44
s.summary = "Protocol Buffers for Swift"
55
s.homepage = "http://protobuf.io#swift"
66
s.license = "Apache 2.0"

plugin/ProtocolBuffers/ProtocolBuffers/Info.plist renamed to ProtocolBuffers.xcodeproj/ProtocolBuffers_Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundleName</key>
14-
<string>ProtocolBuffers</string>
14+
<string>$(PRODUCT_NAME)</string>
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>3.0.22</string>
18+
<string>3.0.24</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

‎ProtocolBuffers.xcodeproj/project.pbxproj‎

Lines changed: 793 additions & 0 deletions
Large diffs are not rendered by default.

plugin/ProtocolBuffers/ProtocolBuffers.xcodeproj/xcshareddata/xcschemes/ProtocolBuffers.xcscheme renamed to ProtocolBuffers.xcodeproj/xcshareddata/xcschemes/ProtocolBuffers.xcscheme

Lines changed: 8 additions & 22 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 = "0900"
3+
LastUpgradeVersion = "9999"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -14,26 +14,12 @@
1414
buildForAnalyzing = "YES">
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "3F85569819C71BCF003802F2"
17+
BlueprintIdentifier = "ProtocolBuffers::ProtocolBuffers"
1818
BuildableName = "ProtocolBuffers.framework"
1919
BlueprintName = "ProtocolBuffers"
2020
ReferencedContainer = "container:ProtocolBuffers.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
23-
<BuildActionEntry
24-
buildForTesting = "YES"
25-
buildForRunning = "NO"
26-
buildForProfiling = "NO"
27-
buildForArchiving = "NO"
28-
buildForAnalyzing = "YES">
29-
<BuildableReference
30-
BuildableIdentifier = "primary"
31-
BlueprintIdentifier = "3F8556A319C71BCF003802F2"
32-
BuildableName = "ProtocolBuffersTests.xctest"
33-
BlueprintName = "UnitTesting"
34-
ReferencedContainer = "container:ProtocolBuffers.xcodeproj">
35-
</BuildableReference>
36-
</BuildActionEntry>
3723
</BuildActionEntries>
3824
</BuildAction>
3925
<TestAction
@@ -47,17 +33,17 @@
4733
skipped = "NO">
4834
<BuildableReference
4935
BuildableIdentifier = "primary"
50-
BlueprintIdentifier = "3F8556A319C71BCF003802F2"
51-
BuildableName = "ProtocolBuffersTests.xctest"
52-
BlueprintName = "UnitTesting"
36+
BlueprintIdentifier = "3F9996DB1F879A470016C76C"
37+
BuildableName = "Tests.xctest"
38+
BlueprintName = "Tests"
5339
ReferencedContainer = "container:ProtocolBuffers.xcodeproj">
5440
</BuildableReference>
5541
</TestableReference>
5642
</Testables>
5743
<MacroExpansion>
5844
<BuildableReference
5945
BuildableIdentifier = "primary"
60-
BlueprintIdentifier = "3F85569819C71BCF003802F2"
46+
BlueprintIdentifier = "ProtocolBuffers::ProtocolBuffers"
6147
BuildableName = "ProtocolBuffers.framework"
6248
BlueprintName = "ProtocolBuffers"
6349
ReferencedContainer = "container:ProtocolBuffers.xcodeproj">
@@ -80,7 +66,7 @@
8066
<MacroExpansion>
8167
<BuildableReference
8268
BuildableIdentifier = "primary"
83-
BlueprintIdentifier = "3F85569819C71BCF003802F2"
69+
BlueprintIdentifier = "ProtocolBuffers::ProtocolBuffers"
8470
BuildableName = "ProtocolBuffers.framework"
8571
BlueprintName = "ProtocolBuffers"
8672
ReferencedContainer = "container:ProtocolBuffers.xcodeproj">
@@ -98,7 +84,7 @@
9884
<MacroExpansion>
9985
<BuildableReference
10086
BuildableIdentifier = "primary"
101-
BlueprintIdentifier = "3F85569819C71BCF003802F2"
87+
BlueprintIdentifier = "ProtocolBuffers::ProtocolBuffers"
10288
BuildableName = "ProtocolBuffers.framework"
10389
BlueprintName = "ProtocolBuffers"
10490
ReferencedContainer = "container:ProtocolBuffers.xcodeproj">

‎ProtocolBuffers.xcodeproj/xcshareddata/xcschemes/xcschememanagement.plist‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<plist version="1.0">
3+
<dict>
4+
<key>SchemeUserState</key>
5+
<dict>
6+
<key>ProtocolBuffers-Package.xcscheme</key>
7+
<dict></dict>
8+
</dict>
9+
<key>SuppressBuildableAutocreation</key>
10+
<dict></dict>
11+
</dict>
12+
</plist>

‎Source/Google.Protobuf.Struct.proto.swift‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -602,10 +602,7 @@ public extension Google.Protobuf {
602602
if let jsonValueFields = jsonMap["fields"] as? Dictionary<String, Dictionary<String,Any>> {
603603
var mapFields = Dictionary<String, Google.Protobuf.Value>()
604604
for (keyFields, valueFields) in jsonValueFields {
605-
guard let keyFromFields = String(keyFields) else {
606-
throw ProtocolBuffersError.invalidProtocolBuffer("Invalid JSON data")
607-
}
608-
mapFields[keyFromFields] = try Google.Protobuf.Value.Builder.decodeToBuilder(jsonMap:valueFields).build()
605+
mapFields[keyFields] = try Google.Protobuf.Value.Builder.decodeToBuilder(jsonMap:valueFields).build()
609606

610607
}
611608
resultDecodedBuilder.fields = mapFields

‎plugin/ProtocolBuffers/ProtocolBuffers(OSX)/Info.plist‎

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

0 commit comments

Comments
 (0)