297 Commits

Author SHA1 Message Date
Yan Zhulanow 78a4e90132 Minor: Fix Maven plugin compilation (configuration parameter is not required now in analyzeAndGenerate(), cherrypick problem) 2016-09-12 19:07:57 +03:00
Yan Zhulanow 015130832b Kapt: allow to use Kapt from compileBunchOfSources() 2016-09-10 17:36:53 +03:00
Yan Zhulanow 6eb3d7e002 Kapt: Refactor kapt type wrappers. Now every ordinary (not NoType) type has a backed PsiType so it's easy to call utility functions from IntelliJ.
(cherry picked from commit 0a684aa)
2016-08-29 16:31:16 +03:00
Ilya Gorbunov 0f8bf310f2 Kotlin script execution for maven: include kotlin-runtime as explicit dependency for script.
Relates to #KT-11839
2016-08-17 12:40:50 +03:00
Sergey Mashkov 3c002625c6 KT-13211 KotlinCompileMojoBase could provide better compilation failure info 2016-08-12 13:59:58 +03:00
Alexey Andreev 496539d101 KT-3008 Add module kind attribute to Maven plugin. Fix tests from libraries subproject 2016-06-27 15:33:26 +03:00
Ilya Gorbunov 7c5c4610e8 Rename -jdk compiler option to -jdk-home (jdkHome), add jdk path validation. 2016-06-23 22:47:45 +03:00
Ilya Gorbunov 644df89dc9 CLI: Allow to specify JDK for classpath building with '-jdk' compiler argument.
Maven: support jdk parameter linked to kotlin.compiler.jdk property.
Gradle: support jdk compiler option.
2016-06-23 22:46:07 +03:00
Ilya Gorbunov 1157e052ee Maven: support languageVersion parameter, linked to property kotlin.compiler.languageVersion. 2016-06-23 22:46:07 +03:00
Ilya Gorbunov 3f3a3820b8 Maven: support jvmTarget parameter in Maven, linked to property kotlin.compiler.jvmTarget.
Gradle: support jvmTarget compiler option.
2016-06-23 22:46:07 +03:00
Alexander Udalov e5d64d316d Fix kotlin-maven-plugin compilation 2016-05-26 14:14:17 +03:00
Alexander Udalov 3c81bb4bfc Add MessageCollector#hasErrors, get rid of MessageSeverityCollector
Also fix duplicated wrapping of a message collector into a message severity
collector (in CLICompiler and in the beginning of doExecute in
K2JVMCompiler/K2JSCompiler)
2016-05-26 11:47:30 +03:00
Alexander Udalov 3ca77de924 Remove traces of old compiler plugin architecture
It was retired with the deprecation and subsequent removal of the old KDoc, and
is now unused
2016-05-26 11:47:30 +03:00
Alexander Udalov 0fe39a186e Simplify public methods of KotlinToJVMBytecodeCompiler
Pass as much as possible in the single CompilerConfiguration instance instead
of in separate function parameters. Add corresponding keys to
JVMConfigurationKeys.

Re changes in compileModules: since output directory (stored now under the key
OUTPUT_DIRECTORY) is different for each module, the configuration of the whole
project is no longer applicable when compiling individual modules. Thus we copy
the project configuration for each module and add the output directory value
2016-05-26 11:47:30 +03:00
Alexander Udalov 6c0ff40197 Move JVMConfigurationKeys to frontend.java
Similarly to K2JVMCompilerArguments, they will soon be needed in the IDE code.
Move COMPILER_JAR_LOCATOR to CLIConfigurationKeys because it's used both in JVM
and JS, and only in CLI. Other keys, non-relevant in the IDE, may be moved out
soon as well, such as incremental compilation components
2016-05-23 14:47:00 +03:00
Sergey Mashkov 77df2e07ad KT-12074 Building Kotlin maven projects using a parent pom will silently fail
We should consider module's basedir if there is relative source directory specified for the execution
2016-05-18 14:47:16 +03:00
Yaroslav Ulanovych de94d5c414 Fix KT-11839 maven goal to execute kotlin script 2016-05-15 16:08:55 +02:00
Ilya Gorbunov 8425304866 Advance snapshot version to 1.1-SNAPSHOT 2016-05-11 17:28:38 +03:00
Alexander Udalov a8629b3836 Do not fail on unknown -X flags
For better compatibility if we add experimental stuff in 1.0.X compilers
2016-04-12 20:03:51 +03:00
Ilya Gorbunov b71b336a69 Fix fq names of moved facade classes in imports and other code occurrences 2015-12-29 18:04:13 +03:00
Michael Nedzelsky ac8dd1262c generate kjsm-files for js-stdlib and during compilation via maven or gradle 2015-11-23 22:32:37 +03:00
Michael Nedzelsky 190bab099c fix KT-9441 Unable to Access Internal Classes from Test Code within Same Module
#KT-9441 Fixed
2015-10-28 01:58:54 +03:00
Ilya Gorbunov 8635eaae69 Alter regex in verify script for versions like 1.0.0-beta+1005 2015-10-20 04:37:05 +03:00
Dmitry Jemerov a54e49aedd Maven build fixed 2015-10-09 12:43:00 +02:00
Dmitry Jemerov 7e2c2ef678 restore compilation after rebase of dropping external annotations; fix affected tests 2015-10-09 11:52:02 +02:00
Alexander Udalov 13c54a2678 Drop external annotations support in build tools
External annotations will only be considered in the IDE for additional
inspections based on more precise types in Java libraries
2015-10-09 11:51:58 +02:00
Ilya Gorbunov 1c79cf2b51 Replace KotlinPackage legacy facade with corresponding package parts. 2015-10-07 22:36:32 +03:00
Dmitry Jemerov 81d0b6c109 verify.groovy: ignore PERF output 2015-09-15 16:24:18 +02:00
Michael Bogdanov 2ca9b3ae0e Code clean 2015-09-07 16:29:10 +03:00
Michael Bogdanov 25234f672a Maven plugin fixes 2015-09-07 16:29:05 +03:00
Sergey Mashkov 8353b4d3e8 Maven: integration test should remove escape sequences from build log 2015-07-30 19:20:30 +03:00
Sergey Mashkov 16ec066437 Maven: integration test should aomit downloading/downloaded messages even if they are printed with no log level 2015-07-28 18:24:21 +03:00
Sergey Mashkov 8b358558c9 Maven: integration test should escape compiler version 2015-07-28 18:04:00 +03:00
Sergey Mashkov 3c3e1a0a52 Maven: eliminate warning classpath entry doesn't exist. Fix integration test 2015-07-28 17:46:15 +03:00
Sergey Mashkov 82165d2a93 Maven: Introduce test for plugin output
Use mvn integration-test to run tests
2015-07-28 13:37:33 +03:00
Sergey Mashkov 015ac0cd5b Maven: take logger every time
The root cause of problem is that we take logger at too early stage so there is initial bootstrap maven logger that is replaced by plexus container via injector at later initialization stage. We have to use injected logger rather than initial bootstrap logger. At the same time there is no actual performance advantage to have LOG field because of JIT inliner will inline getLog() body anyway.

#KT-8630 Fixed
2015-07-28 13:37:23 +03:00
Michael Nedzelsky 3ac1bdcdc8 kotlin-maven-plugin, ant:withKotlin: skip compilation for empty sources
#KT-7618 Fixed
2015-06-11 22:21:16 +03:00
Michael Nedzelsky d629271510 JS: make -meta-info cli option boolean 2015-05-21 02:30:54 +03:00
Sergey Mashkov 4ef745974e Maven: Fix build for Maven 3.0.5 2015-05-19 15:00:10 +03:00
Sergey Mashkov 72238c4d39 Maven: maven annotations is required in compile time in some cases 2015-05-18 19:59:55 +03:00
Sergey Mashkov d04ec74217 Maven: use maven-annotations in kotlin-maven-plugin 2015-05-18 19:36:19 +03:00
Sergey Mashkov 35ed682714 Maven: Introduce test-js goal
#KT-7757 Fixed Maven K2JS should be able to build tests too
2015-05-18 19:36:18 +03:00
Sergey Mashkov 606ea7bb70 Do not pass non-existing source roots to the compiler
#KT-3679 Fixed Maven build fails when some source directories don't exist
2015-05-18 19:27:35 +03:00
Sergey Mashkov 0578f44fd0 Maven: don't scan target directories for annotations in multimodule project
#KT-7187 Fixed Maven K2JVM compiler scanning for annotations
2015-05-18 19:27:35 +03:00
Pavel V. Talanov a21abeba33 Fix kotlin-gradle-plugin to correctly process java source files
Do not remove outdirectory from cp in maven: this is needed for gradle-plugin build to see files compiled by gmaven
    this may cause problems with running mvn install without clean for kotlin
Remove special magic with groovy-output in gradle-plugin pom.xml
2015-04-16 16:40:55 +03:00
Michael Nedzelsky 3bf14518e8 JS backend: add -meta-info command line option for cli compiler 2015-03-18 09:38:53 +03:00
Alexander Udalov 93f02aeead Add source directories to classpath in CLI compiler
Move this logic from Ant and Maven plugins
2015-01-28 19:58:33 +03:00
Alexander Udalov f37e2f173d Rename package jet -> kotlin in util, util-runtime
org.jetbrains.jet.config -> org.jetbrains.kotlin.config
org.jetbrains.jet.utils -> org.jetbrains.kotlin.utils

Also move coreLib.kt to package 'org.jetbrains.kotlin.utils'
2015-01-08 23:32:08 +03:00
Alexander Udalov 8ca803775f Rename package jet -> kotlin in cli, cli-common
org.jetbrains.jet.cli -> org.jetbrains.kotlin.cli

Also fix some minor warnings
2015-01-08 23:32:07 +03:00
Michael Nedzelsky eebb012b13 JS backend: maven: fix compiler mojo 2014-12-12 03:03:43 +03:00