Ant task: do not include runtime by default if destination is a jar

ant/src/org/jetbrains/kotlin/ant/Kotlin2JvmTask.kt

@@ -26,7 +26,7 @@ import java.io.File.separator
 class Kotlin2JvmTask : KotlinCompilerBaseTask() {
     override val compilerFqName = "org.jetbrains.kotlin.cli.jvm.K2JVMCompiler"
 
-    var includeRuntime: Boolean = true
+    var includeRuntime: Boolean = false
     var moduleName: String? = null
 
     var noReflect: Boolean = false

compiler/testData/integration/ant/jvm/doNotIncludeRuntimeByDefault/build.log.expected

@@ -0,0 +1,16 @@
+OUT:
+Buildfile: [TestData]/build.xml
+
+test1:
+  [kotlinc] Compiling [[TestData]/test.kt] => [[Temp]/test.jar]
+
+test2:
+  [kotlinc] Compiling [[TestData]/test.kt] => [[Temp]/test.jar]
+
+test3:
+  [kotlinc] Compiling [[TestData]/test.kt] => [[Temp]/test.jar]
+
+BUILD SUCCESSFUL
+Total time: [time]
+
+Return code: 0

compiler/testData/integration/ant/jvm/doNotIncludeRuntimeByDefault/build.xml

@@ -0,0 +1,41 @@
+<project name="Ant Task Test" default="test3">
+    <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+
+    <target name="test1" description="destination is a jar and attribute includeRuntime is not specified">
+        <kotlinc src="${test.data}/test.kt" output="${temp}/test.jar"/>
+
+        <java classname="TestKt" description="check the resulting jar">
+            <classpath>
+                <pathelement location="${temp}/test.jar"/>
+                <pathelement location="${kotlin.runtime.jar}"/>
+            </classpath>
+            <arg value="${temp}/test.jar"/>
+            <arg value="false" description="if includeRuntime is specified to be true"/>
+        </java>
+    </target>
+
+    <target name="test2" description="destination is a jar and attribute includeRuntime is specified to be false" depends="test1">
+        <kotlinc src="${test.data}/test.kt" output="${temp}/test.jar" includeRuntime="false"/>
+
+        <java classname="TestKt" description="check the resulting jar">
+            <classpath>
+                <pathelement location="${temp}/test.jar"/>
+                <pathelement location="${kotlin.runtime.jar}"/>
+            </classpath>
+            <arg value="${temp}/test.jar"/>
+            <arg value="false" description="if includeRuntime is specified to be true"/>
+        </java>
+    </target>
+
+    <target name="test3" description="destination is a jar and attribute includeRuntime is specified to be true" depends="test2">
+        <kotlinc src="${test.data}/test.kt" output="${temp}/test.jar" includeRuntime="true"/>
+
+        <java classname="TestKt">
+            <classpath>
+                <pathelement location="${temp}/test.jar"/>
+            </classpath>
+            <arg value="${temp}/test.jar"/>
+            <arg value="true" description="if includeRuntime is specified to be true"/>
+        </java>
+    </target>
+</project>

compiler/testData/integration/ant/jvm/doNotIncludeRuntimeByDefault/test.kt

@@ -0,0 +1,14 @@
+import java.io.File
+import java.util.jar.JarFile
+
+fun main(args: Array<String>) {
+    val jar = File(args[0])
+    // if "includeRuntime" is specified to be true
+    var specifiedBeTrue = args[1].toBoolean()
+    for (entry in JarFile(jar).entries()) {
+        if (!specifiedBeTrue && entry.name.startsWith("kotlin/")) {
+            println("Error: Kotlin runtime is expected to be excluded if the attribute \"includeRuntime\" is not specified to be true")
+            break;
+        }
+    }
+}

compiler/testData/integration/ant/jvm/kt11995/build.xml

@@ -2,7 +2,7 @@
     <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
 
     <target name="build">
-        <kotlinc src="${test.data}/test.kt" classpath="${test.data}/Kt11995.jar" output="${temp}/test.jar" nowarn="true" />
+        <kotlinc src="${test.data}/test.kt" classpath="${test.data}/Kt11995.jar" output="${temp}/test.jar" nowarn="true" includeRuntime="true"/>
 
         <exec executable="java">
             <arg line="-classpath ${temp}/test.jar foo.TestKt"/>

compiler/tests-gen/org/jetbrains/kotlin/integration/AntTaskTestGenerated.java

@@ -39,6 +39,11 @@ public class AntTaskTestGenerated extends AbstractAntTaskTest {
         runTest("compiler/testData/integration/ant/jvm/doNotFailOnError/");
     }
 
+    @TestMetadata("doNotIncludeRuntimeByDefault")
+    public void testDoNotIncludeRuntimeByDefault() throws Exception {
+        runTest("compiler/testData/integration/ant/jvm/doNotIncludeRuntimeByDefault/");
+    }
+
     @TestMetadata("failOnErrorByDefault")
     public void testFailOnErrorByDefault() throws Exception {
         runTest("compiler/testData/integration/ant/jvm/failOnErrorByDefault/");