Commit Graph

5087 Commits

Author SHA1 Message Date
jvican 3e812dc71a
Add global toolbox to parse sbt files
This change was proposed by Jason in case that the new parsing mechanism
implemented later on has to be reverted. This change provides a good
baseline, but it's far from ideal with regard to readability of the
parser and performance.
2017-04-18 20:30:05 +02:00
jvican a36d8401e1
Don't use runtime universe to discover autoImport
The previous implementation was using the Scala runtime universe to
check whether a plugin had or not an `autoImport` member. This is a bad
idea for the following reasons:

* The first time you use it, you class load the whole Scalac compiler
  universe. Not efficient. Measurements say this is about a second.
* There is a small overhead of going through the reflection API.

There exists a better approach that consists in checking if `autoImport`
exists with pure Java reflection. Since the class is already class
loaded, we check for:

* A class file named after the plugin FQN that includes `autoImport$` at
  the end, which means that an object named `autoImport` exists.
* A field in the plugin class that is named `autoImport`.

This complies with the plugin sbt specification:

http://www.scala-sbt.org/1.0/docs/Plugins.html#Controlling+the+import+with+autoImport
2017-04-18 20:30:04 +02:00
eugene yokota 27b4faebed Merge pull request #3099 from eed3si9n/wip/bump2
Bump to Zinc 1.0.0-X14
2017-04-18 03:10:12 -04:00
Eugene Yokota 9a81c4da3e Fix scripted dependency-management/cache-update 2017-04-18 01:58:41 -04:00
Eugene Yokota 9e02995ac0 Bump to Zinc 1.0.0-X14 2017-04-18 00:56:22 -04:00
Eugene Yokota debda67b3d Bump lm 1.0.0-X9 2017-04-15 16:53:38 -04:00
Eugene Yokota 1d4ce85a43 Fix scripted tests 2017-04-15 16:53:37 -04:00
Eugene Yokota 81642138e1 Bump to ZInc 1.0.0-X12 2017-04-15 16:53:37 -04:00
eugene yokota 95da5bafc2 Merge pull request #3098 from eed3si9n/wip/server_by_default
[sbt 1.0] Make server command the default shell
2017-04-14 17:34:39 -04:00
Eugene Yokota 86342d0bdd server is now called shell
server command is renamed to shell,
and the old shell command is called oldshell.
2017-04-14 16:35:54 -04:00
Dale Wijnand 36eb7b1e84 Merge pull request #3093 from eed3si9n/wip/log_concurrency
[sbt 1.0] Fix logging + clean concurrency issue
2017-04-14 15:01:41 +01:00
eugene yokota d493a51032 Merge pull request #3104 from eed3si9n/wip/socket_taken
[sbt 1.0] Better error message if socket is taken
2017-04-13 18:11:47 -04:00
Eugene Yokota 0e8459ad66 Better error message if socket is taken
We need to communicate the error states in the thread, so I added a `Future[Unit]` called `ready`.

If something goes wrong during the startup, like if the port is already taken, this can be used to communicate back to the main thread, and display the error accordingly.
2017-04-13 15:49:21 -04:00
Eugene Yokota acf6c1191e Make clean task run exclusively 2017-04-13 15:29:13 -04:00
Eugene Yokota 7acb8764f5 Reimplement clean and cleanFiles tasks
cleanFiles is now a task that lists exactly what will be deleted recursively.
2017-04-13 15:28:48 -04:00
eugene yokota 6834def7b8 Merge pull request #3101 from dwijnand/document-and-cleanup-commands-and-misc
Document & cleanup commands (& misc cleanups)
2017-04-13 15:09:03 -04:00
Dale Wijnand ec15837f43
Replace unnecessary uses of Command.make with Command.apply 2017-04-13 13:52:30 +01:00
Dale Wijnand 6c07972dd0
Cleanup Command/Help and usage 2017-04-13 13:52:30 +01:00
Dale Wijnand 2caa324d52
Solve a scaladoc issue 2017-04-13 11:52:19 +01:00
Dale Wijnand fa487ac8ea
Upgrade from -Ymacro-no-expand to -Ymacro-expand:none 2017-04-13 11:47:59 +01:00
Dale Wijnand 308abcde9f Merge pull request #3082 from dwijnand/remove-most-deprecated
Remove most @deprecated
2017-04-13 10:32:10 +01:00
Dale Wijnand c4c405cbb2
Detail removal of commonly used deprecations in MIGRATION.md 2017-04-13 10:31:51 +01:00
eugene yokota 90e560aa55 Merge pull request #3095 from eed3si9n/fport/3089
[fport] Add three slashes (u3) for file URI
2017-04-12 05:46:43 -04:00
eugene yokota d2e7207299 Merge pull request #3094 from eed3si9n/fport/3035
[fport] Notify about shell less
2017-04-12 05:46:30 -04:00
Eugene Yokota b0b5396769 Use IO.toFile 2017-04-12 03:50:35 -04:00
Eugene Yokota d323c67c95 Add three slashes (u3) for file URI
The uglier but backward compatible fix for #3086 is to use u3 format with three slashes. This on Windows will resolve to `file:///C:/Users/foo/.sbt/preloaded`, and on Mac and Linux `file:////root/.sbt/preloaded/`. Mac and Linux are both tolerant of extra slashes on the front:

```
> eval new File(new URL("file:////Users/foo/.sbt/preloaded/").toURI)
[info] ans: java.io.File = /Users/foo/.sbt/preloaded
```
2017-04-12 03:34:11 -04:00
Dale Wijnand 881cb4246a Notify about shell less
+ Don't notify ScriptMain users by moving the logic to xMain
+ Only trigger shell if shell is a defined command
+ Use existing Shell/BootCommand strings instead of new ones
2017-04-12 03:24:38 -04:00
Dale Wijnand 3f590d8e13
Drop most remaining deprecations 2017-04-11 16:46:11 +01:00
Dale Wijnand 7ce389c1da
Define DefaultEvaluateTaskConfig 2017-04-11 16:46:09 +01:00
Dale Wijnand 6820bcf99c
Drop deprecated inputTask method
Temporarily (FLW) duplicate it in fullRunInputTask.
2017-04-11 16:45:26 +01:00
Dale Wijnand 91354497ab
Drop deprecated InputTask apply method 2017-04-11 16:44:53 +01:00
Dale Wijnand 01b19f0218
Drop deprecated seq method 2017-04-11 16:44:38 +01:00
Dale Wijnand 4ef5e85390
Drop deprecated default resolvers 2017-04-11 16:43:01 +01:00
Dale Wijnand 0d32f6fc76
Drop File/Seq[File] setting enrichments 2017-04-11 16:42:43 +01:00
Dale Wijnand 4a08b65cb2
Drop ProjectReference implicit lifts 2017-04-11 16:40:38 +01:00
Dale Wijnand cef287b6e8
Drop deprecated SubProcess apply overload 2017-04-11 16:40:20 +01:00
Dale Wijnand 9f688be9f5
Simplify sbt.Compiler 2017-04-11 16:39:53 +01:00
Dale Wijnand a6015793e2
Code formatting only changes 2017-04-11 14:32:38 +01:00
Dale Wijnand be3fa7e66d
Just whitespace & comment changes 2017-04-11 11:48:24 +01:00
Dale Wijnand 31b1be2f3b Merge pull request #3081 from dwijnand/kill-project-delegation
Kill project delegation
2017-04-06 07:34:39 +01:00
Dale Wijnand a0eeec37e2
Kill project delegation 2017-04-05 22:47:39 +01:00
Dale Wijnand 5ec8aac18b Merge pull request #3080 from dwijnand/artefact-classifier-and-configurations
Stop defining the artifact configuration based on the classifier
2017-04-05 21:44:44 +01:00
Dale Wijnand cd5c36a11f
Stop defining the artifact configuration based on the classifier
I believe this was accidentally not forward-ported from the 0.14 branch
to the 1.0.x branch.  Notice the change was present in #1016:

  https://github.com/sbt/sbt/pull/1016/files#diff-6373e7f7122325e753b75fe1cc76ff5fL576

and missing in #2478:

  https://github.com/sbt/sbt/pull/2478/files#diff-6373e7f7122325e753b75fe1cc76ff5fR680
2017-04-05 14:14:18 +01:00
eugene yokota 1f02e61819 Merge pull request #3077 from eed3si9n/fport/3008
[fport] Notify & enable users to stay in the warm shell
2017-04-04 20:33:05 -07:00
eugene yokota 42b8da18c3 Merge pull request #3076 from eed3si9n/fport/2908
[fport] Fix triggeredBy/storeAs/etc using :=
2017-04-04 20:08:05 -07:00
eugene yokota f0a16b927a Merge pull request #3072 from eed3si9n/fport/2993
[fport] Add local-preloaded repo
2017-04-04 19:43:20 -07:00
eugene yokota 43d0013bf7 Merge pull request #3075 from eed3si9n/fport/3025
[fport] Write sbt.version to project/build.properties
2017-04-04 18:21:11 -07:00
eugene yokota e2a1f02be9 Merge pull request #3074 from eed3si9n/fport/3015
[fport] ScriptedPlugin: Add support for paginated tests
2017-04-04 18:08:47 -07:00
eugene yokota de0faf446f Merge pull request #3073 from eed3si9n/fport/3001
[fport] Avoid missleading, link the syntax migration guide
2017-04-04 17:03:59 -07:00
Eugene Yokota 15255c15b0 Don't warn on server command 2017-04-04 20:00:56 -04:00