Commit b62151ea authored by Him188's avatar Him188

Fix dependency

parent 8cefb730
...@@ -106,6 +106,7 @@ kotlin { ...@@ -106,6 +106,7 @@ kotlin {
dependencies { dependencies {
runtimeOnly(files("build/classes/kotlin/jvm/main")) // classpath is not properly set by IDE runtimeOnly(files("build/classes/kotlin/jvm/main")) // classpath is not properly set by IDE
api(kotlinx("serialization-runtime", serializationVersion)) api(kotlinx("serialization-runtime", serializationVersion))
api(kotlinx("serialization-protobuf", serializationVersion))
} }
} }
...@@ -114,7 +115,6 @@ kotlin { ...@@ -114,7 +115,6 @@ kotlin {
api(kotlin("test", kotlinVersion)) api(kotlin("test", kotlinVersion))
api(kotlin("test-junit", kotlinVersion)) api(kotlin("test-junit", kotlinVersion))
implementation("org.pcap4j:pcap4j-distribution:1.8.2") implementation("org.pcap4j:pcap4j-distribution:1.8.2")
api(kotlinx("serialization-protobuf", serializationVersion))
runtimeOnly(files("build/classes/kotlin/jvm/main")) // classpath is not properly set by IDE runtimeOnly(files("build/classes/kotlin/jvm/main")) // classpath is not properly set by IDE
runtimeOnly(files("build/classes/kotlin/jvm/test")) // classpath is not properly set by IDE runtimeOnly(files("build/classes/kotlin/jvm/test")) // classpath is not properly set by IDE
......
...@@ -139,7 +139,9 @@ class Jce private constructor(private val charset: JceCharset, override val cont ...@@ -139,7 +139,9 @@ class Jce private constructor(private val charset: JceCharset, override val cont
} }
serializer.descriptor == ByteArraySerializer() -> encodeTaggedByteArray(popTag(), value as ByteArray) serializer.descriptor == ByteArraySerializer() -> encodeTaggedByteArray(popTag(), value as ByteArray)
serializer.descriptor.kind == StructureKind.LIST serializer.descriptor.kind == StructureKind.LIST
&& serializer.descriptor.elementDescriptors()[0].kind is PrimitiveKind -> { && serializer.descriptor.elementDescriptors()[0].kind is PrimitiveKind
&& value !is ArrayList<*>
&& value !is Array<*> -> {
serializer.serialize( serializer.serialize(
ListWriter( ListWriter(
when (value) { when (value) {
......
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