From b2057fe9efe83d3b5b93dffa560ea4764193327c Mon Sep 17 00:00:00 2001 From: Conrad Hoffmann Date: Wed, 1 Jun 2022 11:11:20 +0200 Subject: [PATCH] Switch back to upstream go-webdav It now has all the patches needed. There is still more to come for providing more functionality, but this can all happen upstream. --- go.mod | 5 +---- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index dc3300f..259d6cc 100644 --- a/go.mod +++ b/go.mod @@ -7,11 +7,8 @@ require ( github.com/emersion/go-imap v1.2.0 github.com/emersion/go-sasl v0.0.0-20211008083017-0b9dcfb154ac github.com/emersion/go-vcard v0.0.0-20210521075357-3445b9171995 - github.com/emersion/go-webdav v0.3.2-0.20220310154811-85d2b222bbcd + github.com/emersion/go-webdav v0.3.2-0.20220531210442-d7891ce50c84 github.com/go-chi/chi/v5 v5.0.7 ) require golang.org/x/text v0.3.7 // indirect - -// This needs to be removed once everything is merged upstream -replace github.com/emersion/go-webdav v0.3.2-0.20220310154811-85d2b222bbcd => github.com/bitfehler/go-webdav v0.3.2-0.20220517131716-4ba36d52ba63 diff --git a/go.sum b/go.sum index 39dc0a9..57ffb3f 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,3 @@ -github.com/bitfehler/go-webdav v0.3.2-0.20220517131716-4ba36d52ba63 h1:MnTO1320Uc4TslRsu4qs5y855qT/QwbJMQjP7qIUFBY= -github.com/bitfehler/go-webdav v0.3.2-0.20220517131716-4ba36d52ba63/go.mod h1:uSM1VveeKtogBVWaYccTksToczooJ0rrVGNsgnDsr4Q= github.com/emersion/go-ical v0.0.0-20200224201310-cd514449c39e h1:YGM1sI7edZOt8KAfX9Miq/X99d2QXdgjkJ7vN4HjxAA= github.com/emersion/go-ical v0.0.0-20200224201310-cd514449c39e/go.mod h1:4xVTBPcT43a1pp3vdaa+FuRdX5XhKCZPpWv7m0z9ByM= github.com/emersion/go-imap v1.2.0 h1:lyUQ3+EVM21/qbWE/4Ya5UG9r5+usDxlg4yfp3TgHFA= @@ -12,6 +10,8 @@ github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594/go.mod h1: github.com/emersion/go-vcard v0.0.0-20191221110513-5f81fa0d3cc7/go.mod h1:HMJKR5wlh/ziNp+sHEDV2ltblO4JD2+IdDOWtGcQBTM= github.com/emersion/go-vcard v0.0.0-20210521075357-3445b9171995 h1:DpVfmcoBs6o9VYcccNWbuKFQxuHCgt25/y4q9H8AUvc= github.com/emersion/go-vcard v0.0.0-20210521075357-3445b9171995/go.mod h1:HMJKR5wlh/ziNp+sHEDV2ltblO4JD2+IdDOWtGcQBTM= +github.com/emersion/go-webdav v0.3.2-0.20220531210442-d7891ce50c84 h1:PpV1O8l9GI4JlixqA4lGcjCQldkt9MPg7KS+5g01xFc= +github.com/emersion/go-webdav v0.3.2-0.20220531210442-d7891ce50c84/go.mod h1:uSM1VveeKtogBVWaYccTksToczooJ0rrVGNsgnDsr4Q= github.com/go-chi/chi/v5 v5.0.7 h1:rDTPXLDHGATaeHvVlLcR4Qe0zftYethFucbjVQ1PxU8= github.com/go-chi/chi/v5 v5.0.7/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=