summaryrefslogtreecommitdiff
path: root/formats/protobuf
diff options
context:
space:
mode:
authorLeonid Startsev <sandwwraith@gmail.com>2020-07-14 20:12:51 +0300
committerLeonid Startsev <sandwwraith@gmail.com>2020-07-21 19:13:23 +0300
commitcfb3d252542d937e4eb16ddc7d3bb3556a3f61ed (patch)
tree479a998056e561bfe65842931232d5588dbe05cd /formats/protobuf
parente8cb0cb18d72febf7c852fbe12be6267bfd5c311 (diff)
downloadkotlinx.serialization-cfb3d252542d937e4eb16ddc7d3bb3556a3f61ed.tar.gz
Relocate SerialDescriptor and stuff to .descriptors package
Diffstat (limited to 'formats/protobuf')
-rw-r--r--formats/protobuf/commonMain/src/kotlinx/serialization/protobuf/ProtoBuf.kt1
-rw-r--r--formats/protobuf/commonMain/src/kotlinx/serialization/protobuf/ProtoTypes.kt2
-rw-r--r--formats/protobuf/commonMain/src/kotlinx/serialization/protobuf/internal/ProtobufTaggedDecoder.kt1
-rw-r--r--formats/protobuf/commonMain/src/kotlinx/serialization/protobuf/internal/ProtobufTaggedEncoder.kt1
-rw-r--r--formats/protobuf/commonTest/src/kotlinx/serialization/protobuf/CustomizedSerializableTestClasses.kt1
-rw-r--r--formats/protobuf/commonTest/src/kotlinx/serialization/protobuf/ProtobufMissingFieldsTest.kt1
6 files changed, 6 insertions, 1 deletions
diff --git a/formats/protobuf/commonMain/src/kotlinx/serialization/protobuf/ProtoBuf.kt b/formats/protobuf/commonMain/src/kotlinx/serialization/protobuf/ProtoBuf.kt
index 93434f0b..4ff03442 100644
--- a/formats/protobuf/commonMain/src/kotlinx/serialization/protobuf/ProtoBuf.kt
+++ b/formats/protobuf/commonMain/src/kotlinx/serialization/protobuf/ProtoBuf.kt
@@ -6,6 +6,7 @@ package kotlinx.serialization.protobuf
import kotlinx.serialization.*
import kotlinx.serialization.builtins.*
+import kotlinx.serialization.descriptors.*
import kotlinx.serialization.encoding.*
import kotlinx.serialization.internal.*
import kotlinx.serialization.modules.*
diff --git a/formats/protobuf/commonMain/src/kotlinx/serialization/protobuf/ProtoTypes.kt b/formats/protobuf/commonMain/src/kotlinx/serialization/protobuf/ProtoTypes.kt
index 96a39d60..dc67474c 100644
--- a/formats/protobuf/commonMain/src/kotlinx/serialization/protobuf/ProtoTypes.kt
+++ b/formats/protobuf/commonMain/src/kotlinx/serialization/protobuf/ProtoTypes.kt
@@ -5,7 +5,7 @@
package kotlinx.serialization.protobuf
import kotlinx.serialization.*
-import kotlin.jvm.*
+import kotlinx.serialization.descriptors.*
private const val MASK = Int.MAX_VALUE.toLong() shl 32
diff --git a/formats/protobuf/commonMain/src/kotlinx/serialization/protobuf/internal/ProtobufTaggedDecoder.kt b/formats/protobuf/commonMain/src/kotlinx/serialization/protobuf/internal/ProtobufTaggedDecoder.kt
index d775e60e..b2ec17b6 100644
--- a/formats/protobuf/commonMain/src/kotlinx/serialization/protobuf/internal/ProtobufTaggedDecoder.kt
+++ b/formats/protobuf/commonMain/src/kotlinx/serialization/protobuf/internal/ProtobufTaggedDecoder.kt
@@ -5,6 +5,7 @@
package kotlinx.serialization.protobuf.internal
import kotlinx.serialization.*
+import kotlinx.serialization.descriptors.*
import kotlinx.serialization.encoding.*
import kotlinx.serialization.protobuf.*
diff --git a/formats/protobuf/commonMain/src/kotlinx/serialization/protobuf/internal/ProtobufTaggedEncoder.kt b/formats/protobuf/commonMain/src/kotlinx/serialization/protobuf/internal/ProtobufTaggedEncoder.kt
index 24ff8909..fce693e8 100644
--- a/formats/protobuf/commonMain/src/kotlinx/serialization/protobuf/internal/ProtobufTaggedEncoder.kt
+++ b/formats/protobuf/commonMain/src/kotlinx/serialization/protobuf/internal/ProtobufTaggedEncoder.kt
@@ -5,6 +5,7 @@
package kotlinx.serialization.protobuf.internal
import kotlinx.serialization.*
+import kotlinx.serialization.descriptors.*
import kotlinx.serialization.encoding.*
import kotlinx.serialization.protobuf.*
diff --git a/formats/protobuf/commonTest/src/kotlinx/serialization/protobuf/CustomizedSerializableTestClasses.kt b/formats/protobuf/commonTest/src/kotlinx/serialization/protobuf/CustomizedSerializableTestClasses.kt
index d4f48970..d58e74ba 100644
--- a/formats/protobuf/commonTest/src/kotlinx/serialization/protobuf/CustomizedSerializableTestClasses.kt
+++ b/formats/protobuf/commonTest/src/kotlinx/serialization/protobuf/CustomizedSerializableTestClasses.kt
@@ -6,6 +6,7 @@ package kotlinx.serialization.protobuf
import kotlinx.serialization.*
import kotlinx.serialization.builtins.*
+import kotlinx.serialization.descriptors.*
import kotlinx.serialization.encoding.*
import kotlinx.serialization.descriptors.*
diff --git a/formats/protobuf/commonTest/src/kotlinx/serialization/protobuf/ProtobufMissingFieldsTest.kt b/formats/protobuf/commonTest/src/kotlinx/serialization/protobuf/ProtobufMissingFieldsTest.kt
index 6026c36b..9a927893 100644
--- a/formats/protobuf/commonTest/src/kotlinx/serialization/protobuf/ProtobufMissingFieldsTest.kt
+++ b/formats/protobuf/commonTest/src/kotlinx/serialization/protobuf/ProtobufMissingFieldsTest.kt
@@ -5,6 +5,7 @@
package kotlinx.serialization.protobuf
import kotlinx.serialization.*
+import kotlinx.serialization.descriptors.*
import kotlinx.serialization.encoding.*
import kotlinx.serialization.descriptors.*
import kotlin.test.*