luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,940 Commits 22 Branches 333 Tags 97 MiB
Commit Graph

17940 Commits

Author SHA1 Message Date
Alexandre Archambault b5a4a7ab01 Update version in README 
Next commit fixes the release process for it to handle that
 2017-09-20 16:56:33 +02:00
Alexandre Archambault 1252f2b8d5 Use new helper to get coursier version 2017-09-20 16:55:15 +02:00
Alexandre Archambault 9a35ff416a Setting version to 1.0.0-SNAPSHOT 2017-09-20 16:43:17 +02:00
Alexandre Archambault 799619de6e
Updates for 1.0.0-RC12 2017-09-20 15:13:49 +02:00
Alexandre Archambault c2e7bf8ad5 Setting version to 1.0.0-RC12 2017-09-20 14:47:29 +02:00
Alexandre Archambault 0b5b2f25f2 Merge pull request #658 from coursier/topic/cross-version-patch 
Fix MatchError when using cross version patch with sbt 1.0
 2017-09-20 02:00:19 +02:00
Alexandre Archambault b25fed1ae5 Fix flaky test 2017-09-20 00:12:21 +02:00
Alexandre Archambault 09c5ce417a Quick hack 
This ensures something sometimes random is not in some conditions, see https://github.com/coursier/coursier/issues/650…
 2017-09-20 00:12:20 +02:00
Alexandre Archambault d077a82341 Fix MatchError when using cross version patch with sbt 1.0 2017-09-19 23:23:32 +02:00
Justin Kaeser 45d69f3762 Pass `allJars` when creating ScalaInstance instead of `otherJars`. 
Fixes https://github.com/sbt/sbt/issues/3560
required for https://youtrack.jetbrains.com/issue/SCL-12591
 2017-09-19 19:12:59 +02:00
Guillaume Martres 32e8859df6 Support Java 10 
In bash, "10" < "1.6" returns false, because it's a string comparison.
Use bc instead to compare decimal numbers.
 2017-09-19 13:33:07 +02:00
Eugene Yokota 8a8215cf1b Use uri instead of url 2017-09-18 23:07:29 -04:00
eugene yokota e310735202 Merge pull request #166 from steinybot/wip/sbtopts-crlf 
Remove carriage return characters when loading configuration files.
 2017-09-18 12:55:58 -04:00
eugene yokota 206ccb675a Merge branch 'master' into wip/sbtopts-crlf 2017-09-18 12:55:40 -04:00
Eugene Yokota c5bfc67750 Fixes test 2017-09-17 22:31:57 -04:00
Eugene Yokota 9d40404915 JSON port file 
This implements JSON-based port file. Thoughout the lifetime of the sbt server there will be `cwd / "project" / "target" / "active.json"`, which contains `url` field.

Using this `url` the potential client, such as IDEs can find out which port number to hit.

Ref #3508
 2017-09-17 19:19:56 -04:00
Eugene Yokota 6b8e716428 implement server handshake test 2017-09-16 22:29:58 -04:00
eugene yokota 0ff08bd9ac Merge pull request #3554 from eed3si9n/wip/notes2 
contributors
 2017-09-16 20:33:21 -04:00
Eugene Yokota 15ecc9845a contributors 2017-09-16 20:32:33 -04:00
eugene yokota 4b8d31a9ea Merge pull request #3529 from sbt/1.0.x 
Merge 1.0.x
 2017-09-16 15:54:18 -04:00
eugene yokota 2e4873c7fb Merge pull request #3553 from eed3si9n/wip/bump_version 
1.0.3-SNAPSHOT
 2017-09-16 15:53:51 -04:00
Eugene Yokota 182b8296da 1.0.3-SNAPSHOT 2017-09-16 15:52:58 -04:00
eugene yokota c855f0cd9e Merge pull request #3551 from eed3si9n/wip/autostart 
`sbt.server.autostart` flag and startServer
 2017-09-16 15:25:11 -04:00
Eugene Yokota f21d190a65 `sbt.server.autostart` flag and startServer 
Adds JVM flag `sbt.server.autostart` to enable/disable the automatic starting of sbt server with the sbt shell.

This also adds a new command `startServer` to manually start the server.
 2017-09-16 03:24:30 -04:00
Eugene Yokota 8dbb00f3b1 notes 2017-09-16 02:37:30 -04:00
eugene yokota c514acc651 Merge pull request #3550 from eed3si9n/wip/lm_bump 
bump lm to 1.0.2
 2017-09-16 02:33:12 -04:00
Eugene Yokota 87e95e3a51 bump lm to 1.0.2 2017-09-16 01:43:42 -04:00
eugene yokota 6677802697 Merge pull request #3549 from eed3si9n/wip/zinc_bump 
bump Zinc to 1.0.1
 2017-09-16 01:28:07 -04:00
eugene yokota cb6428f9f2 Merge pull request #167 from cunei/wip-gigahorseflag 
Add flag sbt.gigahorse.enabled, to optionally disable Gigahorse
 2017-09-16 01:14:25 -04:00
eugene yokota 0630b43374 Updated the flag to sbt.gigahorse 2017-09-16 01:07:35 -04:00
Eugene Yokota 4bd7010a4f bump Zinc to 1.0.1 
Fixes #2884
 2017-09-16 00:38:22 -04:00
eugene yokota caf2fa2cb8 Merge pull request #3523 from guillaumebort/1.0.x 
Sbt server could miss some messages
 2017-09-15 23:31:13 -04:00
eugene yokota 7420071f25 Merge pull request #3533 from razvan-panda/1.0.x 
Fix unused imports warnings
 2017-09-15 22:13:06 -04:00
eugene yokota 45765583a6 Merge branch '1.0.x' into 1.0.x 2017-09-15 19:47:08 -04:00
eugene yokota b4744486a8 Merge pull request #3546 from eed3si9n/wip/flaky 
Comment out flaky tests
 2017-09-15 19:41:42 -04:00
eugene yokota 43538bdbe6 Merge pull request #3526 from dwijnand/crossplusplus 
Redefine crossScalaVersions, because it's Def.derive..
 2017-09-15 19:09:11 -04:00
Eugene Yokota 3c5aaca15c comment out part of tests/fork-parallel 
Ref #3545
 2017-09-15 18:50:31 -04:00
Eugene Yokota 4ac231dd49 comment out part of run/error 
Ref #3543
 2017-09-15 18:48:07 -04:00
Dale Wijnand 71ae211841
Redefine crossScalaVersions, because it's Def.derive.. 
Fixes #3495
 2017-09-15 16:59:47 +01:00
Răzvan Flavius Panda 0124a8ad0e Fix unused imports warnings 2017-09-15 16:35:08 +01:00
eugene yokota d81d054bd2 Merge pull request #3507 from kczulko/issue-3453 
Fix for text echo issue when running sbt.
 2017-09-14 14:14:26 -04:00
Antonio Cunei b480c9c65b Add flag sbt.gigahorse.enabled, to optionally disable Gigahorse. Default is true. 2017-09-14 16:07:02 +02:00
kczulko e9fa4201fb Fix review issue. Add 't.restore' before function call. 2017-09-14 09:34:06 +02:00
Dale Wijnand da40288d6f Merge pull request #3517 from dwijnand/run-cp-dirs 
Fix run's support of directories in the classpath
 2017-09-13 16:07:36 +01:00
Dale Wijnand 3cb281945e
Alias when strings are a scala version 2017-09-13 16:03:51 +01:00
Dale Wijnand 930fac2a78
Restrict switchScalaVersion `projects` to just ResolvedReference's 2017-09-13 16:03:51 +01:00
Dale Wijnand 936733b2b1
Cleanup 2017-09-13 16:03:51 +01:00
Guillaume Bort b355aa66e4 Sbt server could miss some messages 
If the read buffer contains more that 2 messages, we need to consume them all before blocking on socket read again. For that we have to loop until the buffer does not contain anymore the message delimiter character.

Same problem in the client ServerConnection code.
 2017-09-13 13:18:38 +02:00
Dale Wijnand 103e40882f
Fix run's support of directories in the classpath 
Fixes #3504
 2017-09-13 10:21:41 +01:00
Dale Wijnand 53e41a0045
Dedup defining bgRun/bgRunMain 2017-09-13 10:21:40 +01:00