Skip to content

Commit b979c2e

Browse files
serbelgailya-g
authored andcommitted
Upgrade Kotlin to 1.6.20 and kotlinx.serialization to 1.3.2.
Also, add yarn.lock. (cherry picked from commit 29dee5e)
1 parent 493aad6 commit b979c2e

File tree

3 files changed

+599
-6
lines changed

3 files changed

+599
-6
lines changed

core/common/src/serializers/DateTimeUnitSerializers.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ public object MonthBasedDateTimeUnitSerializer: KSerializer<DateTimeUnit.MonthBa
132132
}
133133

134134
@Suppress("EXPERIMENTAL_API_USAGE_ERROR", "INVISIBLE_MEMBER")
135+
@OptIn(InternalSerializationApi::class)
135136
public object DateBasedDateTimeUnitSerializer: AbstractPolymorphicSerializer<DateTimeUnit.DateBased>() {
136137

137138
private val impl = SealedClassSerializer("kotlinx.datetime.DateTimeUnit.DateBased",
@@ -149,8 +150,6 @@ public object DateBasedDateTimeUnitSerializer: AbstractPolymorphicSerializer<Dat
149150
SerializationStrategy<DateTimeUnit.DateBased>? =
150151
impl.findPolymorphicSerializerOrNull(encoder, value)
151152

152-
153-
@OptIn(InternalSerializationApi::class)
154153
override val baseClass: KClass<DateTimeUnit.DateBased>
155154
get() = DateTimeUnit.DateBased::class
156155

@@ -162,6 +161,7 @@ public object DateBasedDateTimeUnitSerializer: AbstractPolymorphicSerializer<Dat
162161
}
163162

164163
@Suppress("EXPERIMENTAL_API_USAGE_ERROR", "INVISIBLE_MEMBER")
164+
@OptIn(InternalSerializationApi::class)
165165
public object DateTimeUnitSerializer: AbstractPolymorphicSerializer<DateTimeUnit>() {
166166

167167
private val impl = SealedClassSerializer("kotlinx.datetime.DateTimeUnit",
@@ -177,8 +177,6 @@ public object DateTimeUnitSerializer: AbstractPolymorphicSerializer<DateTimeUnit
177177
override fun findPolymorphicSerializerOrNull(encoder: Encoder, value: DateTimeUnit): SerializationStrategy<DateTimeUnit>? =
178178
impl.findPolymorphicSerializerOrNull(encoder, value)
179179

180-
181-
@OptIn(InternalSerializationApi::class)
182180
override val baseClass: KClass<DateTimeUnit>
183181
get() = DateTimeUnit::class
184182

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ group=org.jetbrains.kotlinx
55
version=0.3.2
66
versionSuffix=SNAPSHOT
77

8-
kotlinVersion=1.6.0
9-
serializationVersion=1.3.1
8+
kotlinVersion=1.6.20
9+
serializationVersion=1.3.2
1010

1111
java.mainToolchainVersion=8
1212
java.modularToolchainVersion=11

0 commit comments

Comments
 (0)