diff --git a/libraries/configureGradleTools.gradle b/libraries/configureGradleTools.gradle index 0ab7acc678d..35020d1d4db 100644 --- a/libraries/configureGradleTools.gradle +++ b/libraries/configureGradleTools.gradle @@ -1,5 +1,5 @@ -configure([project(':kotlin-gradle-plugin'), project(':kotlin-allopen'), project(':kotlin-noarg')]) { project -> +configure([project(':kotlin-gradle-plugin'), project(':kotlin-allopen'), project(':kotlin-noarg'), project(':kotlin-serialization')]) { project -> apply plugin: 'com.gradle.plugin-publish' afterEvaluate { diff --git a/libraries/tools/kotlin-serialization/build.gradle b/libraries/tools/kotlin-serialization/build.gradle index 007664cec65..6a77adffdac 100644 --- a/libraries/tools/kotlin-serialization/build.gradle +++ b/libraries/tools/kotlin-serialization/build.gradle @@ -35,3 +35,12 @@ artifacts { } javadocJar() + +pluginBundle { + plugins { + kotlinSerialization { + id = 'org.jetbrains.kotlin.plugin.serialization' + description = displayName = 'Kotlin compiler plugin for kotlinx.serialization library' + } + } +} \ No newline at end of file diff --git a/libraries/tools/kotlin-serialization/plugin-marker/build.gradle b/libraries/tools/kotlin-serialization/plugin-marker/build.gradle new file mode 100644 index 00000000000..4b9ba47be01 --- /dev/null +++ b/libraries/tools/kotlin-serialization/plugin-marker/build.gradle @@ -0,0 +1,3 @@ +apply from: "$rootDir/libraries/tools/gradle-tools/pluginMarkers.gradle" + +pluginMarkerProject('kotlin-serialization') diff --git a/settings.gradle b/settings.gradle index 166d4370286..c1d64fc5a99 100644 --- a/settings.gradle +++ b/settings.gradle @@ -212,7 +212,8 @@ include ":kotlin-build-common", ":kotlinx-serialization-compiler-plugin", ":kotlinx-serialization-ide-plugin", ":kotlin-serialization", - ":kotlin-serialization-unshaded" + ":kotlin-serialization-unshaded", + ":kotlin-serialization:plugin-marker" def includeCidr = hasProperty("cidrPluginsEnabled") && Boolean.parseBoolean(cidrPluginsEnabled) @@ -247,7 +248,7 @@ if (flags.inJpsBuildIdeaSync) { // modules that we are currently cannot compile with jps include ":kotlin-idl2k" project(':kotlin-idl2k').projectDir = file("$rootDir/libraries/tools/idl2k") - + include ":core:builtins", ":kotlin-stdlib-common", ":kotlin-stdlib", @@ -392,6 +393,7 @@ project(':kotlinx-serialization-compiler-plugin').projectDir = file("$rootDir/pl project(':kotlinx-serialization-ide-plugin').projectDir = file("$rootDir/plugins/kotlin-serialization/kotlin-serialization-ide") project(':kotlin-serialization').projectDir = file("$rootDir/libraries/tools/kotlin-serialization") project(':kotlin-serialization-unshaded').projectDir = file("$rootDir/libraries/tools/kotlin-serialization-unshaded") +project(':kotlin-serialization:plugin-marker').projectDir = file("$rootDir/libraries/tools/kotlin-serialization/plugin-marker") // Uncomment to use locally built protobuf-relocated // includeBuild("dependencies/protobuf")