From d0b241b6815a713e2a48c77d01aaf2b155cb9610 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 8 Oct 2019 14:15:06 +0200 Subject: [PATCH] Minor, fix typo in -include-runtime argument help #KT-34240 Fixed --- .../kotlin/cli/common/arguments/K2JVMCompilerArguments.kt | 2 +- compiler/testData/cli/jvm/help.out | 2 +- .../kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt index 31a03bbf26d..512e75094f4 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt @@ -22,7 +22,7 @@ class K2JVMCompilerArguments : CommonCompilerArguments() { var classpath: String? by NullableStringFreezableVar(null) @GradleOption(DefaultValues.BooleanFalseDefault::class) - @Argument(value = "-include-runtime", description = "Include Kotlin runtime in to resulting .jar") + @Argument(value = "-include-runtime", description = "Include Kotlin runtime into the resulting .jar") var includeRuntime: Boolean by FreezableVar(false) @GradleOption(DefaultValues.StringNullDefault::class) diff --git a/compiler/testData/cli/jvm/help.out b/compiler/testData/cli/jvm/help.out index af969a2a1b5..91618862347 100644 --- a/compiler/testData/cli/jvm/help.out +++ b/compiler/testData/cli/jvm/help.out @@ -2,7 +2,7 @@ Usage: kotlinc-jvm where possible options include: -classpath (-cp) Paths where to find user class files -d Destination for generated class files - -include-runtime Include Kotlin runtime in to resulting .jar + -include-runtime Include Kotlin runtime into the resulting .jar -java-parameters Generate metadata for Java 1.8 reflection on method parameters -jdk-home Path to JDK home directory to include into classpath, if differs from default JAVA_HOME -jvm-target Target version of the generated JVM bytecode (1.6, 1.8, 9, 10, 11 or 12), default is 1.6 diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt index a95c9d8a475..7c421c77578 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.gradle.dsl interface KotlinJvmOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions { /** - * Include Kotlin runtime in to resulting .jar + * Include Kotlin runtime into the resulting .jar * Default value: false */ var includeRuntime: kotlin.Boolean