Commit Graph

30 Commits

Author SHA1 Message Date
Eugene Yokota 8d2a15da6e Bumping Scala version to 2.10.6. 2015-12-14 05:26:34 -05:00
Eugene Yokota 4e8d5e827e Merge 2015-12-03 17:08:45 -05:00
eugene yokota 8749a969c3 Merge pull request #2297 from sbt/wip/fix-2264
Fixes #2264. Fixes updateClassifiers when default configuration is missing + uses listed artifacts if any
2015-12-03 02:11:52 -05:00
Eugene Yokota 3a3965b5f5 Fixes #2264. Use explicit artifacts if any, fallback to hardcoded
Even though it's not really used, updateClassifiers constructs
dependency graph based on the result from update.
The direct cause of #2264 came from the fact that the `allModules`
returned from ConfigurationReport did not include dependency
configurations. For example it returned "compile" instead of
"compile->runtime". I've identified that in #2264 and was fixed by
@Duhemm in f49fb33e6d.

Martin identified that the fix still does not address the fact that
updateClassifier hardcodes the classifiers to be tried. This commit
adds the fallback behavior so for Ivy-published modules it will use the
explicit list of artifacts, and for others it will fallback to the
hardcoded list of classifiers.
2015-12-02 16:41:02 -05:00
eugene yokota c5b7fc1d9c Merge pull request #2272 from Duhemm/fix-1968
Don't pass `-J<flag>` to local java, improve javac's error parsing
2015-11-27 15:37:16 -05:00
Dale Wijnand f270cd2a5c Add Resolver.bintrayIvyRepo 2015-11-25 09:26:58 +00:00
Martin Duhem a8d644eb45 Merge branch '0.13' into fix-1968 2015-11-12 09:15:47 +01:00
eugene yokota 222623071a Merge pull request #2271 from Duhemm/fix-2228
Report failed compilation if errors are registered.
2015-11-12 02:14:08 -05:00
Martin Duhem 590c4d07ef Notes for sbt/sbt#2272 2015-11-11 14:41:26 +01:00
Martin Duhem e19ca7bf85 Notes for sbt/sbt#2271 2015-11-11 14:30:05 +01:00
Huw Giddens cbeaba0ccd Update per the changes since August. 2015-11-11 21:35:57 +11:00
Martin Duhem 26e15c2dd4 Add notes for #2258 2015-10-28 16:05:45 +01:00
Dale Wijnand 397c25679f Add notes for #1750. 2015-08-28 23:38:49 +01:00
Josh Suereth da8bb5b621 Merge pull request #2151 from dwijnand/add-Def.settings
Extract Def.settings from Project#settings.
2015-08-25 09:52:27 -04:00
Huw Giddens 68330d042a Add notes for PR. 2015-08-24 18:36:26 +10:00
Dale Wijnand 786dc7fd10 Add notes for MavenRepository.localIfFile. 2015-08-23 17:33:19 +01:00
Dale Wijnand dcbbc531ed Add notes for PR 2151. 2015-08-20 18:45:42 +01:00
Josh Suereth f3b5bcc02b Merge pull request #2127 from sbt/wip/warn-on-intransitive-pom
Add warning to MakePom for intransitive dependencies.
2015-07-25 08:23:09 -04:00
Josh Suereth 92acfe1287 Fixes from review 2015-07-24 12:48:11 -04:00
Josh Suereth 9beff22d9a Add warning to MakePom for intransitive dependencies.
Intransitive does not work in Maven, and does not translate to pom.xml.
2015-07-24 10:42:49 -04:00
Josh Suereth bad1e9d487 Add handling for transitive exclude rules in pom.xml files.
Fixes #2109

* Add maven resolver tests back to travisCI
* Disable ivy.xml translation test from maven-repository-resolver config, due to incorrect assumptions.
2015-07-23 15:32:27 -04:00
Josh Suereth d0e918d6d3 Merge pull request #2114 from pdalpra/add-append.sequence-list
Add an Append.Sequence instance for List
2015-07-18 07:05:59 -04:00
Pierre DAL-PRA 10c71b3f8a Add an Append.Sequence instance for List, fixes #2107 2015-07-18 10:51:31 +02:00
Pierre DAL-PRA f944ec98d2 Log javaOptions/fork interactions:
- When forking, log the javaOptions that are used
- When javaOptions are defined but fork := false, warn that javaOptions
	will be ignored
2015-07-18 00:37:35 +02:00
eugene yokota 5824ef6d7f Merge pull request #2106 from Duhemm/interface-specific-sources-clean
Find most specific version of compiler interface sources
2015-07-17 10:25:16 -04:00
fkorotkov c73f513016 review comments 2015-07-16 15:49:06 -04:00
Dale Wijnand 5428c07420 Move PR 2085 notes. 2015-07-16 16:24:45 +01:00
Martin Duhem 3195d7256e Notes 2015-07-16 15:46:14 +02:00
Pierre DAL-PRA ea0abefac9 Add notes 2015-07-09 23:45:01 +02:00
Martin Duhem 6c123f22ba Hide stacktrace on compilation error in build definition 2015-07-09 11:40:02 +02:00