prepare pull request

2013-03-01 16:51:14 +04:00
parent 4b19adf4fd
commit c67b4e4627
29 changed files with 1057 additions and 27 deletions
@@ -56,6 +56,7 @@
        <module>tools/kotlin-compiler</module>
        <module>tools/kotlin-jdk-annotations</module>
        <module>tools/runtime</module>
+        <module>tools/kotlin-gradle-plugin</module>
        <module>tools/kotlin-maven-plugin</module>
        <module>tools/kotlin-js-library</module>
        <module>tools/kotlin-js-tests</module>
@@ -1,12 +0,0 @@
-apply plugin: 'groovy'
-apply plugin: 'java'
-
-dependencies {
-    compile gradleApi()
-    groovy localGroovy()
-}
-
-
-task wrapper(type: Wrapper) {
-    gradleVersion = '1.0-rc-2'
-}
@@ -0,0 +1,29 @@
+apply plugin: 'java'
+apply plugin: 'maven'
+
+version = '1.4'
+group = 'org.jetbrains.kotlin'
+
+
+repositories {
+    mavenCentral()
+    mavenLocal()
+}
+
+dependencies {
+    compile gradleApi()
+}
+
+
+jar {
+    from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
+    exclude('META-INF/*.SF', 'META-INF/*.DSA', 'META-INF/*.RSA') 
+}
+
+artifacts {
+    archives  jar
+}
+
+task wrapper(type: Wrapper) {
+    gradleVersion = '1.4'
+}
@@ -1,6 +1,6 @@
-#Wed Apr 25 20:28:41 MSK 2012
+#Thu Feb 21 16:54:17 MSK 2013
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.0-rc-2-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.4-bin.zip
@@ -101,7 +101,7 @@ if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
            warn "Could not set maximum file descriptor limit: $MAX_FD"
        fi
    else
-        warn "Could not query businessSystem maximum file descriptor limit: $MAX_FD_LIMIT"
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
    fi
 fi

@@ -0,0 +1 @@
+rootProject.name = 'gradle-api'
@@ -0,0 +1,7 @@
+<root>
+    <item name='org.gradle.api.Plugin void apply(T)'>
+        <annotation name='jet.runtime.typeinfo.KotlinSignature'>
+            <val name="value" val="&quot;fun apply(p0 : T) : Unit&quot;"/>
+        </annotation>
+    </item>
+</root>
@@ -0,0 +1,12 @@
+<root>
+    <item name='org.gradle.api.internal.HasConvention org.gradle.api.plugins.Convention getConvention()'>
+        <annotation name='jet.runtime.typeinfo.KotlinSignature'>
+            <val name="value" val="&quot;fun getConvention() : Convention&quot;"/>
+        </annotation>
+    </item>
+    <item name='org.gradle.api.internal.AbstractTask org.gradle.api.logging.Logger getLogger()'>
+        <annotation name='jet.runtime.typeinfo.KotlinSignature'>
+            <val name="value" val="&quot;fun getLogger() : Logger?&quot;"/>
+        </annotation>
+    </item>
+</root>
@@ -0,0 +1,13 @@
+<root>
+    <item name='org.gradle.api.plugins.Convention java.util.Map&lt;java.lang.String,java.lang.Object&gt; getPlugins()'>
+        <annotation name='jet.runtime.typeinfo.KotlinSignature'>
+            <val name="value" val="&quot;fun getPlugins() : MutableMap&lt;String, Any&gt;&quot;"/>
+        </annotation>
+    </item>
+    <item name='org.gradle.api.plugins.Convention org.gradle.api.internal.DynamicObject getExtensionsAsDynamicObject()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+        <annotation name='jet.runtime.typeinfo.KotlinSignature'>
+            <val name="value" val="&quot;fun getExtensionsAsDynamicObject() : DynamicObject&quot;"/>
+        </annotation>
+    </item>
+</root>
@@ -0,0 +1,7 @@
+<root>
+    <item name='org.gradle.api.tasks.SourceTask org.gradle.api.file.FileTree getSource()'>
+        <annotation name='jet.runtime.typeinfo.KotlinSignature'>
+            <val name="value" val="&quot;fun getSource() : FileTree&quot;"/>
+        </annotation>
+    </item>
+</root>
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+        xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+
+    <modelVersion>4.0.0</modelVersion>
+    <properties>
+        <maven.version>3.0.4</maven.version>
+    </properties>
+
+    <parent>
+        <groupId>org.jetbrains.kotlin</groupId>
+        <artifactId>kotlin-project</artifactId>
+        <version>0.1-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>kotlin-gradle-plugin</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>gradle-api</artifactId>
+            <version>1.4</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>12.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-compiler</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kdoc</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-runtime</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>6.8</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+
+    <build>
+        <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
+        <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
+
+        <resources>
+            <resource>
+                <!-- jdkAnnotations -->
+                <directory>${kotlin-sdk}/lib</directory>
+                <includes><include>kotlin-jdk-annotations.jar</include></includes>
+                <filtering>false</filtering>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <version>${project.version}</version>
+                <configuration>
+                    <annotationPaths>
+                        <annotationPath>${basedir}/kotlinAnnotation</annotationPath>
+                    </annotationPaths>
+                </configuration>
+
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <phase>compile</phase>
+                        <goals> <goal>compile</goal> </goals>
+                    </execution>
+
+                    <execution>
+                        <id>test-compile</id>
+                        <phase>test-compile</phase>
+                        <goals> <goal>test-compile</goal> </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-invoker-plugin</artifactId>
+                <version>1.8</version>
+                <configuration>
+                    <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+                    <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+                    <postBuildHookScript>verify</postBuildHookScript> <!-- no extension required -->
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>create_local</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>install</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
@@ -1,12 +0,0 @@
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-/**
- * Created by Nikita.Skvortsov
- * Date: 4/28/12, 6:38 PM
- */
-public class KotlinPlugin implements Plugin<Project> {
-    @Override
-    void apply(Project t) {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-}
@@ -0,0 +1,37 @@
+package org.jetbrains.kotlin.gradle.internal
+
+import org.gradle.api.file.SourceDirectorySet
+import groovy.lang.Closure
+import org.gradle.api.internal.file.FileResolver
+import org.gradle.api.internal.file.DefaultSourceDirectorySet
+import org.gradle.util.ConfigureUtil
+
+/**
+ * Created by Nikita.Skvortsov
+ * Date: 2/21/13, 5:51 PM
+ */
+
+trait KotlinSourceSet {
+
+    open fun getKotlin() : SourceDirectorySet
+    open fun kotlin(configureClosure : Closure<Any?>?) : KotlinSourceSet
+
+}
+
+
+open class KotlinSourceSetImpl(displayName : String?, resolver : FileResolver?) : KotlinSourceSet {
+
+    private val kotlin : DefaultSourceDirectorySet = DefaultSourceDirectorySet(displayName + " Kotlin source", resolver);
+    {
+        kotlin.getFilter()?.include("**/*.java", "**/*.kt")
+    }
+
+    override fun getKotlin() : SourceDirectorySet {
+        return kotlin
+    }
+
+    override fun kotlin(configureClosure : Closure<Any?>?) : KotlinSourceSet {
+        ConfigureUtil.configure(configureClosure, getKotlin())
+        return this
+    }
+}
@@ -0,0 +1,116 @@
+package org.jetbrains.kotlin.gradle.plugin
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.plugins.JavaBasePlugin
+import org.gradle.api.plugins.JavaPluginConvention
+import org.gradle.api.plugins.JavaPlugin
+import groovy.lang.Closure
+import org.gradle.api.tasks.SourceSet
+import org.jetbrains.kotlin.gradle.internal.KotlinSourceSetImpl
+import org.gradle.api.internal.project.ProjectInternal
+import org.gradle.api.internal.IConventionAware
+import org.gradle.api.internal.HasConvention
+import org.gradle.api.internal.file.collections.SimpleFileCollection
+import org.gradle.api.file.FileTreeElement
+import org.jetbrains.kotlin.gradle.internal.KotlinSourceSet
+import org.gradle.api.file.SourceDirectorySet
+import org.codehaus.groovy.runtime.MethodClosure
+import org.gradle.api.specs.Spec
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.tasks.KDoc
+import java.io.File
+import java.util.concurrent.Callable
+import org.gradle.api.Action
+import org.gradle.api.tasks.compile.AbstractCompile
+import java.util.Arrays
+
+
+/**
+ * Created by Nikita.Skvortsov
+ * Date: 2/21/13, 5:55 PM
+ */
+
+open class KotlinPlugin : Plugin<Project> {
+
+    public override fun apply(project: Project) {
+        val javaBasePlugin = project.getPlugins()?.apply(javaClass<JavaBasePlugin>())!!
+        val javaPluginConvention = project.getConvention()?.getPlugin(javaClass<JavaPluginConvention>())!!
+
+        project.getPlugins()?.apply(javaClass<JavaPlugin>())
+
+        configureSourceSetDefaults(project as ProjectInternal, javaBasePlugin, javaPluginConvention)
+        configureKDoc(project, javaPluginConvention)
+    }
+
+
+    private fun configureSourceSetDefaults( project: ProjectInternal,
+                                            javaBasePlugin: JavaBasePlugin,
+                                            javaPluginConvention: JavaPluginConvention) {
+        javaPluginConvention.getSourceSets()?.all(object : Action<SourceSet> {
+            override fun execute(sourceSet : SourceSet?) {
+                if (sourceSet is HasConvention) {
+                    val sourceSetName = sourceSet.getName()
+                    val kotlinSourceSet = KotlinSourceSetImpl(sourceSetName, project.getFileResolver())
+                    val kotlinDirSet = kotlinSourceSet.getKotlin()
+                    kotlinDirSet.srcDir(project.file("src/${sourceSetName}/kotlin"))
+
+                    sourceSet.getAllJava()?.source(kotlinDirSet)
+                    sourceSet.getAllSource()?.source(kotlinDirSet)
+                    sourceSet.getConvention().getPlugins().put("kotlin", kotlinSourceSet)
+
+                    sourceSet.getResources()?.getFilter()?.exclude(KSpec({ (elem: FileTreeElement) ->
+                        kotlinDirSet.contains(elem.getFile())
+                    }))
+
+                    val kotlinTaskName = sourceSet.getCompileTaskName("kotlin")
+                    val kotlinTask : KotlinCompile = project.getTasks()?.add(kotlinTaskName , javaClass<KotlinCompile>())!!
+
+                    javaBasePlugin.configureForSourceSet(sourceSet, kotlinTask)
+
+                    kotlinTask setDescription "Compiles the $sourceSet.kotlin."
+                    kotlinTask source kotlinDirSet
+
+                    val javaTask = project.getTasks()?.findByName(sourceSet.getCompileJavaTaskName()) as AbstractCompile?
+                    javaTask?.dependsOn(kotlinTaskName)
+
+                    val sourceSetCompileConfigurationName = if (sourceSetName.equals("main")) {
+                        "compile"
+                    } else {
+                        "${sourceSetName}Compile"
+                    }
+
+                    project.getDependencies()?.add(sourceSetCompileConfigurationName, project.files(kotlinTask.getDestinationDir()))
+                }
+            }
+        });
+    }
+
+    private fun configureKDoc(project: Project, javaPluginConvention: JavaPluginConvention) {
+        val mainSourceSet : HasConvention = javaPluginConvention.getSourceSets()?.getByName(SourceSet.MAIN_SOURCE_SET_NAME)!! as HasConvention
+
+        val kdoc : KDoc = project.getTasks()?.add(KDOC_TASK_NAME, javaClass<KDoc>())!!
+        kdoc.setDescription("Generates KDoc API documentation for the main source code.")
+        kdoc.setGroup(JavaBasePlugin.DOCUMENTATION_GROUP)
+        kdoc.setSource(mainSourceSet.getConvention().getExtensionsAsDynamicObject().getProperty("kotlin"))
+
+        project.getTasks()?.withType(javaClass<KDoc>(), object : Action<KDoc> {
+            override fun execute(param : KDoc?) {
+                param?.getConventionMapping()?.map("destinationDir", object : Callable<Any> {
+                    override fun call() : Any {
+                        return File(javaPluginConvention.getDocsDir(), "kdoc");
+                    }
+                })
+            }
+        })
+    }
+
+    public val KDOC_TASK_NAME : String = "kdoc"
+}
+
+
+open class KSpec<T : Any?>(val predicate : (T) -> Boolean) : Spec<T> {
+    public override fun isSatisfiedBy(p0: T?): Boolean {
+        return p0 != null && predicate(p0)
+    }
+}
@@ -0,0 +1,215 @@
+package org.jetbrains.kotlin.gradle.tasks
+
+import org.gradle.api.tasks.compile.AbstractCompile
+import org.jetbrains.jet.cli.jvm.K2JVMCompiler
+import org.jetbrains.jet.cli.jvm.K2JVMCompilerArguments
+import org.jetbrains.kotlin.gradle.plugin.KSpec
+import java.io.File
+import org.gradle.api.GradleException
+import org.jetbrains.jet.cli.common.ExitCode
+import org.gradle.api.Task
+import org.gradle.api.tasks.SourceTask
+import org.jetbrains.kotlin.doc.KDocArguments
+import org.jetbrains.kotlin.doc.KDocConfig
+import java.util.HashMap
+import java.util.HashSet
+import org.jetbrains.kotlin.doc.KDocCompiler
+import org.gradle.api.tasks.TaskAction
+import java.util.LinkedList
+import com.google.common.io.Resources
+import java.net.URL
+import com.google.common.io.Files
+import org.gradle.api.file.SourceDirectorySet
+import com.google.common.base.Joiner
+
+/**
+ * Created by Nikita.Skvortsov
+ * Date: 2/22/13, 2:56 PM
+ */
+
+open class KotlinCompile() : AbstractCompile() {
+
+    val srcDirsRoots = HashSet<File>()
+    val compiler = K2JVMCompiler()
+    val logger = getLogger()
+
+    // override setSource to track source directory sets
+    override fun setSource(source : Any?) {
+        srcDirsRoots.clear()
+        if (source is SourceDirectorySet) {
+            srcDirsRoots.addAll(source.getSrcDirs())
+        }
+        super.setSource(source)
+    }
+
+    // override source to track source directory sets
+    override fun source(vararg  sources : Any?) : SourceTask? {
+        for (source in sources) {
+            if (source is SourceDirectorySet) {
+                srcDirsRoots.addAll(source.getSrcDirs())
+            }
+        }
+        return super.source(sources)
+    }
+
+    fun findSrcDirRoot(file : File) : String {
+        val absPath = file.getAbsolutePath()
+        for (root in srcDirsRoots) {
+            val rootAbsPath = root.getAbsolutePath()
+            if (absPath.contains(rootAbsPath)) {
+                return rootAbsPath
+            }
+        }
+        return ""
+    }
+
+
+    override fun compile() {
+
+        val args = K2JVMCompilerArguments();
+        val javaSrcRoots = HashSet<String>()
+
+        val sources : MutableList<String> = LinkedList<String>()
+
+        // collect source directory roots for all java files to allow cross compilation
+        getSource().mapTo(sources, { (f : File) : String ->
+            if (f.getName().endsWith(".java")) {
+                val javaRoot = findSrcDirRoot(f)
+                if (javaRoot.length() > 0) {
+                    javaSrcRoots.add(javaRoot)
+                }
+                ""
+            } else {
+                f.getAbsolutePath()
+            }
+        })
+
+        args.setSourceDirs(sources.filter { it.length() > 0 })
+
+        val joiner = Joiner.on(File.pathSeparator)!!
+        val gradleClasspath = getClasspath()?.filter(KSpec<File?>({ it != null && it.isAbsolute() }))?.getAsPath()
+        val javaSrcClasspath = joiner.join(javaSrcRoots)
+        val effectiveClassPath = joiner.join(javaSrcClasspath, gradleClasspath)
+
+        if (effectiveClassPath != null && effectiveClassPath.length() > 0) {
+            args.setClasspath(effectiveClassPath)
+        }
+
+        args.outputDir = (getDestinationDir()?.getPath())
+        args.noJdkAnnotations = true
+        args.annotations = getAnnotations()
+        args.noStdlib = true
+
+        val exitCode = compiler.exec(System.err, args)
+
+        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")
+            else -> ""
+        }
+
+    }
+
+    fun getAnnotations() : String? {
+        val jdkAnnotations : String = "kotlin-jdk-annotations.jar"
+        val jdkAnnotationsResource : URL? = Resources.getResource(jdkAnnotations)
+        if (jdkAnnotationsResource == null) {
+            return null
+        }
+
+        // todo fix leak of deleteOnExit handlers
+        val jdkAnnotationsTempDir : File? = Files.createTempDir()
+        jdkAnnotationsTempDir?.deleteOnExit()
+        val jdkAnnotationsFile : File = File(jdkAnnotationsTempDir, jdkAnnotations)
+
+        Files.copy(Resources.newInputStreamSupplier(jdkAnnotationsResource), jdkAnnotationsFile)
+        return jdkAnnotationsFile.getPath()
+    }
+}
+
+
+
+open class KDoc() : SourceTask() {
+
+    /**
+     * Returns the directory to use to output the API docs
+     */
+    public var destinationDir : String = ""
+
+    /**
+     * Returns the name of the documentation set
+     */
+    public var title : String = ""
+
+    /**
+     * Returns the version name of the documentation set
+     */
+    public var version : String = ""
+
+    /**
+     * Returns a map of the package prefix to the HTML URL for the root of the apidoc using javadoc/kdoc style
+     * directory layouts so that this API doc report can link to external packages
+     */
+    public var packagePrefixToUrls : Map<String, String> = HashMap()
+
+    /**
+     * Returns a Set of the package name prefixes to ignore from the KDoc report
+     */
+    public var ignorePackages : Set<String> = HashSet()
+
+    /**
+     * Returns true if a warning should be generated if there are no comments
+     * on documented function or property
+     */
+    public var warnNoComments : Boolean = true
+
+    /**
+     * Returns the HTTP URL of the root directory of source code that we should link to
+     */
+    public var sourceRootHref : String = ""
+
+    /**
+     * The root project directory used to deduce relative file names when linking to source code
+     */
+    public var projectRootDir : String = ""
+
+    /**
+     * A map of package name to html or markdown files used to describe the package. If none is
+     * speciied we will look for a package.html or package.md file in the source tree
+     */
+    public var packageDescriptionFiles : Map<String,String> = HashMap()
+
+    /**
+     * A map of package name to summary text used in the package overviews
+     */
+    public var packageSummaryText : Map<String,String> = HashMap()
+
+
+    TaskAction fun generateDocs() {
+        val args : KDocArguments  = KDocArguments()
+        val cfg : KDocConfig = args.docConfig
+
+        cfg.docOutputDir = destinationDir
+        cfg.title = title
+        cfg.sourceRootHref = sourceRootHref
+        cfg.projectRootDir = projectRootDir
+        cfg.warnNoComments = warnNoComments
+
+        cfg.packagePrefixToUrls.putAll(packagePrefixToUrls)
+        cfg.ignorePackages.addAll(ignorePackages)
+        cfg.packageDescriptionFiles.putAll(packageDescriptionFiles)
+        cfg.packageSummaryText.putAll(packageSummaryText)
+
+        val compiler : KDocCompiler = KDocCompiler()
+
+        val exitCode = compiler.exec(System.err, args);
+
+        when (exitCode) {
+            ExitCode.COMPILATION_ERROR -> throw GradleException("Failed to generate kdoc. See log for more details")
+            ExitCode.INTERNAL_ERROR -> throw GradleException("Internal generation error. See log for more details")
+            else -> ""
+        }
+
+    }
+}
+
@@ -0,0 +1,103 @@
+package org.jetbrains.kotlin.gradle
+
+import com.google.common.io.Files
+import com.intellij.openapi.util.SystemInfo
+import java.io.File
+import java.util.Arrays
+import java.util.Scanner
+import org.testng.Assert.*
+import org.testng.annotations.AfterMethod
+import org.testng.annotations.BeforeMethod
+import org.testng.annotations.Test
+
+/**
+ * Created by Nikita.Skvortsov
+ * Date: 2/27/13, 5:02 PM
+ */
+
+
+class BasicKotlinGradleIT {
+
+    var workingDir : File = File(".")
+
+    BeforeMethod fun setUp() {
+        workingDir = Files.createTempDir()!!
+        workingDir.mkdirs()
+        copyRecursively(File("src/test/resources/testProject/alfa"), workingDir)
+    }
+
+
+    AfterMethod fun tearDown() {
+        deleteRecursively(workingDir)
+    }
+
+    Test fun testSimpleCompile() {
+        val projectDir = File(workingDir, "alfa")
+
+        val pathToKotlinPlugin = "-PpathToKotlinPlugin=" + File("target/local-repo").getAbsolutePath()
+        val cmd =   if (SystemInfo.isWindows)
+                        Arrays.asList("cmd", "/C", "gradlew.bat", "clean", "compileDeployKotlin", "build", pathToKotlinPlugin, "--no-daemon")
+                    else
+                        Arrays.asList("./gradlew", "clean", "compileDeployKotlin", "build", pathToKotlinPlugin, "--no-daemon")
+
+        val builder : ProcessBuilder = ProcessBuilder(cmd)
+        builder.directory(projectDir)
+
+        builder.redirectErrorStream(true)
+        val process : Process =  builder.start()
+
+        val s : Scanner = Scanner(process.getInputStream()!!)
+        val text : StringBuilder = StringBuilder()
+        while (s.hasNextLine()) {
+            text append s.nextLine()
+            text append "\n"
+        }
+        s.close()
+
+        val result = process.waitFor()
+        val buildOutput = text.toString()
+
+        println(buildOutput)
+
+        assertEquals(result, 0)
+        assertTrue(buildOutput.contains(":compileKotlin"), "Should contain ':compileKotlin'")
+        assertTrue(buildOutput.contains(":compileTestKotlin"), "Should contain ':compileTestKotlin'")
+        assertTrue(buildOutput.contains(":compileDeployKotlin"), "Should contain ':compileDeployKotlin'")
+    }
+
+
+    fun copyRecursively(source: File, target: File) {
+        assertTrue(target.isDirectory())
+        val targetFile = File(target, source.getName())
+        if (source.isDirectory()) {
+            targetFile.mkdir()
+            val array = source.listFiles()
+            if (array != null) {
+                for (child in array) {
+                    copyRecursively(child,targetFile)
+                }
+            }
+        } else {
+            Files.copy(source, targetFile)
+        }
+    }
+
+
+    fun deleteRecursively(f : File): Unit {
+        if (f.isDirectory()) {
+            val children = f.listFiles()
+            if (children != null) {
+                for (child in children) {
+                    deleteRecursively(child)
+                }
+            }
+            val shouldBeEmpty = f.listFiles()
+            if (shouldBeEmpty != null) {
+                assertTrue(shouldBeEmpty.isEmpty())
+            } else {
+                fail("Error listing directory content")
+            }
+        }
+        f.delete()
+    }
+}
@@ -0,0 +1,37 @@
+import org.jetbrains.kotlin.gradle.plugin.*
+buildscript {
+  repositories {
+    mavenCentral()
+    maven {
+        url 'file://' + pathToKotlinPlugin
+    }
+  }
+  dependencies {
+    classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:0.1-SNAPSHOT'
+  }
+}
+
+apply plugin: KotlinPlugin
+
+sourceSets {
+ deploy
+}
+
+repositories {
+  mavenLocal()
+  mavenCentral()
+}
+
+dependencies {
+    compile 'com.google.guava:guava:12.0'
+    deployCompile 'com.google.guava:guava:12.0'
+    testCompile  'org.testng:testng:6.8'
+}
+
+task show << {
+   buildscript.configurations.classpath.each { println it }
+}
+
+task wrapper(type: Wrapper) {
+  gradleVersion="1.4"
+}
@@ -0,0 +1,6 @@
+#Thu Feb 28 14:00:49 MSK 2013
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.4-bin.zip
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
@@ -0,0 +1,12 @@
+package demo 
+
+import com.google.common.primitives.Ints
+import com.google.common.base.Joiner
+
+class ExampleSource(param : Int) {
+  val property = param
+  fun f() : String? {
+    return "Hello World"
+  }
+}
+
@@ -0,0 +1,17 @@
+package demo;
+
+/**
+ * Created by Nikita.Skvortsov
+ * Date: 3/1/13, 10:53 AM
+ */
+public class Greeter {
+    private final String myGreeting;
+
+    public Greeter(String greeting) {
+        myGreeting = greeting;
+    }
+
+    public String getGreeting() {
+        return myGreeting;
+    }
+}
@@ -0,0 +1,18 @@
+package demo;
+
+/**
+ * Created by Nikita.Skvortsov
+ * Date: 3/1/13, 10:50 AM
+ */
+public class HelloWorld {
+    public static void main(String[] args) {
+        final KotlinGreetingJoiner example = new KotlinGreetingJoiner(new Greeter("Hi"));
+
+        example.addName("Harry");
+        example.addName("Ron");
+        example.addName(null);
+        example.addName("Hermione");
+
+        System.out.println(example.getJoinedGreeting());
+    }
+}
@@ -0,0 +1,20 @@
+package demo 
+
+import com.google.common.primitives.Ints
+import com.google.common.base.Joiner
+import java.util.ArrayList
+
+class KotlinGreetingJoiner(val greeter : Greeter) {
+
+    val names = ArrayList<String?>()
+
+    fun addName(name : String?): Unit{
+        names.add(name)
+    }
+
+  fun getJoinedGreeting() : String? {
+    val joiner = Joiner.on(" and ")?.skipNulls();
+    return "${greeter.getGreeting()} ${joiner?.join(names)}"
+  }
+}
+
@@ -0,0 +1,21 @@
+package demo 
+
+import com.google.common.primitives.Ints
+import com.google.common.base.Joiner
+import org.testng.Assert.*
+import org.testng.annotations.AfterMethod
+import org.testng.annotations.BeforeMethod
+import org.testng.annotations.Test as test
+
+class TestSource() {
+    test fun f() {
+        val example : KotlinGreetingJoiner = KotlinGreetingJoiner(Greeter("Hi"))
+        example.addName("Harry")
+        example.addName("Ron")
+        example.addName(null)
+        example.addName("Hermione")
+
+        assertEquals(example.getJoinedGreeting(), "Hi Harry and Ron and Hermione")
+    }
+}
+