From 7011e9422d659e890cdff6c3e9bcfc2e0e6c7cea Mon Sep 17 00:00:00 2001 From: Leonid Startsev Date: Mon, 10 Sep 2018 19:38:54 +0300 Subject: [PATCH] Rename kotlinx-gradle-serialization-plugin => kotlinx-serialization --- .../serialization/gradle/SerializationSubplugin.kt | 4 ++-- .../idea/KotlinSerializationGradleImportHandler.kt | 2 +- settings.gradle | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libraries/tools/kotlin-serialization/src/main/kotlin/org/jetbrains/kotlinx/serialization/gradle/SerializationSubplugin.kt b/libraries/tools/kotlin-serialization/src/main/kotlin/org/jetbrains/kotlinx/serialization/gradle/SerializationSubplugin.kt index eccaefbc6da..542764bd1c2 100644 --- a/libraries/tools/kotlin-serialization/src/main/kotlin/org/jetbrains/kotlinx/serialization/gradle/SerializationSubplugin.kt +++ b/libraries/tools/kotlin-serialization/src/main/kotlin/org/jetbrains/kotlinx/serialization/gradle/SerializationSubplugin.kt @@ -38,8 +38,8 @@ class SerializationGradleSubplugin : Plugin { class SerializationKotlinGradleSubplugin : KotlinGradleSubplugin { companion object { const val SERIALIZATION_GROUP_NAME = "org.jetbrains.kotlin" - const val SERIALIZATION_ARTIFACT_NAME = "kotlinx-gradle-serialization-plugin" - const val SERIALIZATION_ARTIFACT_UNSHADED_NAME = "kotlinx-gradle-serialization-plugin-unshaded" + const val SERIALIZATION_ARTIFACT_NAME = "kotlinx-serialization" + const val SERIALIZATION_ARTIFACT_UNSHADED_NAME = "kotlinx-serialization-unshaded" } private var useUnshaded = false diff --git a/plugins/kotlin-serialization/kotlin-serialization-ide/src/org/jetbrains/kotlinx/serialization/idea/KotlinSerializationGradleImportHandler.kt b/plugins/kotlin-serialization/kotlin-serialization-ide/src/org/jetbrains/kotlinx/serialization/idea/KotlinSerializationGradleImportHandler.kt index b1303d863c7..b3231bafa43 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-ide/src/org/jetbrains/kotlinx/serialization/idea/KotlinSerializationGradleImportHandler.kt +++ b/plugins/kotlin-serialization/kotlin-serialization-ide/src/org/jetbrains/kotlinx/serialization/idea/KotlinSerializationGradleImportHandler.kt @@ -20,5 +20,5 @@ class KotlinSerializationGradleImportHandler : GradleProjectImportHandler { KotlinSerializationImportHandler.modifyCompilerArguments(facet, PLUGIN_GRADLE_JAR) } - private val PLUGIN_GRADLE_JAR = "kotlinx-gradle-serialization-plugin" + private val PLUGIN_GRADLE_JAR = "kotlinx-serialization" } \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 6914f72895e..105a0b43e07 100644 --- a/settings.gradle +++ b/settings.gradle @@ -187,8 +187,8 @@ include ":kotlin-build-common", ":kotlinx-serialization-compiler-plugin", ":kotlinx-serialization-ide-plugin", - ":kotlinx-gradle-serialization-plugin", - ":kotlinx-gradle-serialization-plugin-unshaded" + ":kotlinx-serialization", + ":kotlinx-serialization-unshaded" def isTeamcityBuild = hasProperty("teamcity") || System.getenv("TEAMCITY_VERSION") != null def includeUltimate = hasProperty("intellijUltimateEnabled") && intellijUltimateEnabled != 'false' @@ -306,5 +306,5 @@ project(':kotlin-noarg:plugin-marker').projectDir = file("$rootDir/libraries/too project(':kotlinx-serialization-compiler-plugin').projectDir = file("$rootDir/plugins/kotlin-serialization/kotlin-serialization-compiler") project(':kotlinx-serialization-ide-plugin').projectDir = file("$rootDir/plugins/kotlin-serialization/kotlin-serialization-ide") -project(':kotlinx-gradle-serialization-plugin').projectDir = file("$rootDir/libraries/tools/kotlin-serialization") -project(':kotlinx-gradle-serialization-plugin-unshaded').projectDir = file("$rootDir/libraries/tools/kotlin-serialization-unshaded") +project(':kotlinx-serialization').projectDir = file("$rootDir/libraries/tools/kotlin-serialization") +project(':kotlinx-serialization-unshaded').projectDir = file("$rootDir/libraries/tools/kotlin-serialization-unshaded")