3.0.21

alexeyxo · Jul 14, 2017 · 56e9e7f · 56e9e7f
1 parent 5f865d0
commit 56e9e7f
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 13 deletions.
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.20"
+  s.version      = "3.0.21"
   s.summary      = "Protocol Buffers for Swift"
   s.homepage     = "http://protobuf.io#swift"
   s.license      = "Apache 2.0"

diff --git a/Source/Google.Protobuf.Compiler.Plugin.proto.swift b/Source/Google.Protobuf.Compiler.Plugin.proto.swift
@@ -4,8 +4,6 @@
 /// Syntax "Proto2"
 
 import Foundation
-import ProtocolBuffers
-
 
 public extension Google.Protobuf{ public struct Compiler { }}
 
@@ -18,6 +16,7 @@ public extension Google.Protobuf.Compiler {
             extensionRegistry = ExtensionRegistry()
             registerAllExtensions(registry: extensionRegistry)
             Google.Protobuf.DescriptorRoot.default.registerAllExtensions(registry: extensionRegistry)
+            Google.Protobuf.SwiftDescriptorRoot.default.registerAllExtensions(registry: extensionRegistry)
         }
         public func registerAllExtensions(registry: ExtensionRegistry) {
         }

diff --git a/plugin/ProtocolBuffers/ProtocolBuffers.xcodeproj/project.pbxproj b/plugin/ProtocolBuffers/ProtocolBuffers.xcodeproj/project.pbxproj
@@ -7,7 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		3F0E37D11F19104500CD6072 /* Google.Protobuf.Compiler.Plugin.proto.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F0E37D01F19104500CD6072 /* Google.Protobuf.Compiler.Plugin.proto.swift */; };
+		3F0E37D41F191FCA00CD6072 /* Google.Protobuf.Compiler.Plugin.proto.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F0E37D31F191FCA00CD6072 /* Google.Protobuf.Compiler.Plugin.proto.swift */; };
 		3F1422981A07FDBF0090CEE9 /* ProtocolBuffers.framework in Copy Framework */ = {isa = PBXBuildFile; fileRef = 3F85569919C71BCF003802F2 /* ProtocolBuffers.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		3F2275591D5201BB00FBB3DF /* Google.Protobuf.Any.proto.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F586C371D50EE720015E6F5 /* Google.Protobuf.Any.proto.swift */; };
 		3F22755A1D5201BB00FBB3DF /* Google.Protobuf.Type.proto.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F586C381D50EE720015E6F5 /* Google.Protobuf.Type.proto.swift */; };
@@ -221,7 +221,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		3F0E37D01F19104500CD6072 /* Google.Protobuf.Compiler.Plugin.proto.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Google.Protobuf.Compiler.Plugin.proto.swift; sourceTree = "<group>"; };
+		3F0E37D31F191FCA00CD6072 /* Google.Protobuf.Compiler.Plugin.proto.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Google.Protobuf.Compiler.Plugin.proto.swift; sourceTree = "<group>"; };
 		3F26F7461B909AD300428569 /* delimitedFile.dat */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = delimitedFile.dat; sourceTree = "<group>"; };
 		3F31A1A91BA199C000F477C1 /* ProtocolBuffers.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ProtocolBuffers.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		3F41061C1A1A667700742090 /* ProtocolBuffers.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ProtocolBuffers.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -468,7 +468,7 @@
 		3F89A7E91C396BA9009876B8 /* Source */ = {
 			isa = PBXGroup;
 			children = (
-				3F0E37D01F19104500CD6072 /* Google.Protobuf.Compiler.Plugin.proto.swift */,
+				3F0E37D31F191FCA00CD6072 /* Google.Protobuf.Compiler.Plugin.proto.swift */,
 				3F89A7EA1C396BA9009876B8 /* AbstractMessage.swift */,
 				3F89A7EB1C396BA9009876B8 /* CodedInputStream.swift */,
 				3F89A7EC1C396BA9009876B8 /* CodedOutputStream.swift */,
@@ -862,7 +862,7 @@
 			files = (
 				3F89A8041C396BA9009876B8 /* CodedOutputStream.swift in Sources */,
 				3F89A8191C396BA9009876B8 /* WireFormat.swift in Sources */,
-				3F0E37D11F19104500CD6072 /* Google.Protobuf.Compiler.Plugin.proto.swift in Sources */,
+				3F0E37D41F191FCA00CD6072 /* Google.Protobuf.Compiler.Plugin.proto.swift in Sources */,
 				3F89A80E1C396BA9009876B8 /* Google.Protobuf.Empty.proto.swift in Sources */,
 				3F89A80D1C396BA9009876B8 /* Google.Protobuf.Duration.proto.swift in Sources */,
 				3F89A8061C396BA9009876B8 /* ExtendableMessage.swift in Sources */,

diff --git a/plugin/compiler/plugin.proto → plugin/compiler/google/protobuf/plugin.proto b/plugin/compiler/plugin.proto → plugin/compiler/google/protobuf/plugin.proto
@@ -51,7 +51,11 @@ option java_outer_classname = "PluginProtos";
 
 option go_package = "github.com/golang/protobuf/protoc-gen-go/plugin;plugin_go";
 
+
 import "google/protobuf/descriptor.proto";
+import "google/protobuf/swift-descriptor.proto";
+option (.google.protobuf.swift_file_options).compile_for_framework = false;
+option (.google.protobuf.swift_file_options).entities_access_control = PublicEntities;
 
 // The version number of protocol compiler.
 message Version {

diff --git a/plugin/compiler/react_native/swift_helpers_react.h b/plugin/compiler/react_native/swift_helpers_react.h
@@ -23,7 +23,7 @@
 #include <google/protobuf/descriptor.pb.h>
 #include <google/protobuf/io/printer.h>
 
-#define SWIFT_PROTOBUF_VERSION "3.0.20"
+#define SWIFT_PROTOBUF_VERSION "3.0.21"
 
 namespace google {
     namespace protobuf {

diff --git a/plugin/compiler/realm/swift_helpers_realm.h b/plugin/compiler/realm/swift_helpers_realm.h
@@ -23,7 +23,7 @@
 #include <google/protobuf/descriptor.pb.h>
 #include <google/protobuf/io/printer.h>
 
-#define SWIFT_PROTOBUF_VERSION "3.0.20"
+#define SWIFT_PROTOBUF_VERSION "3.0.21"
 
 namespace google {
     namespace protobuf {

diff --git a/plugin/compiler/swift_helpers.cc b/plugin/compiler/swift_helpers.cc
@@ -110,7 +110,7 @@ namespace google { namespace protobuf { namespace compiler { namespace swift {
     }
 
     bool isCompileForFramework(const FileDescriptor* file) {
-        if (IsBootstrapFile(file)) {
+        if (IsBootstrapFile(file) ) {
             return false;
         }
         else if (file->options().HasExtension(swift_file_options)) {

diff --git a/plugin/compiler/swift_helpers.h b/plugin/compiler/swift_helpers.h
@@ -23,7 +23,7 @@
 #include <google/protobuf/descriptor.pb.h>
 #include <google/protobuf/io/printer.h>
 
-#define SWIFT_PROTOBUF_VERSION "3.0.20"
+#define SWIFT_PROTOBUF_VERSION "3.0.21"
 
 namespace google {
     namespace protobuf {

diff --git a/scripts/makeDescriptor.sh b/scripts/makeDescriptor.sh
@@ -8,12 +8,12 @@ PATH=$PATH:$compiler_root
 
 # we need this for bootstrapping
 protoc -I$compiler_root $compiler_root/google/protobuf/{,swift-}descriptor.proto --cpp_out=$compiler_root
-
 # build the swift generator
 scripts/build.sh
 
 # compile the swift descriptors and utils into the runtime library
-protoc -I$compiler_root $compiler_root/google/protobuf/{,swift-}descriptor.proto $compiler_root/plugin.proto --swift_out=Source/
+protoc -I$compiler_root $compiler_root/google/protobuf/{,swift-}descriptor.proto --swift_out=Source/
+protoc -I$compiler_root $compiler_root/google/protobuf/plugin.proto --swift_out=Source/
 # protoc -I$compiler_root $compiler_root/google/protobuf/Utilities/*.proto --swift_out=Source/
 protoc -I$compiler_root $compiler_root/google/protobuf/api.proto --swift_out=Source/
 protoc -I$compiler_root $compiler_root/google/protobuf/any.proto --swift_out=Source/