luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,639 Commits 29 Branches 315 Tags 107 MiB
Commit Graph

4639 Commits

Author SHA1 Message Date
Martin Duhem d9722fa7e4 Notes for #2708 2016-08-24 14:01:34 +02:00
Martin Duhem 60bcc58852 Fix key selection for build level keys 
PR #2469 added build keys to tab completion, with the side effect of
considering as available candidate in key selection, thus making sbt
think that some inputs were ambiguous (e.g. `baseDirectory`): should it
apply to the current project or to the build level key?

This commit fixes this issue by improving the key selection:
 - If there's no candidate, we return the default key
 - If there's a single possible project level key, and zero or more
   build level keys, then we select the project level key.
 - If there are zero project level key, and a single build level key,
   then we select the build level key
 - If there are multiple candidates, sbt says that the input is
   ambiguous.

Fixes #2707
 2016-08-24 11:13:08 +02:00
Eugene Yokota e94147456c launchconfig 2016-08-23 16:27:52 -04:00
eugene yokota 240781566e Merge pull request #2705 from eed3si9n/wip/new_command 
Adds templateResolvers and `new` command
 2016-08-23 03:17:40 -04:00
Eugene Yokota eaec623bbf Bump to Giter8 0.7.1 2016-08-23 00:45:17 -04:00
Eugene Yokota 456e4c2f54 straighten up dependencies 2016-08-22 18:20:32 -04:00
Eugene Yokota f29932e594 Fix parser for new command 2016-08-22 11:29:35 -04:00
Eugene Yokota 954e744408 Adds templateResolvers and `new` command 
This adds `new` command, which helps create a new build definition. The
`new` command is extensible via a mechanism called the template
resolver,
which evaluates the arbitrary arguments passed to the command to find
and run a template.

As a reference implementation [Giter8][g8] is provided as follows:

    sbt new eed3si9n/hello.g8

This will run eed3si9n/hello.g8 using Giter8.

  [g8]: http://www.foundweekends.org/giter8/
 2016-08-22 02:38:46 -04:00
eugene yokota 5b70e9f4e0 Merge pull request #2703 from milessabin/topic/scala-artifacts-fixed 
Explicit list of artifacts for Scala binary version check
 2016-08-20 07:32:23 -04:00
Miles Sabin 2d31681220 Explicit list of artifacts for Scala binary version check. Fixes #2701 2016-08-19 17:44:19 +01:00
eugene yokota bf7918f072 Merge pull request #2692 from eed3si9n/wip/2686 
Fixes #2686 by resetting scalaVersion for updateSbtClassifiers
 2016-08-05 11:56:15 -04:00
Eugene Yokota ca12418eb8 Fixes #2686 by resetting scalaVersion for updateSbtClassifiers 
Ref #2634

updateSbtClassifiers uses an artificially created dependency graph set
in classifiersModule. The problem is that ivyScala instance is reused
from the outer scope that has the user project's scalaVersion as
demonstrated as follows:

    scala> val is = (ivyScala in updateSbtClassifiers).eval
    is: Option[sbt.IvyScala] =
Some(IvyScala(2.9.3,2.9.3,List(),true,false,true,org.scala-lang))

This change fixes #2686 by redefining ivyScala with scalaVersion and
scalaBinaryVersion scoped to updateSbtClassifiers task. The existing
scripted test was modified to reproduce the bug.
 2016-08-05 01:21:06 -04:00
Eugene Yokota a98ec6b779 Bump to 0.13.12 2016-08-05 01:16:09 -04:00
eugene yokota 6c8555c5f1 Merge pull request #2681 from pauldraper/pauldraper-forked-test-group 
Fix #2677: Tags.ForkedTestGroup doesn't work
 2016-07-25 03:30:07 -04:00
eugene yokota e843957e7c Merge pull request #2682 from xuwei-k/aggregate 
`aggregate` can now be used inside a .sbt file
 2016-07-25 03:26:03 -04:00
xuwei-k b92e5773f7 `aggregate` can now be used inside a .sbt file 2016-07-25 12:07:49 +09:00
Paul Draper 0c9182a4b9 Fix #2677: Tags.ForkedTestGroup doesn't work 
Move tag to correct task
 2016-07-22 10:17:24 -06:00
Dale Wijnand b2731717fe Bump version to 0.13.13-SNAPSHOT 2016-07-18 10:21:52 +01:00
Eugene Yokota 4fe6b07033 launchconfig 2016-07-16 00:05:02 -04:00
Eugene Yokota 8074e6e533 0.13.12 2016-07-15 23:35:36 -04:00
eugene yokota 9ea9abf98d Merge pull request #2659 from dwijnand/log-recompile-on-macro-opt 
Fixes #2654 Silence macro recompilation info message
 2016-07-07 22:37:17 -04:00
Dale Wijnand 83075a90f5 Fixes #2654 Silence macro recompilation info message 
As well as add a test for the macro recompilation info message feature.
 2016-07-08 01:03:32 +01:00
Eugene Yokota cbcdbf44d3 Notes 2016-06-30 23:37:13 +02:00
Eugene Yokota 1f50eacc50 Notes 2016-06-30 14:34:37 +02:00
eugene yokota c07355883f Merge pull request #2653 from anatolydwnld/depends-on-build-sbt-two 
dependsOn can now be used inside a .sbt file for a subproject
 2016-06-30 14:29:44 +02:00
Anatoly Fayngelerin 182fc544f0 Merge branch '0.13' into depends-on-build-sbt-two 2016-06-30 08:13:34 -04:00
Eugene Yokota 8004649040 Notes 2016-06-30 13:37:47 +02:00
Anatoly Fayngelerin fcedd17270 dependsOn can now be used inside a .sbt file for a subproject 2016-06-29 17:20:28 -04:00
eugene yokota aa5d8c139d Merge pull request #2642 from eed3si9n/wip/2002 
Fixes merged ModuleID dropping configuration specification.
 2016-06-13 08:27:12 -04:00
Eugene Yokota 307c725cd1 Ugh. trying to make codacy happy 2016-06-12 03:34:22 -04:00
Eugene Yokota ae58cf342b Fixes merged ModuleID dropping configuration specification. Fixes #2002/#1500 
Given a dependency graph such as:

    libraryDependencies += "com.google.guava" % "guava-tests" % "18.0"
    libraryDependencies += "com.google.guava" % "guava-tests" % "18.0"
% "test" classifier "tests"

previous releases of sbt would drop the Test configuration from the
classifier "tests" artifacts, and end up including the test JARs into
the Compile configuration instead of the Test configuration, which
would result in runtime error.

This fix configures the explicit artifacts into the configuration
during merge even when it says `"*"`.
 2016-06-12 01:27:19 -04:00
Eugene Yokota ec554f2d9d notes 2016-06-10 12:21:49 -04:00
eugene yokota 18568dd6a9 Merge pull request #2637 from eed3si9n/wip/recompile_on_macro_log 
Inform the build user about macro recompilation
 2016-06-10 12:11:38 -04:00
Eugene Yokota bd2e02aeaa Inform the build user about macro recompilation 2016-06-08 00:39:04 -04:00
eugene yokota 9dcc852c33 Merge pull request #2634 from milessabin/topic/scala-organization 
Override scala organization and version transitively at the Ivy level
 2016-06-02 10:34:21 -04:00
Miles Sabin e98b2363c2 Override scala organization and version transitively at the Ivy level. Fixes #2286. 2016-06-02 12:07:30 +01:00
eugene yokota bb332fae59 Merge pull request #2630 from eed3si9n/wip/loadperf 
Loading performance
 2016-05-25 18:06:11 -04:00
Eugene Yokota 6a0f5dd471 Use parent's toString 2016-05-25 12:57:38 -04:00
Eugene Yokota 4900c71ff9 Cache now takes in account of the parent of the classloader 2016-05-25 12:21:35 -04:00
Eugene Yokota 81bff4b67b Marking dependency-management/url pending 
The actual URL doesn't work any more, so marking this pending.
 2016-05-25 03:58:15 -04:00
Eugene Yokota 84f8cc447d Remove unnecessary val 2016-05-25 03:51:53 -04:00
Eugene Yokota f9b1583251 Cache based on the underlying URLs of the ClassLoader per review 2016-05-25 03:51:12 -04:00
Eugene Yokota c67b3881de Display log when sbt loading is going to pause 
Def.make could take 10099ms for 100 subprojects. This would display
logs probably for projects with more than 10 subprojects, which might
pause for a few seconds during load.
 2016-05-25 01:51:07 -04:00
Eugene Yokota 0f43d21e72 Improve structureIndex call by using Vector 
This call takes around 8035ms for 100 subprojects. I don't think using
Vector here had any noticeable effect.
 2016-05-25 01:49:23 -04:00
Eugene Yokota ed0c82de7f Cache global user settings 2016-05-25 01:12:49 -04:00
Eugene Yokota 511737c828 Add perf logs 2016-05-25 01:11:47 -04:00
eugene yokota 9849dff643 Merge pull request #2628 from Duhemm/wip/workaround-2620 
Workaround for sbt/sbt#2620
 2016-05-24 10:26:29 -04:00
Martin Duhem 2b9fd13096 Workaround for sbt/sbt#2620 2016-05-24 10:25:24 +02:00
eugene yokota 74510bc0a9 Merge pull request #2603 from ekrich/wip/native-script 
Add Windows script support and native file extensions on Unix platforms
 2016-05-10 23:15:59 -04:00
ekrich fd5f87e7b4 Add Windows script support and native file extensions on Unix platforms 
When running a sbt script, this change lets the user on UNIX and
Windows platforms to use native file extensions like none/.sh or
.bat/.cmd. The code copies the file to the sbt boot/hash/src_managed
directory with a .scala extension.
 2016-05-10 12:32:32 -07:00