Commit Graph

3716 Commits

Author SHA1 Message Date
Grzegorz Kossakowski 550f14cbad Merge pull request #1619 from gkossakowski/ClassToAPI-NPE
Use Option.apply instead of Some.apply in ClassToAPI
2014-09-25 09:41:45 +02:00
Grzegorz Kossakowski 20f50100be Use Option.apply instead of Some.apply in ClassToAPI
When dealing with Java APIs (Java reflection in case of ClassToAPI), one
should always go through Option.apply that performs null check.

This is supposed to fix NPE reported in #1617. We don't have a reproduction
so this is just an educated guess.
2014-09-24 23:05:52 +02:00
Josh Suereth e8a2fcc26f Merge pull request #1600 from topping/0.13
PR for #1589
2014-09-24 09:11:57 -04:00
Josh Suereth d2a18926b0 Merge pull request #1613 from jedesah/topic/remove-warnings
Remove compiler warnings
2014-09-24 09:10:35 -04:00
Brian Topping 59ea77e590 Add warning for bad XML parse of settings file 2014-09-22 10:56:10 -04:00
eugene yokota d8c9a1ac08 Merge pull request #1607 from sbt/fix/1598-2
Fix #1598 - Ivy fails to load evicted information.
2014-09-21 20:57:14 -04:00
Josh Suereth 14148c96f7 Fix #1598 - Ivy fails to load evicted information.
Upgrade to a version of ivy 2.3.0 that has a backported fix for conflict resolver.
2014-09-19 13:08:49 -04:00
Brian Topping 31acddf856 Additional updates, should be clean now. 2014-09-17 15:24:33 -04:00
Josh Suereth 3c8893ef2c Merge pull request #1590 from jedesah/0.13
Add developer key
2014-09-17 10:32:04 -04:00
eugene yokota dc077c27ed Merge pull request #1602 from sbt/wip/ivy-no-commons-httpclient
Bump to a version of ivy that will not swap in httpclient URL handler.
2014-09-17 10:29:06 -04:00
Josh Suereth 619536b059 Add notes for this fix. 2014-09-17 10:27:12 -04:00
Josh Suereth 920c875e12 Merge pull request #1601 from sbt/wip/circular
Expose Ivy's circular dependency check via UpdateOptions
2014-09-16 18:18:44 -04:00
Jean-Rémi Desjardins 161b0b7ca5 Merge branch '0.13' of github.com:jedesah/sbt into 0.13
Conflicts:
	ivy/src/main/scala/sbt/IvyInterface.scala
2014-09-16 09:29:35 -07:00
Jean-Rémi Desjardins e3975015b8 Fix obtuse compilation error 2014-09-16 09:26:43 -07:00
Jean-Rémi Desjardins 2eb8fd1b8a Merge branch '0.13' of github.com:sbt/sbt into 0.13 2014-09-16 09:20:21 -07:00
Josh Suereth afd917dac3 Bump to a version of ivy that will not swap in httpclient URL handler.
When ivy finds the httpclient on the classpath, it will silently change
its url handler, and the httpclient in ivy 2.3.x has a few known
issues.
2014-09-16 09:32:19 -04:00
Eugene Yokota fe7a6f6193 Expose Ivy's circular dependency check via UpdateOptions 2014-09-16 09:22:21 -04:00
Jean-Remi Desjardins b1b44f9c3f Change additional constructor to what it should probably be
I am at a total loss for why this is not compiling.
2014-09-15 22:38:44 -07:00
Jean-Remi Desjardins c61ca347cf Add notes 2014-09-15 22:37:35 -07:00
Jean-Remi Desjardins 6985a1266a Merge branch '0.13' of github.com:sbt/sbt into 0.13 2014-09-15 22:24:10 -07:00
Brian Topping ad7d9ce42b Tested PR for #485. Had a hard time squashing this, maybe because I did a merge in between. Sorry about that! 2014-09-15 15:26:45 -04:00
Jean-Rémi Desjardins b754c04a30 Add missing default option 2014-09-15 10:02:08 -07:00
Josh Suereth 2181c60925 Merge pull request #1596 from sbt/wip/herald
minor notes changes for herald
2014-09-15 12:11:25 -04:00
Brian Topping ef3eccf95f Merge remote-tracking branch 'upstream/0.13' into 0.13 2014-09-15 11:14:13 -04:00
Brian Topping b89c49adcb Untested PR for #485. Unable to test because unable to build 2014-09-15 10:48:47 -04:00
eugene yokota 904c8377b1 Merge pull request #1588 from sbt/wip/bump-sbt-version
Bump version for next sbt release.
2014-09-13 15:38:42 -04:00
Eugene Yokota 46af6b5907 notes 2014-09-13 15:37:00 -04:00
Josh Suereth c6036d956a Merge pull request #1591 from cunei/wip-set-every-1430
Fix for #1430
2014-09-12 22:54:29 -04:00
Antonio Cunei 9b94a16b73 Undone the revert on the optimization, and fixed setAll()
The optimization, and therefore the change in the behavior
of Relation, is now needed by the class Logic, and cannot
be reverted.

This patch (written by Josh) therefore changes the
implementation of setAll() so that _1s is no longer used.
2014-09-12 20:51:04 +02:00
eugene yokota 4846eb35d5 Merge pull request #1586 from sbt/wip/cross-ivy-maven-issues
Fix ivy-mvn cross-wiring issues
2014-09-12 14:42:39 -04:00
Jean-Rémi Desjardins 880f3733d9 Add constructor to avoid binary compatibility issues 2014-09-11 09:36:37 -07:00
Josh Suereth 6033106a2e Add notes and add note about notes in Contributing. 2014-09-11 11:59:38 -04:00
Grzegorz Kossakowski 7885fd2558 Merge pull request #1572 from Duhemm/textanalysisformat-dependency-kinds
Don't hardcode existing relations in TextAnalysisFormat
2014-09-11 16:55:08 +02:00
Martin Duhem 82152b8905 Don't hardcode existing relations in TextAnalysisFormat
The previous implementation of TextAnalysisFormat contained the list
of all the existing relations that sbt knew of, and used this
information to write to and read from the disk the persisted analyses.

In this knew implementation, TextAnalysisFormat gets from the
Relations object what are the existing relations, and then persists
them to disk.

The previous situation was not optimal since it meant that, in order
to add a new dependency kind, one had to modify both the Relations
and TextAnalysisFormat.

Using this new implementation, no change to TextAnalysisFormat is
required whenever a new dependency kind is added.
2014-09-11 14:45:47 +02:00
Grzegorz Kossakowski 6fa9b48691 Merge pull request #1563 from Duhemm/fix-1544
Fix #1544 (SO in dependencies extraction with macros and name hashing)
2014-09-11 13:25:27 +02:00
Jean-Rémi Desjardins ff9baf5987 Merge branch 'refs/heads/0.13' into topic/remove-warnings 2014-09-10 23:24:53 -07:00
eugene yokota ba97cf87de Merge pull request #1585 from sbt/wip/manual-conscript-generation
Remove automated conscript generation and only generate on release
2014-09-11 15:18:31 +09:00
Jean-Rémi Desjardins 3ea995225f Merge branch '0.13' of github.com:sbt/sbt into 0.13 2014-09-10 22:56:01 -07:00
Jean-Rémi Desjardins ced5230289 Remove some compiler warnings 2014-09-10 22:55:43 -07:00
Jean-Rémi Desjardins 183c2bcfe2 Add developers keySetting
The motivation for this is mainly to avoid having to define a pomExtra to publish to Maven central
2014-09-10 20:18:28 -07:00
Antonio Cunei 9aa0985f4b This commit reverts part of 322f6de655
The implementation of Relation should in theory make no difference
whether an element is unmapped, or whether it is mapped to an empty
set. One of the changes in 322f6de655
introduced an optimization to the '+' operation on Relations that,
in theory, should have made no difference to the semantic.

The result of that optimization is that some mappings of the form
"elem -> Set()" are no longer inserted in the forwardMap of the
Relation.

Unfortunately, the change resulted in the breakage of #1430,
causing "set every" to behave incorrectly. There must be, somewhere
in the code, a test on the presence of a key rather than an access
via <relation>.get(), or some other access that bypasses the
supposed semantic equivalence described above. I spent several
hours trying to track down exactly the offending test, without
success.

By undoing the relevant change in 322f6de655, "set every"
works again. That however offers no guarantee that everything else
will keep working correctly; the underlying quirk in the code that
depends on this supposedly inessential detail is also still
lurking in the code, which is less than ideal.
2014-09-11 02:04:17 +02:00
Antonio Cunei 3d981177df Adding test for broken "set every", see #1430
To test, use:
> scripted tests/set-every
2014-09-11 02:03:38 +02:00
Josh Suereth 8451caf93a Bump version for next sbt release. 2014-09-10 12:36:05 -04:00
Josh Suereth 0f88b7a4f3 Merge pull request #1584 from sbt/wip/fix-test-classloader-issues
Fix issues with specifying scalaHome/scalaInstance and running tests
2014-09-10 12:26:15 -04:00
Martin Duhem 8542c9b31a Fix SOE with macros in dependencies extraction
In some cases, expanded macros report that their original tree and
its expansion are the same, thus creating a cyclic chain. This chain
may then produce a SOE during dependencies or used names extraction.

This kind of problem was already reported in sbt/sbt#1237 and
sbt/sbt#1408. Unfortunately, the fix that was applied to the
dependencies extraction part was not sufficient.

Mark test 'source-dependencies/macro' as passing

Fixes #1544
2014-09-10 15:54:06 +02:00
Josh Suereth bdd3d01f6e Fixes from review, better names and internal code documentation. 2014-09-10 07:56:19 -04:00
Josh Suereth b226f6511a Fix Maven configuration mappings in Ivy.
It turns out there was a very subtle, and evil, issue sitting the Ivy/maven configuration, and it
related to dependency mapping.    A mapping of `foo->bar(*)` means that the local configuration
`foo` depends on the remote configuration `bar`, if it exists, or *ALL CONFIGURATIONS* if `bar`
does not exist.   Since the default Ivy configuration mapping was using the random `master`
configuration, which AFAICT is NEVER specified, just an assumed default, this would cause leaks
between maven + ivy projects.

i.e. if  a maven POM depends on a module denoted by an ivy.xml file, then you'd wind up accidentally
bleeding ALL the ivy module's configurations into the maven module's configurations.

This fix works around the issue, by assuming that if there is no `master` configuration, than the
maven default of `compile` is intended.   As sbt forces generated `ivy.xml` files to abide by
maven conventions, this works in all of our test cases.   The only scenario where it wouldn't work
is those who have custom ivy.xml files *and* have pom.xml files which rely on those custom ivy.xml files,
a very unlikely situation where the workaround is:  "define a master configuration".

Includes a test demonstrating the issue.
2014-09-09 17:45:02 -04:00
Josh Suereth 7157af57cf Add failing test for ivy/maven cross-over configuration issue. 2014-09-09 11:04:20 -04:00
Josh Suereth d9ebceebdd Scalariform refactoring. 2014-09-09 10:46:28 -04:00
Josh Suereth 5ceb247c0a Remove automated conscript generation and only generate on release.
Fixes #1558.

Note: This may mean conscript is updated less frequently, but
is better than the alternative.
2014-09-09 10:44:32 -04:00