Merge remote-tracking branch 'origin/pr/465'

Conflicts:
	libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt

libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/README.txt

@@ -1,7 +1,7 @@
 Deploying gradle api to maven
 
  * gradlew build
-   -> build/libs/gradle-api-1.4.jar
+   -> build/libs/gradle-api-1.6.jar
  
  * mvn deploy
-   build/libs/gradle-api-1.4.jar -> http://repository.jetbrains.com/utils
+   build/libs/gradle-api-1.6.jar -> http://repository.jetbrains.com/utils

libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'java'
 apply plugin: 'maven'
 
-version = '1.4'
+version = '1.6'
 group = 'org.jetbrains.kotlin'
 
 
@@ -25,5 +25,5 @@ artifacts {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '1.4'
+    gradleVersion = '1.6'
 }

libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Feb 21 16:54:17 MSK 2013
+#Sun May 04 12:35:04 MSK 2014
 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
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip

libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/gradlew

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 ##############################################################################
 ##
@@ -61,9 +61,9 @@ while [ -h "$PRG" ] ; do
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/"
+cd "`dirname \"$PRG\"`/" >&-
 APP_HOME="`pwd -P`"
-cd "$SAVED"
+cd "$SAVED" >&-
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 

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

@@ -12,7 +12,7 @@
     <groupId>org.jetbrains.kotlin</groupId>
     <artifactId>gradle-api</artifactId>
     <packaging>pom</packaging>
-    <version>1.4</version>
+    <version>1.6</version>
 
     <build>
         <plugins>
@@ -30,7 +30,7 @@
                         <configuration>
                             <artifacts>
                                 <artifact>
-                                    <file>build/libs/gradle-api-1.4.jar</file>
+                                    <file>build/libs/gradle-api-1.6.jar</file>
                                     <type>jar</type>
                                 </artifact>
                             </artifacts>

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

@@ -8,6 +8,9 @@
         <val name="value" val="&quot;fun apply(p0 : T) : Unit&quot;" />
       </annotation>
     </item>
+    <item name='org.gradle.api.Project java.util.Map&lt;java.lang.String,?&gt; getProperties()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
     <item name="org.gradle.api.Project org.gradle.api.file.ConfigurableFileCollection files(java.lang.Object...)">
       <annotation name="org.jetbrains.annotations.NotNull" />
     </item>
@@ -28,5 +31,8 @@
     <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.tasks.TaskContainer getTasks()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>
 

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

@@ -4,4 +4,7 @@
             <val name="value" val="&quot;fun getSource() : FileTree&quot;"/>
         </annotation>
     </item>
+    <item name='org.gradle.api.tasks.TaskContainer T create(java.lang.String, java.lang.Class&lt;T&gt;)'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
 </root>

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

@@ -50,7 +50,7 @@
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>gradle-api</artifactId>
-            <version>1.4</version>
+            <version>1.6</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -198,4 +198,4 @@
             <url>http://repository.jetbrains.com/utils</url>
         </repository>
     </repositories>
-</project>
+</project>

libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt

@@ -40,10 +40,11 @@ import java.util.HashSet
 import org.gradle.api.UnknownDomainObjectException
 import org.gradle.api.initialization.dsl.ScriptHandler
 import org.jetbrains.kotlin.gradle.plugin.android.AndroidGradleWrapper
+import javax.inject.Inject
 
 val DEFAULT_ANNOTATIONS = "org.jebrains.kotlin.gradle.defaultAnnotations"
 
-open class KotlinPlugin(val scriptHandler: ScriptHandler): Plugin<Project> {
+open class KotlinPlugin [Inject] (val scriptHandler: ScriptHandler): Plugin<Project> {
 
     public override fun apply(project: Project) {
         val javaBasePlugin = project.getPlugins().apply(javaClass<JavaBasePlugin>())
@@ -54,8 +55,7 @@ open class KotlinPlugin(val scriptHandler: ScriptHandler): Plugin<Project> {
         configureSourceSetDefaults(project as ProjectInternal, javaBasePlugin, javaPluginConvention)
         configureKDoc(project, javaPluginConvention)
 
-        val version = project.getProperties()!!.get("kotlin.gradle.plugin.version") as String
-
+        val version = project.getProperties()["kotlin.gradle.plugin.version"] as String
         project.getExtensions().add(DEFAULT_ANNOTATIONS, GradleUtils(scriptHandler).resolveDependencies("org.jetbrains.kotlin:kotlin-jdk-annotations:$version"))
     }
 
@@ -80,7 +80,7 @@ open class KotlinPlugin(val scriptHandler: ScriptHandler): Plugin<Project> {
                     }))
 
                     val kotlinTaskName = sourceSet.getCompileTaskName("kotlin")
-                    val kotlinTask: KotlinCompile = project.getTasks().add(kotlinTaskName, javaClass<KotlinCompile>())!!
+                    val kotlinTask: KotlinCompile = project.getTasks().create(kotlinTaskName, javaClass<KotlinCompile>())
 
                     javaBasePlugin.configureForSourceSet(sourceSet, kotlinTask)
                     // store kotlin classes in separate directory. They will serve as class-path to java compiler
@@ -106,14 +106,14 @@ open class KotlinPlugin(val scriptHandler: ScriptHandler): Plugin<Project> {
         val mainSourceSet = javaPluginConvention.getSourceSets()?.findByName(SourceSet.MAIN_SOURCE_SET_NAME) as HasConvention?
 
         if (mainSourceSet != null) {
-            val kdoc = project.getTasks()?.add(KDOC_TASK_NAME, javaClass<KDoc>())!!
+            val kdoc = project.getTasks().create(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> {
+        project.getTasks().withType(javaClass<KDoc>(), object : Action<KDoc> {
             override fun execute(task: KDoc?) {
                 task!!.destinationDir = File(javaPluginConvention.getDocsDir(), "kdoc")
             }
@@ -124,7 +124,7 @@ open class KotlinPlugin(val scriptHandler: ScriptHandler): Plugin<Project> {
 }
 
 
-open class KotlinAndroidPlugin(val scriptHandler: ScriptHandler): Plugin<Project> {
+open class KotlinAndroidPlugin [Inject] (val scriptHandler: ScriptHandler): Plugin<Project> {
 
     val log = Logging.getLogger(getClass())
 
@@ -133,7 +133,7 @@ open class KotlinAndroidPlugin(val scriptHandler: ScriptHandler): Plugin<Project
         val project = p0 as ProjectInternal
         val ext = project.getExtensions().getByName("android") as BaseExtension
 
-        ext.getSourceSets()?.all(object : Action<AndroidSourceSet> {
+        ext.getSourceSets().all(object : Action<AndroidSourceSet> {
             override fun execute(sourceSet: AndroidSourceSet?) {
                 if (sourceSet is ExtensionAware) {
                     val sourceSetName = sourceSet.getName()
@@ -169,8 +169,8 @@ open class KotlinAndroidPlugin(val scriptHandler: ScriptHandler): Plugin<Project
             }
 
         })
-        val version = project.getProperties()!!.get("kotlin.gradle.plugin.version") as String
-        project.getExtensions().add(DEFAULT_ANNOTATIONS, GradleUtils(scriptHandler).resolveDependencies("org.jetbrains.kotlin:kotlin-android-sdk-annotations:$version"));
+        val version = project.getProperties()["kotlin.gradle.plugin.version"] as String
+        project.getExtensions().add(DEFAULT_ANNOTATIONS, GradleUtils(scriptHandler!!).resolveDependencies("org.jetbrains.kotlin:kotlin-android-sdk-annotations:$version"));
     }
 
     private fun processVariants(variants: DefaultDomainObjectSet<out BaseVariant>, project: Project, androidExt: BaseExtension): Unit {
@@ -187,9 +187,9 @@ open class KotlinAndroidPlugin(val scriptHandler: ScriptHandler): Plugin<Project
         for (variant in variants) {
             if (variant is LibraryVariant || variant is ApkVariant) {
                 val buildType: BuildType = if (variant is LibraryVariant) {
-                    variant.getBuildType()!!
+                    variant.getBuildType()
                 } else {
-                    (variant as ApkVariant).getBuildType()!!
+                    (variant as ApkVariant).getBuildType()
                 }
 
                 val buildTypeSourceSetName = buildType.getName()
@@ -200,7 +200,7 @@ open class KotlinAndroidPlugin(val scriptHandler: ScriptHandler): Plugin<Project
                 val variantName = variant.getName()
 
                 val kotlinTaskName = "compile${variantName}Kotlin"
-                val kotlinTask: KotlinCompile = project.getTasks()!!.add(kotlinTaskName, javaClass<KotlinCompile>())!!
+                val kotlinTask: KotlinCompile = project.getTasks().create(kotlinTaskName, javaClass<KotlinCompile>())
                 kotlinTask.kotlinOptions = kotlinOptions
 
 
@@ -228,10 +228,10 @@ open class KotlinAndroidPlugin(val scriptHandler: ScriptHandler): Plugin<Project
                     javaSourceList.add(buildTypeSourceSet.getJava().getSrcDirs())
                     kotlinTask.source(getExtention<KotlinSourceSet>(buildTypeSourceSet, "kotlin").getKotlin())
                 }
-                javaSourceList.add(callable<File?>{ variant.getProcessResources().getSourceOutputDir() })
-                javaSourceList.add(callable<File?>{ variant.getGenerateBuildConfig()?.getSourceOutputDir() })
-                javaSourceList.add(callable<File?>{ variant.getAidlCompile().getSourceOutputDir() })
-                javaSourceList.add(callable<File?>{ variant.getRenderscriptCompile().getSourceOutputDir() })
+                javaSourceList.add(Callable<File?>{ variant.getProcessResources().getSourceOutputDir() })
+                javaSourceList.add(Callable<File?>{ variant.getGenerateBuildConfig()?.getSourceOutputDir() })
+                javaSourceList.add(Callable<File?>{ variant.getAidlCompile().getSourceOutputDir() })
+                javaSourceList.add(Callable<File?>{ variant.getRenderscriptCompile().getSourceOutputDir() })
 
                 if (variant is ApkVariant) {
                     for (flavour in variant.getProductFlavors().iterator()) {

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

@@ -70,8 +70,11 @@ public open class KotlinCompile(): AbstractCompile() {
         return null
     }
 
-
+    [TaskAction]
     override fun compile() {
+
+        getLogger().debug("Starting Kotlin compilation task")
+
         val args = K2JVMCompilerArguments()
 
         val javaSrcRoots = HashSet<File>()
@@ -122,6 +125,7 @@ public open class KotlinCompile(): AbstractCompile() {
         }
 
         val messageCollector = GradleMessageCollector(logger)
+        getLogger().debug("Calling compiler")
         val exitCode = compiler.exec(messageCollector, args)
 
         when (exitCode) {
@@ -130,6 +134,7 @@ public open class KotlinCompile(): AbstractCompile() {
             else -> {}
         }
 
+        getLogger().debug("Copying resulting files to classes")
         // Copy kotlin classes to all classes directory
         val outputDirFile = File(args.outputDir!!)
         if (outputDirFile.exists()) {

libraries/tools/kotlin-gradle-plugin-core/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt

@@ -17,11 +17,11 @@ import org.jetbrains.kotlin.gradle.BaseGradleIT.Project
 class BasicKotlinGradleIT : BaseGradleIT() {
 
     Test fun testSimpleCompile() {
-        val project = Project("simpleProject")
+        val project = Project("simpleProject", "1.12")
 
         project.build("compileDeployKotlin", "build", "-Pkotlin.gradle.plugin.version=0.1-SNAPSHOT") {
             assertSuccessful()
-            assertReportExists("build/reports/tests/demo.TestSource.html")
+            assertReportExists("build/reports/tests/classes/demo.TestSource.html")
             assertContains(":compileKotlin", ":compileTestKotlin", ":compileDeployKotlin")
         }
 
@@ -32,19 +32,19 @@ class BasicKotlinGradleIT : BaseGradleIT() {
     }
 
     Test fun testKotlinCustomDirectory() {
-        Project("customSrcDir").build("build", "-Pkotlin.gradle.plugin.version=0.1-SNAPSHOT") {
+        Project("customSrcDir", "1.6").build("build", "-Pkotlin.gradle.plugin.version=0.1-SNAPSHOT") {
             assertSuccessful()
         }
     }
 
     Test fun testInlineDisabled() {
-        Project("inlineDisabled").build("build", "-Pkotlin.gradle.plugin.version=0.1-SNAPSHOT") {
+        Project("inlineDisabled", "1.6").build("build", "-Pkotlin.gradle.plugin.version=0.1-SNAPSHOT") {
             assertSuccessful()
         }
     }
 
     Test fun testSimpleKDoc() {
-        Project("kdocProject").build("kdoc", "-Pkotlin.gradle.plugin.version=0.1-SNAPSHOT") {
+        Project("kdocProject", "1.6").build("kdoc", "-Pkotlin.gradle.plugin.version=0.1-SNAPSHOT") {
             assertSuccessful()
             assertReportExists("build/docs/kdoc/demo/MyClass.html")
             assertContains(":kdoc", "Generating kdoc to")
@@ -52,7 +52,7 @@ class BasicKotlinGradleIT : BaseGradleIT() {
     }
 
     Ignore fun testKotlinExtraJavaSrc() {
-        Project("additionalJavaSrc").build("build", "-Pkotlin.gradle.plugin.version=0.1-SNAPSHOT") {
+        Project("additionalJavaSrc", "1.6").build("build", "-Pkotlin.gradle.plugin.version=0.1-SNAPSHOT") {
             assertSuccessful()
         }
     }

libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.12/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Sun May 04 12:17:58 MSK 2014
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip

libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.6/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Feb 28 14:00:49 MSK 2013
+#Sun May 04 12:35:04 MSK 2014
 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
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip

libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.6/gradlew

@@ -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 "$@"

libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.6/gradlew.bat

@@ -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

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

@@ -15,7 +15,7 @@ import org.gradle.api.initialization.dsl.ScriptHandler
 
 abstract class KotlinBasePluginWrapper: Plugin<Project> {
 
-    val log = Logging.getLogger(getClass())!!
+    val log = Logging.getLogger(getClass())
 
     public override fun apply(project: Project) {
         val sourceBuildScript = findSourceBuildScript(project);
@@ -38,14 +38,14 @@ abstract class KotlinBasePluginWrapper: Plugin<Project> {
 
         props.load(inputStream);
 
-        val projectVersion = props.get("project.version") as String
+        val projectVersion = props["project.version"] as String
         log.debug("Found project version [$projectVersion]")
         project.getExtensions().getExtraProperties()?.set("kotlin.gradle.plugin.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)!!
+        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() })

libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt

@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.gradle.BaseGradleIT.Project
 class BasicKotlinGradleIT: BaseGradleIT() {
 
     Test fun testCrossCompile() {
-        val project = Project("kotlinJavaProject")
+        val project = Project("kotlinJavaProject", "1.6")
 
         project.build("compileDeployKotlin", "build") {
             assertSuccessful()
@@ -31,7 +31,7 @@ class BasicKotlinGradleIT: BaseGradleIT() {
     }
 
     Test fun testKotlinOnlyCompile() {
-        val project = Project("kotlinProject")
+        val project = Project("kotlinProject", "1.6")
 
         project.build("build") {
             assertSuccessful()
@@ -46,7 +46,7 @@ class BasicKotlinGradleIT: BaseGradleIT() {
     }
 
     Test fun testKotlinClasspath() {
-        Project("classpathTest").build("build") {
+        Project("classpathTest", "1.6").build("build") {
             assertSuccessful()
             assertReportExists()
             assertContains(":compileKotlin", ":compileTestKotlin")
@@ -54,7 +54,7 @@ class BasicKotlinGradleIT: BaseGradleIT() {
     }
 
     Test fun testMultiprojectPluginClasspath() {
-        Project("multiprojectClassPathTest").build("build") {
+        Project("multiprojectClassPathTest", "1.6").build("build") {
             assertSuccessful()
             assertReportExists("subproject")
             assertContains(":subproject:compileKotlin", ":subproject:compileTestKotlin")