Commit 8f250bed authored by bernhard's avatar bernhard

Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	build.gradle
#	gradle/wrapper/gradle-wrapper.properties
parent 6a95540b
......@@ -2,7 +2,7 @@
buildscript {
ext.versions = [
kotlin: '1.3.30',
dokka: '0.9.17',
dokka: '0.9.18',
ical4j: '2.2.3'
]
......
......@@ -109,7 +109,7 @@ class Task: ICalendar() {
is DtStart -> { t.dtStart = prop }
is Completed -> { t.completedAt = prop }
is PercentComplete -> t.percentComplete = prop.percentage
is Categories -> t.categories = prop.categories.filterNotNull()
is Categories -> t.categories = prop.categories.iterator().asSequence().toList().filterNotNull()
is RRule -> t.rRule = prop
is RDate -> t.rDates += prop
is ExDate -> t.exDates += prop
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment