Migrate to Kotlin 1.7.0 (#1977)

* Remove Java 1.6 target
* Update binary-compatibility-validator
* Suppress some animal sniffer detections that can be desugared

Author: sandwwraith

build.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2017-2022 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
 
 buildscript {
@@ -173,6 +173,7 @@ subprojects {
     afterEvaluate { // Can be applied only when the project is evaluated
         animalsniffer {
             sourceSets = [sourceSets.main]
+            annotation = "kotlinx.serialization.json.internal.SuppressAnimalSniffer"
         }
         dependencies {
             signature 'net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature'

buildSrc/src/main/kotlin/Java9Modularity.kt

@@ -1,3 +1,7 @@
+/*
+ * Copyright 2017-2022 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
+ */
+
 import org.gradle.api.*
 import org.gradle.api.tasks.bundling.*
 import org.gradle.api.tasks.compile.*
@@ -6,6 +10,7 @@ import org.jetbrains.kotlin.gradle.dsl.*
 import org.jetbrains.kotlin.gradle.plugin.mpp.*
 import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.*
 import org.jetbrains.kotlin.gradle.targets.jvm.*
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.io.*
 
 object Java9Modularity {
@@ -28,7 +33,7 @@ object Java9Modularity {
             }
 
             target.compilations.forEach { compilation ->
-                val compileKotlinTask = compilation.compileKotlinTask as AbstractCompile
+                val compileKotlinTask = compilation.compileKotlinTask as KotlinCompile
                 val defaultSourceSet = compilation.defaultSourceSet
 
                 // derive the names of the source set and compile module task
@@ -64,7 +69,7 @@ object Java9Modularity {
         }
     }
 
-    private fun Project.registerCompileModuleTask(taskName: String, compileTask: AbstractCompile, sourceFile: File, targetFile: File) =
+    private fun Project.registerCompileModuleTask(taskName: String, compileTask: KotlinCompile, sourceFile: File, targetFile: File) =
         tasks.register(taskName, JavaCompile::class) {
             // Also add the module-info.java source file to the Kotlin compile task;
             // the Kotlin compiler will parse and check module dependencies,
@@ -86,7 +91,7 @@ object Java9Modularity {
                 // The module path should be the same as the classpath of the compiler.
                 options.compilerArgs = listOf(
                     "--release", "9",
-                    "--module-path", compileTask.classpath.asPath,
+                    "--module-path", compileTask.libraries.asPath,
                     "-Xlint:-requires-transitive-automatic"
                 )
             }

core/api/kotlinx-serialization-core.api

@@ -1188,6 +1188,7 @@ public final class kotlinx/serialization/internal/UnitSerializer : kotlinx/seria
 
 public final class kotlinx/serialization/modules/PolymorphicModuleBuilder {
 	public fun <init> (Lkotlin/reflect/KClass;Lkotlinx/serialization/KSerializer;)V
+	public synthetic fun <init> (Lkotlin/reflect/KClass;Lkotlinx/serialization/KSerializer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun buildTo (Lkotlinx/serialization/modules/SerializersModuleBuilder;)V
 	public final fun default (Lkotlin/jvm/functions/Function1;)V
 	public final fun defaultDeserializer (Lkotlin/jvm/functions/Function1;)V

formats/json-tests/build.gradle.kts

@@ -2,6 +2,7 @@
  * Copyright 2017-2022 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
 import Java9Modularity.configureJava9ModuleInfo
+import org.jetbrains.kotlin.gradle.tasks.*
 
 plugins {
     kotlin("multiplatform")
@@ -11,7 +12,7 @@ plugins {
 apply(from = rootProject.file("gradle/native-targets.gradle"))
 apply(from = rootProject.file("gradle/configure-source-sets.gradle"))
 
-tasks.withType<SourceTask> {
+tasks.withType<Kotlin2JsCompile> {
     if (this.name == "compileTestKotlinJsLegacy") {
         this.exclude("**/PropertyInitializerTest.kt")
     }

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

@@ -63,6 +63,7 @@ class LocalClassesTest {
         }
     }
 
+    @Suppress("SERIALIZER_TYPE_INCOMPATIBLE")
     @Test
     fun testObjectCustomSerializer() {
         @Serializable(with = ObjectCustomSerializer::class)
@@ -76,6 +77,7 @@ class LocalClassesTest {
         }
     }
 
+    @Suppress("SERIALIZER_TYPE_INCOMPATIBLE")
     @Test
     fun testClassCustomSerializer() {
         @Serializable(with = ClassCustomSerializer::class)

formats/json/api/kotlinx-serialization-json.api

@@ -358,6 +358,10 @@ public final class kotlinx/serialization/json/JvmStreamsKt {
 	public static final fun encodeToStream (Lkotlinx/serialization/json/Json;Lkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;Ljava/io/OutputStream;)V
 }
 
+public final class kotlinx/serialization/json/internal/JsonLexerKt {
+	public static final field BATCH_SIZE I
+}
+
 public final class kotlinx/serialization/json/internal/JsonStreamsKt {
 	public static final fun decodeByReader (Lkotlinx/serialization/json/Json;Lkotlinx/serialization/DeserializationStrategy;Lkotlinx/serialization/json/internal/SerialReader;)Ljava/lang/Object;
 	public static final fun decodeToSequenceByReader (Lkotlinx/serialization/json/Json;Lkotlinx/serialization/json/internal/SerialReader;Lkotlinx/serialization/DeserializationStrategy;Lkotlinx/serialization/json/DecodeSequenceMode;)Lkotlin/sequences/Sequence;
@@ -381,6 +385,10 @@ public final class kotlinx/serialization/json/internal/StreamingJsonDecoderKt {
 	public static final fun decodeStringToJsonTree (Lkotlinx/serialization/json/Json;Lkotlinx/serialization/DeserializationStrategy;Ljava/lang/String;)Lkotlinx/serialization/json/JsonElement;
 }
 
+public final class kotlinx/serialization/json/internal/StringOpsKt {
+	public static final fun getESCAPE_STRINGS ()[Ljava/lang/String;
+}
+
 public final class kotlinx/serialization/json/internal/TreeJsonDecoderKt {
 	public static final fun readJson (Lkotlinx/serialization/json/Json;Lkotlinx/serialization/json/JsonElement;Lkotlinx/serialization/DeserializationStrategy;)Ljava/lang/Object;
 }

formats/json/commonMain/src/kotlinx/serialization/json/JsonElement.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2017-2022 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
 
 @file:Suppress("unused")
@@ -97,6 +97,7 @@ internal class JsonLiteral internal constructor(
         return true
     }
 
+    @SuppressAnimalSniffer // Boolean.hashCode(boolean)
     public override fun hashCode(): Int {
         var result = isString.hashCode()
         result = 31 * result + content.hashCode()

formats/json/commonMain/src/kotlinx/serialization/json/internal/Composers.kt

@@ -41,6 +41,7 @@ internal open class Composer(@JvmField internal val writer: JsonWriter) {
     fun printQuoted(value: String) = writer.writeQuoted(value)
 }
 
+@SuppressAnimalSniffer // Long(Integer).toUnsignedString(long)
 internal class ComposerForUnsignedNumbers(writer: JsonWriter, private val forceQuoting: Boolean) : Composer(writer) {
     override fun print(v: Int) {
         if (forceQuoting) printQuoted(v.toUInt().toString()) else print(v.toUInt().toString())

formats/json/commonMain/src/kotlinx/serialization/json/internal/SuppressAnimalSniffer.kt

@@ -0,0 +1,14 @@
+/*
+ * Copyright 2017-2022 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package kotlinx.serialization.json.internal
+
+/**
+ * Suppresses Animal Sniffer plugin errors for certain methods.
+ * Such methods include references to Java 8 methods that are not
+ * available in Android API, but can be desugared by R8.
+ */
+@Retention(AnnotationRetention.BINARY)
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
+internal annotation class SuppressAnimalSniffer

formats/json/commonMain/src/kotlinx/serialization/json/internal/TreeJsonEncoder.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2017-2022 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
 @file:OptIn(ExperimentalSerializationApi::class)
 
@@ -102,6 +102,7 @@ private sealed class AbstractJsonTreeEncoder(
         putElement(tag, JsonPrimitive(value.toString()))
     }
 
+    @SuppressAnimalSniffer // Long(Integer).toUnsignedString(long)
     override fun encodeTaggedInline(tag: String, inlineDescriptor: SerialDescriptor): Encoder =
         if (inlineDescriptor.isUnsignedNumber) object : AbstractEncoder() {
             override val serializersModule: SerializersModule = json.serializersModule