Commit Graph

17940 Commits

Author SHA1 Message Date
Alexandre Archambault 954841eb93
Merge pull request #761 from coursier/topic/tweak-manual-profile-activation
Allow to deactivate Maven profiles from the CLI
2018-01-31 10:09:40 +01:00
Eugene Yokota 0221858217 improve Windows build 2018-01-31 00:04:23 -05:00
eugene yokota d6c54fd5d5
Merge pull request #147 from SethTisue/fix-typo-in-filename
fix typo in AbstractLogger.scala filename
2018-01-30 23:52:45 -05:00
Eugene Yokota 1f9a8bf310 start an instance of sbt in the background 2018-01-30 23:46:12 -05:00
Eugene Yokota 4b1de14f87 Use State to pick the port file 2018-01-30 23:46:12 -05:00
Eugene Yokota 50f3dd2e20 Use ipcsocket 2018-01-30 23:21:10 -05:00
eugene yokota cbf7d92488
Merge pull request #3910 from cunei/wip-fix-fork-parallel
Allow the full tests/fork-parallel to pass on less than four cores
2018-01-30 22:30:27 -05:00
Seth Tisue ba5b60300d fix typo in AbstractLogger.scala filename 2018-01-30 16:19:09 -08:00
Antonio Cunei c310ade9f8 Allow the full tests/fork-parallel to pass on less than four cores
The test will be meaningless on less than four cores, but the
scripted test will pass. On four or more cores, the test wil
test testForkedParallel as expected.

Closes #3545
2018-01-30 23:59:37 +01:00
Alexandre Archambault 14bc756b5b Allow to deactivate Maven profiles from the CLI
And add extra tests for profile deactivation
2018-01-30 17:26:07 +01:00
Dale Wijnand e3f33ddf7d
Merge pull request #3897 from dwijnand/misc
Misc tweaks and cleanups
2018-01-30 13:02:55 +00:00
Dale Wijnand e2cb5a0693
Merge pull request #206 from devkat/1.x
Fix typo.
2018-01-30 08:52:41 +00:00
Andreas Jim-Hartmann 5e275da2a9 Fix typo. 2018-01-30 08:50:08 +01:00
Dale Wijnand bee69ebb92
Get rid of old MavenResolverPluginTest 2018-01-30 07:29:17 +00:00
Dale Wijnand 2f48425511
Remove old zinc addSbtAlternateResolver stuff 2018-01-30 07:29:17 +00:00
Dale Wijnand 286758e2ba
Minor cleanups 2018-01-30 07:29:17 +00:00
Alexandre Archambault 1ddfbed8a8
Merge pull request #758 from coursier/topic/move-readme
Move tut-processed README.md under doc/readme
2018-01-29 21:35:58 +01:00
Yi Cheng 849d128b90 Specify classifier on module level on CLI (#735) 2018-01-29 21:02:49 +01:00
Alexandre Archambault 5a82ba903e Move tut-processed README.md under doc/readme 2018-01-29 20:45:28 +01:00
Nick Howard 796ec19493 gitignore. Add pants files to gitignore (#751) 2018-01-25 13:01:09 -08:00
Dale Wijnand 7a720f1fd0
Merge pull request #3901 from colindean/fix-sbt012x-link
Fixes link to documentation for deprecated 0.10/0.12 DSL syntax
2018-01-25 09:44:28 +00:00
Colin Dean 3e11b3f000 Fixes link to documentation for deprecated 0.10/0.12 DSL syntax
Fixes sbt/website#558
2018-01-24 23:13:00 -05:00
Yi Cheng 7a38d1de40
Temporarily disable nexus test to unblock master (#753)
To get around #752
2018-01-24 14:55:06 -08:00
eugene yokota be6bbcd82e
Merge pull request #3875 from eed3si9n/wip/scripted
non-triggered scripted plugin: SbtPlugin
2018-01-23 20:27:03 -05:00
Dale Wijnand 5daf10d6c7
Tweak the description of KList 2018-01-23 17:14:27 +00:00
Dale Wijnand 92ed849eaa
Remove import-excluding Predef.conforms
As of Scala 2.11 Predef.conforms isn't implicit anymore (and it's
deprecated), so import-excluding doesn't avoid the implicit (the
implicit version is now Predef.$conforms). Also in Scala 2.13
Predef.conforms has been removed.
2018-01-23 17:14:15 +00:00
eugene yokota 5d89795657
Merge pull request #3876 from eed3si9n/wip/jlineinit
Fix tab completion running `sbt console`
2018-01-22 14:14:35 -05:00
Eugene Yokota 58ee24b427 Migrate to the new way of enabling scripted 2018-01-22 14:03:02 -05:00
Eugene Yokota 0d83b2fc3f notes 2018-01-22 14:03:02 -05:00
Eugene Yokota c20029ce16 Work around package name confusion
This works around the name conflict between sbt.test package and sbt.Keys.test.

1. sbt.test package is renamed to sbt.scriptedtest. This allows 1.0 plugins and builds to use `test` to mean `Keys.test`.
2. To keep binary compatibility for sbt 0.13 scripted, I am adding `sbt.test.ScriptedRunner` and `sbt.test.ScriptedTests` in `scripted-plugin` artifact.
3. Another affected user is Giter8 plugin that uses ScriptedPlugin. Since the intereactions are limited to `sbt.ScriptedPlugin.*`, we should be fine here. - https://github.com/foundweekends/giter8/blob/v0.11.0-M2/plugin/src/main/scala-sbt-1.0/giter8/SBTCompat.scala
2018-01-22 14:03:02 -05:00
Eugene Yokota b05802f63b move some scripted defaults settings to global
Fixes #3656
2018-01-22 14:03:02 -05:00
Eugene Yokota 08eaba9107 Add SbtPlugin
Fixes #3538

This brings in `sbt.ScriptedPlugin` as `sbt.plugins.ScriptedPlugin` into sbt mothership.
In addition, `sbt.plugins.SbtPlugin` is added that enables the scripted plugin and `sbtPlugin := true`.

This allows plugin authors to bring in scripted plugin by writing:

```scala
lazy val root = (project in file("."))
  .enablePlugins(SbtPlugin)
```
2018-01-22 14:02:06 -05:00
Eugene Yokota 655c2ac5d1 Make ScriptedPlugin not a triggered plugin
Fixes #3514
2018-01-22 14:00:37 -05:00
Alexandre Archambault ef5eb90c49
Merge pull request #747 from coursier/topic/remove-deprecated-cli-options
Remove deprecated "source repository" stuff
2018-01-22 01:23:23 +01:00
Alexandre Archambault 5992c1d2d7 Remove deprecated "source repository" stuff 2018-01-21 22:28:05 +01:00
Bohdan Yavorskyi 2d5f7c3eb4 mixing urls and jars in bootstrap (#742) 2018-01-21 21:55:46 +01:00
eugene yokota 8cfec5b3bf
Merge pull request #3891 from allanrenucci/scripted
Enable parallel execution of scripted in the plugin
2018-01-19 12:37:22 -05:00
Dale Wijnand 2c6e38829f
Merge pull request #204 from OlegYch/fix-deadlock
avoid deadlocks on spotty connections
2018-01-18 16:29:07 +00:00
OlegYch d267b6fda5
clarify intent 2018-01-18 15:43:18 +00:00
OlegYch 86c59d8f72
avoid deadlocks on spotty connections, fix https://github.com/sbt/sbt/issues/3738 2018-01-18 15:43:18 +00:00
eugene yokota 8067edbd8a
Merge pull request #3885 from dwijnand/warnings
Remove compile warnings
2018-01-17 13:13:51 -05:00
Allan Renucci 2aed011bc9 Cleanup 2018-01-17 15:19:18 +01:00
jvican 12d2ecfa62 Enable parallel execution of scripted in the plugin
The change to enable batched and parallel execution for scripted was
done only for the scripted-sbt project. This pull request enables it for
scripted-plugin, so that all sbt plugins in 1.x. can benefit from it.

By default, it configures a number of parallel instances of 1 and batch
execution is disabled. Users can change the number of parallel sbt hosts
running scripted tests via the `scriptedParallelInstances` setting.

In some plugins scripted tests', batch execution can cause issues
because the first time `>` commands are executed they assume sbt starts
up. This error can be fixed by doing `reload` before running the `>`
command.

Note that the current scripted plugin does not allow parallel execution
in non-batched mode.
2018-01-17 15:19:18 +01:00
Dale Wijnand c0efc41f2e
Merge pull request #3889 from dwijnand/sbtOn-works-more
Tweak RunFromSourceMain so compile/run/test work
2018-01-17 13:50:46 +00:00
Dale Wijnand 5333d0df08
Merge pull request #3865 from dwijnand/fix-Extracted.append
Deprecates Extracted#append for appendWithSession
2018-01-17 10:01:25 +00:00
eugene yokota 9a6799ac74
Merge pull request #3887 from dwijnand/fix-sbtOn-prompt-echo
Fix sbtOn's prompt & echo
2018-01-16 15:53:51 -05:00
Eugene Yokota ca712acf41 Fix tab completion running `sbt console`
Fixes #3841

This fixes console task that internally uses JLine. When `console` is started from batch mode, the tab is printed as is. This is because JLine is not initialized yet.
Calling `usingTerminal` initializes and restores the terminal afterwards.
2018-01-16 15:41:48 -05:00
Dale Wijnand b2290658ba
Tweak RunFromSourceMain so compile/run/test work
Tested pos/neg compilation of a simple hello world file, running said
file & a simple uTest test suite.

Uses things already downloaded in ~/.ivy2/cache, & shares ~/.sbt/boot
for the compiler-bridge component.
2018-01-16 17:05:38 +00:00
Dale Wijnand c00739ebcd
Fix sbtOn's prompt & echo
This is what it looks like now! 🎉

    > sbtOn /s/t-sbtOn
    [...]
    [info] Running (fork) sbt.RunFromSourceMain /s/t-sbtOn
    Listening for transport dt_socket at address: 5005
    [warn] sbt version mismatch, current: 1.0.3, in build.properties: "1.1.0", use 'reboot' to use the new value.
    [info] Loading settings from idea.sbt,global-plugins.sbt ...
    [info] Loading global plugins from /Users/dnw/.dotfiles/.sbt/1.0/plugins
    [info] Updating ProjectRef(uri("file:/Users/dnw/.sbt/1.0/plugins/"), "global-plugins")...
    [info] Done updating.
    [info] Loading settings from plugins.sbt ...
    [info] Loading project definition from /s/t-sbtOn/project
    [info] Updating ProjectRef(uri("file:/s/t-sbtOn/project/"), "t-sbton-build")...
    [info] Done updating.
    [info] Loading settings from build.sbt ...
    [info] Set current project to t (in build file:/s/t-sbtOn/)
    [info] sbt server started at local:///Users/dnw/.sbt/1.0/server/2c27eaf4c750902a3a41/sock
    > show baseDirectory
    [info] /s/t-sbtOn
    > exit
    [info] shutting down server
    [success] Total time: 34 s, completed 16-Jan-2018 14:37:32
    > Exception in thread "Thread-17" java.io.IOException: Stream closed
    	at java.lang.ProcessBuilder$NullOutputStream.write(ProcessBuilder.java:433)
    	at java.io.OutputStream.write(OutputStream.java:116)
    	at java.io.BufferedOutputStream.flushBuffer(BufferedOutputStream.java:82)
    	at java.io.BufferedOutputStream.flush(BufferedOutputStream.java:140)
    	at java.io.FilterOutputStream.close(FilterOutputStream.java:158)
    	at scala.sys.process.BasicIO$.$anonfun$input$1(BasicIO.scala:200)
    	at scala.sys.process.BasicIO$.$anonfun$input$1$adapted(BasicIO.scala:198)
    	at scala.sys.process.ProcessBuilderImpl$Simple.$anonfun$run$2(ProcessBuilderImpl.scala:75)
    	at scala.sys.process.ProcessImpl$Spawn$$anon$1.run(ProcessImpl.scala:23)

    > show {.}/baseDirectory
    [...]
    [info] ThisBuild / baseDirectory
    [info] 	/d/sbt
2018-01-16 14:40:03 +00:00
Dale Wijnand 113656aed1
Remove compile warnings 2018-01-16 11:17:01 +00:00