Commit Graph

300 Commits

Author SHA1 Message Date
Yan Zhulanow af9c5cc45d Providing plugin classpath through JPS extensions 2015-02-26 15:25:44 +03:00
Andrey Breslav febfdde89e Compiler plugins can provide extra command line parameters in JPS 2015-02-26 15:25:39 +03:00
Mikhail Mutcianko 95fd4006d9 fix android jps build test case
- add proper way of setting up android sdk for jps
- add missing android plugin runtime library
2015-02-26 15:25:38 +03:00
Mikhail Mutcianko 1912b2b0ec add android jps builder test stub
wtf
2015-02-26 15:25:35 +03:00
Mikhail Mutcianko baa442207b fix android resource path arguments after rebase 2015-02-26 15:25:34 +03:00
Mikhail Mutcianko ec0d1f5d06 fix android plugin libs dependencies 2015-02-26 15:25:30 +03:00
Mikhail Mutcianko c6b8cbbb01 add android layout file searching to kotlin jps plugin 2015-02-26 15:25:28 +03:00
Nikolay Krasko 8ea9d39e98 Do not generate long lines and simplify merge in generated tests 2015-02-24 13:15:09 +03:00
Dmitry Jemerov ce4b2db8f6 vendor and homepage 2015-02-19 15:35:46 +03:00
Nikolay Krasko f1774bd6fb Fixed test data according to fixed bug in IDEA JPS. 2015-02-19 14:36:23 +03:00
Evgeny Gerashchenko 460a77275a Added tests with conversion between Java and Kotlin and moving class. 2015-02-18 18:51:59 +03:00
Evgeny Gerashchenko f09fd923f3 Fixed test data according to fixed bug in IDEA JPS. 2015-02-18 18:51:50 +03:00
Evgeny Gerashchenko 4ddaa5cdda Filtering out non-existent directories from generated classpath. The check is so simple, because there may be, e.g. non-existent production output directory for just created module.
#KT-6703 fixed
2015-02-18 13:37:35 +03:00
Evgeny Gerashchenko 7e9ea23ce0 Minor. Clarified property name. 2015-02-18 13:37:34 +03:00
Evgeny Gerashchenko d1a2fd9c66 KT-6586 accessing Kotlin class static class object variable's value from Java does not properly update between compiles
#KT-6586 fixed
2015-02-18 13:37:34 +03:00
Alexander Udalov 0217121814 Revert "Fixed compilation. Some class files generated by kotlinc may have no annotation (that should be fixed later)."
This reverts commit 4b6112d380.

This workaround is not needed anymore after the fix in e705ff2
2015-02-17 15:32:46 +03:00
Alexander Udalov 640adecde6 Fix KotlinJpsBuildTest, run J+K tests with runtime
Otherwise javac is not able to find class KotlinClass$Kind, which is used in
annotation argument and for some reason this leads to an exception (in javac)
which gets swallowed and unresolved reference is reported in Java code.

java:INFO:com.sun.tools.javac.code.Symbol$CompletionFailure: class file for
kotlin.jvm.internal.KotlinClass$Kind not found
java:INFO:Errors occurred while compiling module 'm1'
2015-02-16 21:46:23 +03:00
Alexander Udalov 6ce8d6bd2e Serialize descriptors for local/anonymous classes on JVM
Reflection needs this information to work for local classes and anonymous
objects
2015-02-16 21:46:21 +03:00
Alexander Udalov 45fec9257a Minor, move replaceHashWithStar to JetTestUtils 2015-02-16 20:19:48 +03:00
Pavel V. Talanov a1f4c06a49 Update test data that mentioned old JvmAbi constants 2015-02-16 15:38:34 +03:00
Evgeny Gerashchenko 4b6112d380 Fixed compilation. Some class files generated by kotlinc may have no annotation (that should be fixed later). 2015-02-16 15:34:35 +03:00
Evgeny Gerashchenko dd89311d22 Not reading class file three times incremental caches. 2015-02-13 21:51:51 +03:00
Evgeny Gerashchenko 9f159b1fea Extracted cli-parser to separate library. Removed full dependency jps-plugin -> idea-full. 2015-02-13 21:51:50 +03:00
Evgeny Gerashchenko 1484ce4a46 Renamed and moved module ide-compiler-runner to idea-jps-common.
Motivation: it has only a bunch of constants and a trivial class needed in idea and jps modules.
2015-02-13 21:51:50 +03:00
Evgeny Gerashchenko bca8711182 Removed redundant dependencies. 2015-02-13 21:51:50 +03:00
Evgeny Gerashchenko 3e1b869070 Moved parts of ide-compiler-runner to direct modules. 2015-02-13 21:51:49 +03:00
Evgeny Gerashchenko d3d30106a4 Corrected updating Java mappings for package facade classes. We report all source files for it, not only currently compiled. 2015-02-11 19:19:55 +03:00
Evgeny Gerashchenko 1a486bf969 Reverted wrong test data for tests where files are added to package. Let them fail. 2015-02-11 19:19:55 +03:00
Evgeny Gerashchenko 02faa02a35 Checking Java mappings after rebuild (failing now for partially compiled package facades) 2015-02-11 19:19:55 +03:00
Evgeny Gerashchenko 478118c12a Extracted common function getRecompilationDecision. 2015-02-06 17:44:42 +03:00
Evgeny Gerashchenko 432408e1a8 Checking source to output mapping after rebuild. 2015-02-06 17:44:41 +03:00
Evgeny Gerashchenko c5593a5b80 Correctly processing disappeared protos, files with constants/inline function. 2015-02-06 17:44:41 +03:00
Evgeny Gerashchenko 5b89f88447 Minor. Simplified getObsoletePackageParts() and similar functions. 2015-02-06 17:44:40 +03:00
Evgeny Gerashchenko 89f3d21ba4 Clearing incremental cache for removed files without scanning output directory. 2015-02-06 17:44:40 +03:00
Evgeny Gerashchenko 602642715c Checking incremental cache dump after make. Comparing it with dump after rebuild. 2015-02-06 17:44:40 +03:00
Evgeny Gerashchenko f071802e19 Simplified process of filtering out obsolete package parts and loading descriptors from incremental caches.
Now when file is deleted or dirty (compiled right now), its old package part is used. Current package of file doesn't matter.
2015-02-06 17:44:39 +03:00
Evgeny Gerashchenko 512ea72e69 Minor. Green code and formatting. 2015-02-06 15:56:33 +03:00
Evgeny Gerashchenko 84ca0a5b4e Minor. Green code. 2015-02-06 15:56:33 +03:00
Evgeny Gerashchenko c1b6e3a63d Minor. Swapped test data. "other" and "same" packages were confused. 2015-01-30 14:01:33 +03:00
Evgeny Gerashchenko 1e3558afc6 Simple changing temp directory in JPS test for easier debugging. 2015-01-30 14:01:32 +03:00
Alexander Udalov 5903b8c4a7 Reorder and optimize dependencies between modules and libraries
- drop 'kotlin-runtime' and other dependencies which are exported by
  other modules ('util' and 'util.runtime' in case of 'kotlin-runtime')
- make all Kotlin modules from the compiler depend on 'util' for clarity
- put 'util' and 'util.runtime' to the bottom of the list everywhere: when
  kotlin-runtime gets reflection, classes from core/ should have higher
  priority than their previous versions from kotlin-runtime.jar
2015-01-28 19:58:35 +03:00
Alexander Udalov 3ea59117ac Simplify code in module script/xml generation
Pass classpath and annotation roots explicitly instead of wrapped in a callback
2015-01-28 19:58:32 +03:00
Alexander Udalov fa2116040e Modules.xml: add Java sources right after Kotlin sources
Java sources should appear before classpath dependencies because they should
have higher priority if the same symbol is located in the module source and in
the classpath. This is so because by default module source has the highest
priority in IDEA except the JDK. Ideally this will be handled later by full
support of modules in the compiler
2015-01-28 19:58:31 +03:00
Alexander Udalov eb3588bd0a Minor, don't add external annotation roots multiple times 2015-01-28 19:58:31 +03:00
Evgeny Gerashchenko a6362dda22 Added workaround for linkage error in IDEA 14.0-14.0.2 2015-01-27 16:43:01 +03:00
Evgeny Gerashchenko c60797e306 Rebuilding dependants fully only when constants/inline functions changed. This is not 100% precise, but it is faster. It is a compromise until we implement preciser incremental compilation. 2015-01-19 15:36:57 +03:00
Evgeny Gerashchenko 72687758a5 Rebuilding dependent modules. 2015-01-19 15:36:56 +03:00
Evgeny Gerashchenko 00f2ba5124 Test with Java and Kotlin changed simultaneously. 2015-01-19 15:36:56 +03:00
Evgeny Gerashchenko 967f470b16 Added multi-module tests on incremental compilation.
Changing code wasn't required, Java's incremental caches were enough.
2015-01-19 15:36:55 +03:00
Evgeny Gerashchenko 2b438a286f Updated test data according to changes in IDEA. 2015-01-16 20:19:37 +03:00