Xcode9 3.0.24

alexeyxo · Oct 6, 2017 · 6b88719 · 6b88719
1 parent 475c6b3
commit 6b88719
Show file tree

Hide file tree

Showing 71 changed files with 851 additions and 1,650 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode8.3
+osx_image: xcode9
 before_install:
   - brew update
   - brew install protobuf
@@ -10,7 +10,7 @@ install:
   - scripts/build.sh
   - scripts/makeTests.sh
 script:
-  - xcodebuild test -project ./plugin/ProtocolBuffers/ProtocolBuffers.xcodeproj -scheme "ProtocolBuffers(OSX)" -destination 'platform=macos'
+  - xcodebuild test -project ./ProtocolBuffers.xcodeproj -scheme "ProtocolBuffers" -destination 'platform=macos'
 #  - xctool -project ./plugin/ProtocolBuffers/ProtocolBuffers.xcodeproj -sdk iphonesimulator -scheme ProtocolBuffers build test
 #  - xctool -project ./plugin/ProtocolBuffers/ProtocolBuffers.xcodeproj -scheme "ProtocolBuffers(OSX)" build test
 #  - xctool -project ./plugin/ProtocolBuffers/ProtocolBuffers.xcodeproj -sdk appletvsimulator -scheme "ProtocolBuffers(tvOS)" build test
diff --git a/...olBuffers/ProtocolBuffersTests/Info.plist → Info.plist b/...olBuffers/ProtocolBuffersTests/Info.plist → Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -16,8 +16,6 @@
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>

diff --git a/ProtocolBuffers-Swift.podspec b/ProtocolBuffers-Swift.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "ProtocolBuffers-Swift"
-  s.version      = "3.0.23"
+  s.version      = "3.0.24"
   s.summary      = "Protocol Buffers for Swift"
   s.homepage     = "http://protobuf.io#swift"
   s.license      = "Apache 2.0"

diff --git a/...rotocolBuffers/ProtocolBuffers/Info.plist → ...fers.xcodeproj/ProtocolBuffers_Info.plist b/...rotocolBuffers/ProtocolBuffers/Info.plist → ...fers.xcodeproj/ProtocolBuffers_Info.plist
@@ -11,11 +11,11 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>ProtocolBuffers</string>
+	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.22</string>
+	<string>3.0.24</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/ProtocolBuffers.xcodeproj/project.pbxproj b/ProtocolBuffers.xcodeproj/project.pbxproj
diff --git a/...eddata/xcschemes/ProtocolBuffers.xcscheme → ...eddata/xcschemes/ProtocolBuffers.xcscheme b/...eddata/xcschemes/ProtocolBuffers.xcscheme → ...eddata/xcschemes/ProtocolBuffers.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "9999"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,26 +14,12 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "3F85569819C71BCF003802F2"
+               BlueprintIdentifier = "ProtocolBuffers::ProtocolBuffers"
                BuildableName = "ProtocolBuffers.framework"
                BlueprintName = "ProtocolBuffers"
                ReferencedContainer = "container:ProtocolBuffers.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "NO"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "3F8556A319C71BCF003802F2"
-               BuildableName = "ProtocolBuffersTests.xctest"
-               BlueprintName = "UnitTesting"
-               ReferencedContainer = "container:ProtocolBuffers.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
@@ -47,17 +33,17 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "3F8556A319C71BCF003802F2"
-               BuildableName = "ProtocolBuffersTests.xctest"
-               BlueprintName = "UnitTesting"
+               BlueprintIdentifier = "3F9996DB1F879A470016C76C"
+               BuildableName = "Tests.xctest"
+               BlueprintName = "Tests"
                ReferencedContainer = "container:ProtocolBuffers.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "3F85569819C71BCF003802F2"
+            BlueprintIdentifier = "ProtocolBuffers::ProtocolBuffers"
             BuildableName = "ProtocolBuffers.framework"
             BlueprintName = "ProtocolBuffers"
             ReferencedContainer = "container:ProtocolBuffers.xcodeproj">
@@ -80,7 +66,7 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "3F85569819C71BCF003802F2"
+            BlueprintIdentifier = "ProtocolBuffers::ProtocolBuffers"
             BuildableName = "ProtocolBuffers.framework"
             BlueprintName = "ProtocolBuffers"
             ReferencedContainer = "container:ProtocolBuffers.xcodeproj">
@@ -98,7 +84,7 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "3F85569819C71BCF003802F2"
+            BlueprintIdentifier = "ProtocolBuffers::ProtocolBuffers"
             BuildableName = "ProtocolBuffers.framework"
             BlueprintName = "ProtocolBuffers"
             ReferencedContainer = "container:ProtocolBuffers.xcodeproj">

diff --git a/ProtocolBuffers.xcodeproj/xcshareddata/xcschemes/xcschememanagement.plist b/ProtocolBuffers.xcodeproj/xcshareddata/xcschemes/xcschememanagement.plist
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plist version="1.0">
+<dict>
+  <key>SchemeUserState</key>
+  <dict>
+    <key>ProtocolBuffers-Package.xcscheme</key>
+    <dict></dict>
+  </dict>
+  <key>SuppressBuildableAutocreation</key>
+  <dict></dict>
+</dict>
+</plist>
diff --git a/Source/Google.Protobuf.Struct.proto.swift b/Source/Google.Protobuf.Struct.proto.swift
@@ -602,10 +602,7 @@ public extension Google.Protobuf {
                 if let jsonValueFields = jsonMap["fields"] as? Dictionary<String, Dictionary<String,Any>> {
                     var mapFields = Dictionary<String, Google.Protobuf.Value>()
                     for (keyFields, valueFields) in jsonValueFields {
-                        guard let keyFromFields = String(keyFields) else {
-                            throw ProtocolBuffersError.invalidProtocolBuffer("Invalid JSON data")
-                        }
-                        mapFields[keyFromFields] = try Google.Protobuf.Value.Builder.decodeToBuilder(jsonMap:valueFields).build()
+                        mapFields[keyFields] = try Google.Protobuf.Value.Builder.decodeToBuilder(jsonMap:valueFields).build()
 
                     }
                     resultDecodedBuilder.fields = mapFields

diff --git a/plugin/ProtocolBuffers/ProtocolBuffers(OSX)/Info.plist b/plugin/ProtocolBuffers/ProtocolBuffers(OSX)/Info.plist