Commit Graph

29 Commits

Author SHA1 Message Date
Andrey Breslav e092d00c2e Support exported dependencies
Original commit: 5c58cb946c
2013-08-27 15:48:18 +04:00
Alexander Udalov f2ba3cf157 Rename package in JPS plugin tests
Package 'kotlin' is not supported until package views are implemented, because
its name clashes with the stdlib

Original commit: 2af8dd4298
2013-08-26 15:59:43 +04:00
Natalia.Ukhorskaya 160070be27 Implement method from super class
Original commit: aec1fa8697
2013-08-08 16:03:03 +04:00
Natalia.Ukhorskaya 48ac33d730 Check is JavaBuilder.IS_ENABLED public
Original commit: bc9af296a5
2013-08-08 16:02:58 +04:00
Natalia.Ukhorskaya cfa8694eb7 Disable kotlin-jps-plugin when java-jps-plugin is disabled
Original commit: 2cc4638b09
2013-08-08 14:07:50 +04:00
Andrey Breslav eba00a0cd9 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.

Original commit: 387bf2601b
2013-07-25 20:18:03 +04:00
Erokhin Stanislav 30ce814129 Merge branch 'master' into idea13
Original commit: 79a9253b74
2013-07-09 19:52:06 +04:00
Andrey Breslav 9defbe0083 Path separator must be constant
TeamCity agents have different OS'es, but build parameters are fixed

Original commit: 7171cd4cc5
2013-06-10 15:33:44 +04:00
Natalia.Ukhorskaya 372ea911a5 Merge branch 'master' into idea13
Conflicts:
	idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java
	idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java
	libraries/stdlib/src/kotlin/properties/Properties.kt
	libraries/stdlib/test/properties/delegation/DelegationTest.kt
	libraries/stdlib/test/properties/delegation/MapDelegationTest.kt
	libraries/stdlib/test/properties/delegation/lazy/LazyValuesTest.kt
	update_dependencies.xml

Original commit: 8429162220
2013-06-04 13:14:08 +04:00
Andrey Breslav 005124ed27 Support custom JDK annotations path for TeamCity
Original commit: 6d6e627641
2013-05-31 20:35:32 +04:00
Andrey Breslav 8b0054af39 Do not fail on circular dependencies + better message
Original commit: a8267b370e
2013-05-30 13:07:50 +04:00
Andrey Breslav 77a22016f4 Do not fail on circular dependencies + better message
Original commit: 6465abe7eb
2013-05-29 21:39:36 +04:00
Andrey Breslav db0a5f4f80 Using XML instead of module scripts when running from IDE
Original commit: f1f9d5327c
2013-04-29 17:59:52 +04:00
Andrey Breslav 779e153749 Interface extracted from KotlinModuleScriptGenerator
Original commit: abd162d466
2013-04-29 15:46:37 +04:00
Evgeny Gerashchenko 0581d8b0af Removed unnecessary final on local variables.
Original commit: ec5331057a
2013-03-13 14:12:50 +04:00
Evgeny Gerashchenko f5749968a6 Happy new year 2013!
Original commit: 52b7ee6447
2013-01-28 18:58:08 +04:00
Natalia.Ukhorskaya 40efae0050 Add JpsTests for inheritance (J-K-J, K-J-K)
Original commit: 1824879dd0
2012-12-17 17:48:06 +04:00
Andrey Breslav 99d77e3593 Don't run the builder if there's no dirty files
Original commit: 08a150b09e
2012-12-03 14:06:46 +04:00
Natalia.Ukhorskaya 9ba7e91942 Rename test projects for jps plugin. Do not lowercase first letter in project name
Original commit: 1378f836f5
2012-11-27 15:34:36 +04:00
Natalia.Ukhorskaya eef49ca923 Add tests for jps plugin
Original commit: 74ca357502
2012-11-27 14:54:18 +04:00
Andrey Breslav f0c15286c1 Migrating to IDEA 123.4
Original commit: 3b11d5787c
2012-11-23 12:38:54 +04:00
Andrey Breslav 1f1b323ec1 Proper dependencies for the JPS plugin
Original commit: 10cedf8576
2012-11-21 20:51:50 +04:00
Natalia.Ukhorskaya 765147b876 Add Java Source Roots to classpath
#KT-3062 Fixed

Original commit: ff45322d1a
2012-11-21 19:44:29 +04:00
Andrey Breslav ae57dfe9a8 Report exceptions from both makes to Exception Analyzer
Original commit: 3e1a5a7be1
2012-11-21 19:31:14 +04:00
Andrey Breslav 3a0b4505ef Introducing KotlinPaths to impose some discipline on compiler/library location
Original commit: 4ed07cd9ae
2012-11-21 18:16:09 +04:00
Andrey Breslav cd020e3cfc KT-3056 Kotlin: Cannot find kotlinc home. Make sure plugin is properly installed
#KT-3056 Fixed

Original commit: 4ee76a6649
2012-11-21 14:12:51 +04:00
Andrey Breslav 49afb0948f Migrate to IDEA 122.813
Original commit: 47e057d529
2012-11-19 17:04:18 +04:00
Andrey Breslav 8db5f6741c Initial implementation for external build
#KT-2751 Fixed
 #KT-3017 Fixed
 #KT-3021 Fixed

Original commit: 9592bfd62f
2012-11-13 13:46:12 +04:00
Andrey Breslav 95e5edc194 JPS plugin stub
Original commit: f7a6c6f6fd
2012-11-13 13:46:12 +04:00