Support default module name for withKotlin ant task

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

@@ -70,12 +70,9 @@ public class Kotlin2JvmTask : KotlinCompilerBaseTask() {
             args.add(it.list().join(pathSeparator))
         }
 
+
         if (moduleName == null) {
-            if (owningTarget != null) {
-                moduleName = owningTarget.name
-            } else if (getProject() != null) {
-                moduleName = getProject().name
-            }
+            moduleName = defaultModuleName
         }
 
         moduleName?.let {

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

@@ -17,6 +17,7 @@
 package org.jetbrains.kotlin.ant
 
 import org.apache.tools.ant.AntClassLoader
+import org.apache.tools.ant.Task
 import org.jetbrains.kotlin.preloading.ClassPreloadingUtils
 import org.jetbrains.kotlin.preloading.Preloader
 import java.io.File
@@ -63,4 +64,8 @@ object KotlinAntTaskUtil {
 
         return classLoader
     }
+
 }
+
+public val Task.defaultModuleName: String?
+    get() = owningTarget?.name ?: project?.name

ant/src/org/jetbrains/kotlin/ant/KotlinCompilerAdapter.java

@@ -92,6 +92,9 @@ public class KotlinCompilerAdapter extends Javac13 {
 
         kotlinc.setExternalAnnotations(externalAnnotations);
 
+        if (moduleName == null) {
+            moduleName = AntPackage.getDefaultModuleName(javac);
+        }
         kotlinc.setModuleName(moduleName);
 
         kotlinc.getAdditionalArguments().addAll(additionalArguments);