remove gogoprotobuf

.github/workflows/build.yml

@@ -10,11 +10,6 @@ jobs:
       uses: actions/checkout@v4
       with:
         path: gopath/github.com/katydid/testsuite
-    - name: Checkout gogoprotobuf
-      uses: actions/checkout@v4
-      with:
-        repository: gogo/protobuf
-        path: gopath/github.com/gogo/protobuf
     - name: Setup Go
       uses: actions/setup-go@v3
       with:
@@ -26,7 +21,7 @@ jobs:
     - name: Install tools
       run: |
         cd gopath/github.com/katydid/testsuite
-        go install -x github.com/gogo/protobuf/protoc-gen-gogo
+        go install -x google.golang.org/protobuf/cmd/protoc-gen-go
     - name: Setup protoc
       run: |
         cd gopath/github.com/katydid/testsuite

go.mod

@@ -5,9 +5,10 @@ go 1.23
 require (
 	github.com/gogo/protobuf v1.3.2
 	github.com/katydid/parser-go-json v0.1.0
+	github.com/katydid/parser-go-proto v0.1.0
 	github.com/katydid/parser-go-xml v0.1.0
-	github.com/katydid/parser-gogo-proto v0.2.0
 	github.com/katydid/validator-go v0.5.1
+	google.golang.org/protobuf v1.36.3
 )
 
 require github.com/katydid/parser-go v0.6.0 // indirect

go.sum

@@ -1,13 +1,15 @@
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/katydid/parser-go v0.6.0 h1:8VFYXEp9pZsq4CCxYLDavPPqOSX+JXsmhjfU4XMB8iw=
 github.com/katydid/parser-go v0.6.0/go.mod h1:1BwRfDlyRgDlAaURZ4FXi7IzHqWKTsrCdsstLsFeQho=
 github.com/katydid/parser-go-json v0.1.0 h1:r3+YkDtf9A4JYO+MrdQsN2azxITrgO+2Sc5SSNhp+YI=
 github.com/katydid/parser-go-json v0.1.0/go.mod h1:iLjxtkGLdPROUPBHZAhOTIdQerUPl/FEplS10rlq9Nc=
+github.com/katydid/parser-go-proto v0.1.0 h1:cnS9dtjZkZ4dYiivy56tHvVja0gV8b04QY4P4VFjE28=
+github.com/katydid/parser-go-proto v0.1.0/go.mod h1:yBWqastp7U/qi8qJqM1qIl3yfP8CTtiUnothslx+NGs=
 github.com/katydid/parser-go-xml v0.1.0 h1:8AL0X9hQbNLbQeqRbOdKBOwx4WTSWjy7kxEMmWqHMXc=
 github.com/katydid/parser-go-xml v0.1.0/go.mod h1:7rEHS3YuEv/8/ep+uQnLgcvT1znZs8JEc3ZaBbpygjA=
-github.com/katydid/parser-gogo-proto v0.2.0 h1:zUpdli98aYSQY1mvzbysNkk/41jPB25W4NiRXocI/Kg=
-github.com/katydid/parser-gogo-proto v0.2.0/go.mod h1:AH9y+kby4gN4o8w3MHDn6EX4SjrviWycnFjvEr/o1Ho=
 github.com/katydid/validator-go v0.5.1 h1:XgLkSO62OFjcS7hmN8RTj0gHpMBdYRTAkiVtM59SV7E=
 github.com/katydid/validator-go v0.5.1/go.mod h1:ZVsNg5NEwcOJT2ukTrCu/jKKuNiTRS/4sw4cMNr9vh8=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
@@ -38,4 +40,7 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU=
+google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=

tools/tools.go

@@ -5,5 +5,5 @@
 package tools
 
 import (
-	_ "github.com/gogo/protobuf/protoc-gen-gogo"
+	_ "google.golang.org/protobuf/cmd/protoc-gen-go"
 )

validator/gen-validator-tests/Makefile

@@ -2,12 +2,12 @@ gofmt:
 	gofmt -l -s -w .
 
 regenerate:
-	(protoc --gogo_out=. -I=.:../../../../../:../../../../../github.com/gogo/protobuf/protobuf person.proto)
-	(protoc --gogo_out=. -I=.:../../../../../:../../../../../github.com/gogo/protobuf/protobuf srctree.proto)
-	(protoc --gogo_out=. -I=.:../../../../../:../../../../../github.com/gogo/protobuf/protobuf treeregister.proto)
-	(protoc --gogo_out=. -I=.:../../../../../:../../../../../github.com/gogo/protobuf/protobuf typewriterprison.proto)
-	(protoc --gogo_out=. -I=.:../../../../../:../../../../../github.com/gogo/protobuf/protobuf puddingmilkshake.proto)
-	(protoc --gogo_out=. -I=.:../../../../../:../../../../../github.com/gogo/protobuf/protobuf topsyturvy.proto)
-	(protoc --gogo_out=. -I=.:../../../../../:../../../../../github.com/gogo/protobuf/protobuf knot.proto)
-	(protoc --gogo_out=. -I=.:../../../../../:../../../../../github.com/gogo/protobuf/protobuf banana.proto)
+	(protoc --go_out=. --go_opt=paths=source_relative person.proto)
+	(protoc --go_out=. --go_opt=paths=source_relative srctree.proto)
+	(protoc --go_out=. --go_opt=paths=source_relative treeregister.proto)
+	(protoc --go_out=. --go_opt=paths=source_relative typewriterprison.proto)
+	(protoc --go_out=. --go_opt=paths=source_relative puddingmilkshake.proto)
+	(protoc --go_out=. --go_opt=paths=source_relative topsyturvy.proto)
+	(protoc --go_out=. --go_opt=paths=source_relative knot.proto)
+	(protoc --go_out=. --go_opt=paths=source_relative banana.proto)
 	find . -name "*.pb.go" | xargs gofmt -l -s -w

validator/gen-validator-tests/bench.go

@@ -20,11 +20,11 @@ import (
 	"math/rand"
 	"reflect"
 
-	"github.com/gogo/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	jsonparser "github.com/katydid/parser-go-json/json"
+	protoparser "github.com/katydid/parser-go-proto/proto"
 	xmlparser "github.com/katydid/parser-go-xml/xml"
-	protoparser "github.com/katydid/parser-gogo-proto/proto"
 	"github.com/katydid/validator-go/validator"
 	"github.com/katydid/validator-go/validator/ast"
 	"github.com/katydid/validator-go/validator/combinator"

validator/gen-validator-tests/person_tests.go

@@ -15,8 +15,8 @@
 package main
 
 import (
-	"github.com/gogo/protobuf/proto"
 	. "github.com/katydid/validator-go/validator/combinator"
+	"google.golang.org/protobuf/proto"
 )
 
 var DavidPerson = &Person{

validator/gen-validator-tests/validate.go

@@ -18,10 +18,10 @@ import (
 	"encoding/json"
 	"encoding/xml"
 
-	"github.com/gogo/protobuf/proto"
-	"github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
 	"github.com/katydid/validator-go/validator/ast"
 	"github.com/katydid/validator-go/validator/combinator"
+	"google.golang.org/protobuf/proto"
+	descriptor "google.golang.org/protobuf/types/descriptorpb"
 )
 
 type Validator struct {