Skip to content

Commit f8ee153

Browse files
committed
Add missing IMeta and fix isKotlinClass
1 parent 07ca610 commit f8ee153

File tree

4 files changed

+14
-2
lines changed

4 files changed

+14
-2
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package net.servicestack.client;
2+
3+
public interface IMeta {
4+
}

src/AndroidClient/android/src/main/java/net/servicestack/client/Utils.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,13 @@ public static Double tryParseDouble(String str) {
6262
}
6363

6464
static final String KotlinAnnotationClass = "kotlin.jvm.internal.KotlinClass";
65+
static final String KotliMetadataClass = "kotlin.Metadata";
6566

6667
public static boolean isKotlinClass(Class type)
6768
{
6869
for (Annotation attr : type.getAnnotations()){
69-
if (KotlinAnnotationClass.equals(attr.annotationType().getName()))
70+
String annotationName = attr.annotationType().getName();
71+
if (KotlinAnnotationClass.equals(annotationName) || KotliMetadataClass.equals(annotationName))
7072
return true;
7173
}
7274
return false;
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package net.servicestack.client;
2+
3+
public interface IMeta {
4+
}

src/AndroidClient/client/src/main/java/net/servicestack/client/Utils.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,13 @@ public static Double tryParseDouble(String str) {
6262
}
6363

6464
static final String KotlinAnnotationClass = "kotlin.jvm.internal.KotlinClass";
65+
static final String KotliMetadataClass = "kotlin.Metadata";
6566

6667
public static boolean isKotlinClass(Class type)
6768
{
6869
for (Annotation attr : type.getAnnotations()){
69-
if (KotlinAnnotationClass.equals(attr.annotationType().getName()))
70+
String annotationName = attr.annotationType().getName();
71+
if (KotlinAnnotationClass.equals(annotationName) || KotliMetadataClass.equals(annotationName))
7072
return true;
7173
}
7274
return false;

0 commit comments

Comments
 (0)