Commit Graph

11900 Commits

Author SHA1 Message Date
Grzegorz Kossakowski 07ff2d8e26 Add a pending test for a modified member of a trait
The test shows that name hashing optimization is broken for members
defined in traits. The problem is that modification of a member of a trait
triggers change of a hash of trait's name.

The behavior covered by this test regressed in
40ebc82531
The bug is tracked in #2436.
2016-02-23 15:44:12 +01:00
Dan Sanduleac abb53d4cb2 Fix for weird bug where sbt.librarymanagement's package object somehow conflicts with sbt.Keys.. Thanks Scala 2016-02-23 12:02:11 +00:00
Dan Sanduleac 1d8ec0430d Depend on custom librarymanagement 0.1.0 which contains the sourcesDocs changes. 2016-02-23 12:02:11 +00:00
Eugene Yokota 0e19b83e2e include version in Windws into the projectID 2016-02-22 18:14:42 -05:00
eugene yokota 55628f6437 Merge pull request #96 from TLmaK0/fix_git_for_windows_interactive
Allow to run sbt interactive mode in git for windows bash
2016-02-22 02:07:52 -05:00
eugene yokota a4a32340d1 Merge pull request #98 from DarrenBishop/master
-jvm-debug for Windows launch script
2016-02-22 02:07:44 -05:00
eugene yokota 7fd6beeb5b Merge pull request #97 from sbt/wip/windows
Generate product upgrade ID
2016-02-22 02:06:56 -05:00
Eugene Yokota ca0a42b349 Generate product upgrade ID. Fixes sbt/sbt#2181 2016-02-22 02:00:54 -05:00
Eugene Yokota 6ed481346b 0.13.11 2016-02-22 01:13:57 -05:00
eugene yokota d3c5bb4fa9 Merge pull request #105 from sbt/wip/104
Allow individual memory options to be controlled
2016-02-19 22:56:15 -05:00
Dale Wijnand 497db332cd Merge pull request #29 from Duhemm/fport/add-documentation-for-filefunction-cached
FPORT: add documention for FileFunction.cached
2016-02-19 23:55:07 +00:00
Eugene Yokota 843a60734b Fixes #104. Allow individual memory options to be controlled
When a `-J` option is passed in such as `-J-XX:MaxPermSize=1001M`, it
will override only that option.
2016-02-19 17:46:05 -05:00
eugene yokota ab22123728 Merge pull request #103 from mihaic/patch-1
Check memory options in JAVA_TOOL_OPTIONS
2016-02-19 16:49:24 -05:00
eugene yokota 3c839ff3d3 Merge pull request #2463 from dwijnand/add-issue-and-pr-templates
Add issue & pr templates
2016-02-19 11:04:45 -05:00
Dale Wijnand f20e12edf2 Add "Clean history" to contributing with links 2016-02-19 13:21:11 +00:00
Dale Wijnand 855d2b65de Trim the templates 2016-02-18 16:44:20 +00:00
Dale Wijnand d19b59cc78 Add issue & pr templates 2016-02-17 23:09:36 +00:00
Mihai Capotă 0d9806b9ff Check memory options in JAVA_TOOL_OPTIONS
JAVA_TOOL_OPTIONS is used by the JVM [1] so it must also be checked for memory options that conflict with the ones set in get_mem_opts.

[1] https://docs.oracle.com/javase/8/docs/technotes/guides/troubleshoot/envvars002.html
2016-02-17 11:26:13 -08:00
Johannes Rudolph 014c98daf4 Merge pull request #92 from dwijnand/readm-link-to-compatibility-notes
Fix link to Compatibility notes
2016-02-17 09:28:56 +01:00
Dale Wijnand e387d35a43 Fix link to Compatibility notes 2016-02-16 23:18:46 +00:00
eugene yokota e35e8f9fff Merge pull request #30 from dwijnand/bump-sbt-houserules-for-mima
Bump sbt-houserules to add MiMa
2016-02-15 15:15:00 -05:00
Dale Wijnand e1c7f39e5a Exempt out of -Xfuture in util-collection 2016-02-14 23:15:32 +00:00
Dale Wijnand dc410f9842 Unexecute Positions 2016-02-14 23:00:26 +00:00
Dale Wijnand 81757bcb15 Bump sbt-houserules to add MiMa
See sbt/sbt#2383
2016-02-14 21:16:49 +00:00
Tim Harper a48d7cb904 add documention for FileFunction.cached 2016-02-11 13:45:16 +01:00
Johannes Rudolph d989e8fa01 include space in token in `whatDependsOn` parser for better suggestions, fixes #91 2016-02-10 12:48:00 +01:00
Dan Sanduleac 978f2304e5 Stop deducing confs from classifier when delivering 2016-02-09 15:13:10 +00:00
Dan Sanduleac 63d657e9c0 [1/2] Add {source,doc}ArtifactTypes settings, use them in update* tasks in conjunction with ArtifactTypeFilter 2016-02-09 15:13:10 +00:00
Dan Sanduleac f11755e181 ModuleID + inclusions 2016-02-09 11:48:12 +00:00
Dan Sanduleac 7d2054f3ae ExclusionRule -> InclExclRule 2016-02-09 11:46:16 +00:00
Dan Sanduleac 42ad2fcf05 Get rid of sources/docs configurations 2016-02-09 11:37:52 +00:00
Johannes Rudolph 96aee390df next version 2016-02-01 11:02:29 +01:00
Johannes Rudolph 188a343161
prepare 0.8.2 2016-02-01 11:01:25 +01:00
Johannes Rudolph e551c8f526 Merge pull request #89 from chtefi/patch-1
Use v0.4.16 of dagre-d3 to avoid javascript error
2016-02-01 09:40:29 +01:00
Stéphane Derosiaux b62fcec676 Use v0.4.16 of dagre-d3 to avoid javascript error
When using `dagre-d3` v0.4.10, my browser (Chrome 49) crashes an javascript error and the arrows are not displayed :
```
Uncaught TypeError: t.getTransformToElement is not a function
```
This happens in the function `getCoords` of the library.

Using the latest version v0.4.16 of dagre-d3 fixes the issue.
2016-01-31 18:11:32 +01:00
Martin Duhem 9bc50e558e Use scripted engine from sbt/util 2016-01-26 14:51:14 +01:00
Martin Duhem 149122ab4d Hide stacktrace upon failure on pending scripted test 2016-01-25 14:48:06 +01:00
eugene yokota 56666016e0 Merge pull request #101 from sbt/wip/99
Handle SBT_OPTS
2016-01-22 14:14:07 -05:00
Eugene Yokota cd57c59372 Workaround for travis-ci/travis-ci#5227 2016-01-21 23:43:17 -05:00
Eugene Yokota 40167af167 Handle SBT_OPTS
Fixes sbt/sbt-launcher-package#99 formerly known as sbt/sbt#2194.
get_mem_opts() is a bash function that generates memory related
options. This change makes it return `""` the SBT_OPTS variable
contains memory-related options already.
2016-01-21 23:26:25 -05:00
Dale Wijnand 91093b32dd Merge pull request #2403 from timcharper/1.0.x
Forward port pull request #2399 to 1.0.x
2016-01-19 06:41:17 +00:00
Tim Harper 2eda2ebd46 bugfix - apply autoImports for global plugins at global configuration stage
Previously, the autoimports for globally defined plugins were not
imported for global configuration files, although they were imported for
project configuration files.

This patch causes an additional plugin discovery phase to happen during
global config evaluation, so that auto-plugins can be detected and their
imports subsequently included.
2016-01-18 21:43:32 -07:00
Tim Harper 96eadfc3dd add notes on running tests 2016-01-18 21:42:06 -07:00
Tim Harper bbccbc83d3 Amend contributing build instructions to help solve potential build problems 2016-01-18 21:41:49 -07:00
Dale Wijnand fa7776215b Merge pull request #2387 from dwijnand/update-1.0.x-readme
Update README with 1.0.x
2016-01-17 23:47:15 +00:00
Dale Wijnand 1c103d5eef Merge pull request #2396 from dwijnand/fport/rename-travis-matrix-var
Make the intent of the env variable clearer in travis configuration.
2016-01-17 23:20:33 +00:00
Dale Wijnand 3649f5ba70 Update README with 1.0.x 2016-01-17 21:28:32 +00:00
Dale Wijnand fc9b59b8a4 Merge pull request #2392 from dwijnand/fport/drop-scala-override-in-some-scripted-tests
FPORT: Upgrade Scala version in scripted tests
2016-01-17 21:25:22 +00:00
Grzegorz Kossakowski 8f8740d309 Make the intent of the env variable clearer in travis configuration.
Cherry-pick from e738bc3f73.
2016-01-17 21:21:23 +00:00
Guillaume Martres a05218f5ac Make sbt aware of Dotty
This small set of changes, together with the compiler-bridge I wrote
(https://github.com/smarter/dotty-bridge) enables us to compile code
using Dotty in sbt, see https://github.com/smarter/dotty-example-project
for an example.

Partial forward port of #2344.
2016-01-17 16:37:22 +00:00