Rework SerializationSubplugin for the new subplugins API

libraries/tools/kotlin-serialization/src/main/kotlin/org/jetbrains/kotlinx/serialization/gradle/SerializationSubplugin.kt

@@ -16,44 +16,25 @@
 
 package org.jetbrains.kotlinx.serialization.gradle
 
-import org.gradle.api.Plugin
+import org.gradle.api.provider.Provider
-import org.gradle.api.Project
-import org.gradle.api.tasks.compile.AbstractCompile
 import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
-import org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin
+import org.jetbrains.kotlin.gradle.plugin.KotlinCompilerPluginSupportPlugin
 import org.jetbrains.kotlin.gradle.plugin.SubpluginArtifact
 import org.jetbrains.kotlin.gradle.plugin.SubpluginOption
 
-class SerializationGradleSubplugin : Plugin<Project> {
+class SerializationGradleSubplugin : KotlinCompilerPluginSupportPlugin {
-    companion object {
-        fun isEnabled(project: Project) = project.plugins.findPlugin(SerializationGradleSubplugin::class.java) != null
-    }
-
-    override fun apply(project: Project) {
-        // nothing here
-    }
-}
-
-class SerializationKotlinGradleSubplugin : KotlinGradleSubplugin<AbstractCompile> {
     companion object {
         const val SERIALIZATION_GROUP_NAME = "org.jetbrains.kotlin"
         const val SERIALIZATION_ARTIFACT_NAME = "kotlin-serialization"
         const val SERIALIZATION_ARTIFACT_UNSHADED_NAME = "kotlin-serialization-unshaded"
     }
 
-    override fun isApplicable(project: Project, task: AbstractCompile): Boolean =
+    override fun isApplicable(kotlinCompilation: KotlinCompilation<*>): Boolean = true
-        SerializationGradleSubplugin.isEnabled(project)
 
-    override fun apply(
+    override fun applyToCompilation(
-        project: Project,
+        kotlinCompilation: KotlinCompilation<*>
-        kotlinCompile: AbstractCompile,
+    ): Provider<List<SubpluginOption>> =
-        javaCompile: AbstractCompile?,
+        kotlinCompilation.target.project.provider { emptyList<SubpluginOption>() }
-        variantData: Any?,
-        androidProjectHandler: Any?,
-        kotlinCompilation: KotlinCompilation<*>?
-    ): List<SubpluginOption> {
-        return emptyList()
-    }
 
     override fun getPluginArtifact(): SubpluginArtifact =
         SubpluginArtifact(SERIALIZATION_GROUP_NAME, SERIALIZATION_ARTIFACT_NAME)

libraries/tools/kotlin-serialization/src/main/resources/META-INF/services/org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin

@@ -1,17 +0,0 @@
-#
-# Copyright 2010-2017 JetBrains s.r.o.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-org.jetbrains.kotlinx.serialization.gradle.SerializationKotlinGradleSubplugin