Skip to content

Commit 78589fd

Browse files
authored
feat: kotlin 2.2.x support (#1848)
1 parent 0387a8d commit 78589fd

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

test-app/build-tools/android-metadata-generator/src/src/com/telerik/metadata/parsing/kotlin/classes/KotlinClassDescriptor.kt

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ import com.telerik.metadata.parsing.kotlin.metadata.bytecode.BytecodeClassMetada
1515
import com.telerik.metadata.parsing.kotlin.methods.KotlinMethodDescriptor
1616
import com.telerik.metadata.parsing.kotlin.properties.KotlinPropertyDescriptor
1717
import com.telerik.metadata.security.classes.SecuredClassRepository
18+
import org.apache.bcel.classfile.JavaClass
19+
import java.util.*
20+
import java.util.stream.Collectors
1821
import kotlin.metadata.KmClass
1922
import kotlin.metadata.KmProperty
2023
import kotlin.metadata.Visibility
@@ -23,13 +26,6 @@ import kotlin.metadata.jvm.Metadata
2326
import kotlin.metadata.jvm.getterSignature
2427
import kotlin.metadata.jvm.setterSignature
2528
import kotlin.metadata.visibility
26-
import org.apache.bcel.classfile.JavaClass
27-
import java.io.IOException
28-
import java.nio.file.Files
29-
import java.nio.file.Paths
30-
import java.nio.file.StandardOpenOption
31-
import java.util.*
32-
import java.util.stream.Collectors
3329

3430
class KotlinClassDescriptor(nativeClass: JavaClass, private val metadataAnnotation: MetadataAnnotation,
3531
override val isPackagePrivate: Boolean
@@ -62,9 +58,9 @@ class KotlinClassDescriptor(nativeClass: JavaClass, private val metadataAnnotati
6258
fields.add(possibleObjectInstanceField.get())
6359
}
6460

65-
if (metaClass.enumEntries.isNotEmpty()) {
66-
67-
val enumFields = getEnumEntriesAsFields(nativeClass, metaClass.enumEntries)
61+
if (metaClass.kmEnumEntries.isNotEmpty()) {
62+
val enums: Collection<String> = metaClass.kmEnumEntries.map { it.name }
63+
val enumFields = getEnumEntriesAsFields(nativeClass, enums)
6864
fields.addAll(enumFields)
6965
}
7066

test-app/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ ns_default_google_java_format_version = 1.6
3939
ns_default_gson_version = 2.10.1
4040
ns_default_json_version = 20180813
4141
ns_default_junit_version = 4.13.2
42-
ns_default_kotlin_version = 2.0.0
43-
ns_default_kotlinx_metadata_jvm_version = 2.0.0
42+
ns_default_kotlin_version = 2.2.20
43+
ns_default_kotlinx_metadata_jvm_version = 2.2.20
4444
ns_default_mockito_core_version = 3.0.0
4545
ns_default_spotbugs_version = 3.1.12

0 commit comments

Comments
 (0)