Revert 2 dev (#3)

* Revert "Adapt tests for K2 and upcoming deprecations in K1 (Kotlin#2230)"

This reverts commit f9229ef.

* Revert "Fix value class encoding in various corner cases (Kotlin#2242)"

This reverts commit 3cec2f7.

* Revert "Improved docs for JsonContentPolymorphicSerializer (Kotlin#2189)"

This reverts commit 3555872.

* Revert "Fix incorrect json decoding iterator's .hasNext() behavior on array-wrapped inputs: (Kotlin#2268)"

This reverts commit 2864aea.

* Revert "Fix memory leak caused by invalid KTypeWrapper's equals method (Kotlin#2274)"

This reverts commit 836f2bd.

* Revert "Replace deprecated ThreadLocal with kotlin.native.concurrent.ThreadLocal (Kotlin#2266)"

This reverts commit d73f6e3.

* Revert "Get rid of deprecated toChar() in JS-specific code (Kotlin#2252)"

This reverts commit 3686362.

* Revert "Rename json-okio `target` variables to `sink` (Kotlin#2226)"

This reverts commit a978cf0.

* Revert "Replace `runCatching-map-getOrDefault` in caching (Kotlin#2248)"

This reverts commit da91066.

* Revert "Configure project settings for Intellij IDEA (Kotlin#2217)"

This reverts commit d519d45.

* Revert "Updated K/N targets in accordance with official recommendations (Kotlin#2216)"

This reverts commit fe63ced.

.gitignore

@@ -3,8 +3,6 @@
 # IntelliJ files
 **/.idea/*
 !/.idea/vcs.xml
-!/.idea/codeStyles
-!/.idea/copyright
 out/
 *.iml
 

core/api/kotlinx-serialization-core.api

@@ -1067,7 +1067,7 @@ public abstract class kotlinx/serialization/internal/TaggedDecoder : kotlinx/ser
 	public final fun decodeEnum (Lkotlinx/serialization/descriptors/SerialDescriptor;)I
 	public final fun decodeFloat ()F
 	public final fun decodeFloatElement (Lkotlinx/serialization/descriptors/SerialDescriptor;I)F
-	public fun decodeInline (Lkotlinx/serialization/descriptors/SerialDescriptor;)Lkotlinx/serialization/encoding/Decoder;
+	public final fun decodeInline (Lkotlinx/serialization/descriptors/SerialDescriptor;)Lkotlinx/serialization/encoding/Decoder;
 	public final fun decodeInlineElement (Lkotlinx/serialization/descriptors/SerialDescriptor;I)Lkotlinx/serialization/encoding/Decoder;
 	public final fun decodeInt ()I
 	public final fun decodeIntElement (Lkotlinx/serialization/descriptors/SerialDescriptor;I)I
@@ -1123,7 +1123,7 @@ public abstract class kotlinx/serialization/internal/TaggedEncoder : kotlinx/ser
 	public final fun encodeEnum (Lkotlinx/serialization/descriptors/SerialDescriptor;I)V
 	public final fun encodeFloat (F)V
 	public final fun encodeFloatElement (Lkotlinx/serialization/descriptors/SerialDescriptor;IF)V
-	public fun encodeInline (Lkotlinx/serialization/descriptors/SerialDescriptor;)Lkotlinx/serialization/encoding/Encoder;
+	public final fun encodeInline (Lkotlinx/serialization/descriptors/SerialDescriptor;)Lkotlinx/serialization/encoding/Encoder;
 	public final fun encodeInlineElement (Lkotlinx/serialization/descriptors/SerialDescriptor;I)Lkotlinx/serialization/encoding/Encoder;
 	public final fun encodeInt (I)V
 	public final fun encodeIntElement (Lkotlinx/serialization/descriptors/SerialDescriptor;II)V

core/commonMain/src/kotlinx/serialization/internal/Tagged.kt

@@ -51,7 +51,7 @@ public abstract class TaggedEncoder<Tag : Any?> : Encoder, CompositeEncoder {
     protected open fun encodeTaggedInline(tag: Tag, inlineDescriptor: SerialDescriptor): Encoder =
         this.apply { pushTag(tag) }
 
-    override fun encodeInline(descriptor: SerialDescriptor): Encoder =
+    final override fun encodeInline(descriptor: SerialDescriptor): Encoder =
         encodeTaggedInline(popTag(), descriptor)
 
     // ---- Implementation of low-level API ----
@@ -209,7 +209,7 @@ public abstract class TaggedDecoder<Tag : Any?> : Decoder, CompositeDecoder {
 
     // ---- Implementation of low-level API ----
 
-    override fun decodeInline(descriptor: SerialDescriptor): Decoder =
+    final override fun decodeInline(descriptor: SerialDescriptor): Decoder =
         decodeTaggedInline(popTag(), descriptor)
 
     // TODO this method should be overridden by any sane format that supports top-level nulls

core/commonTest/src/kotlinx/serialization/MetaSerializableTest.kt

@@ -4,19 +4,18 @@ import kotlinx.serialization.test.*
 import kotlin.reflect.KClass
 import kotlin.test.*
 
-@MetaSerializable
-@Target(AnnotationTarget.CLASS, AnnotationTarget.PROPERTY)
-annotation class MySerializable
-
-@MetaSerializable
-@Target(AnnotationTarget.CLASS, AnnotationTarget.PROPERTY)
-annotation class MySerializableWithInfo(
-    val value: Int,
-    val kclass: KClass<*>
-)
+class MetaSerializableTest {
 
+    @MetaSerializable
+    @Target(AnnotationTarget.CLASS, AnnotationTarget.PROPERTY)
+    annotation class MySerializable
 
-class MetaSerializableTest {
+    @MetaSerializable
+    @Target(AnnotationTarget.CLASS, AnnotationTarget.PROPERTY)
+    annotation class MySerializableWithInfo(
+        val value: Int,
+        val kclass: KClass<*>
+    )
 
     @MySerializable
     class Project1(val name: String, val language: String)

core/commonTest/src/kotlinx/serialization/features/SchemaTest.kt

@@ -7,8 +7,6 @@ package kotlinx.serialization.features
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.*
 import kotlinx.serialization.descriptors.*
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder
 import kotlinx.serialization.internal.*
 import kotlinx.serialization.test.EnumSerializer
 import kotlin.test.*
@@ -20,17 +18,15 @@ class SchemaTest {
     @Serializable
     data class Box<T>(val boxed: T)
 
-    @Serializable(Data1.Companion::class)
+    @Serializable
     data class Data1(val l: List<Int> = emptyList(), val s: String) {
-        companion object: KSerializer<Data1> {
-            override val descriptor = buildClassSerialDescriptor("Data1") {
+        @Serializer(forClass = Data1::class)
+        companion object {
+            // TODO removal of explicit type crashes the compiler
+            override val descriptor: SerialDescriptor = buildClassSerialDescriptor("Data1") {
                 element("l", listSerialDescriptor<Int>(), isOptional = true)
                 element("s", serialDescriptor<String>())
             }
-
-            override fun serialize(encoder: Encoder, value: Data1) = error("Should not be called")
-
-            override fun deserialize(decoder: Decoder): Data1 = error("Should not be called")
         }
     }
 

core/jvmMain/src/kotlinx/serialization/internal/Caching.kt

@@ -17,12 +17,9 @@ import kotlin.reflect.KTypeProjection
  * but ClassValue is not available on Android, thus we attempt to check it dynamically
  * and fallback to ConcurrentHashMap-based cache.
  */
-private val useClassValue = try {
+private val useClassValue = runCatching {
     Class.forName("java.lang.ClassValue")
-    true
-} catch (_: Throwable) {
-    false
-}
+}.map { true }.getOrDefault(false)
 
 /**
  * Creates a **strongly referenced** cache of values associated with [Class].
@@ -170,7 +167,7 @@ private class KTypeWrapper(private val origin: KType) : KType {
 
     override fun equals(other: Any?): Boolean {
         if (other == null) return false
-        if (origin != (other as? KTypeWrapper)?.origin) return false
+        if (origin != other) return false
 
         val kClassifier = classifier
         if (kClassifier is KClass<*>) {

formats/json-okio/commonMain/src/kotlinx/serialization/json/okio/OkioStreams.kt

@@ -16,7 +16,7 @@ import kotlinx.serialization.json.okio.internal.OkioSerialReader
 import okio.*
 
 /**
- * Serializes the [value] with [serializer] into a [sink] using JSON format and UTF-8 encoding.
+ * Serializes the [value] with [serializer] into a [target] using JSON format and UTF-8 encoding.
  *
  * @throws [SerializationException] if the given value cannot be serialized to JSON.
  * @throws [okio.IOException] If an I/O error occurs and sink can't be written to.
@@ -25,9 +25,9 @@ import okio.*
 public fun <T> Json.encodeToBufferedSink(
     serializer: SerializationStrategy<T>,
     value: T,
-    sink: BufferedSink
+    target: BufferedSink
 ) {
-    val writer = JsonToOkioStreamWriter(sink)
+    val writer = JsonToOkioStreamWriter(target)
     try {
         encodeByWriter(writer, serializer, value)
     } finally {
@@ -36,16 +36,16 @@ public fun <T> Json.encodeToBufferedSink(
 }
 
 /**
- * Serializes given [value] to a [sink] using UTF-8 encoding and serializer retrieved from the reified type parameter.
+ * Serializes given [value] to a [target] using UTF-8 encoding and serializer retrieved from the reified type parameter.
  *
  * @throws [SerializationException] if the given value cannot be serialized to JSON.
  * @throws [okio.IOException] If an I/O error occurs and sink can't be written to.
  */
 @ExperimentalSerializationApi
 public inline fun <reified T> Json.encodeToBufferedSink(
     value: T,
-    sink: BufferedSink
-): Unit = encodeToBufferedSink(serializersModule.serializer(), value, sink)
+    target: BufferedSink
+): Unit = encodeToBufferedSink(serializersModule.serializer(), value, target)
 
 
 /**

formats/json-okio/commonMain/src/kotlinx/serialization/json/okio/internal/OkioJsonStreams.kt

@@ -11,34 +11,34 @@ import kotlinx.serialization.json.internal.JsonWriter
 import kotlinx.serialization.json.internal.SerialReader
 import okio.*
 
-internal class JsonToOkioStreamWriter(private val sink: BufferedSink) : JsonWriter {
+internal class JsonToOkioStreamWriter(private val target: BufferedSink) : JsonWriter {
     override fun writeLong(value: Long) {
         write(value.toString())
     }
 
     override fun writeChar(char: Char) {
-        sink.writeUtf8CodePoint(char.code)
+        target.writeUtf8CodePoint(char.code)
     }
 
     override fun write(text: String) {
-        sink.writeUtf8(text)
+        target.writeUtf8(text)
     }
 
     override fun writeQuoted(text: String) {
-        sink.writeUtf8CodePoint('"'.code)
+        target.writeUtf8CodePoint('"'.code)
         var lastPos = 0
         for (i in text.indices) {
             val c = text[i].code
             if (c < ESCAPE_STRINGS.size && ESCAPE_STRINGS[c] != null) {
-                sink.writeUtf8(text, lastPos, i) // flush prev
-                sink.writeUtf8(ESCAPE_STRINGS[c]!!)
+                target.writeUtf8(text, lastPos, i) // flush prev
+                target.writeUtf8(ESCAPE_STRINGS[c]!!)
                 lastPos = i + 1
             }
         }
 
-        if (lastPos != 0) sink.writeUtf8(text, lastPos, text.length)
-        else sink.writeUtf8(text)
-        sink.writeUtf8CodePoint('"'.code)
+        if (lastPos != 0) target.writeUtf8(text, lastPos, text.length)
+        else target.writeUtf8(text)
+        target.writeUtf8CodePoint('"'.code)
     }
 
     override fun release() {

formats/json-tests/build.gradle.kts

@@ -15,8 +15,6 @@ apply(from = rootProject.file("gradle/configure-source-sets.gradle"))
 tasks.withType<Kotlin2JsCompile> {
     if (this.name == "compileTestKotlinJsLegacy") {
         this.exclude("**/PropertyInitializerTest.kt")
-        // Partially custom serializers without 'implicit customisation by companion' annotation are not supported on Legacy JS
-        this.exclude("**/PartiallyCustomSerializerTest.kt", "**/JsonCustomSerializersTest.kt")
     }
 }
 

formats/json-tests/commonTest/src/kotlinx/serialization/features/MetaSerializableJsonTest.kt

@@ -4,14 +4,13 @@ import kotlinx.serialization.*
 import kotlinx.serialization.json.*
 import kotlin.test.*
 
-@MetaSerializable
-@Target(AnnotationTarget.PROPERTY, AnnotationTarget.CLASS)
-annotation class JsonComment(val comment: String)
-
-@JsonComment("class_comment")
-data class IntDataCommented(val i: Int)
-
 class MetaSerializableJsonTest : JsonTestBase() {
+    @MetaSerializable
+    @Target(AnnotationTarget.PROPERTY, AnnotationTarget.CLASS)
+    annotation class JsonComment(val comment: String)
+
+    @JsonComment("class_comment")
+    data class IntDataCommented(val i: Int)
 
     @Serializable
     data class Carrier(

formats/json-tests/commonTest/src/kotlinx/serialization/features/PartiallyCustomSerializerTest.kt

@@ -10,7 +10,7 @@ import kotlinx.serialization.json.Json
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
-@Serializable(WithNull.Companion::class)
+@Serializable
 data class WithNull(@SerialName("value") val nullable: String? = null) {
     @Serializer(forClass = WithNull::class)
     companion object : KSerializer<WithNull> {