Fix KT-4168 use proper buildscript classpath

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

@@ -37,10 +37,11 @@ import org.gradle.api.artifacts.dsl.DependencyHandler
 import org.gradle.api.artifacts.ConfigurationContainer
 import org.gradle.api.artifacts.Dependency
 import java.util.HashSet
+import org.gradle.api.initialization.dsl.ScriptHandler
 
 val DEFAULT_ANNOTATIONS = "org.jebrains.kotlin.gradle.defaultAnnotations"
 
-open class KotlinPlugin: Plugin<Project> {
+open class KotlinPlugin(val scriptHandler: ScriptHandler): Plugin<Project> {
 
     public override fun apply(project: Project) {
         val javaBasePlugin = project.getPlugins().apply(javaClass<JavaBasePlugin>())
@@ -52,7 +53,8 @@ open class KotlinPlugin: Plugin<Project> {
         configureKDoc(project, javaPluginConvention)
 
         val version = project.getProperties()!!.get("kotlin.gradle.plugin.version") as String
-        project.getExtensions().add(DEFAULT_ANNOTATIONS, GradleUtils.resolveDependencies(project, "org.jetbrains.kotlin:kotlin-jdk-annotations:$version"))
+
+        project.getExtensions().add(DEFAULT_ANNOTATIONS, GradleUtils(scriptHandler).resolveDependencies("org.jetbrains.kotlin:kotlin-jdk-annotations:$version"))
     }
 
 
@@ -124,7 +126,7 @@ open class KotlinPlugin: Plugin<Project> {
 }
 
 
-open class KotlinAndroidPlugin: Plugin<Project> {
+open class KotlinAndroidPlugin(val scriptHandler: ScriptHandler): Plugin<Project> {
 
     val log = Logging.getLogger(getClass())
 
@@ -170,7 +172,7 @@ open class KotlinAndroidPlugin: Plugin<Project> {
 
         })
         val version = project.getProperties()!!.get("kotlin.gradle.plugin.version") as String
-        project.getExtensions().add(DEFAULT_ANNOTATIONS, GradleUtils.resolveDependencies(project, "org.jetbrains.kotlin:kotlin-android-sdk-annotations:$version"));
+        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 {
@@ -271,17 +273,15 @@ open class KSpec<T: Any?>(val predicate: (T) -> Boolean): Spec<T> {
     }
 }
 
-open class GradleUtils() {
+open class GradleUtils(val scriptHandler: ScriptHandler) {
-    class object {
+    public fun resolveDependencies(vararg coordinates: String): Collection<File> {
-        public fun resolveDependencies(project: Project, vararg coordinates: String): Collection<File> {
+        val dependencyHandler : DependencyHandler = scriptHandler.getDependencies()
-            val dependencyHandler : DependencyHandler = project.getBuildscript().getDependencies()
+        val configurationsContainer : ConfigurationContainer = scriptHandler.getConfigurations()
-            val configurationsContainer : ConfigurationContainer = project.getBuildscript().getConfigurations()
 
-            val deps = coordinates.map { dependencyHandler.create(it) }
+        val deps = coordinates.map { dependencyHandler.create(it) }
-            val configuration = configurationsContainer.detachedConfiguration(*deps.copyToArray())
+        val configuration = configurationsContainer.detachedConfiguration(*deps.copyToArray())
 
-            return configuration.getResolvedConfiguration().getFiles(KSpec({ dep -> true }))!!
+        return configuration.getResolvedConfiguration().getFiles(KSpec({ dep -> true }))!!
-        }
     }
 }
 

libraries/tools/kotlin-gradle-plugin/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 org.gradle.api.Project getParent()'>
+        <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>

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

@@ -11,14 +11,21 @@ import java.net.URL
 import org.gradle.api.logging.Logging
 import java.util.Properties
 import java.io.FileNotFoundException
+import org.gradle.api.initialization.dsl.ScriptHandler
 
 abstract class KotlinBasePluginWrapper: Plugin<Project> {
 
     val log = Logging.getLogger(getClass())!!
 
     public override fun apply(project: Project) {
-        val dependencyHandler : DependencyHandler = project.getBuildscript().getDependencies()
+        val sourceBuildScript = findSourceBuildScript(project);
-        val configurationsContainer : ConfigurationContainer = project.getBuildscript().getConfigurations()
+        if (sourceBuildScript == null) {
+            log.error("Failed to determine source cofiguration of kotlin plugin. Can not download core. Please verify that this or any parent project " +
+                      "contains 'kotlin-gradle-plugin' in buildscript's classpath configuration.");
+            return;
+        }
+        val dependencyHandler : DependencyHandler = sourceBuildScript.getDependencies()
+        val configurationsContainer : ConfigurationContainer = sourceBuildScript.getConfigurations()
 
         log.debug("Loading version information")
         val props = Properties()
@@ -48,7 +55,8 @@ abstract class KotlinBasePluginWrapper: Plugin<Project> {
         log.debug("Class loader created")
         val cls = Class.forName(getPluginClassName(), true, kotlinPluginClassloader)
         log.debug("Plugin class loaded")
-        val pluginInstance = cls.newInstance()
+        val constructor = cls.getConstructor(javaClass<ScriptHandler>())
+        val pluginInstance = constructor.newInstance(sourceBuildScript)
         log.debug("Plugin class instantiated")
 
         val applyMethod = cls.getMethod("apply", javaClass<Project>())
@@ -58,6 +66,23 @@ abstract class KotlinBasePluginWrapper: Plugin<Project> {
     }
 
     public abstract fun getPluginClassName():String
+
+    private fun findSourceBuildScript(project: Project): ScriptHandler? {
+        log.debug("Looking for proper script handler")
+        var curProject = project
+        while (curProject != curProject.getParent()) {
+            log.debug("Looking in project $project")
+            val scriptHandler = curProject.getBuildscript()
+            val found = scriptHandler.getConfigurations().findByName("classpath")?.find { it.name.contains("kotlin-gradle-plugin") } != null;
+            if (found) {
+                log.debug("Found! returning...")
+                return scriptHandler
+            }
+            log.debug("not found, switching to parent")
+            curProject = curProject.getParent()
+        }
+        return null
+    }
 }
 
 open class KotlinPluginWrapper: KotlinBasePluginWrapper() {

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

@@ -63,6 +63,14 @@ class BasicKotlinGradleIT {
         }
     }
 
+    Test fun testMultiprojectPluginClasspath() {
+        Project("multiprojectClassPathTest").build("build") {
+            assertSuccessful()
+            assertReportExists("subproject")
+            assertContains(":subproject:compileKotlin", ":subproject:compileTestKotlin")
+        }
+    }
+
     class Project(val projectName: String)
 
     class CompiledProject(val project: Project, val output: String, val resultCode: Int)
@@ -78,7 +86,7 @@ class BasicKotlinGradleIT {
     }
 
     private fun CompiledProject.assertSuccessful(): CompiledProject {
-        assertEquals(resultCode, 0)
+        assertEquals(0, resultCode)
         return this
     }
 
@@ -90,7 +98,11 @@ class BasicKotlinGradleIT {
     }
 
     private fun CompiledProject.assertReportExists(): CompiledProject {
-        assertTrue(File(File(workingDir, project.projectName), "build/reports/tests/demo.TestSource.html").exists(), "Test report does not exist. Were tests executed?")
+        assertReportExists("")
+        return this
+    }
+    private fun CompiledProject.assertReportExists(subProject: String): CompiledProject {
+        assertTrue(File(File(File(workingDir, project.projectName), subProject), "build/reports/tests/demo.TestSource.html").exists(), "Test report does not exist. Were tests executed?")
         return this
     }
 

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

@@ -0,0 +1,15 @@
+buildscript {
+  repositories {
+    mavenCentral()
+    maven {
+        url 'file://' + pathToKotlinPlugin
+    }
+  }
+  dependencies {
+    classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:0.1-SNAPSHOT'
+  }
+}
+
+task wrapper(type: Wrapper) {
+  gradleVersion="1.4"
+}

libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/multiprojectClassPathTest/gradle/wrapper/gradle-wrapper.properties

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

libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/multiprojectClassPathTest/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/src/test/resources/testProject/multiprojectClassPathTest/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/test/resources/testProject/multiprojectClassPathTest/settings.gradle

@@ -0,0 +1 @@
+include 'subproject'

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

@@ -0,0 +1,18 @@
+apply plugin: "kotlin"
+
+repositories {
+  mavenCentral()
+  maven {
+    url 'file://' + pathToKotlinPlugin
+  }
+}
+
+dependencies {
+    compile 'com.google.guava:guava:12.0'
+    testCompile  'org.testng:testng:6.8'
+    testRuntime  'org.jetbrains.kotlin:kotlin-stdlib:0.1-SNAPSHOT'
+}
+
+test {
+    useTestNG()
+}

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

@@ -0,0 +1,18 @@
+package demo
+
+import sun.nio.cs.SingleByte
+import sun.net.spi.nameservice.dns.DNSNameService
+import javax.crypto.Cipher
+import com.sun.java.browser.plugin2.DOM
+import com.sun.crypto.provider.AESCipher
+
+fun box(): String {
+    val a = SingleByte() // charsets.jar
+    val c = DNSNameService() // dnsns.ajr
+    val e : Cipher? = null // jce.jar
+    val f : AESCipher? = null // sunjce_provider.jar
+    val j : DOM? = null // plugin.jar
+    return "OK"
+}
+
+

libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/multiprojectClassPathTest/subproject/src/test/kotlin/tests.kt

@@ -0,0 +1,11 @@
+package demo
+
+import org.testng.Assert.*
+import org.testng.annotations.Test as test
+
+class TestSource() {
+    test fun f() {
+        assertEquals(box(), "OK")
+    }
+}
+