Commit Graph

58 Commits

Author SHA1 Message Date
Andrey Breslav 2c61ff9085 Use Project SDK for jps-plugin 2014-01-20 20:12:17 +04:00
Andrey Breslav 77c340d872 Always use Project SDK 2014-01-20 20:08:28 +04:00
Andrey Breslav 0155bf0189 Fix for KT-4413 Do not add error types to supertype lists
The list is not filtered upon creation because it would force lazy types to compute

#KT-4413 Fixed
2014-01-16 20:05:12 +04:00
Evgeny Gerashchenko 4239f5bb18 Got rid of "namespace" word in backend. 2014-01-14 18:06:47 +04:00
Zalim Bashorov 8917bd0331 KotlinJpsBuildTestCase -> KotlinJpsBuildTest 2013-11-12 20:34:23 +04:00
Zalim Bashorov 4fb995c50b JPS: add tests for: exclude in compiler settings, project with more then one file. 2013-11-12 20:33:05 +04:00
Zalim Bashorov b31e2d7421 JPS: ignore excluded directories and files in compilation.
#KT-4188 fixed
2013-11-12 18:44:30 +04:00
Zalim Bashorov 923fd74c0a JPS: revert KotlinBuilder changes for using dirty files, because it's wrong. 2013-11-12 18:44:30 +04:00
Zalim Bashorov e5a58e0c70 JPS: switched to use dirty files without incremental compilation (temporary hack for recompiling all).
Fixed compiling files from excluded directories.
2013-11-08 18:14:22 +04:00
Zalim Bashorov 1409dd7812 Refresh FS after compilation for js and sourcemap files. 2013-11-08 18:14:21 +04:00
Andrey Breslav b726b5070a Do not use a method that is not present in some versions fo JPS 2013-10-31 18:31:00 +04:00
Zalim Bashorov da718af8b7 Minor refactoring -- rename some classes and variables. 2013-10-24 19:06:07 +04:00
Zalim Bashorov 3f4cd455e2 Make private all fields in JpsKotlinCompilerSettings. 2013-10-24 19:06:07 +04:00
Zalim Bashorov faa82317b6 Added "Additional command line parameters" to the Kotlin Compiler Settings tab. 2013-10-24 18:37:00 +04:00
Zalim Bashorov 4d68262b7f CLI & JPS: use List instead Set for libraries and decencies. 2013-10-24 18:36:59 +04:00
Andrey Breslav aacf133ef6 Ignore all output directories in a chunk
Otherwise the class files generated by previous builds for one of the targets in the chunk would interfere with source definitions, and we get overload resolution ambiguities and such
2013-10-21 19:21:23 +04:00
Andrey Breslav 2a43d2adee Report correct build targets for outputs + tests on output removal 2013-10-21 19:21:23 +04:00
Andrey Breslav c84e582397 Correctly report locations of output files 2013-10-21 19:21:23 +04:00
Andrey Breslav 251c659e91 Check removed files as well as dirty ones 2013-10-21 19:21:22 +04:00
Andrey Breslav 61270e8ee5 Do not fail on bad Kotlin configuration if there are no Kotlin files 2013-10-18 12:23:07 +04:00
Zalim Bashorov 31a4d91122 CLI: drop CompilerArguments and unnecessary methods from *CompilerArguments classes 2013-10-16 17:39:49 +04:00
Zalim Bashorov 5e0ef68d64 JPS: switch to using *CompilerArgument classes(from IDEA Project Settings) in build. 2013-10-16 17:39:49 +04:00
Zalim Bashorov 41d0a8be24 JPS: removed unnecessary code for running compiler out of process. 2013-10-16 17:39:48 +04:00
Zalim Bashorov 1176d58f40 JPS: transferring compiler settings to the JPS 2013-10-16 17:39:48 +04:00
Andrey Breslav 60425b15e6 Support circular dependencies
We generate a module script with information on all modules in the chunk, then build the whole chunk as "one big module"
2013-10-14 14:42:24 +04:00
Andrey Breslav d4a89d04d7 Each module carries its output directory 2013-10-10 17:49:17 +04:00
Zalim Bashorov dd553ef671 JPS plugin: refactoring:
- extract utility methods from KotlinBuilder;
- use StringUtil#join instead for iteration;
- add private constructor to LibraryUtils.
2013-10-04 19:18:19 +04:00
Zalim Bashorov 2b9b563efb JPS plugin: add support external compilation for JS modules. 2013-10-03 13:58:02 +04:00
Zalim Bashorov cfb7104ae9 JPS plugin: make the code more understandable -- added some comments and rename scriptFile to moduleFile. 2013-10-03 13:58:02 +04:00
Zalim Bashorov fc6b77366a JPS plugin: remove unnecessary method KotlinSourceFileCollector#hasDirtyFiles. 2013-10-03 13:48:38 +04:00
Natalia.Ukhorskaya 188e8b983e Missed sdk annotations for Android Sdk
#KT-3965 Fixed
2013-09-12 11:38:46 +04:00
Andrey Breslav 1e91fb8d27 Using annotations from reexported libraries 2013-08-29 20:30:34 +04:00
Andrey Breslav 5c58cb946c Support exported dependencies 2013-08-27 15:48:18 +04:00
Alexander Udalov 2af8dd4298 Rename package in JPS plugin tests
Package 'kotlin' is not supported until package views are implemented, because
its name clashes with the stdlib
2013-08-26 15:59:43 +04:00
Natalia.Ukhorskaya aec1fa8697 Implement method from super class 2013-08-08 16:03:03 +04:00
Natalia.Ukhorskaya bc9af296a5 Check is JavaBuilder.IS_ENABLED public 2013-08-08 16:02:58 +04:00
Natalia.Ukhorskaya 2cc4638b09 Disable kotlin-jps-plugin when java-jps-plugin is disabled 2013-08-08 14:07:50 +04:00
Andrey Breslav 387bf2601b Log version in JPS plugin
CompilerVersion.java is moved to cli-common (shared between compiler and JPS plugin) and renamed to KotlinVersion

This is needed because on TeamCity a JPS plugin is configured separately from the compiler, so it may happen that
JPS plugin version X tries to run compiler version X+100, and causes trouble.
2013-07-25 20:18:03 +04:00
Andrey Breslav 7171cd4cc5 Path separator must be constant
TeamCity agents have different OS'es, but build parameters are fixed
2013-06-10 15:33:44 +04:00
Andrey Breslav 6d6e627641 Support custom JDK annotations path for TeamCity 2013-05-31 20:35:32 +04:00
Andrey Breslav 6465abe7eb Do not fail on circular dependencies + better message 2013-05-29 21:39:36 +04:00
Andrey Breslav f1f9d5327c Using XML instead of module scripts when running from IDE 2013-04-29 17:59:52 +04:00
Andrey Breslav abd162d466 Interface extracted from KotlinModuleScriptGenerator 2013-04-29 15:46:37 +04:00
Evgeny Gerashchenko ec5331057a Removed unnecessary final on local variables. 2013-03-13 14:12:50 +04:00
Evgeny Gerashchenko 52b7ee6447 Happy new year 2013! 2013-01-28 18:58:08 +04:00
Natalia.Ukhorskaya 1824879dd0 Add JpsTests for inheritance (J-K-J, K-J-K) 2012-12-17 17:48:06 +04:00
Andrey Breslav 08a150b09e Don't run the builder if there's no dirty files 2012-12-03 14:06:46 +04:00
Natalia.Ukhorskaya 1378f836f5 Rename test projects for jps plugin. Do not lowercase first letter in project name 2012-11-27 15:34:36 +04:00
Natalia.Ukhorskaya 74ca357502 Add tests for jps plugin 2012-11-27 14:54:18 +04:00
Andrey Breslav 3b11d5787c Migrating to IDEA 123.4 2012-11-23 12:38:54 +04:00