Commit Graph

17940 Commits

Author SHA1 Message Date
Josh Suereth 653a1c11ea Merge remote-tracking branch 'origin/0.13.6' into wip/merge-0.13.6 2014-09-08 12:46:08 -04:00
eugene yokota 35eed37d04 Merge pull request #1581 from sbt/wip/fix-config-class-gc
Fix issue where generated config-classes was not propogated.
2014-09-08 22:57:03 +09:00
eugene yokota f3a84e39b9 Merge pull request #1581 from sbt/wip/fix-config-class-gc
Fix issue where generated config-classes was not propogated.
2014-09-08 22:57:03 +09:00
eugene yokota f6212e421e Merge pull request #1577 from sbt/wip/fix-inter-project-chains
Split out inter-project resolver into its own Chain.
2014-09-08 22:51:25 +09:00
eugene yokota 115d404072 Merge pull request #1577 from sbt/wip/fix-inter-project-chains
Split out inter-project resolver into its own Chain.
2014-09-08 22:51:25 +09:00
Daniel Peebles a857ae2759 Fixes #1570 2014-09-08 00:55:58 -04:00
Josh Suereth bc421f0ac9 Fix issue where generated config-classes was not propogated.
Fixes #1568.

This is the fallout of attempting not to leak config-file classes. Since
we DO NOT have valid incremental compiler for config-classes, we've instituted
workaround to ensure that regular incremental compilation *AND* our own
sbt loader do not hose each other.   A full solution will eventually be
to find a way for .sbt files to participate in regular compilation of a
project.

For now, we fix the tracking of generated.class files throughout an sbt
"loadProjects" call, and then clean any .class files that were not
generated for a full reload.   This commit just fixes
a minor tracking issue.
2014-09-07 12:01:50 -04:00
Josh Suereth 448eaff4bd Merge pull request #1573 from cunei/wip-scala-bin-compat
Allow the "-bin" Scala version suffix to specify a bincompat version
2014-09-05 11:34:05 -04:00
Josh Suereth b43d358e0e Merge pull request #1573 from cunei/wip-scala-bin-compat
Allow the "-bin" Scala version suffix to specify a bincompat version
2014-09-05 11:34:05 -04:00
Josh Suereth cd9205cffe Split out inter-project resolver into its own Chain.
Fixes #1565

* Create two chains if we have inter-project resolver
  - One which ensures inter-project deps are always taken
  - One which will look in all "other" repositories for
    dependencies and will use the "most up-to-date" -SNAPSHOT
    strategy.
* No additional tests, as this would simple break every
  multi-project test if it were wrong.
2014-09-05 10:40:49 -04:00
Josh Suereth dbf69b11cd Split out inter-project resolver into its own Chain.
Fixes #1565

* Create two chains if we have inter-project resolver
  - One which ensures inter-project deps are always taken
  - One which will look in all "other" repositories for
    dependencies and will use the "most up-to-date" -SNAPSHOT
    strategy.
* No additional tests, as this would simple break every
  multi-project test if it were wrong.
2014-09-05 10:40:49 -04:00
Josh Suereth 86480a3f6c Merge pull request #1561 from jamesward/patch-2
Fix url to sbt-dev group
2014-09-04 14:39:51 -04:00
Antonio Cunei 751305ab95 Allow the "-bin" Scala version suffix to specify a bincompat version
There is sometimes the need to use a test version of Scala that is
intended to be binary compatible with a standard release version.

At this time, due to the particular logic implemented within sbt,
a non-numeric suffix will never have the same binaryScalaVersion
of a release version ending in ".0", like for instance "2.11.0".

This commit allows developers to use as suffix any string that
begins with "-bin", for instance "2.11.0-bin-compat-test-1".
Such a suffix will have a binaryScalaVersion of "2.11", being
therefore considered binary compatible with release versions.
2014-09-04 01:15:58 +02:00
Antonio Cunei a6d85ae2cb Allow the "-bin" Scala version suffix to specify a bincompat version
There is sometimes the need to use a test version of Scala that is
intended to be binary compatible with a standard release version.

At this time, due to the particular logic implemented within sbt,
a non-numeric suffix will never have the same binaryScalaVersion
of a release version ending in ".0", like for instance "2.11.0".

This commit allows developers to use as suffix any string that
begins with "-bin", for instance "2.11.0-bin-compat-test-1".
Such a suffix will have a binaryScalaVersion of "2.11", being
therefore considered binary compatible with release versions.
2014-09-04 01:15:58 +02:00
Martin Duhem efa71548d1 Add unit tests for TextAnalysisFormat
Those tests use the random Analysis generator that is used in the
unit tests for the subproject `incremental-compiler`.

Random Analyses are serialized and then constructed back from this
representation.
2014-09-03 23:24:08 +02:00
Martin Duhem c55ae4fd18 Fix random Analysis generator for ScalaCheck
Unit tests in incremental-compiler subproject use a generator to
create random Analysis objects. This generator was unfortunately
not working properly and generated only empty Analyses (it failed
to generate any non-empty Analysis because of a bug in the `unique`
generator).
2014-09-03 23:10:22 +02:00
James Ward cfd9da5789 Fix url to sbt-dev group 2014-08-31 09:51:58 -06:00
eugene yokota 68602278d5 Merge pull request #1557 from gkossakowski/scripted-compactify
Fix `compactify` scripted test failure.
2014-08-27 14:18:28 -04:00
Grzegorz Kossakowski b4110bfc17 Fix `compactify` scripted test failure.
Travis CI stopped allowing long file names on its file system. We need
to explicitly set lower limit on file name length using
`-Xmax-classfile-name` Scala compiler option. We set the limit to 240
characters.

Fixes #1553
2014-08-27 16:24:28 +02:00
Johannes Rudolph 8ef3760226 Merge pull request #55 from jaytaylor/clearer-force-flag-instructions
Clearer messaging for `sbt 'dependency-graph --force'` command.
2014-08-27 10:04:37 +02:00
Jay Taylor dfdba57248 Clearer messaging for `sbt 'dependency-graph --force'` command. 2014-08-26 20:26:08 -07:00
Eugene Yokota 9018085a7a Merge branch '0.13' into 0.13.6 2014-08-24 18:24:37 -04:00
Eugene Yokota 7e0c76f5a6 Merge branch '0.13' into 0.13.6 2014-08-24 18:24:37 -04:00
Eugene Yokota 66ad21ec52 notes 2014-08-24 18:21:32 -04:00
Josh Suereth ca0665d7f0 Merge pull request #1537 from sbt/fix/1275
Improves pom dynamic revision conversion
2014-08-24 18:19:02 -04:00
Josh Suereth 260d67f288 Merge pull request #1537 from sbt/fix/1275
Improves pom dynamic revision conversion
2014-08-24 18:19:02 -04:00
Josh Suereth 98bdefb9c5 Merge pull request #1555 from sbt/fix/1541-scala-sbt
#1541. Use HTTPS for sbt plugin repository
2014-08-24 18:18:02 -04:00
Josh Suereth dfb5943731 Merge pull request #1555 from sbt/fix/1541-scala-sbt
#1541. Use HTTPS for sbt plugin repository
2014-08-24 18:18:02 -04:00
Eugene Yokota 97110b6c9d #1541. Use HTTPS for sbt plugin repository 2014-08-24 16:37:24 -04:00
Eugene Yokota a5a44a88c2 #1541. Use HTTPS for sbt plugin repository 2014-08-24 16:37:24 -04:00
Eugene Yokota d2b86f5cc5 notes 2014-08-23 23:37:45 -04:00
eugene yokota 34ef2d2dd7 Merge pull request #1548 from sbt/fix/1541
HTTPS: Various HTTPS related changes
2014-08-23 23:32:19 -04:00
eugene yokota 3aa8e7dd2d Merge pull request #1548 from sbt/fix/1541
HTTPS: Various HTTPS related changes
2014-08-23 23:32:19 -04:00
Eugene Yokota 090e3a6468 #1541. Use HTTPS for Typesafe repository 2014-08-23 17:47:48 -04:00
Eugene Yokota 7e2982e056 notes 2014-08-23 17:47:48 -04:00
Eugene Yokota d86e6ccd26 Fixes #1549. Use HTTPS for Java.net Maven 2 repository 2014-08-23 17:47:48 -04:00
Eugene Yokota 2904bdcb32 #1541. Use HTTPS for Typesafe repository 2014-08-23 17:47:48 -04:00
Eugene Yokota 9b42a1899d Fixes #1549. Use HTTPS for Java.net Maven 2 repository 2014-08-23 17:47:48 -04:00
Eugene Yokota 1566058227 Deprecate JavaNet1Repository. #1541
I don’t think there’s an alternative for java.net Maven 1 repository.
2014-08-23 17:47:47 -04:00
Eugene Yokota 1e180cc030 Deprecate JavaNet1Repository. #1541
I don’t think there’s an alternative for java.net Maven 1 repository.
2014-08-23 17:47:47 -04:00
Eugene Yokota c648a31c59 #1541. Launcher uses HTTPS Maven Central by default 2014-08-23 17:47:47 -04:00
eugene yokota 631ec5134f Merge pull request #1554 from sbt/wip/compactify-pending
#1553/#1546. Mark compactify test as pending
2014-08-23 17:46:33 -04:00
Eugene Yokota 180956f180 #1553/#1546. Mark compactify test as pending 2014-08-23 17:43:43 -04:00
eugene yokota 425940e483 Merge pull request #1551 from sbt/fix/1550
Fixes #1550/#1546. Name hashing change to fix the build
2014-08-23 14:36:50 -04:00
Eugene Yokota bb20310922 Run AnalysisTest without name hashing 2014-08-23 02:58:44 -04:00
Eugene Yokota 1387f720b3 Move notes item to compatibility implication 2014-08-22 19:24:52 -04:00
Eugene Yokota 8f39a84db2 Fixes #1550. Turning off name hashing to test Ant style 2014-08-22 19:15:08 -04:00
Eugene Yokota 112052241c #1550. Fixes scripted/join that broke with #1546
Name hashing is now turned on by default, so I’m changing the value for
inc.Relations.empty, so inc.Analysis.empty functions as expected when
it’s joined with name hashing analyses.
2014-08-22 19:12:27 -04:00
eugene yokota 6fa61e972f Merge pull request #1547 from joshk/patch-1
Use the new Docker queue on Travis
2014-08-22 18:10:35 -04:00
Josh Kalderimis f4c20563d7 bumping the file to run the build again
fixed an issue with the Docker workers
2014-08-22 11:41:21 +02:00