Skip to content

Commit 1051600

Browse files
authored
Alignment with Android API <24 (#1013)
Use method that present in all versions of Android API. It have the same behavior because library does not have `@Inherited` annotations. resolves #1010
1 parent 05f9ce2 commit 1051600

File tree

1 file changed

+5
-5
lines changed
  • runtime/jvmMain/src/kotlinx/serialization/internal

1 file changed

+5
-5
lines changed

runtime/jvmMain/src/kotlinx/serialization/internal/Platform.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ private fun <T: Any> Class<T>.isNotAnnotated(): Boolean {
5757
/*
5858
* For annotated enums search serializer directly (or do not search at all?)
5959
*/
60-
return getDeclaredAnnotation(Serializable::class.java) == null &&
61-
getDeclaredAnnotation(Polymorphic::class.java) == null
60+
return getAnnotation(Serializable::class.java) == null &&
61+
getAnnotation(Polymorphic::class.java) == null
6262
}
6363

6464
private fun <T: Any> KClass<T>.polymorphicSerializer(): KSerializer<T>? {
@@ -67,10 +67,10 @@ private fun <T: Any> KClass<T>.polymorphicSerializer(): KSerializer<T>? {
6767
* annotations.
6868
*/
6969
val jClass = java
70-
if (jClass.getDeclaredAnnotation(Polymorphic::class.java) != null) {
70+
if (jClass.getAnnotation(Polymorphic::class.java) != null) {
7171
return PolymorphicSerializer(this)
7272
}
73-
val serializable = jClass.getDeclaredAnnotation(Serializable::class.java)
73+
val serializable = jClass.getAnnotation(Serializable::class.java)
7474
if (serializable != null && serializable.with == PolymorphicSerializer::class) {
7575
return PolymorphicSerializer(this)
7676
}
@@ -83,7 +83,7 @@ private fun <T: Any> KClass<T>.interfaceSerializer(): KSerializer<T>? {
8383
* Check if it has no annotations or `@Serializable(with = PolymorphicSerializer::class)`,
8484
* otherwise bailout.
8585
*/
86-
val serializable = java.getDeclaredAnnotation(Serializable::class.java)
86+
val serializable = java.getAnnotation(Serializable::class.java)
8787
if (serializable == null || serializable.with == PolymorphicSerializer::class) {
8888
return PolymorphicSerializer(this)
8989
}

0 commit comments

Comments
 (0)