types: remove stub packages
CL/177623 updates v1 to not depend on the previous import paths.
Change-Id: I46a61b8f8fa136c9c1fe367ff311732ba8841279
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177604
Reviewed-by: Damien Neil <dneil@google.com>
diff --git a/cmd/protoc-gen-go-grpc/testdata/go.mod b/cmd/protoc-gen-go-grpc/testdata/go.mod
index 44d8145..ba49f45 100644
--- a/cmd/protoc-gen-go-grpc/testdata/go.mod
+++ b/cmd/protoc-gen-go-grpc/testdata/go.mod
@@ -1,7 +1,7 @@
module google.golang.org/protobuf/cmd/protoc-gen-go-grpc/testdata
require (
- github.com/golang/protobuf v1.2.1-0.20190516201927-a2cd3ac1b343
+ github.com/golang/protobuf v1.2.1-0.20190516215712-ae2eaafab405
google.golang.org/grpc v1.19.0
google.golang.org/protobuf v1.0.0
)
diff --git a/cmd/protoc-gen-go/testdata/go.mod b/cmd/protoc-gen-go/testdata/go.mod
index ee647c2..08b9186 100644
--- a/cmd/protoc-gen-go/testdata/go.mod
+++ b/cmd/protoc-gen-go/testdata/go.mod
@@ -1,7 +1,7 @@
module google.golang.org/protobuf/cmd/protoc-gen-go/testdata
require (
- github.com/golang/protobuf v1.2.1-0.20190516201927-a2cd3ac1b343
+ github.com/golang/protobuf v1.2.1-0.20190516215712-ae2eaafab405
google.golang.org/protobuf v1.0.0
)
diff --git a/go.mod b/go.mod
index 1d12292..3e72592 100644
--- a/go.mod
+++ b/go.mod
@@ -3,6 +3,6 @@
go 1.9
require (
- github.com/golang/protobuf v1.2.1-0.20190516201927-a2cd3ac1b343
+ github.com/golang/protobuf v1.2.1-0.20190516215712-ae2eaafab405
github.com/google/go-cmp v0.3.0
)
diff --git a/go.sum b/go.sum
index 3a3456a..95dc240 100644
--- a/go.sum
+++ b/go.sum
@@ -1,9 +1,11 @@
github.com/golang/protobuf v1.2.1-0.20190514181236-7800af189d76/go.mod h1:Zfz6qcDoDBESdv6JsKsGpgNHnkvwJAJwcA9eL+mOkgc=
github.com/golang/protobuf v1.2.1-0.20190515194842-7574ba03306e/go.mod h1:GjgUz9uwrRQmdPBBrFqiVbojAmlpy6ryM6DCzC+20rE=
-github.com/golang/protobuf v1.2.1-0.20190516201927-a2cd3ac1b343 h1:7ggaFvChsnb7ONk6XaHOlWSUItKRmiaCuisgen9uhSg=
github.com/golang/protobuf v1.2.1-0.20190516201927-a2cd3ac1b343/go.mod h1:PScGDF2x230A126tLt9Ol9RjhXzbiPJrt/CogooD2mE=
+github.com/golang/protobuf v1.2.1-0.20190516215712-ae2eaafab405 h1:j0K4x4UIgNTsXHO1mjIWLGLVyvq1tcfhurSmgbnMTE4=
+github.com/golang/protobuf v1.2.1-0.20190516215712-ae2eaafab405/go.mod h1:UmP8hhPKR5WWIjbT9v0JEVT+U0DBSjbW8KaZVeyFfRE=
github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
google.golang.org/protobuf v0.0.0-20190514172829-e89e6244e0e8/go.mod h1:791zQGC15vDqjpmPRn1uGPu5oHy/Jzw/Q1n5JsgIIcY=
google.golang.org/protobuf v0.0.0-20190514231807-cdb777356907/go.mod h1:HeRLsKXv4+wE27dOIGwnqcOgq6a1O/GJ7mGhiEPnBrU=
google.golang.org/protobuf v0.0.0-20190516201745-40b83d67fc75/go.mod h1:jf+u8AHuKtkib+0J4/bQXPNzCmT3V9a02hVzYKtatuw=
+google.golang.org/protobuf v0.0.0-20190516215540-a95b29fbf623/go.mod h1:cWWmz5lsCWIcqGLROrKq5Lu231IJw2PzqOZ8cgspbfY=
diff --git a/types/descriptor/stub.go b/types/descriptor/stub.go
deleted file mode 100644
index 5695b62..0000000
--- a/types/descriptor/stub.go
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// TODO: This file exists to have the minimum number of forwarding declarations
-// to keep v1 working. This will be deleted in the near future.
-package descriptor_proto
-
-import "google.golang.org/protobuf/types/descriptorpb"
-
-type (
- DescriptorProto = descriptorpb.DescriptorProto
- DescriptorProto_ExtensionRange = descriptorpb.DescriptorProto_ExtensionRange
- DescriptorProto_ReservedRange = descriptorpb.DescriptorProto_ReservedRange
- EnumDescriptorProto = descriptorpb.EnumDescriptorProto
- EnumDescriptorProto_EnumReservedRange = descriptorpb.EnumDescriptorProto_EnumReservedRange
- EnumOptions = descriptorpb.EnumOptions
- EnumValueDescriptorProto = descriptorpb.EnumValueDescriptorProto
- EnumValueOptions = descriptorpb.EnumValueOptions
- ExtensionRangeOptions = descriptorpb.ExtensionRangeOptions
- FieldDescriptorProto = descriptorpb.FieldDescriptorProto
- FieldDescriptorProto_Label = descriptorpb.FieldDescriptorProto_Label
- FieldDescriptorProto_Type = descriptorpb.FieldDescriptorProto_Type
- FieldOptions = descriptorpb.FieldOptions
- FieldOptions_CType = descriptorpb.FieldOptions_CType
- FieldOptions_JSType = descriptorpb.FieldOptions_JSType
- FileDescriptorProto = descriptorpb.FileDescriptorProto
- FileDescriptorSet = descriptorpb.FileDescriptorSet
- FileOptions = descriptorpb.FileOptions
- FileOptions_OptimizeMode = descriptorpb.FileOptions_OptimizeMode
- GeneratedCodeInfo = descriptorpb.GeneratedCodeInfo
- GeneratedCodeInfo_Annotation = descriptorpb.GeneratedCodeInfo_Annotation
- MessageOptions = descriptorpb.MessageOptions
- MethodDescriptorProto = descriptorpb.MethodDescriptorProto
- MethodOptions = descriptorpb.MethodOptions
- MethodOptions_IdempotencyLevel = descriptorpb.MethodOptions_IdempotencyLevel
- OneofDescriptorProto = descriptorpb.OneofDescriptorProto
- OneofOptions = descriptorpb.OneofOptions
- ServiceDescriptorProto = descriptorpb.ServiceDescriptorProto
- ServiceOptions = descriptorpb.ServiceOptions
- SourceCodeInfo = descriptorpb.SourceCodeInfo
- SourceCodeInfo_Location = descriptorpb.SourceCodeInfo_Location
- UninterpretedOption = descriptorpb.UninterpretedOption
- UninterpretedOption_NamePart = descriptorpb.UninterpretedOption_NamePart
-)
-
-const (
- Default_EnumOptions_Deprecated = descriptorpb.Default_EnumOptions_Deprecated
- Default_EnumValueOptions_Deprecated = descriptorpb.Default_EnumValueOptions_Deprecated
- Default_FieldOptions_Ctype = descriptorpb.Default_FieldOptions_Ctype
- Default_FieldOptions_Deprecated = descriptorpb.Default_FieldOptions_Deprecated
- Default_FieldOptions_Jstype = descriptorpb.Default_FieldOptions_Jstype
- Default_FieldOptions_Lazy = descriptorpb.Default_FieldOptions_Lazy
- Default_FieldOptions_Weak = descriptorpb.Default_FieldOptions_Weak
- Default_FileOptions_CcEnableArenas = descriptorpb.Default_FileOptions_CcEnableArenas
- Default_FileOptions_CcGenericServices = descriptorpb.Default_FileOptions_CcGenericServices
- Default_FileOptions_Deprecated = descriptorpb.Default_FileOptions_Deprecated
- Default_FileOptions_JavaGenericServices = descriptorpb.Default_FileOptions_JavaGenericServices
- Default_FileOptions_JavaMultipleFiles = descriptorpb.Default_FileOptions_JavaMultipleFiles
- Default_FileOptions_JavaStringCheckUtf8 = descriptorpb.Default_FileOptions_JavaStringCheckUtf8
- Default_FileOptions_OptimizeFor = descriptorpb.Default_FileOptions_OptimizeFor
- Default_FileOptions_PhpGenericServices = descriptorpb.Default_FileOptions_PhpGenericServices
- Default_FileOptions_PyGenericServices = descriptorpb.Default_FileOptions_PyGenericServices
- Default_MessageOptions_Deprecated = descriptorpb.Default_MessageOptions_Deprecated
- Default_MessageOptions_MessageSetWireFormat = descriptorpb.Default_MessageOptions_MessageSetWireFormat
- Default_MessageOptions_NoStandardDescriptorAccessor = descriptorpb.Default_MessageOptions_NoStandardDescriptorAccessor
- Default_MethodDescriptorProto_ClientStreaming = descriptorpb.Default_MethodDescriptorProto_ClientStreaming
- Default_MethodDescriptorProto_ServerStreaming = descriptorpb.Default_MethodDescriptorProto_ServerStreaming
- Default_MethodOptions_Deprecated = descriptorpb.Default_MethodOptions_Deprecated
- Default_MethodOptions_IdempotencyLevel = descriptorpb.Default_MethodOptions_IdempotencyLevel
- Default_ServiceOptions_Deprecated = descriptorpb.Default_ServiceOptions_Deprecated
- FieldDescriptorProto_LABEL_OPTIONAL = descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL
- FieldDescriptorProto_LABEL_REPEATED = descriptorpb.FieldDescriptorProto_LABEL_REPEATED
- FieldDescriptorProto_LABEL_REQUIRED = descriptorpb.FieldDescriptorProto_LABEL_REQUIRED
- FieldDescriptorProto_TYPE_BOOL = descriptorpb.FieldDescriptorProto_TYPE_BOOL
- FieldDescriptorProto_TYPE_BYTES = descriptorpb.FieldDescriptorProto_TYPE_BYTES
- FieldDescriptorProto_TYPE_DOUBLE = descriptorpb.FieldDescriptorProto_TYPE_DOUBLE
- FieldDescriptorProto_TYPE_ENUM = descriptorpb.FieldDescriptorProto_TYPE_ENUM
- FieldDescriptorProto_TYPE_FIXED32 = descriptorpb.FieldDescriptorProto_TYPE_FIXED32
- FieldDescriptorProto_TYPE_FIXED64 = descriptorpb.FieldDescriptorProto_TYPE_FIXED64
- FieldDescriptorProto_TYPE_FLOAT = descriptorpb.FieldDescriptorProto_TYPE_FLOAT
- FieldDescriptorProto_TYPE_GROUP = descriptorpb.FieldDescriptorProto_TYPE_GROUP
- FieldDescriptorProto_TYPE_INT32 = descriptorpb.FieldDescriptorProto_TYPE_INT32
- FieldDescriptorProto_TYPE_INT64 = descriptorpb.FieldDescriptorProto_TYPE_INT64
- FieldDescriptorProto_TYPE_MESSAGE = descriptorpb.FieldDescriptorProto_TYPE_MESSAGE
- FieldDescriptorProto_TYPE_SFIXED32 = descriptorpb.FieldDescriptorProto_TYPE_SFIXED32
- FieldDescriptorProto_TYPE_SFIXED64 = descriptorpb.FieldDescriptorProto_TYPE_SFIXED64
- FieldDescriptorProto_TYPE_SINT32 = descriptorpb.FieldDescriptorProto_TYPE_SINT32
- FieldDescriptorProto_TYPE_SINT64 = descriptorpb.FieldDescriptorProto_TYPE_SINT64
- FieldDescriptorProto_TYPE_STRING = descriptorpb.FieldDescriptorProto_TYPE_STRING
- FieldDescriptorProto_TYPE_UINT32 = descriptorpb.FieldDescriptorProto_TYPE_UINT32
- FieldDescriptorProto_TYPE_UINT64 = descriptorpb.FieldDescriptorProto_TYPE_UINT64
- FieldOptions_CORD = descriptorpb.FieldOptions_CORD
- FieldOptions_JS_NORMAL = descriptorpb.FieldOptions_JS_NORMAL
- FieldOptions_JS_NUMBER = descriptorpb.FieldOptions_JS_NUMBER
- FieldOptions_JS_STRING = descriptorpb.FieldOptions_JS_STRING
- FieldOptions_STRING = descriptorpb.FieldOptions_STRING
- FieldOptions_STRING_PIECE = descriptorpb.FieldOptions_STRING_PIECE
- FileOptions_CODE_SIZE = descriptorpb.FileOptions_CODE_SIZE
- FileOptions_LITE_RUNTIME = descriptorpb.FileOptions_LITE_RUNTIME
- FileOptions_SPEED = descriptorpb.FileOptions_SPEED
- MethodOptions_IDEMPOTENCY_UNKNOWN = descriptorpb.MethodOptions_IDEMPOTENCY_UNKNOWN
- MethodOptions_IDEMPOTENT = descriptorpb.MethodOptions_IDEMPOTENT
- MethodOptions_NO_SIDE_EFFECTS = descriptorpb.MethodOptions_NO_SIDE_EFFECTS
-)
-
-var (
- FieldDescriptorProto_Label_name = descriptorpb.FieldDescriptorProto_Label_name
- FieldDescriptorProto_Label_value = descriptorpb.FieldDescriptorProto_Label_value
- FieldDescriptorProto_Type_name = descriptorpb.FieldDescriptorProto_Type_name
- FieldDescriptorProto_Type_value = descriptorpb.FieldDescriptorProto_Type_value
- FieldOptions_CType_name = descriptorpb.FieldOptions_CType_name
- FieldOptions_CType_value = descriptorpb.FieldOptions_CType_value
- FieldOptions_JSType_name = descriptorpb.FieldOptions_JSType_name
- FieldOptions_JSType_value = descriptorpb.FieldOptions_JSType_value
- File_google_protobuf_descriptor_proto = descriptorpb.File_google_protobuf_descriptor_proto
- FileOptions_OptimizeMode_name = descriptorpb.FileOptions_OptimizeMode_name
- FileOptions_OptimizeMode_value = descriptorpb.FileOptions_OptimizeMode_value
- MethodOptions_IdempotencyLevel_name = descriptorpb.MethodOptions_IdempotencyLevel_name
- MethodOptions_IdempotencyLevel_value = descriptorpb.MethodOptions_IdempotencyLevel_value
-)
diff --git a/types/known/stub.go b/types/known/stub.go
deleted file mode 100644
index 9e1b5e9..0000000
--- a/types/known/stub.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// TODO: This file exists to have the minimum number of forwarding declarations
-// to keep v1 working. This will be deleted in the near future.
-
-package known_proto
-
-import (
- "google.golang.org/protobuf/types/known/anypb"
- "google.golang.org/protobuf/types/known/durationpb"
- "google.golang.org/protobuf/types/known/emptypb"
- "google.golang.org/protobuf/types/known/structpb"
- "google.golang.org/protobuf/types/known/timestamppb"
- "google.golang.org/protobuf/types/known/wrapperspb"
-)
-
-type (
- Any = anypb.Any
- BoolValue = wrapperspb.BoolValue
- BytesValue = wrapperspb.BytesValue
- DoubleValue = wrapperspb.DoubleValue
- Duration = durationpb.Duration
- Empty = emptypb.Empty
- FloatValue = wrapperspb.FloatValue
- Int32Value = wrapperspb.Int32Value
- Int64Value = wrapperspb.Int64Value
- ListValue = structpb.ListValue
- NullValue = structpb.NullValue
- StringValue = wrapperspb.StringValue
- Struct = structpb.Struct
- Timestamp = timestamppb.Timestamp
- UInt32Value = wrapperspb.UInt32Value
- UInt64Value = wrapperspb.UInt64Value
- Value = structpb.Value
- Value_BoolValue = structpb.Value_BoolValue
- Value_ListValue = structpb.Value_ListValue
- Value_NullValue = structpb.Value_NullValue
- Value_NumberValue = structpb.Value_NumberValue
- Value_StringValue = structpb.Value_StringValue
- Value_StructValue = structpb.Value_StructValue
-)
-
-const (
- NullValue_NULL_VALUE = structpb.NullValue_NULL_VALUE
-)
-
-var (
- File_google_protobuf_any_proto = anypb.File_google_protobuf_any_proto
- File_google_protobuf_duration_proto = durationpb.File_google_protobuf_duration_proto
- File_google_protobuf_empty_proto = emptypb.File_google_protobuf_empty_proto
- File_google_protobuf_struct_proto = structpb.File_google_protobuf_struct_proto
- File_google_protobuf_timestamp_proto = timestamppb.File_google_protobuf_timestamp_proto
- File_google_protobuf_wrappers_proto = wrapperspb.File_google_protobuf_wrappers_proto
- NullValue_name = structpb.NullValue_name
- NullValue_value = structpb.NullValue_value
-)
diff --git a/types/plugin/stub.go b/types/plugin/stub.go
deleted file mode 100644
index f6d87c6..0000000
--- a/types/plugin/stub.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2019 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// TODO: This file exists to have the minimum number of forwarding declarations
-// to keep v1 working. This will be deleted in the near future.
-
-package plugin_proto
-
-import "google.golang.org/protobuf/types/pluginpb"
-
-type (
- CodeGeneratorRequest = pluginpb.CodeGeneratorRequest
- CodeGeneratorResponse = pluginpb.CodeGeneratorResponse
- CodeGeneratorResponse_File = pluginpb.CodeGeneratorResponse_File
- Version = pluginpb.Version
-)
-
-var (
- File_google_protobuf_compiler_plugin_proto = pluginpb.File_google_protobuf_compiler_plugin_proto
-)
