Merge branch 'master' into idea13

Conflicts: idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java libraries/stdlib/src/kotlin/properties/Properties.kt libraries/stdlib/test/properties/delegation/DelegationTest.kt libraries/stdlib/test/properties/delegation/MapDelegationTest.kt libraries/stdlib/test/properties/delegation/lazy/LazyValuesTest.kt update_dependencies.xml
2013-06-04 11:26:36 +04:00
parent fc3a413fba acbccb9411
commit 8429162220
198 changed files with 3212 additions and 550 deletions
@@ -57,6 +57,7 @@
        <module>tools/kotlin-jdk-annotations</module>
        <module>tools/runtime</module>
        <module>tools/kotlin-gradle-plugin</module>
+        <module>tools/kotlin-gradle-plugin-core</module>
        <module>tools/kotlin-maven-plugin</module>
        <module>tools/kotlin-js-library</module>
        <module>tools/kotlin-js-tests</module>
@@ -0,0 +1,175 @@
+package kotlin.properties
+
+public trait ReadOnlyProperty<in R, out T> {
+    public fun get(thisRef: R, desc: PropertyMetadata): T
+}
+
+public trait ReadWriteProperty<in R, T> {
+    public fun get(thisRef: R, desc: PropertyMetadata): T
+    public fun set(thisRef: R, desc: PropertyMetadata, value: T)
+}
+
+public object Delegates {
+    public fun notNull<T: Any>(): ReadWriteProperty<Any?, T> = NotNullVar()
+
+    public fun lazy<T>(initializer: () -> T): ReadOnlyProperty<Any?, T> = LazyVal(initializer)
+    public fun blockingLazy<T>(lock: Any? = null, initializer: () -> T): ReadOnlyProperty<Any?, T> = BlockingLazyVal(lock, initializer)
+
+    public fun observable<T>(initial: T, onChange: (desc: PropertyMetadata, oldValue: T, newValue: T) -> Unit): ReadWriteProperty<Any?, T> {
+        return ObservableProperty<T>(initial) { (desc, old, new) ->
+            onChange(desc, old, new)
+            true
+        }
+    }
+
+    public fun vetoable<T>(initial: T, onChange: (desc: PropertyMetadata, oldValue: T, newValue: T) -> Boolean): ReadWriteProperty<Any?, T> {
+        return ObservableProperty<T>(initial, onChange)
+    }
+
+    public fun mapVar<T>(map: MutableMap<in String, Any?>,
+                         default: (thisRef: Any?, desc: String) -> T = defaultValueProvider): ReadWriteProperty<Any?, T> {
+        return FixedMapVar<Any?, String, T>(map, defaultKeyProvider, default)
+    }
+
+    public fun mapVal<T>(map: Map<in String, Any?>,
+                         default: (thisRef: Any?, desc: String) -> T = defaultValueProvider): ReadOnlyProperty<Any?, T> {
+        return FixedMapVal<Any?, String, T>(map, defaultKeyProvider, default)
+    }
+}
+
+
+private class NotNullVar<T: Any>() : ReadWriteProperty<Any?, T> {
+    private var value: T? = null
+
+    public override fun get(thisRef: Any?, desc: PropertyMetadata): T {
+        return value ?: throw IllegalStateException("Property ${desc.name} should be initialized before get")
+    }
+
+    public override fun set(thisRef: Any?, desc: PropertyMetadata, value: T) {
+        this.value = value
+    }
+}
+
+class ObservableProperty<T>(initialValue: T, val onChange: (name: jet.PropertyMetadata, oldValue: T, newValue: T) -> Boolean): ReadWriteProperty<Any?, T> {
+    private var value = initialValue
+
+    public override fun get(thisRef: Any?, desc: PropertyMetadata): T {
+        return value
+    }
+
+    public override fun set(thisRef: Any?, desc: PropertyMetadata, value: T) {
+        if (onChange(desc, this.value, value)) {
+            this.value = value
+        }
+    }
+}
+
+private val NULL_VALUE: Any = Any()
+
+private fun escape(value: Any?): Any {
+    return value ?: NULL_VALUE
+}
+
+private fun unescape(value: Any?): Any? {
+    return if (value == NULL_VALUE) null else value
+}
+
+private class LazyVal<T>(private val initializer: () -> T) : ReadOnlyProperty<Any?, T> {
+    private var value: Any? = null
+
+    public override fun get(thisRef: Any?, desc: PropertyMetadata): T {
+        if (value == null) {
+            value = escape(initializer())
+        }
+        return unescape(value) as T
+    }
+}
+
+private class BlockingLazyVal<T>(lock: Any?, private val initializer: () -> T) : ReadOnlyProperty<Any?, T> {
+    private val lock = lock ?: this
+    private volatile var value: Any? = null
+
+    public override fun get(thisRef: Any?, desc: PropertyMetadata): T {
+        val _v1 = value
+        if (_v1 != null) {
+            return unescape(_v1) as T
+        }
+
+        return synchronized(lock) {
+            val _v2 = value
+            if (_v2 != null) {
+                unescape(_v2) as T
+            }
+            else {
+                val typedValue = initializer()
+                value = escape(typedValue)
+                typedValue
+            }
+        }
+    }
+}
+
+public class KeyMissingException(message: String): RuntimeException(message)
+
+public abstract class MapVal<T, in K, out V>() : ReadOnlyProperty<T, V> {
+    protected abstract fun map(ref: T): Map<in K, Any?>
+    protected abstract fun key(desc: PropertyMetadata): K
+
+    protected open fun default(ref: T, desc: PropertyMetadata): V {
+        throw KeyMissingException("Key $desc is missing in $ref")
+    }
+
+    public override fun get(thisRef: T, desc: PropertyMetadata) : V {
+        val map = map(thisRef)
+        val key = key(desc)
+        if (!map.containsKey(key)) {
+            return default(thisRef, desc)
+        }
+
+        return map[key] as V
+    }
+}
+
+public abstract class MapVar<T, in K, V>() : MapVal<T, K, V>(), ReadWriteProperty<T, V> {
+    protected abstract override fun map(ref: T): MutableMap<in K, Any?>
+
+    public override fun set(thisRef: T, desc: PropertyMetadata, value: V) {
+        val map = map(thisRef)
+        map.put(key(desc), value)
+    }
+}
+
+private val defaultKeyProvider:(PropertyMetadata) -> String = {it.name}
+private val defaultValueProvider:(Any?, Any?) -> Nothing = {(thisRef, key) -> throw KeyMissingException("$key is missing from $thisRef")}
+
+public open class FixedMapVal<T, in K, out V>(private val map: Map<in K, Any?>,
+                                              private val key: (PropertyMetadata) -> K,
+                                              private val default: (ref: T, key: K) -> V = defaultValueProvider) : MapVal<T, K, V>() {
+    protected override fun map(ref: T): Map<in K, Any?> {
+        return map
+    }
+
+    protected override fun key(desc: PropertyMetadata): K {
+        return (key)(desc)
+    }
+
+    protected override fun default(ref: T, desc: PropertyMetadata): V {
+        return (default)(ref, key(desc))
+    }
+}
+
+public open class FixedMapVar<T, in K, V>(private val map: MutableMap<in K, Any?>,
+                                          private val key: (PropertyMetadata) -> K,
+                                          private val default: (ref: T, key: K) -> V = defaultValueProvider) : MapVar<T, K, V>() {
+    protected override fun map(ref: T): MutableMap<in K, Any?> {
+        return map
+    }
+
+    protected override fun key(desc: PropertyMetadata): K {
+        return (key)(desc)
+    }
+
+    protected override fun default(ref: T, desc: PropertyMetadata): V {
+        return (default)(ref, key(desc))
+    }
+}
@@ -2,7 +2,6 @@ package kotlin.properties

 import java.util.HashMap
 import java.util.ArrayList
-import kotlin.properties.delegation.ObservableProperty

 public class ChangeEvent(val source: Any, val name: String, val oldValue: Any?, val newValue: Any?) {
    var propogationId: Any? = null
@@ -65,8 +64,8 @@ public abstract class ChangeSupport {
        }
    }

-    protected fun property<T>(init: T): ObservableProperty<T> {
-        return ObservableProperty(init) { name, oldValue, newValue -> changeProperty(name, oldValue, newValue) }
+    protected fun property<T>(init: T): ReadWriteProperty<Any?, T> {
+        return Delegates.observable(init) { desc, oldValue, newValue -> changeProperty(desc.name, oldValue, newValue) }
    }

    public fun onPropertyChange(fn: (ChangeEvent) -> Unit) {
@@ -3,8 +3,6 @@ package test.properties.delegation
 import junit.framework.TestCase
 import kotlin.test.*
 import kotlin.properties.*
-import kotlin.properties.delegation.*
-import kotlin.properties.delegation.lazy.*

 trait WithBox {
    fun box(): String
@@ -27,8 +25,8 @@ class DelegationTest(): DelegationTestBase() {
 }

 public class TestNotNullVar<T>(val a1: String, val b1: T): WithBox {
-    var a: String by NotNullVar<String>()
-    var b by NotNullVar<T>()
+    var a: String by Delegates.notNull<String>()
+    var b by Delegates.notNull<T>()

    override fun box(): String {
        a = a1
@@ -61,4 +59,4 @@ class TestObservableProperty: WithBox, ChangeSupport() {
        if (!result) return "fail: result should be true"
        return "OK"
    }
-}
+}
@@ -1,7 +1,7 @@
 package test.properties.delegation

 import java.util.HashMap
-import kotlin.properties.delegation.*
+import kotlin.properties.*

 class MapDelegationTest(): DelegationTestBase() {

@@ -48,10 +48,10 @@ class MapDelegationTest(): DelegationTestBase() {

 class TestMapValWithDifferentTypes(): WithBox {
    val map = hashMapOf("a" to "a", "b" to 1, "c" to A(1), "d" to null)
-    val a by map.readOnlyProperty<String>()
-    val b by map.readOnlyProperty<Int>()
-    val c by map.readOnlyProperty<Any>()
-    val d by map.readOnlyProperty<Int?>()
+    val a by Delegates.mapVal<String>(map)
+    val b by Delegates.mapVal<Int>(map)
+    val c by Delegates.mapVal<Any>(map)
+    val d by Delegates.mapVal<Int?>(map)

    override fun box(): String {
        if (a != "a") return "fail at 'a'"
@@ -66,10 +66,10 @@ class TestMapValWithDifferentTypes(): WithBox {

 class TestMapVarWithDifferentTypes(): WithBox {
    val map: HashMap<String, Any?> = hashMapOf("a" to "a", "b" to 1, "c" to A(1), "d" to "d")
-    var a by map.property<String>()
-    var b by map.property<Int>()
-    var c by map.property<Any>()
-    var d by map.property<String?>()
+    var a by Delegates.mapVar<String>(map)
+    var b by Delegates.mapVar<Int>(map)
+    var c by Delegates.mapVar<Any>(map)
+    var d by Delegates.mapVar<String?>(map)

    override fun box(): String {
        a = "aa"
@@ -87,8 +87,8 @@ class TestMapVarWithDifferentTypes(): WithBox {
 }

 class TestNullableKey: WithBox {
-    val map = hashMapOf(null to "null")
-    var a by map.property<String?> { desc -> null }
+    val map = hashMapOf(null:Any? to "null": Any?)
+    var a by FixedMapVar<Any?, Any?, Any?>(map, key = { desc -> null }, default = {ref, desc -> null})

    override fun box(): String {
        if (a != "null") return "fail at 'a'"
@@ -99,10 +99,10 @@ class TestNullableKey: WithBox {
 }

 class TestMapPropertyString(): WithBox {
-    val map = hashMapOf("a" to "a", "b" to "b", "c" to "c")
-    val a by map.readOnlyProperty<String>()
-    var b by map.property<String>()
-    val c by map.property<String>()
+    val map = hashMapOf("a" to "a", "b" to "b", "c" to "c":Any?)
+    val a by Delegates.mapVal<String>(map)
+    var b by Delegates.mapVar<String>(map)
+    val c by Delegates.mapVal<String>(map)

    override fun box(): String {
        b = "newB"
@@ -115,9 +115,9 @@ class TestMapPropertyString(): WithBox {

 class TestMapValWithDefault(): WithBox {
    val map = hashMapOf<String, String>()
-    val a by map.readOnlyProperty<String>(default = { "aDefault" })
-    val b by map.readOnlyProperty<String>(default = { "bDefault" }, key = "b")
-    val c by map.readOnlyProperty<String>(default = { "cDefault" }, key = { desc -> desc.name })
+    val a by Delegates.mapVal<String>(map, default = { ref, desc -> "aDefault" })
+    val b by FixedMapVal<TestMapValWithDefault, String, String>(map, default = { ref, desc -> "bDefault" }, key = {"b"})
+    val c by FixedMapVal<TestMapValWithDefault, String, String>(map, default = { ref, desc -> "cDefault" }, key = { desc -> desc.name })

    override fun box(): String {
        if (a != "aDefault") return "fail at 'a'"
@@ -128,10 +128,10 @@ class TestMapValWithDefault(): WithBox {
 }

 class TestMapVarWithDefault(): WithBox {
-    val map = hashMapOf<String, String>()
-    var a by map.property<String>(default = { "aDefault" })
-    var b by map.property<String>(default = { "bDefault" }, key = "b")
-    var c by map.property<String>(default = { "cDefault" }, key = { desc -> desc.name })
+    val map = hashMapOf<String, Any?>()
+    var a: String by Delegates.mapVar(map, default = {ref, desc -> "aDefault" })
+    var b: String by FixedMapVar<Any?, String, String>(map, default = {ref, desc -> "bDefault" }, key = {"b"})
+    var c: String by FixedMapVar<Any?, String, String>(map, default = {ref, desc -> "cDefault" }, key = { desc -> desc.name })

    override fun box(): String {
        if (a != "aDefault") return "fail at 'a'"
@@ -148,9 +148,9 @@ class TestMapVarWithDefault(): WithBox {
 }

 class TestMapPropertyKey(): WithBox {
-    val map = hashMapOf("a" to "a", "b" to "b")
-    val a by map.readOnlyProperty<String>(key = "a")
-    var b by map.property<String>(key = "b")
+    val map = hashMapOf("a" to "a", "b" to "b" : Any?)
+    val a by FixedMapVal<Any?, String, String>(map, key = {"a"})
+    var b by FixedMapVar<Any?, String, String>(map, key = {"b"})

    override fun box(): String {
        b = "c"
@@ -161,9 +161,9 @@ class TestMapPropertyKey(): WithBox {
 }

 class TestMapPropertyFunction(): WithBox {
-    val map = hashMapOf("aDesc" to "a", "bDesc" to "b")
-    val a by map.readOnlyProperty<String> { desc -> "${desc.name}Desc" }
-    var b by map.property<String> { desc -> "${desc.name}Desc" }
+    val map = hashMapOf("aDesc" to "a", "bDesc" to "b": Any?)
+    val a by FixedMapVal<Any?, String, String>(map, { desc -> "${desc.name}Desc" })
+    var b by FixedMapVar<Any?, String, String>(map, { desc -> "${desc.name}Desc" })

    override fun box(): String {
        b = "c"
@@ -173,17 +173,18 @@ class TestMapPropertyFunction(): WithBox {
    }
 }

-val mapVal = object : MapVal<TestMapPropertyCustom, String>() {
-    override fun getMap(thisRef: TestMapPropertyCustom) = thisRef.map
-    override fun getKey(desc: PropertyMetadata) = "${desc.name}Desc"
+val mapVal = object: MapVal<TestMapPropertyCustom, String, String>() {
+    override fun map(ref: TestMapPropertyCustom) = ref.map
+    override fun key(desc: PropertyMetadata) = "${desc.name}Desc"
 }
-val mapVar = object : MapVar<TestMapPropertyCustom, String>() {
-    override fun getMap(thisRef: TestMapPropertyCustom) = thisRef.map
-    override fun getKey(desc: PropertyMetadata) = "${desc.name}Desc"
+
+val mapVar = object : MapVar<TestMapPropertyCustom, String, String>() {
+    override fun map(ref: TestMapPropertyCustom) = ref.map
+    override fun key(desc: PropertyMetadata) = "${desc.name}Desc"
 }

 class TestMapPropertyCustom(): WithBox {
-    val map = hashMapOf("aDesc" to "a", "bDesc" to "b")
+    val map = hashMapOf("aDesc" to "a", "bDesc" to "b":Any?)
    val a by mapVal
    var b by mapVar

@@ -195,22 +196,22 @@ class TestMapPropertyCustom(): WithBox {
    }
 }

-val mapValWithDefault = object : MapVal<TestMapPropertyCustomWithDefault, String>() {
-    override fun getMap(thisRef: TestMapPropertyCustomWithDefault) = thisRef.map
-    override fun getKey(desc: PropertyMetadata) = desc.name
+val mapValWithDefault = object : MapVal<TestMapPropertyCustomWithDefault, String, String>() {
+    override fun map(ref: TestMapPropertyCustomWithDefault) = ref.map
+    override fun key(desc: PropertyMetadata) = desc.name

-    override fun getDefaultValue(desc: PropertyMetadata, key: Any?) = "default"
+    override fun default(ref: TestMapPropertyCustomWithDefault, key: PropertyMetadata) = "default"
 }

-val mapVarWithDefault = object : MapVar<TestMapPropertyCustomWithDefault, String>() {
-    override fun getMap(thisRef: TestMapPropertyCustomWithDefault) = thisRef.map
-    override fun getKey(desc: PropertyMetadata) = desc.name
+val mapVarWithDefault = object : MapVar<TestMapPropertyCustomWithDefault, String, String>() {
+    override fun map(ref: TestMapPropertyCustomWithDefault) = ref.map
+    override fun key(desc: PropertyMetadata) = desc.name

-    override fun getDefaultValue(desc: PropertyMetadata, key: Any?) = "default"
+    override fun default(ref: TestMapPropertyCustomWithDefault, key: PropertyMetadata) = "default"
 }

 class TestMapPropertyCustomWithDefault(): WithBox {
-    val map = hashMapOf<String, String>()
+    val map = hashMapOf<String, Any?>()
    val a by mapValWithDefault
    var b by mapVarWithDefault

@@ -221,4 +222,4 @@ class TestMapPropertyCustomWithDefault(): WithBox {
        if (b != "c") return "fail at 'b' after set"
        return "OK"
    }
-}
+}
@@ -1,8 +1,8 @@
 package test.properties.delegation.lazy

-import kotlin.properties.delegation.lazy.*
 import test.properties.delegation.WithBox
 import test.properties.delegation.DelegationTestBase
+import kotlin.properties.*

 class LazyValuesTest(): DelegationTestBase() {

@@ -33,7 +33,7 @@ class LazyValuesTest(): DelegationTestBase() {

 class TestLazyVal: WithBox {
    var result = 0
-    val a by LazyVal {
+    val a by Delegates.lazy {
        ++result
    }

@@ -48,8 +48,8 @@ class TestNullableLazyVal: WithBox {
    var resultA = 0
    var resultB = 0

-    val a: Int? by NullableLazyVal { resultA++; null}
-    val b by NullableLazyVal { foo() }
+    val a: Int? by Delegates.lazy { resultA++; null}
+    val b by Delegates.lazy { foo() }

    override fun box(): String {
        a
@@ -70,7 +70,7 @@ class TestNullableLazyVal: WithBox {

 class TestAtomicLazyVal: WithBox {
    var result = 0
-    val a by AtomicLazyVal {
+    val a by Delegates.blockingLazy {
        ++result
    }

@@ -85,8 +85,8 @@ class TestVolatileNullableLazyVal: WithBox {
    var resultA = 0
    var resultB = 0

-    val a: Int? by VolatileNullableLazyVal { resultA++; null}
-    val b by VolatileNullableLazyVal { foo() }
+    val a: Int? by Delegates.blockingLazy { resultA++; null}
+    val b by Delegates.blockingLazy { foo() }

    override fun box(): String {
        a
@@ -107,7 +107,7 @@ class TestVolatileNullableLazyVal: WithBox {

 class TestVolatileLazyVal: WithBox {
    var result = 0
-    val a by VolatileLazyVal {
+    val a by Delegates.blockingLazy {
        ++result
    }

@@ -122,8 +122,8 @@ class TestAtomicNullableLazyVal: WithBox {
    var resultA = 0
    var resultB = 0

-    val a: Int? by AtomicNullableLazyVal { resultA++; null}
-    val b by AtomicNullableLazyVal { foo() }
+    val a: Int? by Delegates.blockingLazy { resultA++; null}
+    val b by Delegates.blockingLazy { foo() }

    override fun box(): String {
        a
@@ -0,0 +1 @@
+local-repo
@@ -1,7 +1,7 @@
-Deploying gradle api to maven
-
- * gradlew build
-   -> build/libs/gradle-api-1.4.jar
- 
- * mvn deploy
-   build/libs/gradle-api-1.4.jar -> http://repository.jetbrains.com/utils
+Deploying gradle api to maven
+
+ * gradlew build
+   -> build/libs/gradle-api-1.4.jar
+ 
+ * mvn deploy
+   build/libs/gradle-api-1.4.jar -> http://repository.jetbrains.com/utils
@@ -1,51 +1,51 @@
-<?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-plugin-anno.version>1.4.1</maven-plugin-anno.version>
-        <maven.version>3.0.4</maven.version>
-    </properties>
-
-    <groupId>org.jetbrains.kotlin</groupId>
-    <artifactId>gradle-api</artifactId>
-    <packaging>pom</packaging>
-    <version>1.4</version>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.7</version>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>build/libs/gradle-api-1.4.jar</file>
-                                    <type>jar</type>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-  <distributionManagement>
-    <repository>
-      <id>utils</id>
-      <url>http://repository.jetbrains.com/utils</url>
-    </repository>
-  </distributionManagement>
-
-</project>
+<?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-plugin-anno.version>1.4.1</maven-plugin-anno.version>
+        <maven.version>3.0.4</maven.version>
+    </properties>
+
+    <groupId>org.jetbrains.kotlin</groupId>
+    <artifactId>gradle-api</artifactId>
+    <packaging>pom</packaging>
+    <version>1.4</version>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.7</version>
+                <executions>
+                    <execution>
+                        <id>attach-artifacts</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>attach-artifact</goal>
+                        </goals>
+                        <configuration>
+                            <artifacts>
+                                <artifact>
+                                    <file>build/libs/gradle-api-1.4.jar</file>
+                                    <type>jar</type>
+                                </artifact>
+                            </artifacts>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+  <distributionManagement>
+    <repository>
+      <id>utils</id>
+      <url>http://repository.jetbrains.com/utils</url>
+    </repository>
+  </distributionManagement>
+
+</project>
@@ -0,0 +1,5 @@
+<root>
+    <item name='com.google.common.base.Joiner com.google.common.base.Joiner on(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+</root>
@@ -0,0 +1,5 @@
+<root>
+    <item name='com.google.common.io.Files java.io.File createTempDir()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+</root>
@@ -1,5 +1,5 @@
-<root>
-    <item name='org.apache.commons.io.FilenameUtils java.lang.String getExtension(java.lang.String)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
+<root>
+    <item name='org.apache.commons.io.FilenameUtils java.lang.String getExtension(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
@@ -0,0 +1,18 @@
+<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>
+    <item name='org.gradle.api.Project org.gradle.api.plugins.PluginContainer getPlugins()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <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>
@@ -0,0 +1,5 @@
+<root>
+    <item name='org.gradle.api.file.FileCollection org.gradle.api.file.FileCollection filter(org.gradle.api.specs.Spec&lt;? super java.io.File&gt;)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+</root>
@@ -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>
@@ -0,0 +1,15 @@
+<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='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>
@@ -0,0 +1,5 @@
+<root>
+    <item name='org.gradle.api.internal.project.ProjectInternal org.gradle.api.internal.tasks.TaskContainerInternal getTasks()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+</root>
@@ -0,0 +1,5 @@
+<root>
+    <item name='org.gradle.api.logging.Logging org.gradle.api.logging.Logger getLogger(java.lang.Class)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+</root>
@@ -0,0 +1,22 @@
+<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>
+    <item name='org.gradle.api.plugins.PluginContainer org.gradle.api.Plugin apply(java.lang.String)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.gradle.api.plugins.PluginContainer T apply(java.lang.Class&lt;T&gt;)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+    <item name='org.gradle.api.plugins.Convention T getPlugin(java.lang.Class&lt;T&gt;)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </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,5 @@
+<root>
+    <item name='org.gradle.api.tasks.compile.AbstractCompile org.gradle.api.file.FileCollection getClasspath()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+</root>
@@ -0,0 +1,154 @@
+<?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-core</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <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>
+            <version>12.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.directory.studio</groupId>
+            <artifactId>org.apache.commons.io</artifactId>
+            <version>2.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>gradle-api</artifactId>
+            <version>1.4</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <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>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib</artifactId>
+            <version>${project.version}</version>
+        </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>
+            <resource>
+                <directory>${project.basedir}/src/main/resources</directory>
+            </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>
+                <!-- Invoker plugin maintains local maven repository in local-repo for gradle integration tests -->
+                <artifactId>maven-invoker-plugin</artifactId>
+                <version>1.8</version>
+                <configuration>
+                    <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+                    <localRepositoryPath>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>
+
+    <repositories>
+        <repository>
+            <id>jetbrains-utils</id>
+            <url>http://repository.jetbrains.com/utils</url>
+        </repository>
+    </repositories>
+</project>
@@ -0,0 +1,125 @@
+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.junit.Before
+import org.junit.After
+import org.junit.Test
+import kotlin.test.assertTrue
+import kotlin.test.assertEquals
+import kotlin.test.fail
+
+class BasicKotlinGradleIT {
+
+    var workingDir: File = File(".")
+
+    Before fun setUp() {
+        workingDir = Files.createTempDir()
+        workingDir.mkdirs()
+        copyRecursively(File("src/test/resources/testProject/alfa"), workingDir)
+    }
+
+
+    After fun tearDown() {
+        deleteRecursively(workingDir)
+    }
+
+    Test fun testSimpleCompile() {
+        val projectDir = File(workingDir, "alfa")
+
+        val pathToKotlinPlugin = "-PpathToKotlinPlugin=" + File("local-repo").getAbsolutePath()
+        val cmd = if (SystemInfo.isWindows)
+            listOf("cmd", "/C", "gradlew.bat", "compileDeployKotlin", "build", pathToKotlinPlugin, "--no-daemon", "--debug")
+        else
+            listOf("/bin/bash", "./gradlew", "compileDeployKotlin", "build", pathToKotlinPlugin, "--no-daemon", "--debug")
+
+        val builder = ProcessBuilder(cmd)
+        builder.directory(projectDir)
+        builder.redirectErrorStream(true)
+        val process = builder.start()
+
+        val s = Scanner(process.getInputStream()!!)
+        val text = 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'")
+        assertTrue(File(projectDir, "build/reports/tests/demo.TestSource.html").exists(), "Test report does not exist. Were tests executed?")
+
+        // Run the build second time, assert everything is up-to-date
+
+        val up2dateBuilder = ProcessBuilder(cmd)
+        up2dateBuilder.directory(projectDir)
+        up2dateBuilder.redirectErrorStream(true)
+        val up2dateProcess = up2dateBuilder.start()
+
+        val up2dateProcessScanner = Scanner(up2dateProcess.getInputStream()!!)
+        val up2dateText = StringBuilder()
+        while (up2dateProcessScanner.hasNextLine()) {
+            up2dateText append up2dateProcessScanner.nextLine()
+            up2dateText append "\n"
+        }
+        up2dateProcessScanner.close()
+
+        val up2dateResult = up2dateProcess.waitFor()
+        val up2dateBuildOutput = up2dateText.toString()
+
+        println(up2dateBuildOutput)
+
+        assertEquals(up2dateResult, 0)
+        assertTrue(up2dateBuildOutput.contains(":compileKotlin UP-TO-DATE"), "Should contain ':compileKotlin UP-TO-DATE'")
+        assertTrue(up2dateBuildOutput.contains(":compileTestKotlin UP-TO-DATE"), "Should contain ':compileTestKotlin UP-TO-DATE'")
+        assertTrue(up2dateBuildOutput.contains(":compileDeployKotlin UP-TO-DATE"), "Should contain ':compileDeployKotlin UP-TO-DATE'")
+        assertTrue(up2dateBuildOutput.contains(":compileJava UP-TO-DATE"), "Should contain ':compileJava UP-TO-DATE'")
+    }
+
+
+    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,49 @@
+buildscript {
+  repositories {
+    mavenCentral()
+    maven {
+        url 'file://' + pathToKotlinPlugin
+    }
+  }
+  dependencies {
+    classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin-core:0.1-SNAPSHOT'
+  }
+}
+
+apply plugin: org.jetbrains.kotlin.gradle.plugin.KotlinPlugin
+
+sourceSets {
+ deploy
+}
+
+repositories {
+  maven {
+     url 'file://' + pathToKotlinPlugin
+  }
+  mavenCentral()
+}
+
+dependencies {
+    compile 'com.google.guava:guava:12.0'
+    deployCompile 'com.google.guava:guava:12.0'
+    testCompile  'org.testng:testng:6.8'
+    testRuntime  'org.jetbrains.kotlin:kotlin-stdlib:0.1-SNAPSHOT'
+}
+
+test {
+    useTestNG()
+}
+
+task show << {
+   buildscript.configurations.classpath.each { println it }
+}
+
+
+compileKotlin {
+    kotlinOptions.annotations = "externalAnnotations"
+}
+
+
+task wrapper(type: Wrapper) {
+  gradleVersion="1.4"
+}
@@ -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>
@@ -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")
+    }
+}
+
@@ -1,5 +1,5 @@
-<root>
-    <item name='com.google.common.io.Files java.io.File createTempDir()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
+<root>
+    <item name='com.google.common.io.Files java.io.File createTempDir()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
@@ -0,0 +1,5 @@
+<root>
+    <item name='org.gradle.api.artifacts.Configuration org.gradle.api.artifacts.ResolvedConfiguration getResolvedConfiguration()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+</root>
@@ -0,0 +1,5 @@
+<root>
+    <item name='org.gradle.api.Project org.gradle.api.artifacts.dsl.DependencyHandler getDependencies()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+</root>
@@ -4,4 +4,9 @@
            <val name="value" val="&quot;fun getConfigurations() : ConfigurationContainer&quot;"/>
        </annotation>
    </item>
+    <item name='org.gradle.api.initialization.dsl.ScriptHandler org.gradle.api.artifacts.dsl.DependencyHandler getDependencies()'>
+        <annotation name='jet.runtime.typeinfo.KotlinSignature'>
+            <val name="value" val="&quot;fun getDependencies() : DependencyHandler&quot;"/>
+        </annotation>
+    </item>
 </root>
@@ -1,5 +1,5 @@
-<root>
-    <item name='org.gradle.api.logging.Logging org.gradle.api.logging.Logger getLogger(java.lang.Class)'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
+<root>
+    <item name='org.gradle.api.logging.Logging org.gradle.api.logging.Logger getLogger(java.lang.Class)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
@@ -21,51 +21,26 @@

    <dependencies>
        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.11</version>
-            <scope>test</scope>
+          <groupId>org.jetbrains.kotlin</groupId>
+          <artifactId>kotlin-stdlib</artifactId>
+          <version>${project.version}</version>
        </dependency>
        <dependency>
-        	<groupId>commons-lang</groupId>
-        	<artifactId>commons-lang</artifactId>
-        	<version>2.3</version>
+          <groupId>org.jetbrains.kotlin</groupId>
+          <artifactId>kotlin-jdk-annotations</artifactId>
+          <version>${project.version}</version>
        </dependency>
        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>12.0</version>
+          <groupId>org.jetbrains.kotlin</groupId>
+          <artifactId>gradle-api</artifactId>
+          <version>1.4</version>
+          <scope>provided</scope>
        </dependency>
        <dependency>
-            <groupId>org.apache.directory.studio</groupId>
-            <artifactId>org.apache.commons.io</artifactId>
-            <version>2.4</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>gradle-api</artifactId>
-            <version>1.4</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <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>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib</artifactId>
-            <version>${project.version}</version>
+          <groupId>org.jetbrains.kotlin</groupId>
+          <artifactId>kotlin-gradle-plugin-core</artifactId>
+          <version>${project.version}</version>
+          <scope>provided</scope>
        </dependency>
    </dependencies>

@@ -75,14 +50,9 @@
        <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>
            <resource>
                <directory>${project.basedir}/src/main/resources</directory>
+              <filtering>true</filtering>
            </resource>
        </resources>

@@ -0,0 +1,64 @@
+package org.jetbrains.kotlin.gradle.plugin
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.artifacts.dsl.DependencyHandler
+import org.gradle.api.artifacts.ConfigurationContainer
+import org.gradle.api.artifacts.Dependency
+import org.gradle.api.specs.Spec
+import java.io.File
+import java.net.URL
+import org.gradle.api.logging.Logging
+import java.util.Properties
+import java.io.FileNotFoundException
+
+open class KotlinPluginWrapper: Plugin<Project> {
+
+    val log = Logging.getLogger(getClass())!!
+
+    public override fun apply(project: Project) {
+        val dependencyHandler : DependencyHandler = project.getBuildscript().getDependencies()
+        val configurationsContainer : ConfigurationContainer = project.getBuildscript().getConfigurations()
+
+        log.debug("Loading version information")
+        val props = Properties()
+        val propFileName = "project.properties"
+        val inputStream = getClass().getClassLoader()!!.getResourceAsStream(propFileName)
+
+        if (inputStream == null) {
+            throw FileNotFoundException("property file '" + propFileName + "' not found in the classpath")
+        }
+
+        props.load(inputStream);
+
+        val projectVersion = props.get("project.version")
+        log.debug("Found project version [" + projectVersion + "]")
+
+        log.debug("Creating configuration and dependency")
+        val kotlinPluginCoreCoordinates = "org.jetbrains.kotlin:kotlin-gradle-plugin-core:" + projectVersion
+        val dependency = dependencyHandler.create(kotlinPluginCoreCoordinates)
+        val configuration = configurationsContainer.detachedConfiguration(dependency)!!
+
+        log.debug("Resolving [" + kotlinPluginCoreCoordinates + "]")
+        val kotlinPluginDependencies : List<URL> = configuration.getResolvedConfiguration().getFiles(KSpec({ dep -> true }))!!.map({(f: File):URL -> f.toURI().toURL() })
+        log.debug("Resolved files: [" + kotlinPluginDependencies.toString() + "]")
+        log.debug("Load plugin in parent-last URL classloader")
+        val kotlinPluginClassloader = ParentLastURLClassLoader(kotlinPluginDependencies, getClass().getClassLoader())
+        log.debug("Class loader created")
+        val cls = Class.forName("org.jetbrains.kotlin.gradle.plugin.KotlinPlugin", true, kotlinPluginClassloader)
+        log.debug("Plugin class loaded")
+        val pluginInstance = cls.newInstance()
+        log.debug("Plugin class instantiated")
+
+        val applyMethod = cls.getMethod("apply", javaClass<Project>())
+        log.debug("'apply' method found, invoking...")
+        applyMethod.invoke(pluginInstance, project);
+        log.debug("'apply' method invoked successfully")
+    }
+}
+
+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,74 @@
+package org.jetbrains.kotlin.gradle.plugin;
+
+
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.List;
+
+/**
+ * A parent-last classloader that will try the child classloader first and then the parent.
+ * This takes a fair bit of doing because java really prefers parent-first.
+ * <p/>
+ * For those not familiar with class loading trickery, be wary
+ */
+public class ParentLastURLClassLoader extends ClassLoader {
+    private ChildURLClassLoader childClassLoader;
+
+    public ParentLastURLClassLoader(List<URL> classpath, ClassLoader parent) {
+        super(Thread.currentThread().getContextClassLoader());
+
+        URL[] urls = classpath.toArray(new URL[classpath.size()]);
+
+        childClassLoader = new ChildURLClassLoader(urls, new FindClassClassLoader(parent));
+    }
+
+    @Override
+    protected synchronized Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
+        try {
+            // first we try to find a class inside the child classloader
+            return childClassLoader.findClass(name);
+        } catch (ClassNotFoundException e) {
+            // didn't find it, try the parent
+            return super.loadClass(name, resolve);
+        }
+    }
+
+    /**
+     * This class allows me to call findClass on a classloader
+     */
+    private static class FindClassClassLoader extends ClassLoader {
+        public FindClassClassLoader(ClassLoader parent) {
+            super(parent);
+        }
+
+        @Override
+        public Class<?> findClass(String name) throws ClassNotFoundException {
+            return super.findClass(name);
+        }
+    }
+
+    /**
+     * This class delegates (child then parent) for the findClass method for a URLClassLoader.
+     * We need this because findClass is protected in URLClassLoader
+     */
+    private static class ChildURLClassLoader extends URLClassLoader {
+        private FindClassClassLoader realParent;
+
+        public ChildURLClassLoader(URL[] urls, FindClassClassLoader realParent) {
+            super(urls, null);
+
+            this.realParent = realParent;
+        }
+
+        @Override
+        public Class<?> findClass(String name) throws ClassNotFoundException {
+            try {
+                // first try to use the URLClassLoader findClass
+                return super.findClass(name);
+            } catch (ClassNotFoundException e) {
+                // if that fails, we ask our real parent classloader to load the class (we give up)
+                return realParent.loadClass(name);
+            }
+        }
+    }
+}
@@ -1 +1 @@
-implementation-class=org.jetbrains.kotlin.gradle.plugin.KotlinPlugin
+implementation-class=org.jetbrains.kotlin.gradle.plugin.KotlinPluginWrapper
@@ -0,0 +1 @@
+project.version=${project.version}
@@ -30,11 +30,12 @@ class BasicKotlinGradleIT {
    Test fun testSimpleCompile() {
        val projectDir = File(workingDir, "alfa")

-        val pathToKotlinPlugin = "-PpathToKotlinPlugin=" + File("local-repo").getAbsolutePath()
+        val pathToKotlinPluginWrapper = "-PpathToKotlinPluginWrapper=" + File("local-repo").getAbsolutePath()
+        val pathToKotlinPlugin = "-PpathToKotlinPlugin=" + File("../kotlin-gradle-plugin-core/local-repo").getAbsolutePath()
        val cmd = if (SystemInfo.isWindows)
-            listOf("cmd", "/C", "gradlew.bat", "compileDeployKotlin", "build", pathToKotlinPlugin, "--no-daemon", "--debug")
+            listOf("cmd", "/C", "gradlew.bat", "compileDeployKotlin", "build", pathToKotlinPluginWrapper, pathToKotlinPlugin, "--no-daemon", "--debug")
        else
-            listOf("/bin/bash", "./gradlew", "compileDeployKotlin", "build", pathToKotlinPlugin, "--no-daemon", "--debug")
+            listOf("/bin/bash", "./gradlew", "compileDeployKotlin", "build", pathToKotlinPluginWrapper, pathToKotlinPlugin, "--no-daemon", "--debug")

        val builder = ProcessBuilder(cmd)
        builder.directory(projectDir)
@@ -4,6 +4,9 @@ buildscript {
    maven {
        url 'file://' + pathToKotlinPlugin
    }
+    maven {
+        url 'file://' + pathToKotlinPluginWrapper
+    }
  }
  dependencies {
    classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:0.1-SNAPSHOT'