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

Pill: Support kotlinx.serialization plugin

Browse Source
This commit is contained in:
Yan Zhulanow
2021-01-14 19:38:08 +09:00
parent bcce187e3f
commit 4e8ec69ca7
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/pill/pill-importer/src/ModelParser.kt
+10 -3
View File
@@ -228,7 +228,7 @@ class ModelParser(private val variant: Variant, private val modulePrefix: String
forTests = sourceSet.isTestSourceSet, forTests = sourceSet.isTestSourceSet,
sourceDirectories = sourceDirectories, sourceDirectories = sourceDirectories,
resourceDirectories = resourceDirectories, resourceDirectories = resourceDirectories,
kotlinOptions = kotlinCompileTask?.let { getKotlinOptions(it) }, kotlinOptions = kotlinCompileTask?.let { getKotlinOptions(it, project) },
compileClasspathConfigurationName = sourceSet.compileClasspathConfigurationName, compileClasspathConfigurationName = sourceSet.compileClasspathConfigurationName,
runtimeClasspathConfigurationName = sourceSet.runtimeClasspathConfigurationName runtimeClasspathConfigurationName = sourceSet.runtimeClasspathConfigurationName
) )
@@ -257,7 +257,7 @@ class ModelParser(private val variant: Variant, private val modulePrefix: String
return roots return roots
} }
private fun getKotlinOptions(kotlinCompileTask: Any): PSourceRootKotlinOptions? { private fun getKotlinOptions(kotlinCompileTask: Any, project: Project): PSourceRootKotlinOptions {
val compileArguments = run { val compileArguments = run {
val method = kotlinCompileTask::class.java.getMethod("getSerializedCompilerArguments") val method = kotlinCompileTask::class.java.getMethod("getSerializedCompilerArguments")
method.isAccessible = true method.isAccessible = true
@@ -270,6 +270,12 @@ class ModelParser(private val variant: Variant, private val modulePrefix: String
val extraArguments = compileArguments.filter { it.startsWith("-X") && !it.startsWith("-Xplugin=") } val extraArguments = compileArguments.filter { it.startsWith("-X") && !it.startsWith("-Xplugin=") }
val pluginClasspath = mutableListOf<String>()
if (project.plugins.hasPlugin("org.jetbrains.kotlin.plugin.serialization")) {
pluginClasspath += "\$KOTLIN_BUNDLED\$/lib/kotlinx-serialization-compiler-plugin.jar"
}
return PSourceRootKotlinOptions( return PSourceRootKotlinOptions(
parseBoolean("no-stdlib"), parseBoolean("no-stdlib"),
parseBoolean("no-reflect"), parseBoolean("no-reflect"),
@@ -277,7 +283,8 @@ class ModelParser(private val variant: Variant, private val modulePrefix: String
parseString("api-version"), parseString("api-version"),
parseString("language-version"), parseString("language-version"),
parseString("jvm-target"), parseString("jvm-target"),
extraArguments extraArguments,
pluginClasspath
) )
} }
plugins/pill/pill-importer/src/model/PModule.kt
+2 -1
View File
@@ -38,5 +38,6 @@ data class PSourceRootKotlinOptions(
val apiVersion: String?, val apiVersion: String?,
val languageVersion: String?, val languageVersion: String?,
val jvmTarget: String?, val jvmTarget: String?,
val extraArguments: List<String> val extraArguments: List<String>,
val pluginClasspath: List<String>
) )
plugins/pill/pill-importer/src/render.kt
+7 -1
View File
@@ -88,7 +88,13 @@ private fun renderModule(project: PProject, module: PModule) = PFile(
kotlinCompileOptions.apiVersion.option("apiVersion") kotlinCompileOptions.apiVersion.option("apiVersion")
xml("option", "name" to "pluginOptions") { xml("array") } xml("option", "name" to "pluginOptions") { xml("array") }
xml("option", "name" to "pluginClasspaths") { xml("array") } xml("option", "name" to "pluginClasspaths") {
xml("array") {
for (path in kotlinCompileOptions.pluginClasspath) {
xml("option", "value" to path)
}
}
}
} }
} }
} }