diff --git a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/annotations.xml index 67c82aa96e6..55a42927e18 100644 --- a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/annotations.xml +++ b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/annotations.xml @@ -8,6 +8,9 @@ + + + @@ -28,5 +31,8 @@ + + + diff --git a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/tasks/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/tasks/annotations.xml index 67bc433ea20..f379f72b327 100644 --- a/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/tasks/annotations.xml +++ b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/tasks/annotations.xml @@ -4,4 +4,7 @@ + + + \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-core/pom.xml b/libraries/tools/kotlin-gradle-plugin-core/pom.xml index a868d57bd50..affa7a99944 100644 --- a/libraries/tools/kotlin-gradle-plugin-core/pom.xml +++ b/libraries/tools/kotlin-gradle-plugin-core/pom.xml @@ -50,7 +50,7 @@ org.jetbrains.kotlin gradle-api - 1.4 + 1.6 provided @@ -157,4 +157,4 @@ http://repository.jetbrains.com/utils - \ No newline at end of file + diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt index 7f448767e10..6ad11a6f037 100644 --- a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt @@ -39,10 +39,11 @@ import org.gradle.api.artifacts.Dependency import java.util.HashSet import org.gradle.api.UnknownDomainObjectException import org.gradle.api.initialization.dsl.ScriptHandler +import javax.inject.Inject val DEFAULT_ANNOTATIONS = "org.jebrains.kotlin.gradle.defaultAnnotations" -open class KotlinPlugin(val scriptHandler: ScriptHandler): Plugin { +open class KotlinPlugin [Inject] (val scriptHandler: ScriptHandler): Plugin { public override fun apply(project: Project) { val javaBasePlugin = project.getPlugins().apply(javaClass()) @@ -53,8 +54,7 @@ open class KotlinPlugin(val scriptHandler: ScriptHandler): Plugin { 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")) } @@ -79,7 +79,7 @@ open class KotlinPlugin(val scriptHandler: ScriptHandler): Plugin { })) val kotlinTaskName = sourceSet.getCompileTaskName("kotlin") - val kotlinTask: KotlinCompile = project.getTasks().add(kotlinTaskName, javaClass())!! + val kotlinTask: KotlinCompile = project.getTasks().create(kotlinTaskName, javaClass()) javaBasePlugin.configureForSourceSet(sourceSet, kotlinTask) // store kotlin classes in separate directory. They will serve as class-path to java compiler @@ -105,14 +105,14 @@ open class KotlinPlugin(val scriptHandler: ScriptHandler): Plugin { val mainSourceSet = javaPluginConvention.getSourceSets()?.findByName(SourceSet.MAIN_SOURCE_SET_NAME) as HasConvention? if (mainSourceSet != null) { - val kdoc = project.getTasks()?.add(KDOC_TASK_NAME, javaClass())!! + val kdoc = project.getTasks().create(KDOC_TASK_NAME, javaClass())!! 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(), object : Action { + project.getTasks().withType(javaClass(), object : Action { override fun execute(task: KDoc?) { task!!.destinationDir = File(javaPluginConvention.getDocsDir(), "kdoc") } @@ -123,7 +123,7 @@ open class KotlinPlugin(val scriptHandler: ScriptHandler): Plugin { } -open class KotlinAndroidPlugin(val scriptHandler: ScriptHandler): Plugin { +open class KotlinAndroidPlugin [Inject] (val scriptHandler: ScriptHandler): Plugin { val log = Logging.getLogger(getClass()) @@ -132,7 +132,7 @@ open class KotlinAndroidPlugin(val scriptHandler: ScriptHandler): Plugin { + ext.getSourceSets().all(object : Action { override fun execute(sourceSet: AndroidSourceSet?) { if (sourceSet is ExtensionAware) { val sourceSetName = sourceSet.getName() @@ -168,8 +168,8 @@ open class KotlinAndroidPlugin(val scriptHandler: ScriptHandler): Plugin, project: Project, androidExt: BaseExtension): Unit { @@ -186,9 +186,9 @@ open class KotlinAndroidPlugin(val scriptHandler: ScriptHandler): Plugin())!! + val kotlinTask: KotlinCompile = project.getTasks().create(kotlinTaskName, javaClass()) kotlinTask.kotlinOptions = kotlinOptions @@ -227,10 +227,10 @@ open class KotlinAndroidPlugin(val scriptHandler: ScriptHandler): Plugin(buildTypeSourceSet, "kotlin").getKotlin()) } - javaSourceList.add(callable{ variant.getProcessResources().getSourceOutputDir() }) - javaSourceList.add(callable{ variant.getGenerateBuildConfig()?.getSourceOutputDir() }) - javaSourceList.add(callable{ variant.getAidlCompile().getSourceOutputDir() }) - javaSourceList.add(callable{ variant.getRenderscriptCompile().getSourceOutputDir() }) + javaSourceList.add(Callable{ variant.getProcessResources().getSourceOutputDir() }) + javaSourceList.add(Callable{ variant.getGenerateBuildConfig()?.getSourceOutputDir() }) + javaSourceList.add(Callable{ variant.getAidlCompile().getSourceOutputDir() }) + javaSourceList.add(Callable{ variant.getRenderscriptCompile().getSourceOutputDir() }) if (variant is ApkVariant) { for (flavour in variant.getProductFlavors().iterator()) { diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt index fe49587e97e..29c600bc009 100644 --- a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt +++ b/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() @@ -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()) { diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin-core/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt index ef1634908b4..06707872798 100644 --- a/libraries/tools/kotlin-gradle-plugin-core/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt +++ b/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() } } diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.12/gradle/wrapper/gradle-wrapper.jar b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.12/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000000..3c7abdf1279 Binary files /dev/null and b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.12/gradle/wrapper/gradle-wrapper.jar differ diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.12/gradle/wrapper/gradle-wrapper.properties b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.12/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000000..88b32868887 --- /dev/null +++ b/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 diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.4/gradlew b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.12/gradlew similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.4/gradlew rename to libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.12/gradlew diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.4/gradlew.bat b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.12/gradlew.bat similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.4/gradlew.bat rename to libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.12/gradlew.bat diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.4/gradle/wrapper/gradle-wrapper.jar b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.4/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 42d9b0e9c58..00000000000 Binary files a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.4/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.6/gradle/wrapper/gradle-wrapper.jar b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.6/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000000..3c7abdf1279 Binary files /dev/null and b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.6/gradle/wrapper/gradle-wrapper.jar differ diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.4/gradle/wrapper/gradle-wrapper.properties b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.6/gradle/wrapper/gradle-wrapper.properties similarity index 81% rename from libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.4/gradle/wrapper/gradle-wrapper.properties rename to libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.6/gradle/wrapper/gradle-wrapper.properties index 90e63547fc6..a91fd600121 100644 --- a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.4/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.6/gradlew b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.6/gradlew new file mode 100644 index 00000000000..91a7e269e19 --- /dev/null +++ b/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 "$@" diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.6/gradlew.bat b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/GradleWrapper-1.6/gradlew.bat new file mode 100644 index 00000000000..8a0b282aa68 --- /dev/null +++ b/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 diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt index 8f9e5e65ecd..a9050a7ca04 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt +++ b/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 { - 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 { 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 = configuration.getResolvedConfiguration().getFiles(KSpec({ dep -> true }))!!.map({(f: File):URL -> f.toURI().toURL() }) diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt index 692404341e5..7e990587e17 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt +++ b/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")