summaryrefslogtreecommitdiff
path: root/main
Commit message (Collapse)AuthorAgeFilesLines
...
* Remove useless type parameters for {Test,}Evaluator (#416)Guillaume Martres2018-09-156-39/+39
| | | | | | * Remove useless type parameters for {Test,}Evaluator * Update Evaluator.scala
* Make sure files are readable when traversing source files. (#423)Victor Borja2018-09-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Mill was trying to read all files found under the source directory to create a digest for each of them. This was causing an error for broken symlinks. At first I believed temporary files should be ignored to avoid this problem, and asked at the gitter channel how to go about this, but overriding the `sources` task as [suggested](https://gitter.im/lihaoyi/mill?at=5ad6cd801130fe3d36eb7655) by @lihaoyi didn't actually help. on a simple scala project, editing a file with Emacs, creates a link file, like: ``` vic@oeiuwq ~/h/foo> ls -la foo/src/ total 8 drwxr-xr-x 4 vic staff 128 Sep 1 12:23 . lrwxr-xr-x 1 vic staff 22 Sep 1 12:23 .#hello.scala -> vic@oeiuwq.local.10748 drwxr-xr-x 3 vic staff 96 Sep 1 12:22 .. -rw-r--r-- 1 vic staff 12 Sep 1 12:22 hello.scala ``` So this patch only makes sures that the files (or the symlink here) is actually readable before trying to digest it. Fixes #402
* Fix shutdown hook failures in tests (#422)aosagie2018-09-022-18/+11
| | | | | | * Remove duplication from ClassLoader.create * Prevent closing of context class loader in tests so that shutdown hooks can run
* Fix incremental compilation when a Scala project depends on a Java project ↵Guillaume Martres2018-08-251-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#414) * Upgrade ammonite to 1.1.2-30-53edc31 This is mainly to get https://github.com/lihaoyi/Ammonite/pull/851 which should reduce the amount of unnecessary work done by incremental compilation in the Mill build. This requires some code changes since this means we now depend on a more recent version of coursier, as a side-effect this means that we do not depend on scalaz anymore. Also use the same ammonite version in the Mill build and in ScalaModule#ammoniteReplClasspath. Also remove an incorrect dependency in the caffeine integration test. This was always wrong but did not start failing until this commit, probably due to dependencies appearing in a different order on the classpath. * Rename ScalaWorker to ZincWorker Starting with the next commit, it will be used in Java-only projects too, so the name is misleading. * Upgrade to Zinc 1.2.1 * Fix incremental compilation when a Scala project depends on a Java project Before this commit, JavaModule#compile simply called javac unconditionally, thus generating new classfiles every time. But if a Scala project depends on a Java project, this will throw off the incremental compilation algorithm which will unnecessarily recompile files. To avoid this we now use Zinc to compile Java projects too (as a bonus this means that Java compilation becomes incremental). This required some refactoring in ZincWorkerImpl to be able to compile stuff without having to pass Scala-specific options. The issue solved by this commit could be reproduced by running in the Mill repository: $ mill main.compile $ mill -i @ main.compile() and observing that before this commit, the `main.compile()` call ended up recompiling code.
* Tidying up:Li Haoyi2018-08-2228-0/+3194
| | | | | - Combine `main/` and `core/` - Rename `jsbridges/`/`scalanativebridges/` -> `worker/` for consistency with other terminology
* Make the REPL evaluator accessible from the REPL itself (#413)Guillaume Martres2018-08-221-1/+1
| | | | This makes it easier to hack on Mill using Mill itself, the evaluator is available using `replApplyHandler.evaluator`
* Make visualizePlan work with external modules (#406)Joseph K. Strauss2018-08-101-27/+16
|
* Visualize Plan (#404)Joseph K. Strauss2018-08-083-28/+72
| | | | | | | | | | | | | | * Make necessary import changes * Refactor to allow calling internally w/o println * Refactor to allow multiple visualize modes * Add new visualizaPlan grap entire plan * Remove and alphabetize imports * Document visualizePlan
* Fix bug with 'u' at the beginning of path (#384)Joseph K. Strauss2018-08-031-2/+1
|
* add JavaModule#runBackground, to allow a task to kick off processes to run ↵Li Haoyi2018-07-212-14/+23
| | | | in the background that only die when the task is re-run
* add --disable-ticker, handle --color correctly (#379)Anton Sviridov2018-07-146-7/+27
|
* Allow hyphens in module and task names (#362)Joseph K. Strauss2018-06-069-11/+98
| | | | | | | | | | | | | | | | | * Allow bacticked tasks * Prevent stack overflow * Test for illegal bacticked identifiers * Filter out illegal backticked identifiers The only legal identifiers are aplanumeric, unserscore (_), and hyphens (-). * Remove unused method that is invalid * Document valid characters for module/task names
* fix #233 add append and exclude rules to assembly (#309)Nikolay Tatarinov2018-06-012-45/+162
| | | | | | | | | | | | | | | | | | | | | | | | * fix #233 add append and exclude rules to assembly * handle existing files and concatenation when file already exists in assembly * add assembly tests for append rules * tests for append patterns * tests for exclude patterns * make append algorithm use single map with fold over classpathIterator * move assembly rules logic to method * move grouping method to Assembly object, make assemblyRules Seq[_] rather than T[Seq[_]] * add test cases for when there are no rules * keep default parameter in createAssembly not to break CI * add one more reference.conf entry to tests
* Fix MILL_CLASSPATH for Windows (#354)Joseph K. Strauss2018-05-301-9/+20
| | | | | | | | | | | | | | | | | | | * Use comma as separator in MILL_CLASSPATH There is no need to use environment-specific separator, especially since - other variables are using commas anyway, and - it is not sent to any system-level command * Fix whitespace * Use MILL_CLASSPATH for Windows * Use vm options file for client on windows * Remove overzealous distinct * Clean up unnecessary ceremony
* move graphviz interactions onto a single worker thread to satisfy J2V8 ↵Li Haoyi2018-05-253-23/+52
| | | | limitation
* move VisualizeModule out into it's own ExternalModule; for some reason it ↵Li Haoyi2018-05-252-7/+15
| | | | wasn't getting picked up in the build discovery before
* Add a `visualize` command to render portions of the build graph as SVG (#349)Li Haoyi2018-05-257-35/+271
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Transitive reduction of visualized graph via jgrapht now works ``` out/dev/launcher/dest/run -i visualize __.compile _ out/dev/launcher/dest/run -i visualize core.__ ``` * Move test running logic from scalaworker into scalalib This is to try and reduce the size of the classpath we are passing to the test runner subprocess, in an attempt to fix the command-line-too-long errors we're getting in Appveyor. Now the test runner subprocess should no longer need Zinc or all of it's transitive dependencies * - Break out `GraphvizTools` into a separate Mill module, to avoid bloating the main jar and try to shorten the `MILL_SCALA_WORKER` classpath being sent to scalajslib.test (which is blowing up on windows as the CLI command is too long) - Move the meat of `resolveDependencies` from `scalalib` to `main`, to support resolving mill modules - DRY up resolution of mill modules in `Util.millProjectModule` * fix mill module resolution * Tweaks to try and make zinc work again... * Tweak `Module#reflect` to try and make it happy with `visualize` module... * fix integration test classpath * move visualization into it's own module
* Add a TwirlModule to compile Twirl templates (#271)Guillaume Grossetie2018-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | * initial implementation * Upgrade to the latest version * Add tests * Update the code to comply with the new API * Use reflection to call TwirlCompiler.compile function * Run twirllib.test on CI * Use the Java API as a workaround * wip * Cleanup the code (code review) * Add an example to call the Scala API * twirl that works with scala API * Create functions to override the default settings (will be available in the future)
* fixtestsLi Haoyi2018-05-221-2/+2
|
* Migrate `ProxyOutputStream` to the `main.client` module, add unit/fuzz tests ↵Li Haoyi2018-05-229-74/+193
| | | | to make sure it works
* optimize output streaming to allow batch writesLi Haoyi2018-05-222-38/+34
|
* 0.2.20.2.2Li Haoyi2018-05-201-1/+0
|
* Preserve caches between interactive and client/server mode (#342)Li Haoyi2018-05-192-14/+3
| | | | We were incorrectly duplicating the JDK classpath as part of the application classpath when we spawned the Mill server from the Mill client. This makes the transmission of application classpath to the Mill server explicit via an environment variable, so we don't end up including random things from the client classloader hierarchy that we didn't expect
* WIP keep mill server alive if you Ctrl-C during --watch (#339)Li Haoyi2018-05-198-85/+139
| | | | | | | | * wip * Clean up more resources in the Mill client after every command * catch and ignore SIGINT in Mill server to make it survive Ctrl-C on the client
* Allow shebang with launcherUniversalScript (#338)Matthew de Detrich2018-05-181-1/+3
|
* [WIP] Fixes #227; add `mill clean` (#315)Guillaume Galy2018-05-162-1/+111
| | | | | | | | | | | | | | | | * Adding clean as a default task * [WIP] Improve 'clean' paths resolution * Improve clean targets resolution mechanism * fix error on clean all * update "clean all" to keep all 'out/mill-*' paths * fix cross module resolution in clean task * Add documentation for "clean" task
* don't fail command when there is no build.sc file in directory. Lets the ↵Nikolay Tatarinov2018-05-071-3/+8
| | | | user to run basic mill commands (#307)
* Resolves #305, use an English locale when excuting java command line (#306)Guillaume Grossetie2018-04-301-1/+1
| | | Otherwise we cannot rely on the exception message because the error returned by the java command line will be localized.
* Make builds able to depend on external projects (#291)Olivier Mélois2018-04-1812-14/+233
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Make builds able to depend on external projects Builds are now able to load external projects and depend on them as if they were local submodules. `import $file.external.path.build` * Disambiguate "dest" for foreign modules. * Calling modules loaded from external directories "Foreign" to avoid conflicting with the already existing concept of "ExternalModule". * Amended the way `dest` is computed for foreign modules * Added tests to check that the source paths and dest are as expected * Added a test to show that local modules do not conflict with foreign modules when they are named the same * WIP windows build fail * Added bootstrapping step in CYGWIN CI job * * Revert externalOutPath deletion * Add documentation for foreign-modules * reverting appveyor changes * Disabling Foreign modules tests against Java9 See https://github.com/lihaoyi/mill/issues/302
* rename modules scalaworker -> scalalib.worker, client -> main.clientLi Haoyi2018-04-1211-6/+534
|
* rename Cached#v -> valueLi Haoyi2018-04-101-1/+1
|
* - Swap client-server integer encoding over to a more standard format (32-bit)Li Haoyi2018-04-093-17/+19
| | | | | - Unit tests for client code using the new Java support - Make server auto-shutdown when the client version changes, to avoid stale-server confusion
* caffeine core and guava tests seem to passLi Haoyi2018-04-091-2/+2
|
* mergeLi Haoyi2018-04-086-44/+150
|\
| * Adds envVars propagation client -> serverOlivier Melois2018-03-294-10/+21
| | | | | | | | | | | | | | | | | | | | Since Mill now executes in a long-lived JVM, the builds do not have a chance to use environment variables as inputs. This propagates the environment variables from the client all the way down to the context available to the tasks as a `Map[String, String]` so that they can be used as inputs should the user choose to do so. https://github.com/lihaoyi/mill/issues/257
* | explicitly disable clientserver tests on windowsLi Haoyi2018-04-081-75/+77
| |
* | remove clientserver from ci since those tests are now in mainLi Haoyi2018-04-071-1/+2
| |
* | Merge commit '36eb8bd6bfd534d002b01f8800e4b5d896aa4e77' into client-javaLi Haoyi2018-04-073-1/+48
|\ \
| * | - Add `mill version` commandLi Haoyi2018-04-063-1/+48
| | | | | | | | | | | | - Make `Evaluator` robust against `null` results
* | | migrate client module onto new JavaModule traitLi Haoyi2018-04-072-19/+24
| | |
* | | first pass at moving mill client over to JavaModuleLi Haoyi2018-04-074-3/+308
| | |
* | | Merge branch 'master' into restore-masterRobby2018-04-072-5/+5
|\ \ \ | |/ / |/| | | | | | | | | | | # Conflicts: # .travis.yml # scalalib/src/mill/scalalib/Dep.scala
| * | try to fix buildLi Haoyi2018-04-061-3/+3
| | |
| * | fix buildLi Haoyi2018-04-061-2/+2
| | |
* | | Detect sh/batch launcher, dev.assembly, and release filename.Robby2018-03-311-1/+5
|/ /
* / Universal script generation for assembly, launcher, and release (#264)Pierre Kisters2018-03-291-18/+34
|/
* Windows client/server improvements (#262)Robby2018-03-291-0/+9
|
* Merge branch 'master' of github.com:lihaoyi/millLi Haoyi2018-03-251-10/+7
|\
| * try to fix classloading issues on runLocal and test with java 9 (#255)Nikolay Tatarinov2018-03-251-10/+7
| | | | | | | | | | | | | | | | | | | | * fix class loading for inprocess in java 9 * always add rt jar in case of java 9 * move all custom classloading logic into mill.util.ClassLoader * add comments explaining parent class loader changes and comment in tests pointing to original issue
* | update bump Ammonite to 1.1.0 stableLi Haoyi2018-03-251-1/+1
| |