Merge pull request #233 from nskvortsov/master

Kotlin Gradle plugin improvements

libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/annotations.xml

@@ -10,4 +10,9 @@
     <item name='org.gradle.api.Project org.gradle.api.plugins.Convention getConvention()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.gradle.api.Project org.gradle.api.initialization.dsl.ScriptHandler getBuildscript()'>
+        <annotation name='jet.runtime.typeinfo.KotlinSignature'>
+            <val name="value" val="&quot;fun getBuildscript() : ScriptHandler&quot;"/>
+        </annotation>
+    </item>
 </root>

libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/initialization/dsl/annotations.xml

@@ -0,0 +1,7 @@
+<root>
+    <item name='org.gradle.api.initialization.dsl.ScriptHandler org.gradle.api.artifacts.ConfigurationContainer getConfigurations()'>
+        <annotation name='jet.runtime.typeinfo.KotlinSignature'>
+            <val name="value" val="&quot;fun getConfigurations() : ConfigurationContainer&quot;"/>
+        </annotation>
+    </item>
+</root>

libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/internal/annotations.xml

@@ -7,4 +7,9 @@
     <item name='org.gradle.api.internal.AbstractTask org.gradle.api.logging.Logger getLogger()'>
         <annotation name='org.jetbrains.annotations.NotNull'/>
     </item>
+    <item name='org.gradle.api.internal.AbstractTask org.gradle.api.Project getProject()'>
+        <annotation name='jet.runtime.typeinfo.KotlinSignature'>
+            <val name="value" val="&quot;fun getProject() : Project&quot;"/>
+        </annotation>
+    </item>
 </root>

libraries/tools/kotlin-gradle-plugin/pom.xml

@@ -26,6 +26,11 @@
             <version>4.11</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+        	<groupId>commons-lang</groupId>
+        	<artifactId>commons-lang</artifactId>
+        	<version>2.3</version>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -47,6 +52,11 @@
             <artifactId>kotlin-compiler</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-jdk-annotations</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kdoc</artifactId>
@@ -71,6 +81,9 @@
                 <includes><include>kotlin-jdk-annotations.jar</include></includes>
                 <filtering>false</filtering>
             </resource>
+            <resource>
+                <directory>${project.basedir}/src/main/resources</directory>
+            </resource>
         </resources>
 
         <plugins>

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt

@@ -30,12 +30,21 @@ import org.gradle.api.logging.Logger
 import org.gradle.api.logging.Logging
 import org.apache.commons.io.FileUtils
 import java.io.IOException
+import org.apache.commons.lang.StringUtils
+import org.gradle.api.initialization.dsl.ScriptHandler
 
 public open class KotlinCompile(): AbstractCompile() {
 
     val srcDirsRoots = HashSet<File>()
     val compiler = K2JVMCompiler()
-    val logger = getLogger()
+    val logger = Logging.getLogger(getClass())
+
+    public val kotlinOptions: K2JVMCompilerArguments = K2JVMCompilerArguments();
+
+    {
+        kotlinOptions.noStdlib = true
+        kotlinOptions.noJdkAnnotations = true
+    }
 
     // override setSource to track source directory sets
     override fun setSource(source: Any?) {
@@ -70,7 +79,7 @@ public open class KotlinCompile(): AbstractCompile() {
 
     override fun compile() {
 
-        val args = K2JVMCompilerArguments()
+        val args = kotlinOptions
 
         val javaSrcRoots = HashSet<File>()
         val sources = ArrayList<File>()
@@ -92,31 +101,25 @@ public open class KotlinCompile(): AbstractCompile() {
             return
         }
 
-        args.setSourceDirs(sources.map { it.getAbsolutePath() })
+        val customSources = args.getSourceDirs();
+        if (customSources == null || customSources.isEmpty()) {
+            args.setSourceDirs(sources.map { it.getAbsolutePath() })
+        }
 
-        val gradleClasspath = getClasspath()
-        val effectiveClassPath = (javaSrcRoots + gradleClasspath).makeString(File.pathSeparator)
 
-        args.setClasspath(effectiveClassPath)
+        if (StringUtils.isEmpty(kotlinOptions.classpath)) {
+            val existingClasspathEntries =  getClasspath().filter(KSpec<File?>({ it != null && it.exists() }))
+            val effectiveClassPath = (javaSrcRoots + existingClasspathEntries).makeString(File.pathSeparator)
+            args.setClasspath(effectiveClassPath)
+        }
 
         val embeddedAnnotations = getAnnotations()
+        args.outputDir =if (StringUtils.isEmpty(kotlinOptions.outputDir)) { getDestinationDir()?.getPath() } else { kotlinOptions.outputDir }
+        args.annotations = if (StringUtils.isEmpty(kotlinOptions.annotations)) { embeddedAnnotations.getPath() } else { kotlinOptions.annotations }
 
-        args.outputDir = getDestinationDir()?.getPath()
-        args.noJdkAnnotations = true
-        args.annotations = embeddedAnnotations.getPath()
-        args.noStdlib = true
-
-        val logger = Logging.getLogger(getClass())
         val messageCollector = GradleMessageCollector(logger)
         val exitCode = compiler.exec(messageCollector, args)
 
-        val annotationsDir = embeddedAnnotations.getParentFile()
-        try {
-            FileUtils.deleteDirectory(annotationsDir);
-        } catch (e : IOException) {
-            logger.warn("Could not delete temporary annotations directory " + annotationsDir, e)
-        }
-
         when (exitCode) {
             ExitCode.COMPILATION_ERROR -> throw GradleException("Compilation error. See log for more details")
             ExitCode.INTERNAL_ERROR -> throw GradleException("Internal compiler error. See log for more details")
@@ -125,20 +128,26 @@ public open class KotlinCompile(): AbstractCompile() {
     }
 
     fun getAnnotations(): File {
-        val jdkAnnotations: String = "kotlin-jdk-annotations.jar"
-        val jdkAnnotationsResource = Resources.getResource(jdkAnnotations) ?:
-                                     throw GradleException(jdkAnnotations + " not found in Kotlin gradle plugin classpath")
+        val configuration = getProject()
+                .getBuildscript()
+                .getConfigurations()
+                .getByName(ScriptHandler.CLASSPATH_CONFIGURATION)!!
 
-        val jdkAnnotationsTempDir = Files.createTempDir()
-        val jdkAnnotationsFile = File(jdkAnnotationsTempDir, jdkAnnotations)
+        val jdkAnnotationsFromClasspath = configuration.find { it.name.startsWith("kotlin-jdk-annotations") }
 
-        Files.copy(Resources.newInputStreamSupplier(jdkAnnotationsResource), jdkAnnotationsFile)
-        return jdkAnnotationsFile
+        if (jdkAnnotationsFromClasspath != null) {
+            logger.info("using jdk annontations from [${jdkAnnotationsFromClasspath.getAbsolutePath()}]")
+            return jdkAnnotationsFromClasspath
+        } else {
+            throw GradleException("kotlin-jdk-annotations not found in Kotlin gradle plugin classpath")
+        }
     }
 }
 
 public open class KDoc(): SourceTask() {
 
+    val logger = Logging.getLogger(getClass())
+
     /**
      * Returns the directory to use to output the API docs
      */
@@ -210,7 +219,6 @@ public open class KDoc(): SourceTask() {
 
         val compiler = KDocCompiler()
 
-        val logger = Logging.getLogger(getClass())
         val messageCollector = GradleMessageCollector(logger)
         val exitCode = compiler.exec(messageCollector, args);
 
@@ -231,10 +239,10 @@ class GradleMessageCollector(val logger : Logger): MessageCollector {
         val text = position + message
 
         when (severity) {
-          in CompilerMessageSeverity.VERBOSE -> logger.debug(text)
-          in CompilerMessageSeverity.ERRORS -> logger.error(text)
-          CompilerMessageSeverity.INFO -> logger.info(text)
-          else -> logger.warn(text)
+            in CompilerMessageSeverity.VERBOSE -> logger.debug(text)
+            in CompilerMessageSeverity.ERRORS -> logger.error(text)
+            CompilerMessageSeverity.INFO -> logger.info(text)
+            else -> logger.warn(text)
         }
     }
 }

libraries/tools/kotlin-gradle-plugin/src/main/resources/META-INF/gradle-plugins/kotlin.properties

@@ -0,0 +1 @@
+implementation-class=org.jetbrains.kotlin.gradle.plugin.KotlinPlugin

libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/build.gradle

@@ -1,4 +1,3 @@
-import org.jetbrains.kotlin.gradle.plugin.*
 buildscript {
   repositories {
     mavenCentral()
@@ -11,7 +10,7 @@ buildscript {
   }
 }
 
-apply plugin: KotlinPlugin
+apply plugin: "kotlin"
 
 sourceSets {
  deploy
@@ -32,6 +31,12 @@ task show << {
    buildscript.configurations.classpath.each { println it }
 }
 
+
+compileKotlin {
+    kotlinOptions.annotations = "externalAnnotations"
+}
+
+
 task wrapper(type: Wrapper) {
   gradleVersion="1.4"
 }

libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/externalAnnotations/com/google/common/base/annotations.xml

@@ -0,0 +1,18 @@
+<root>
+    <item name='com.google.common.base.Joiner com.google.common.base.Joiner on(java.lang.String)'>
+        <annotation name='jet.runtime.typeinfo.KotlinSignature'>
+            <val name="value" val="&quot;fun on(separator : String?) : Joiner&quot;"/>
+        </annotation>
+    </item>
+    <item name='com.google.common.base.Joiner com.google.common.base.Joiner.MapJoiner withKeyValueSeparator(java.lang.String)'>
+        <annotation name='jet.runtime.typeinfo.KotlinSignature'>
+            <val name="value"
+                 val="&quot;fun withKeyValueSeparator(keyValueSeparator : String?) : Joiner.MapJoiner?&quot;"/>
+        </annotation>
+    </item>
+    <item name='com.google.common.base.Joiner com.google.common.base.Joiner skipNulls()'>
+        <annotation name='jet.runtime.typeinfo.KotlinSignature'>
+            <val name="value" val="&quot;fun skipNulls() : Joiner&quot;"/>
+        </annotation>
+    </item>
+</root>

libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/src/main/kotlin/helloWorld.kt

@@ -13,8 +13,8 @@ class KotlinGreetingJoiner(val greeter : Greeter) {
     }
 
   fun getJoinedGreeting() : String? {
-    val joiner = Joiner.on(" and ")?.skipNulls();
-    return "${greeter.getGreeting()} ${joiner?.join(names)}"
+    val joiner = Joiner.on(" and ").skipNulls();
+    return "${greeter.getGreeting()} ${joiner.join(names)}"
   }
 }