From aed9d3899e7b72f892372c4a2efd34c0b1e3a66b Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Thu, 3 Aug 2017 02:24:10 +0300 Subject: [PATCH] Misc: Fix compiler argument usages after refactoring --- .../GradleKotlinCompilerRunner.kt | 2 +- .../gradle/internal/KaptGenerateStubsTask.kt | 4 +-- .../kotlin/gradle/internal/KaptTask.kt | 4 +-- .../gradle/tasks/KotlinCompileCommon.kt | 2 +- .../kotlin/maven/K2JSCompilerMojo.java | 20 ++++++------- .../kotlin/maven/K2JVMCompileMojo.java | 22 +++++++-------- .../kotlin/maven/KotlinCompileMojoBase.java | 28 +++++++++---------- .../kotlin/maven/KotlinTestCompileMojo.java | 2 +- .../maven/KotlinTestJSCompilerMojo.java | 6 ++-- .../jetbrains/kotlin/maven/MetadataMojo.java | 8 +++--- .../kotlin/maven/TestMetadataMojo.java | 6 ++-- .../maven/kapt/KaptJVMCompilerMojo.java | 16 +++++++---- .../maven/kapt/KaptTestJvmCompilerMojo.java | 2 +- 13 files changed, 63 insertions(+), 59 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt index bfe70ccfceb..549be228654 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt @@ -89,7 +89,7 @@ internal class GradleCompilerRunner(private val project: Project) : KotlinCompil environment: GradleCompilerEnvironment ): ExitCode { val buildFile = makeModuleFile( - args.moduleName, + args.moduleName!!, isTest = false, outputDir = args.destinationAsFile, sourcesToCompile = sourcesToCompile, diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KaptGenerateStubsTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KaptGenerateStubsTask.kt index 062dca13d60..a1a5c730331 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KaptGenerateStubsTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KaptGenerateStubsTask.kt @@ -66,8 +66,8 @@ open class KaptGenerateStubsTask : KotlinCompile() { val args = createCompilerArgs() kotlinCompileTask.setupCompilerArgs(args) - args.pluginClasspaths = (pluginOptions.classpath + args.pluginClasspaths).toSet().toTypedArray() - args.pluginOptions = (pluginOptions.arguments + args.pluginOptions).toTypedArray() + args.pluginClasspaths = (pluginOptions.classpath + args.pluginClasspaths!!).toSet().toTypedArray() + args.pluginOptions = (pluginOptions.arguments + args.pluginOptions!!).toTypedArray() args.verbose = project.hasProperty("kapt.verbose") && project.property("kapt.verbose").toString().toBoolean() == true args.classpathAsList = this.compileClasspath.toList() args.destinationAsFile = this.destinationDir diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KaptTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KaptTask.kt index 6b2bd652cb2..722a55400dc 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KaptTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KaptTask.kt @@ -55,8 +55,8 @@ open class KaptTask : ConventionTask() { val args = K2JVMCompilerArguments() kotlinCompileTask.setupCompilerArgs(args) - args.pluginClasspaths = (pluginOptions.classpath + args.pluginClasspaths).toSet().toTypedArray() - args.pluginOptions = (pluginOptions.arguments + args.pluginOptions).toTypedArray() + args.pluginClasspaths = (pluginOptions.classpath + args.pluginClasspaths!!).toSet().toTypedArray() + args.pluginOptions = (pluginOptions.arguments + args.pluginOptions!!).toTypedArray() args.verbose = project.hasProperty("kapt.verbose") && project.property("kapt.verbose").toString().toBoolean() == true val messageCollector = GradleMessageCollector(logger) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt index c24d98f09db..e1e4a4a8cab 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinCompileCommon.kt @@ -43,7 +43,7 @@ internal open class KotlinCompileCommon : AbstractKotlinCompile()) { it.canonicalPath } } val messageCollector = GradleMessageCollector(logger) diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java index af8dc5268d7..74377f8868b 100644 --- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java +++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java @@ -96,11 +96,11 @@ public class K2JSCompilerMojo extends KotlinCompileMojoBase sourceRoots) throws MojoExecutionException { - arguments.outputFile = outputFile; - arguments.noStdlib = true; - arguments.metaInfo = metaInfo; - arguments.moduleKind = moduleKind; - arguments.main = main; + arguments.setOutputFile(outputFile); + arguments.setNoStdlib(true); + arguments.setMetaInfo(metaInfo); + arguments.setModuleKind(moduleKind); + arguments.setMain(main); List libraries; try { @@ -109,11 +109,11 @@ public class K2JSCompilerMojo extends KotlinCompileMojoBase> collector = getOutputDirectoriesCollector(); @@ -131,7 +131,7 @@ public class K2JSCompilerMojo extends KotlinCompileMojoBase getClassPathElements() throws DependencyResolutionRequiredException { diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java index 8d0129a4e5a..92ca920600f 100644 --- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java +++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java @@ -139,11 +139,11 @@ public class K2JVMCompileMojo extends KotlinCompileMojoBase sourceRoots) throws MojoExecutionException { - arguments.destination = output; + arguments.setDestination(output); // don't include runtime, it should be in maven dependencies - arguments.noStdlib = true; - arguments.javaParameters = this.javaParameters; + arguments.setNoStdlib(true); + arguments.setJavaParameters(this.javaParameters); //noinspection deprecation if (module != null || testModule != null) { @@ -156,35 +156,35 @@ public class K2JVMCompileMojo extends KotlinCompileMojoBase e List sourceRoots ) throws MojoExecutionException { for (File sourceRoot : sourceRoots) { - arguments.freeArgs.add(sourceRoot.getPath()); + arguments.getFreeArgs().add(sourceRoot.getPath()); } return compiler.exec(messageCollector, Services.EMPTY, arguments); } @@ -439,16 +439,16 @@ public abstract class KotlinCompileMojoBase e private void configureCompilerArguments(@NotNull A arguments, @NotNull CLICompiler compiler, @NotNull List sourceRoots) throws MojoExecutionException { if (getLog().isDebugEnabled()) { - arguments.verbose = true; + arguments.setVerbose(true); } - arguments.suppressWarnings = nowarn; - arguments.languageVersion = languageVersion; - arguments.apiVersion = apiVersion; - arguments.multiPlatform = multiPlatform; + arguments.setSuppressWarnings(nowarn); + arguments.setLanguageVersion(languageVersion); + arguments.setApiVersion(apiVersion); + arguments.setMultiPlatform(multiPlatform); if (experimentalCoroutines != null) { - arguments.coroutinesState = experimentalCoroutines; + arguments.setCoroutinesState(experimentalCoroutines); } configureSpecificCompilerArguments(arguments, sourceRoots); @@ -460,24 +460,24 @@ public abstract class KotlinCompileMojoBase e throw new MojoExecutionException(e.getMessage()); } - if (arguments.noInline) { + if (arguments.getNoInline()) { getLog().info("Method inlining is turned off"); } List pluginClassPaths = getCompilerPluginClassPaths(); if (pluginClassPaths != null && !pluginClassPaths.isEmpty()) { - if (arguments.pluginClasspaths == null || arguments.pluginClasspaths.length == 0) { - arguments.pluginClasspaths = pluginClassPaths.toArray(new String[pluginClassPaths.size()]); + if (arguments.getPluginClasspaths() == null || arguments.getPluginClasspaths().length == 0) { + arguments.setPluginClasspaths(pluginClassPaths.toArray(new String[pluginClassPaths.size()])); } else { for (String path : pluginClassPaths) { - if (ArrayUtil.indexOf(arguments.pluginClasspaths, path) < 0) { - arguments.pluginClasspaths = ArrayUtil.append(arguments.pluginClasspaths, path); + if (ArrayUtil.indexOf(arguments.getPluginClasspaths(), path) < 0) { + arguments.setPluginClasspaths(ArrayUtil.append(arguments.getPluginClasspaths(), path)); } } } if (getLog().isDebugEnabled()) { - getLog().debug("Plugin classpaths are: " + Joiner.on(", ").join(arguments.pluginClasspaths)); + getLog().debug("Plugin classpaths are: " + Joiner.on(", ").join(arguments.getPluginClasspaths())); } } @@ -494,7 +494,7 @@ public abstract class KotlinCompileMojoBase e getLog().debug("Plugin options are: " + Joiner.on(", ").join(pluginArguments)); } - arguments.pluginOptions = pluginArguments.toArray(new String[pluginArguments.size()]); + arguments.setPluginOptions(pluginArguments.toArray(new String[pluginArguments.size()])); } } diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinTestCompileMojo.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinTestCompileMojo.java index 5311f271a2f..372c23f2731 100644 --- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinTestCompileMojo.java +++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinTestCompileMojo.java @@ -88,7 +88,7 @@ public class KotlinTestCompileMojo extends K2JVMCompileMojo { @Override protected void configureSpecificCompilerArguments(@NotNull K2JVMCompilerArguments arguments, @NotNull List sourceRoots) throws MojoExecutionException { classpath = testClasspath; - arguments.friendPaths = new String[] { output }; + arguments.setFriendPaths(new String[] { output }); output = testOutput; super.configureSpecificCompilerArguments(arguments, sourceRoots); } diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinTestJSCompilerMojo.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinTestJSCompilerMojo.java index 07f5e7234c3..ca3a53a44e3 100644 --- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinTestJSCompilerMojo.java +++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinTestJSCompilerMojo.java @@ -81,13 +81,13 @@ public class KotlinTestJSCompilerMojo extends K2JSCompilerMojo { @Override protected void configureSpecificCompilerArguments(@NotNull K2JSCompilerArguments arguments, @NotNull List sourceRoots) throws MojoExecutionException { List friends = getOutputDirectoriesCollector().getOrDefault(project.getArtifactId(), Collections.emptyList()); - arguments.friendModules = StringUtil.join(friends, File.pathSeparator); + arguments.setFriendModules(StringUtil.join(friends, File.pathSeparator)); output = testOutput; super.configureSpecificCompilerArguments(arguments, sourceRoots); - arguments.outputFile = outputFile; - arguments.metaInfo = metaInfo; + arguments.setOutputFile(outputFile); + arguments.setMetaInfo(metaInfo); } @Override diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/MetadataMojo.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/MetadataMojo.java index a4343ead37c..c72cbaf3d7b 100644 --- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/MetadataMojo.java +++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/MetadataMojo.java @@ -61,10 +61,10 @@ public class MetadataMojo extends KotlinCompileMojoBase sourceRoots) throws MojoExecutionException { - arguments.destination = output; - if (!arguments.multiPlatform) { + arguments.setDestination(output); + if (!arguments.getMultiPlatform()) { getLog().info("multiPlatform forced for metadata generation"); - arguments.multiPlatform = true; + arguments.setMultiPlatform(true); } List classpathList = filterClassPath(project.getBasedir(), classpath); @@ -73,7 +73,7 @@ public class MetadataMojo extends KotlinCompileMojoBase sourceRoots) throws MojoExecutionException { classpath = testClasspath; - arguments.friendPaths = new String[] { output }; + arguments.setFriendPaths(new String[] { output }); output = testOutput; super.configureSpecificCompilerArguments(arguments, sourceRoots); }