Commit Graph

3648 Commits

Author SHA1 Message Date
eugene yokota e9b79c5956 Merge pull request #1490 from sbt/wip/1484
Fixes NullPointerException during update. Fixes #1484
2014-08-04 11:50:47 -04:00
eugene yokota 9b42c8cd1c Merge pull request #1499 from sbt/wip/fix-nightly-push
Fix nightly push to go to snapshot repository.
2014-08-04 11:24:47 -04:00
Josh Suereth 33deeea8b3 Fix nightly push to go to snapshot repository. 2014-08-04 11:08:29 -04:00
Josh Suereth 19b91396a2 Fix broken cross versioning semantics using + 2014-08-04 10:44:40 -04:00
Eugene Yokota 9d86e1c7fc Merged 0.13.5 to remove documents 2014-08-04 10:14:46 -04:00
Eugene Yokota dc2ae51d73 Adds UnresolvedWarningConfiguration that caches ModuleID -> SourcePosition mapping.
UnresolvedWarning is moved back to IvyActions.scala where it belongs.
The mapping between ModuleID and SourcePosition is passed in as UnresolvedWarningConfiguration.
This is calculated once in Defaults using State and is cached to filesystem.
2014-08-03 02:31:56 -04:00
Eugene Yokota 58b7c63f84 Unresolved dependency warning includes source position. Fixes #528
Unresolved dependency warning is moved to UnresolvedDependencyWarning class including
the fail path that was added in #1467.
To display the source position, I need to access the State, so I had to move the
error processing out of IvyActions and add UnresolvedDependencyWarning, which is
aware of State.
2014-08-02 06:25:24 -04:00
Eugene Yokota 9124056440 Fixes NullPointerException during update. Fixes #1484 2014-08-01 21:00:41 -04:00
eugene yokota 4a83fcaeb1 Merge pull request #1489 from sbt/fix/issue-856
Fixes #856 - Store ++ scala version changes on session.
2014-08-01 17:42:35 -04:00
Josh Suereth 676519cb96 Add notes for bugfix. 2014-08-01 17:41:34 -04:00
Josh Suereth cc7546b1eb Fixes #856 - Store ++ scala version changes on session.
* Ensure the ++ command stores its changes on the sbt session.
* Make sure `session clear-all` will clear out ++ changes
* Validate that `set` command doesn't undo `++` changes

Note: There is some autogenerated Setting[_] delegate optimisation
      work that could be done in the future.
2014-08-01 17:39:43 -04:00
eugene yokota 7f1786924f Merge pull request #1488 from sbt/wip/fix-1375
Fixes #1375 - Check for empty filenames.
2014-08-01 17:37:51 -04:00
Josh Suereth 5150339a0a Add notes so we have a merge conflict.
Conflicts:
	notes/0.13.6.md
2014-08-01 17:37:12 -04:00
Josh Suereth f4ff84db34 Fixes #1375 - Check for empty filenames.
Starting sbt in root isn't a great idea, but it shouldn't break.
2014-08-01 17:36:14 -04:00
eugene yokota 550a7f8e96 Merge pull request #1487 from sbt/wip/fr-1306
Fixes #1306 - Attempt to turn test suite names into better filenames.
2014-08-01 17:34:48 -04:00
Josh Suereth b6e3791731 Add notes for test report fix. 2014-08-01 17:18:37 -04:00
Josh Suereth ef70d84323 Fixes #1306 - Attempt to turn test suite names into better filenames. 2014-08-01 17:14:00 -04:00
eugene yokota 7ecf7d7b61 Merge pull request #1486 from sbt/fix/issue-1478
Fixes #1478 - Append new sLog when reloading in set command.
2014-08-01 16:23:16 -04:00
Josh Suereth 928abb61aa Add PR notes. 2014-08-01 15:14:51 -04:00
Josh Suereth 49f1529c5a Fixes #1478 - Append new sLog when reloading in set command.
* Migrate weak reference into logger class so we can test clearing it.
* Ensure new state.log is propoagted into settings on `set` command.
* Fix set test so that it ensures the sLog is relatively stable when
  reloading on set command.
2014-08-01 15:04:32 -04:00
Eugene Yokota b393df8acf Updated notes 2014-07-31 18:24:43 -04:00
Josh Suereth 775b21eef2 Merge pull request #1477 from puffnfresh/dont-warn-not-simple-types
Change "Not a simple type" warning to log message
2014-07-31 17:51:22 -04:00
eugene yokota 500a0ce43d Merge pull request #1476 from sbt/wip/exclude-rules-ivy
Add caching around dependency exclude rule evaluation
2014-07-31 17:14:01 -04:00
Eugene Yokota d06bd002ff Add Release.javaVersionCheckSettings to Release.settings 2014-07-31 15:18:39 -04:00
Eugene Yokota eeb9898954 Fix contributing.md 2014-07-31 04:37:45 -04:00
eugene yokota d3842d87f4 Merge pull request #1482 from joscha/patch-1
Remove whitespaces at the end of Google Group URL
2014-07-31 04:34:13 -04:00
Joscha Feth 58e4f757cb Remove whitespaces at the end of Google Group URL 2014-07-31 10:31:16 +02:00
Eugene Yokota 0a00d0625a Added sbt-javaversioncheck to the build, and bumped up sbt/ivy version to 2.3.0-sbt-14d4d23e25f354cd296c73bfff405544434d5f80 2014-07-30 19:52:59 -04:00
Brian McKenna 2fefaf5758 Change "Not a simple type" warning to log message
Workaround for -Xfatal-warnings being triggered because of #830.
2014-07-30 07:45:03 -06:00
Eugene Yokota a1c54bfb59 Updates internal Ivy to 2.3.0-sbt-fac2aaab6f982c4424b47e6b190190bef50a6f59 for exclude rule perf 2014-07-29 22:06:05 -04:00
Eugene Yokota f77b6b2b03 scalariform formatting 2014-07-29 22:03:02 -04:00
eugene yokota ea2c7f7d46 Merge pull request #1473 from sbt/wip/resolve-consolidation2
Improved consolidated resolution testing. #1454
2014-07-29 21:29:47 -04:00
eugene yokota 99335c959e Merge pull request #1474 from sbt/wip/0136-m1-notes1
Updated release notes
2014-07-29 21:29:20 -04:00
Eugene Yokota 38ba0181f3 Move one item to bug fix 2014-07-29 21:06:33 -04:00
Eugene Yokota b5bc76e2d1 Updated notes 2014-07-29 18:35:48 -04:00
Eugene Yokota 5687f72557 Improved consolidated resolution testing. #1454 2014-07-29 12:49:50 -04:00
Josh Suereth 57aaaf7a60 Merge pull request #1467 from sbt/wip/eviction-warning
Eviction warnings (Fixes #1200)
2014-07-29 11:08:42 -04:00
Eugene Yokota d6dbbaaf2e Improve doc on ModuleDetailReport per @jsuereth 2014-07-28 13:25:54 -04:00
Eugene Yokota cdf3c6e857 notes. #1200 2014-07-27 12:53:49 -04:00
Eugene Yokota c8af32950d Implements eviction warning stories. #1200
This implements all stories from https://github.com/sbt/sbt/wiki/User-Stories%3A-Conflict-Warning.
When scalaVersion is no longer effective an eviction warning will display.

    Scala version was updated by one of library dependencies:
        * org.scala-lang:scala-library:2.10.2 -> 2.10.3

When there're suspected incompatibility in directly depended Java libraries,
eviction warnings will display.

   There may be incompatibilities among your library dependencies.
   Here are some of the libraries that were evicted:
      * commons-io:commons-io:1.4 -> 2.4

When there's suspected incompatiblity in directly depended Scala libraries,
eviction warnings will display.

  There may be incompatibilities among your library dependencies.
  Here are some of the libraries that were evicted:
      * com.typesafe.akka:akka-actor_2.10:2.1.4 -> 2.3.4

This also adds 'evicted' task, which displays more detailed eviction warnings.
2014-07-27 12:26:12 -04:00
Eugene Yokota 3e3d7651f8 pseudo-case class VersionNumber
VersionNumber is a pseudo-case class that represents any form of
version number. The unapply extractor can parse String into
three sequences that makes up VersionNumber.
VersionNumberCompatibility trait uses two VersionNumber instances
to evaluate binary compatibility between them.
Two implementations SemVer and SecondSegment are provided.
2014-07-27 12:14:30 -04:00
Eugene Yokota f2ad294984 Fixing more NullPointerError by wrapping license URL with Option 2014-07-27 12:01:11 -04:00
Eugene Yokota bb6e3e34e6 Fixing NullPointerError caused by reading String from Ivy directly 2014-07-25 03:51:20 -04:00
Eugene Yokota d40733807f Implemented general eviction warning. #1200
a> update
    [info] Updating {file:/foo/}a...
    [info] Resolving org.fusesource.jansi#jansi;1.4 ...
    [info] Done updating.
    [warn] Some dependencies were evicted:
    [warn]  * org.scala-lang:scala-library (2.10.1) -> 2.10.3
2014-07-25 03:51:20 -04:00
Eugene Yokota 855e7f176b Expand ModuleReport into the full Ivy resolution report. #1200
Currently sbt's update task generates UpdateReport from
Ivy's resolution report.
For each configuration there's ConfigurationReport, which contains
just enough information on the resolved module/revision/artifact.

Speaking of module, in Ivy module means organization and name,
and organization, name, and version is called module revision.
In sbt, module revision is called Module.
This is relevant because to talk about evictions, we need
a terminology for organization and name combo.

In any case ConfigurationReport is expanded to have `details`
field, which contains Seq[ModuleDetailReport], which represents
organization and name combo plus all the modules
just like Ivy's resolution report XML.
Furthermore, ModuleReport is expanded to include licenses,
eviction, callers, etc.
2014-07-25 03:51:19 -04:00
eugene yokota 5b070b9dcc Merge pull request #1454 from sbt/wip/resolve-consolidation
Consolidated resolution
2014-07-24 02:13:01 -04:00
Eugene Yokota e997769971 Consolidated resolution. Fixes #413
This adds a new setting key called updateOptions, which can enable
consolidated resolution for update task.
The consolidated resolution automatically generates an artificial
module descriptor based on the SHA-1 of all external dependencies.
This consolidates the Ivy resolution of identical Ivy dependency
graph across multiple subprojects.

This is how it's enabled:

    updateOptions := updateOptions.value.withConsolidatedResolution(true)
2014-07-24 02:12:46 -04:00
eugene yokota 0bb882b186 Merge pull request #1463 from jaceklaskowski/docs-contributing
Contributing updated
2014-07-23 23:54:31 -04:00
Jacek Laskowski cb21614258 Contributing updated 2014-07-24 00:57:36 +02:00
eugene yokota 9df5882766 Merge pull request #1456 from sbt/wip/build-sbt-vals-in-set-command
Export build.sbt values inside sbt.
2014-07-21 10:30:39 -04:00