azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename kotlinx-serialization => kotlin-serialization

Browse Source 
Discussed with @elizarov and @ilya-g
This commit is contained in:
Leonid Startsev
2018-09-11 17:31:24 +03:00
parent 099ad8de1e
commit fa990174ef
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-serialization/src/main/kotlin/org/jetbrains/kotlinx/serialization/gradle/SerializationSubplugin.kt
+2 -2
View File
@@ -38,8 +38,8 @@ class SerializationGradleSubplugin : Plugin<Project> {
class SerializationKotlinGradleSubplugin : KotlinGradleSubplugin<AbstractCompile> {
companion object {
const val SERIALIZATION_GROUP_NAME = "org.jetbrains.kotlin"
const val SERIALIZATION_ARTIFACT_NAME = "kotlinx-serialization"
const val SERIALIZATION_ARTIFACT_UNSHADED_NAME = "kotlinx-serialization-unshaded"
const val SERIALIZATION_ARTIFACT_NAME = "kotlin-serialization"
const val SERIALIZATION_ARTIFACT_UNSHADED_NAME = "kotlin-serialization-unshaded"
}
private var useUnshaded = false
plugins/kotlin-serialization/kotlin-serialization-ide/src/org/jetbrains/kotlinx/serialization/idea/KotlinSerializationGradleImportHandler.kt
+1 -1
View File
@@ -20,5 +20,5 @@ class KotlinSerializationGradleImportHandler : GradleProjectImportHandler {
KotlinSerializationImportHandler.modifyCompilerArguments(facet, PLUGIN_GRADLE_JAR)
}
private val PLUGIN_GRADLE_JAR = "kotlinx-serialization"
private val PLUGIN_GRADLE_JAR = "kotlin-serialization"
}
settings.gradle
+4 -4
View File
@@ -187,8 +187,8 @@ include ":kotlin-build-common",
":kotlinx-serialization-compiler-plugin",
":kotlinx-serialization-ide-plugin",
":kotlinx-serialization",
":kotlinx-serialization-unshaded"
":kotlin-serialization",
":kotlin-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-serialization').projectDir = file("$rootDir/libraries/tools/kotlin-serialization")
project(':kotlinx-serialization-unshaded').projectDir = file("$rootDir/libraries/tools/kotlin-serialization-unshaded")
project(':kotlin-serialization').projectDir = file("$rootDir/libraries/tools/kotlin-serialization")
project(':kotlin-serialization-unshaded').projectDir = file("$rootDir/libraries/tools/kotlin-serialization-unshaded")