luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
11,969 Commits 29 Branches 314 Tags 75 MiB
Commit Graph

11969 Commits

Author SHA1 Message Date
Jessica Hamilton 6ffec60e4b
sbt.bat: JAVACMD is not quoted in version check 
This fixes a failed version check for a path containing spaces.
 2018-04-20 11:07:23 +12:00
Dale Wijnand ccf938c786
Switch to varargs inThisBuild (+friends) 2018-04-19 22:34:52 +01:00
Dale Wijnand f459b218c4
Switch inThisBuild (+friends) to use varargs SettingsDefinition 2018-04-19 22:34:32 +01:00
Dale Wijnand dfff1ed928
Merge pull request #4032 from eed3si9n/wip/servertest 
improve server testing
 2018-04-18 07:12:53 +02:00
Eugene Yokota 1ec07c1867 Recover sbtOn 2018-04-17 23:26:29 +02:00
Ethan Atkins 2bb717dbf9 Exclude directories instead of including files 
The existing filter caused SourceModificationWatch.watch to ignore
deleted files because !file.exists implies !file.isFile. The intention
of the filter was to exclude directories that had a name ending in
".scala".
 2018-04-13 11:36:40 -07:00
Alexey Alekhin a1e3146c08
Don't use initialize request id for the internal collectAnalyses call 2018-04-12 19:47:32 +02:00
Johannes Rudolph 3b1207e9c2
Merge pull request #151 from leifwickland/patch-1 
Fix minor typo
 2018-04-11 17:09:47 +02:00
Dale Wijnand a8c1239e32
Merge pull request #4058 from retronym/topic/quietly-cancel 
Avoid printing RejectedExectionExeption stack trace after cancellation
 2018-04-11 12:00:03 +01:00
Dale Wijnand 2e2c3f6e89
Merge pull request #4087 from hvesalai/patch-2 
Update to Jline 2.14.6
 2018-04-11 11:55:56 +01:00
Eugene Yokota 190dc23f70 Fixes linter that detects missing .value 
Fixes #4079

#3216 introduced a linter that checks against missing `.value`, but the tree only checked for `Ident`. This doesn't work because in reality the symbols of build.sbt are transformed to `$somehash.npmInstallTask` where `somehash` is the wrapper object we create. Similarly for the built-in keys, they are presented as `sbt.Keys.compile`.

With this change unused task will fail to load the build with the following message:

```
/sbt-4079/build.sbt:26: error: The key `compile` is not being invoked inside the task definition.

Problem: Keys missing `.value` are not initialized and their dependency is not registered.

Solution: Replace `compile` by `compile.value` or remove it if unused.

  compile
  ^
/sbt-4079/build.sbt:27: error: The key `npmInstallTask` is not being invoked inside the task definition.

Problem: Keys missing `.value` are not initialized and their dependency is not registered.

Solution: Replace `npmInstallTask` by `npmInstallTask.value` or remove it if unused.

  npmInstallTask
  ^
```
 2018-04-11 01:31:38 -04:00
Heikki Vesalainen e5a37cad42
Update to Jline 2.14.6 
This version of Jline fixes three things for Emacs users:
- ANSI colors are now enabled for Emacs.
- Terminal echo is now disabled for Emacs.
- History is enabled for all dump terminals.
 2018-04-11 00:10:56 +03:00
Leif Wickland 6f4dfaa45e
Fix minor typo. 2018-04-10 10:22:48 -06:00
Jean-Luc Deprez d70c78d02b
- Java version detection broken, when path to JDK contains spaces. 
Allways outputs:
    sbt requires at least version 6+, you have
    version 0

- the quoted version word for findstr doesn't seem to work in the for-command statement, quotes not needed for a single word.
 2018-04-10 16:12:28 +02:00
Dale Wijnand 54a6262f7f
Merge pull request #4041 from dwijnand/Scoped.equals 
Give Scoped a default equals/hashCode implementation
 2018-04-10 06:10:55 +01:00
eugene yokota 7ae83cc755
Merge pull request #4085 from eed3si9n/wip/bumpzinc 
Zinc 1.1.5
 2018-04-09 13:37:50 -04:00
Eugene Yokota b9eb7764f3 Zinc 1.1.5 2018-04-09 12:37:42 -04:00
Dale Wijnand 4fc45e0155
Merge pull request #4056 from BennyHill/fix/3042 
Introduce CompositeProject
 2018-04-09 11:30:17 +01:00
Dale Wijnand 98e2b0b5d3
Merge pull request #4082 from eed3si9n/wip/repl 
Re-fixing console and JLine
 2018-04-09 11:23:58 +01:00
Dale Wijnand 6718803ee6
Merge pull request #4080 from naferx/add-lastGrep 
Add lastGrep command
 2018-04-09 07:19:17 +01:00
Eugene Yokota 8ed796fb25 Re-fixing console and JLine 
Fixes #3482 take 2

I thought I tested #4054 using a local build, but when I ran 1.1.3, `console` did not display anything that I typed.
Switching to `usingTerminal` which calls `terminal.restore` similar to what I had in 1.1.1 fixes `console`.
 2018-04-09 00:11:17 -04:00
eugene yokota 4d7149a7f3
Merge pull request #4078 from retronym/bump/houserules 
Upgrade to latest sbt-houserules
 2018-04-08 14:33:04 -04:00
eugene yokota 435a1c47f5
Merge pull request #159 from retronym/bump/houserules 
Upgrade to latest sbt-houserules
 2018-04-08 14:32:02 -04:00
Nafer Sanabria 3e201cee4d Add lastGrep command 2018-04-08 10:56:25 -05:00
Jason Zaugg f2d3cfea3f Upgrade to latest sbt-houserules 2018-04-08 14:37:51 +10:00
Jason Zaugg 1abb0a3641 Upgrade to latest sbt-houserules 2018-04-08 14:31:48 +10:00
Alistair Johnson b0ad1a44c0 Remove projects parameter from CompositeProject.expand 2018-04-07 15:56:31 +02:00
eugene yokota 7ba36d64b9
Merge pull request #226 from eed3si9n/wip/debug 
forward -debug to sbt
 2018-04-06 22:01:20 -04:00
eugene yokota 314ff46432
Merge pull request #4076 from eed3si9n/wip/bumplauncher 
launcher 1.0.4
 2018-04-06 19:35:27 -04:00
Alistair Johnson 6cce4f6fd9 Remove duplicate Projects 2018-04-07 01:26:40 +02:00
Alistair Johnson 68c005e4b5 Ensure precedence of top level Projects over ComponentProjects 2018-04-07 01:04:45 +02:00
Eugene Yokota 32385c8bb7 launcher 1.0.4 2018-04-06 18:36:10 -04:00
eugene yokota 8f6e2fe371
Merge pull request #4075 from eed3si9n/wip/bump 
bump IO and Zinc
 2018-04-06 18:10:07 -04:00
Eugene Yokota 8781c16cbb bump IO and Zinc 2018-04-06 16:30:33 -04:00
Eugene Yokota 8727faa8b3 forward -debug to sbt 
`-debug` is a legitimate command since 0.13.13, but it's been impossible to use it because Bash eats it. This allows log level to be set to debug level. (similar to `-warn` setting to warn level)

Ref https://github.com/sbt/sbt/pull/2742
 2018-04-06 08:26:28 -04:00
eugene yokota 7690a1bd24
Merge pull request #4070 from steinybot/fix/3432 
Add dependencyResolution scoped to updateSbtClassifiers task
 2018-04-06 05:58:27 -04:00
Dale Wijnand 8350d7ca03
Merge pull request #225 from eed3si9n/wip/jdk10 
Fix Java version detection and comparison for JDK 10
 2018-04-06 10:45:47 +01:00
Eugene Yokota b2fdb7685f Fix Java version detection on Windows 
Fixes https://github.com/sbt/sbt/issues/4055
Adds JDK 10 testing on Windows
 2018-04-06 05:24:07 -04:00
Eugene Yokota a638ad49ac Fix bash number comparison 
This adds JDK 10 and 11 testing on Linux
 2018-04-06 05:23:14 -04:00
eugene yokota 5c32787574
Merge pull request #4071 from eed3si9n/wip/closewatch 
Use MacOSXWatchService instead of PollingWatchService
 2018-04-06 04:34:30 -04:00
Eugene Yokota 707bf08c4e Add new closewatch mode 2018-04-05 20:29:26 -04:00
Jason Pickens 9043a92e8b
Merge branch '1.1.x' into fix/3432 2018-04-06 10:55:21 +12:00
Jason Steenstra-Pickens 4dc76e2b38 Add dependencyResolution scoped to updateSbtClassifiers task 
Fixes #3432
 2018-04-06 10:41:31 +12:00
eugene yokota a0ef0c02d9
Merge pull request #158 from dwijnand/StringTypeTag-opt-test-enforcement 
Enforce invariant in StringTypeTag optimisation
 2018-04-05 10:45:34 -04:00
eugene yokota b7d3959241
Merge pull request #4067 from eed3si9n/wip/reload-perf 
perf: optimize hash for build
 2018-04-05 10:37:41 -04:00
Dale Wijnand 029952895b
Enforce invariant in StringTypeTag optimisation 
Or, put differently, "Add a test for sbt/util#153".
 2018-04-05 09:43:22 +01:00
Eugene Yokota ad3692b2df Use NIO Files.getLastModifiedTime for hashing 2018-04-05 04:22:16 -04:00
Eugene Yokota 04d6a8b44c perf: optimize hash for build 
This hot path was discovered by retronym using FlameGraph.
This removes intermediate creation of Array.

`filesModifiedBytes` in particular was bad as it was going through all `*.class` files, each generating an Array. This replaces that with `fileModifiedHash` that accepts `MessageDigest`.

According to the flamegraph, evalCommon footprint reduced from 4.5% to 3.6%.
Using `time sbt reload reload reload exit`, the median reduced from 41.450s to 39.467s.
 2018-04-05 03:26:02 -04:00
Alistair Johnson 03fc4ac686 Ensure unique project Id in composite projects 2018-04-04 21:01:05 +02:00
Alistair Johnson 77b536b25f Merge branch '1.x' of https://github.com/BennyHill/sbt into fix/3042 
Conflicts:
	main/src/main/scala/sbt/internal/BuildDef.scala
	main/src/main/scala/sbt/internal/EvaluateConfigurations.scala
 2018-04-04 18:30:56 +02:00