Skip to content

Commit 1b3e65e

Browse files
committed
Drop kotlinx.serialization compiler plugin as it's unnecessary and will simplify build logic
1 parent 9696cc2 commit 1b3e65e

File tree

5 files changed

+30
-26
lines changed

5 files changed

+30
-26
lines changed

dokka-runners/dokka-gradle-plugin/api/dokka-gradle-plugin.api

-15
Original file line numberDiff line numberDiff line change
@@ -254,21 +254,6 @@ public abstract class org/jetbrains/dokka/gradle/engine/parameters/DokkaGenerato
254254
public abstract fun getSuppressObviousFunctions ()Lorg/gradle/api/provider/Property;
255255
}
256256

257-
public final class org/jetbrains/dokka/gradle/engine/parameters/DokkaModuleDescriptionKxs$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
258-
public static final field INSTANCE Lorg/jetbrains/dokka/gradle/engine/parameters/DokkaModuleDescriptionKxs$$serializer;
259-
public fun childSerializers ()[Lkotlinx/serialization/KSerializer;
260-
public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
261-
public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lorg/jetbrains/dokka/gradle/engine/parameters/DokkaModuleDescriptionKxs;
262-
public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
263-
public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
264-
public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lorg/jetbrains/dokka/gradle/engine/parameters/DokkaModuleDescriptionKxs;)V
265-
public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
266-
}
267-
268-
public final class org/jetbrains/dokka/gradle/engine/parameters/DokkaModuleDescriptionKxs$Companion {
269-
public final fun serializer ()Lkotlinx/serialization/KSerializer;
270-
}
271-
272257
public abstract class org/jetbrains/dokka/gradle/engine/parameters/DokkaPackageOptionsSpec : java/io/Serializable, org/jetbrains/dokka/gradle/engine/parameters/HasConfigurableVisibilityModifiers {
273258
public abstract fun getDocumentedVisibilities ()Lorg/gradle/api/provider/SetProperty;
274259
public abstract fun getMatchingRegex ()Lorg/gradle/api/provider/Property;

dokka-runners/dokka-gradle-plugin/build.gradle.kts

-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ import dokkabuild.utils.skipTestFixturesPublications
99

1010
plugins {
1111
id("dokkabuild.gradle-plugin")
12-
13-
kotlin("plugin.serialization") version embeddedKotlinVersion
14-
1512
`jvm-test-suite`
1613
`java-test-fixtures`
1714
id("dokkabuild.dev-maven-publish")

dokka-runners/dokka-gradle-plugin/src/main/kotlin/engine/parameters/DokkaModuleDescriptionKxs.kt

+21-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
*/
44
package org.jetbrains.dokka.gradle.engine.parameters
55

6-
import kotlinx.serialization.Serializable
6+
import kotlinx.serialization.json.JsonObject
7+
import kotlinx.serialization.json.buildJsonObject
8+
import kotlinx.serialization.json.jsonPrimitive
9+
import kotlinx.serialization.json.put
710
import org.gradle.kotlin.dsl.java
811
import org.jetbrains.dokka.DokkaConfiguration
912
import org.jetbrains.dokka.gradle.internal.InternalDokkaGradlePluginApi
@@ -23,7 +26,6 @@ import org.jetbrains.dokka.gradle.internal.InternalDokkaGradlePluginApi
2326
* @see org.jetbrains.dokka.gradle.engine.parameters.DokkaModuleDescriptionKxs
2427
* @see org.jetbrains.dokka.DokkaModuleDescriptionImpl
2528
*/
26-
@Serializable
2729
@InternalDokkaGradlePluginApi
2830
data class DokkaModuleDescriptionKxs(
2931
/** @see DokkaConfiguration.DokkaModuleDescription.name */
@@ -34,4 +36,20 @@ data class DokkaModuleDescriptionKxs(
3436
val moduleOutputDirName: String = "module",
3537
/** name of the sibling directory that contains the module includes */
3638
val moduleIncludesDirName: String = "includes",
37-
)
39+
) {
40+
internal companion object {
41+
fun toJsonObject(module: DokkaModuleDescriptionKxs): JsonObject = buildJsonObject {
42+
put("name", module.name)
43+
put("modulePath", module.modulePath)
44+
put("moduleOutputDirName", module.moduleOutputDirName)
45+
put("moduleIncludesDirName", module.moduleIncludesDirName)
46+
}
47+
48+
fun fromJsonObject(obj: JsonObject): DokkaModuleDescriptionKxs = DokkaModuleDescriptionKxs(
49+
name = obj["name"]!!.jsonPrimitive.content,
50+
modulePath = obj["modulePath"]!!.jsonPrimitive.content,
51+
moduleOutputDirName = obj["moduleOutputDirName"]!!.jsonPrimitive.content,
52+
moduleIncludesDirName = obj["moduleIncludesDirName"]!!.jsonPrimitive.content,
53+
)
54+
}
55+
}

dokka-runners/dokka-gradle-plugin/src/main/kotlin/engine/parameters/builders/DokkaParametersBuilder.kt

+6-3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
*/
44
package org.jetbrains.dokka.gradle.engine.parameters.builders
55

6+
import kotlinx.serialization.json.JsonObject
67
import org.gradle.api.Project
78
import org.gradle.api.file.ArchiveOperations
89
import org.gradle.api.file.FileCollection
@@ -96,9 +97,11 @@ internal class DokkaParametersBuilder(
9697
}
9798

9899
val moduleDescriptor: DokkaModuleDescriptionKxs =
99-
DokkaBasePlugin.jsonMapper.decodeFromString(
100-
DokkaModuleDescriptionKxs.serializer(),
101-
moduleDescriptorJson.readText(),
100+
DokkaModuleDescriptionKxs.fromJsonObject(
101+
DokkaBasePlugin.jsonMapper.decodeFromString(
102+
JsonObject.serializer(),
103+
moduleDescriptorJson.readText(),
104+
)
102105
)
103106

104107
val moduleOutputDirectory = moduleDir.resolve(moduleDescriptor.moduleOutputDirName)

dokka-runners/dokka-gradle-plugin/src/main/kotlin/tasks/DokkaGenerateModuleTask.kt

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
*/
44
package org.jetbrains.dokka.gradle.tasks
55

6+
import kotlinx.serialization.json.JsonObject
67
import org.gradle.api.file.ArchiveOperations
78
import org.gradle.api.file.FileSystemOperations
89
import org.gradle.api.model.ObjectFactory
@@ -87,8 +88,8 @@ constructor(
8788

8889
val encodedModuleDesc =
8990
DokkaBasePlugin.jsonMapper.encodeToString(
90-
DokkaModuleDescriptionKxs.serializer(),
91-
moduleDesc
91+
JsonObject.serializer(),
92+
DokkaModuleDescriptionKxs.toJsonObject(moduleDesc)
9293
)
9394

9495
logger.info("encodedModuleDesc: $encodedModuleDesc".lines().joinToString(" "))

0 commit comments

Comments
 (0)