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

[Gradle] Add additional logging for setting .moduleName in compiler args

Browse Source 
^KT-54312 Verification Pending
This commit is contained in:
Sebastian Sellmair
2022-10-26 10:16:55 +02:00
committed by Space Team
parent 570524a1a9
commit 51c71efa2e
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/CompilerArgumentsContributor.kt
+4 -2
View File
@@ -67,6 +67,7 @@ internal open class KotlinJvmCompilerArgumentsContributor(
taskProvider: KotlinJvmCompilerArgumentsProvider taskProvider: KotlinJvmCompilerArgumentsProvider
) : AbstractKotlinCompileArgumentsContributor<K2JVMCompilerArguments>(taskProvider) { ) : AbstractKotlinCompileArgumentsContributor<K2JVMCompilerArguments>(taskProvider) {
private val taskName = taskProvider.taskName
private val moduleName = taskProvider.moduleName private val moduleName = taskProvider.moduleName
private val friendPaths = taskProvider.friendPaths private val friendPaths = taskProvider.friendPaths
private val compileClasspath = taskProvider.compileClasspath private val compileClasspath = taskProvider.compileClasspath
@@ -82,10 +83,10 @@ internal open class KotlinJvmCompilerArgumentsContributor(
super.contributeArguments(args, flags) super.contributeArguments(args, flags)
args.moduleName = moduleName args.moduleName = moduleName
logger.kotlinDebug { "args.moduleName = ${args.moduleName}" } logger.kotlinDebug { "$taskName | args.moduleName = ${args.moduleName}" }
args.friendPaths = friendPaths.files.map { it.absolutePath }.toTypedArray() args.friendPaths = friendPaths.files.map { it.absolutePath }.toTypedArray()
logger.kotlinDebug { "args.friendPaths = ${args.friendPaths?.joinToString() ?: "[]"}" } logger.kotlinDebug { "$taskName | args.friendPaths = ${args.friendPaths?.joinToString() ?: "[]"}" }
if (DefaultsOnly in flags) return if (DefaultsOnly in flags) return
@@ -98,5 +99,6 @@ internal open class KotlinJvmCompilerArgumentsContributor(
args.destinationAsFile = destinationDir args.destinationAsFile = destinationDir
compilerOptions.fillCompilerArguments(args) compilerOptions.fillCompilerArguments(args)
logger.kotlinDebug { "$taskName | args.moduleName = ${args.moduleName} (w/ compilerOptions applied)" }
} }
} }
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+1
View File
@@ -521,6 +521,7 @@ open class KotlinCompileArgumentsProvider<T : AbstractKotlinCompile<out CommonCo
class KotlinJvmCompilerArgumentsProvider class KotlinJvmCompilerArgumentsProvider
(taskProvider: KotlinCompile) : KotlinCompileArgumentsProvider<KotlinCompile>(taskProvider) { (taskProvider: KotlinCompile) : KotlinCompileArgumentsProvider<KotlinCompile>(taskProvider) {
val taskName: String = taskProvider.name
val moduleName: String = taskProvider.moduleName.get() val moduleName: String = taskProvider.moduleName.get()
val friendPaths: FileCollection = taskProvider.friendPaths val friendPaths: FileCollection = taskProvider.friendPaths
val compileClasspath: Iterable<File> = taskProvider.libraries val compileClasspath: Iterable<File> = taskProvider.libraries