From 514296664cee5dca425a10bddf57b1fabf31fcc2 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Mon, 24 Feb 2020 21:16:45 +0100 Subject: [PATCH] caldav: upgrade to latest go-ical API --- caldav/client.go | 6 +++--- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/caldav/client.go b/caldav/client.go index a8113ba..0ec71fc 100644 --- a/caldav/client.go +++ b/caldav/client.go @@ -180,7 +180,7 @@ func decodeCalendarObjectList(ms *internal.Multistatus) ([]CalendarObject, error } r := bytes.NewReader(calData.Data) - data, err := ical.NewDecoder(r).DecodeCalendar() + data, err := ical.NewDecoder(r).Decode() if err != nil { return nil, err } @@ -264,7 +264,7 @@ func (c *Client) GetCalendarObject(path string) (*CalendarObject, error) { return nil, fmt.Errorf("caldav: expected Content-Type %q, got %q", ical.MIMEType, mediaType) } - cal, err := ical.NewDecoder(resp.Body).DecodeCalendar() + cal, err := ical.NewDecoder(resp.Body).Decode() if err != nil { return nil, err } @@ -287,7 +287,7 @@ func (c *Client) PutCalendarObject(path string, cal *ical.Calendar) (*CalendarOb // https://github.com/Kozea/Radicale/issues/1016 var buf bytes.Buffer - if err := ical.NewEncoder(&buf).EncodeCalendar(cal); err != nil { + if err := ical.NewEncoder(&buf).Encode(cal); err != nil { return nil, err } diff --git a/go.mod b/go.mod index 46c265b..8a71f73 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,6 @@ module github.com/emersion/go-webdav go 1.13 require ( - github.com/emersion/go-ical v0.0.0-20200224170602-c9b8621220bc + github.com/emersion/go-ical v0.0.0-20200224201310-cd514449c39e github.com/emersion/go-vcard v0.0.0-20191221110513-5f81fa0d3cc7 ) diff --git a/go.sum b/go.sum index c17f351..46d9ff1 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,4 @@ -github.com/emersion/go-ical v0.0.0-20200224170602-c9b8621220bc h1:kpISLFxf4eYcslxD/XkzE2Su7UQdNKt0XYgnN6MEUxg= -github.com/emersion/go-ical v0.0.0-20200224170602-c9b8621220bc/go.mod h1:4xVTBPcT43a1pp3vdaa+FuRdX5XhKCZPpWv7m0z9ByM= +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-vcard v0.0.0-20191221110513-5f81fa0d3cc7 h1:SE+tcd+0kn0cT4MqTo66gmkjqWHF1Z+Yha5/rhLs/H8= github.com/emersion/go-vcard v0.0.0-20191221110513-5f81fa0d3cc7/go.mod h1:HMJKR5wlh/ziNp+sHEDV2ltblO4JD2+IdDOWtGcQBTM=