Commit Graph

220 Commits

Author SHA1 Message Date
Leonid Shalupov 632d12021f maven-plugin: compiler messages to maven log 2013-02-22 17:57:58 +04:00
Leonid Shalupov 0a1303d118 build: no classes rename in jarjar
build: fixed proguard shrinking
2013-02-13 14:22:54 +04:00
Andrey Breslav 01a24c6334 Better debugging of arguments in Maven 2013-02-05 20:32:11 +04:00
max-kammerer dbfb29fdf8 Fixed error on running kotlin-maven-plugin tests 2013-02-04 18:32:01 +04:00
Evgeny Gerashchenko 52b7ee6447 Happy new year 2013! 2013-01-28 18:58:08 +04:00
Alexander Udalov 173dfc4811 Fix kotlin-maven-plugin compilation 2013-01-16 23:09:17 +04:00
Leonid Shalupov 6778dda9db maven: report Kotlin Compiler version as INFO 2012-12-14 17:36:02 +04:00
Leonid Shalupov f9331407a5 reverting wrong pull request 148; to be discussed 2012-12-05 21:53:34 +04:00
Philippe Marschall 3a9ed81915 Skip Plugin Exceution for POM Projects
It's quite common to have a multi module project with a parent project
that has POM packaging. It would be quite convenient if the
kotlin-maven-plugin could be configured there instead of in each module.
Currently this is not possible because the plugin tries to execute on
POM projects with fails.

 - skip execution on POM projects
2012-12-05 15:17:46 +01:00
James Strachan 0506708e70 include the maps.js standard JS file in the maven plugin (fixing up issues caused by the refactoring of kotlin_lib.js into 2 files) 2012-10-25 16:56:13 +01:00
James Strachan c843d23416 allow the maven plugin to have its source directories to be configured on a per execution basis (e.g. so that you can have different directories for JS compilation as to JVM based compilation). Its a shame to require 2 fields for configuration; but tried all other permutations I could think of but could not figure out a cleaner way -better approaches welcome! :) 2012-10-25 10:57:31 +01:00
James Strachan fdb755e2e7 update for KT-2765 so we can specify annotationPaths for kdoc too 2012-09-14 16:34:25 +01:00
James Strachan 3d66ebd0e1 added partial fix for KT-2765 so we can specify the paths to where annotations.xml files can be found 2012-09-14 15:04:09 +01:00
Leonid Shalupov 15b5ba5b51 KT-2694 simplify loop 2012-09-07 13:46:54 +04:00
Alexander Fedorov a245861711 skip if sources don't exists 2012-08-28 17:25:42 +04:00
Evgeny Gerashchenko f9b0223ab6 Using kotlin-jdk-annotations.jar from valid location in kotlin-maven-plugin. 2012-07-23 20:06:40 +04:00
Evgeny Gerashchenko 8050b96f27 Fixed code outside main project which was broken after refactoring. 2012-07-07 23:07:20 +04:00
James Strachan 20da5c48ea got the mvn k2js plugin working again & re-enabled the js building in the mvn build (apart from running the junit JS tests as some of them fail) 2012-07-05 11:43:35 +01:00
James Strachan d950d19292 fixed up the maven plugin after Pavel's changes 2012-07-04 22:01:04 +01:00
Evgeny Gerashchenko 77df57c150 Replaced jdk-headers with jdk-annotations everywhere. 2012-07-03 13:36:58 +04:00
James Strachan c09106fe68 fixed the JS maven plugin so it can generate a single JS file with all the required kotlin JS inside 2012-06-25 10:03:46 +01:00
James Strachan 3546a9ff54 added an integration test that compiles the JS unit tests and generates the QUnit test case 2012-06-14 15:32:57 +01:00
James Strachan 57ffb91514 fix possible NPE 2012-05-31 09:38:26 +01:00
James Strachan 2d4354af6c fixed possible NPE 2012-05-31 09:32:03 +01:00
James Strachan 872f08303e allow the JS maven plugin to copy the kotlin JS library file - or append it 2012-05-30 16:43:33 +01:00
James Strachan e41f59779e avoid mandatory properties for optional things on the plugin 2012-05-30 16:43:04 +01:00
James Strachan 4cff5f9759 modified the JS compiler so that it can have definitions and library sources specified or discovered on the classpath; so for example we can then discover the kotlin standard library kotlin that needs to be compiled; plus the JS library definitions (which map to the kotlin-lib.js file) 2012-05-30 15:51:08 +01:00
James Strachan d7573b49a6 allow the JS compiler to take a list of files, verbose flag and a flag to indicate if a main call is required; plus added a test case to ensure we can compile some of the kotlin standard library using the K2JSCompiler directly 2012-05-30 11:31:35 +01:00
James Strachan 4921aeafc3 refactored the maven plugin to use the vanilla K2JSCompiler directly and avoid using the K2JVMCompiler when generating JS code; also included a default LibrarySourceConfig which detects JS library code on the classpath which works nicer in maven/ant style worlds where dependencies tend to be specified rather than file paths to zip files 2012-05-29 17:28:15 +01:00
James Strachan 2898abb245 simplified the kotlin-js-library source generation so we can selectively include some of the kotlin standard library for use in JS compilation 2012-05-29 08:49:36 +01:00
James Strachan 7f53b2f111 workaround for windows test failure 2012-05-28 19:50:22 +01:00
James Strachan 4d7ab80c3e workaround for windows test failure 2012-05-28 19:08:31 +01:00
James Strachan 6486023feb workaround for windows test failure 2012-05-28 18:48:53 +01:00
James Strachan ec1a7f44ae create a standard jar of the kotlin JS source that needs to be compiled when generating JS code so its easy to reuse using regular maven dependencies in build tools; updated the examples to reuse this so that its easy to build JS code without needing to know where on the file system a kotlin checkout lives 2012-05-28 17:16:12 +01:00
James Strachan 1254aa9e6f allow the JS compiler to reference the JS library source so that maven based JS compilation can work & use the new kotlin.browser API 2012-05-26 07:45:10 +01:00
Evgeny Gerashchenko 1ff9c86083 Reverted K2JVMCompilerArguments.altHeaders->jdkHeaders usage. 2012-05-23 17:52:16 +04:00
Evgeny Gerashchenko ea36cf9fb0 Reverted all changes related to renaming jdkHeaders to altHeaders. 2012-05-23 17:05:09 +04:00
pTalanov c8fe0080c7 Fix compilation for maven build 2012-05-16 17:43:12 +04:00
Leonid Shalupov c6223fc0c2 stream integration test logs 2012-05-15 20:09:40 +02:00
Leonid Shalupov c689840eee jdk -> alt 2012-05-15 18:21:35 +02:00
Leonid Shalupov 734b60bb67 Merge pull request #51 from detouched/maven-plugin-test
maven plugin: uncommented invoker plugin but commented phase binding.
2012-05-15 07:57:35 -07:00
Leonid Shalupov a8951284ac libraries: jdkHeaders -> altHeaders 2012-05-15 16:49:06 +02:00
Evgeny Gerashchenko 15f6e7403e Renamed jdkHeaders to altHeaders in all places where it makes sense. 2012-05-15 15:19:55 +04:00
Daniel Penkin 43d64f2265 Uncommented invoker plugin but commented phase binding.
Integration tests are not held during normal package but still available via "mvn integration-test" command.
2012-05-09 13:58:40 +04:00
Leonid Shalupov 9f13d3b263 commented out maven integrations tests for now 2012-05-09 04:25:30 +04:00
Daniel Penkin 422fc81e38 Removed unnecessary import statement 2012-05-08 23:15:27 +04:00
Daniel Penkin a2ee297db9 Removed unnecessary repository sections 2012-05-08 23:10:03 +04:00
Daniel Penkin 281e8e5a76 Temporarily removed settings.xml 2012-05-08 12:51:21 +04:00
Daniel Penkin d6e8b63dc3 Added simple kotlin-maven-plugin integration test 2012-05-08 12:51:20 +04:00
Daniel Penkin 1484e8852c Merged with upstream master 2012-05-08 12:08:37 +04:00