improvement: Update conjure-go to 6.11.0 (#158)

palantir · Nov 17, 2021 · e6778d6 · e6778d6
1 parent 4cb2a98
commit e6778d6
Show file tree

Hide file tree

Showing 12 changed files with 107 additions and 54 deletions.
diff --git a/changelog/@unreleased/pr-158.v2.yml b/changelog/@unreleased/pr-158.v2.yml
@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: Update conjure-go to 6.11.0
+  links:
+  - https://github.com/palantir/godel-conjure-plugin/pull/158
diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/go-bindata/go-bindata v3.1.2+incompatible
 	github.com/mholt/archiver v2.1.0+incompatible
 	github.com/nmiyake/pkg/dirs v1.1.0
-	github.com/palantir/conjure-go/v6 v6.10.0
+	github.com/palantir/conjure-go/v6 v6.11.0
 	github.com/palantir/distgo v1.29.0
 	github.com/palantir/go-ptimports/v2 v2.10.0 // indirect
 	github.com/palantir/godel/v2 v2.41.0

diff --git a/go.sum b/go.sum
@@ -324,8 +324,8 @@ github.com/palantir/conjure-go-runtime/v2 v2.23.0/go.mod h1:tDxL5svQhuafB7yHQbie
 github.com/palantir/conjure-go-runtime/v2 v2.25.0/go.mod h1:tDxL5svQhuafB7yHQbieBDsNwtRTHrQMXmlYrIkZttI=
 github.com/palantir/conjure-go/v4 v4.2.0/go.mod h1:VSVefkM94TdXRyP7wvBeURBNOFkYRJEtxPi8BeyKFi8=
 github.com/palantir/conjure-go/v5 v5.0.1/go.mod h1:qAWik7iYoJtlHwyJ/sG0FuJx1PtzrLVCUglLH1k7NrE=
-github.com/palantir/conjure-go/v6 v6.10.0 h1:HVxuoEe+LNGfdXyoOrj/ZeqZOhNgpnZjhLZ1IBRhSfg=
-github.com/palantir/conjure-go/v6 v6.10.0/go.mod h1:rAePFCXmBwV/p6r762CqAczU4x5XbJ3K7s2ahnK2R+Q=
+github.com/palantir/conjure-go/v6 v6.11.0 h1:quWzA3kQ8EkyUuuaVdA2x1z8lw28S1bZc3DAb0o9HC0=
+github.com/palantir/conjure-go/v6 v6.11.0/go.mod h1:rAePFCXmBwV/p6r762CqAczU4x5XbJ3K7s2ahnK2R+Q=
 github.com/palantir/distgo v1.2.0/go.mod h1:jOCcoLD92T/eN4VfRxczaDIWsqyy1f0yQZMFOt3cJCw=
 github.com/palantir/distgo v1.20.0/go.mod h1:Jfsd7o7+kzCY8a3xpbPabr5IMjW6zSNOKLTNa8TJH4g=
 github.com/palantir/distgo v1.29.0 h1:xWmSZKmFq362QzmPtzsQ3aPWFE1RfvxnkU7FQDsTHnQ=

diff --git a/integration_test/integration_test.go b/integration_test/integration_test.go
@@ -122,8 +122,8 @@ projects:
 package api
 
 import (
-	safejson "github.com/palantir/pkg/safejson"
-	safeyaml "github.com/palantir/pkg/safeyaml"
+	"github.com/palantir/pkg/safejson"
+	"github.com/palantir/pkg/safeyaml"
 )
 
 type TestCase struct {
@@ -160,8 +160,8 @@ import (
 	"context"
 	"fmt"
 
-	safejson "github.com/palantir/pkg/safejson"
-	safeyaml "github.com/palantir/pkg/safeyaml"
+	"github.com/palantir/pkg/safejson"
+	"github.com/palantir/pkg/safeyaml"
 )
 
 type TestUnion struct {

diff --git a/vendor/github.com/palantir/conjure-go/v6/conjure-api/conjure/spec/structs.conjure.go b/vendor/github.com/palantir/conjure-go/v6/conjure-api/conjure/spec/structs.conjure.go
diff --git a/vendor/github.com/palantir/conjure-go/v6/conjure-api/conjure/spec/unions.conjure.go b/vendor/github.com/palantir/conjure-go/v6/conjure-api/conjure/spec/unions.conjure.go
diff --git a/vendor/github.com/palantir/conjure-go/v6/conjure/conjure.go b/vendor/github.com/palantir/conjure-go/v6/conjure/conjure.go
diff --git a/vendor/github.com/palantir/conjure-go/v6/conjure/enumwriter.go b/vendor/github.com/palantir/conjure-go/v6/conjure/enumwriter.go
diff --git a/vendor/github.com/palantir/conjure-go/v6/conjure/outputs.go b/vendor/github.com/palantir/conjure-go/v6/conjure/outputs.go
diff --git a/vendor/github.com/palantir/conjure-go/v6/conjure/snip/imports.go b/vendor/github.com/palantir/conjure-go/v6/conjure/snip/imports.go
diff --git a/vendor/github.com/palantir/conjure-go/v6/conjure/types/conjure_definition.go b/vendor/github.com/palantir/conjure-go/v6/conjure/types/conjure_definition.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -55,7 +55,7 @@ github.com/nmiyake/pkg/dirs
 github.com/nmiyake/pkg/errorstringer
 # github.com/nwaples/rardecode v1.0.0
 github.com/nwaples/rardecode
-# github.com/palantir/conjure-go/v6 v6.10.0
+# github.com/palantir/conjure-go/v6 v6.11.0
 ## explicit
 github.com/palantir/conjure-go/v6/conjure
 github.com/palantir/conjure-go/v6/conjure-api/conjure/spec