Commit Graph

5624 Commits

Author SHA1 Message Date
Grzegorz Kossakowski 4a9981720a Remove work-arounds for Scala 2.11 problematic dependencies
The ff0fd6eec6 introduced some exclusions
that were necessary for getting sbt to resolve dependencies properly
against Scala 2.11.0-M7.

Scala 2.11.0-M8 fixed its dependency structure so we can get rid of those
exclusions now.
2014-02-12 14:12:20 +01:00
Grzegorz Kossakowski 62072ebcca Merge pull request #1113 from retronym/ticket/si-8263
Scala 2.11 compatibility
2014-02-12 14:05:47 +01:00
Grzegorz Kossakowski 53331d9328 Merge pull request #1113 from retronym/ticket/si-8263
Scala 2.11 compatibility
2014-02-12 14:05:47 +01:00
Jason Zaugg 10ed229004 SI-8263 Avoid SOE in Symbol#logicallyEnclosingMember under Scala 2.11
Since the fix for SI-2066, Scala 2.11 calls logicallyEnclosingMember on the
`x` in the expansion of the task macro:

    InitializeInstance.app[[T0[x]](T0[java.io.File], T0[java.io.File]), Seq[java.io.File]]

This exposed the fact that SBT has created `T0` with `NoSymbol` as
the owner. This led to the a SOE.

I will also change the compiler to be more tolerant of this, but we
can observe good discipline in the macro and pick a sensible owner.
2014-02-12 13:30:46 +01:00
Jason Zaugg 4e073373da SI-8263 Avoid SOE in Symbol#logicallyEnclosingMember under Scala 2.11
Since the fix for SI-2066, Scala 2.11 calls logicallyEnclosingMember on the
`x` in the expansion of the task macro:

    InitializeInstance.app[[T0[x]](T0[java.io.File], T0[java.io.File]), Seq[java.io.File]]

This exposed the fact that SBT has created `T0` with `NoSymbol` as
the owner. This led to the a SOE.

I will also change the compiler to be more tolerant of this, but we
can observe good discipline in the macro and pick a sensible owner.
2014-02-12 13:30:46 +01:00
Jason Zaugg 9b4564f0cd SI-8262 Fix compilation with 2.11 due to shadowing of Range
We now have `global.Range`, so our wildcard import of `global._`
shadows `scala.Range`.

This commit fully qualifies that type so as to be compatible with
Scala 2.10 and 2.11.
2014-02-12 13:11:28 +01:00
Roch Delsalle 05d96912d1 Update Community-Plugins.rst
sbt-scct fork / published on central with 0.13 compatibility
2014-02-12 11:02:53 +01:00
Josh Suereth e4375b3e58 Merge pull request #1108 from dansanduleac/dynamic-app-launch
Launcher to retrieve dynamic app versions correctly
2014-02-11 08:07:00 -05:00
Dan Sanduleac 6abac450ef Retrieve dynamic app versions correctly 2014-02-10 09:18:41 +00:00
Mark Harrah 49bf842b3d Restructure Natures/AutoPlugin types
- remove AutoPlugin.provides
 * name comes from module name
 * AutoPlugin is Nature-like via Basic
- Project.addNatures only accepts varags of Nature values
 * enforces that a user cannot explicitly enable an AutoPlugin
 * drops need for && and - combinators
- Project.excludeNatures accepts varags of AutoPlugin values
 * enforces that only AutoPlugins can be excluded
 * drops need for && and - combinators
2014-02-08 10:23:31 -05:00
Mark Harrah e037731d81 TODO 2014-02-08 10:23:31 -05:00
Mark Harrah eb7da2f689 move Nature-related classes to Natures.scala 2014-02-08 10:23:31 -05:00
Mark Harrah 0fc5f1525e Generate error when multiple AutoPlugins provide the same Nature. 2014-02-08 10:23:31 -05:00
Mark Harrah 708a3b107b minor API updates 2014-02-08 10:23:31 -05:00
Mark Harrah 4feb7d3dc8 Fix typos in AutoPlugin API docs. 2014-02-08 10:23:31 -05:00
Suzanne Hamilton 4ab8074753 Fix formatting of inline code samples which are pluralized 2014-02-06 08:49:44 -05:00
Josh Suereth 85753e4035 Merge pull request #1100 from dansanduleac/sessionSettings2
Fixed SessionSettings replacing existing setting
2014-02-02 04:24:49 -08:00
Dan Sanduleac 083eb38bd2 [scripted] Session update without reload 2014-02-02 08:50:47 +00:00
Josh Suereth b7c50d4269 Merge pull request #1089 from dansanduleac/overwritePublish
Expose overwrite flag in IvyActions.publish
2014-02-01 07:56:41 -08:00
Josh Suereth f8536ad9a5 Merge pull request #1097 from kalmanb/0.13
Add sbt-ctags community plugin information
2014-01-30 00:36:11 -08:00
Josh Suereth b313d2db19 Merge pull request #1099 from ngocdaothanh/0.13
Add link to plugin xitrum-package (collects dependency .jar files for standalone Scala programs)
2014-01-28 06:26:05 -08:00
Josh Suereth bfa507affd Merge pull request #1098 from xerial/sbt-sonatype
Add a link to sbt-sonatype plugin in Using-Sonatype page
2014-01-28 04:34:16 -08:00
Josh Suereth 555087bdf4 Merge pull request #1101 from retronym/ticket/1031
Avoid compiler crash for naked `key.value` calls.
2014-01-28 04:31:23 -08:00
Josh Suereth 7241428137 Merge pull request #1102 from gkossakowski/inc-error-handling
Improve error handling in incremental compiler
2014-01-28 02:16:43 -08:00
Jason Zaugg 264e49a912 Avoid compiler crash for naked `key.value` calls.
Untyped trees underneath typed trees makes Jack and sad boy.
And they make superaccessors a sad phase.

The recent refactoring to retain original types in the trees
representing the argument to the task macro meant that the `value`
macro also was changed to try to avoid this untyped-under-typed
problem. However, it didn't go deep enough, and left the child
trees of the placeholder tree `InputWrapper.wrap[T](key)` untyped.

This commit uses `c.typeCheck` to locally typeheck that tree fully
instead.

Fixes #1031
2014-01-28 10:45:15 +01:00
Grzegorz Kossakowski bb8dd21620 Record the name of an Analysis file in case of a read failure.
Catch ReadException and wrap it in IOException that carries the name
of the file we failed to read in its message.

We have to catch exception and wrap them because in TextAnalysisFormat
we don't have an access to the file name (it operates using an abstract
reader).
2014-01-27 19:48:13 +01:00
Grzegorz Kossakowski 668ae8d8b1 Fix typo in assertion message in TextAnalysisFormat
Add missing string interpolation indicator in assertion message.
2014-01-27 19:41:04 +01:00
Dan Sanduleac 8bfab5313e Fixed SessionSettings replacing existing setting 2014-01-27 14:55:08 +00:00
Ngoc Dao 02a7fd8c83 Add link to xitrum-package (collects dependency .jar files for standalone Scala programs) 2014-01-27 19:16:23 +09:00
Taro L. Saito 91650c7f71 Add a link to sbt-sonatype plugin in Using-Sonatype page 2014-01-26 00:12:16 +09:00
kalmanb 9af1585e8d Add sbt-ctags community plugin information 2014-01-25 22:21:49 +13:00
Mark Harrah 162d8094ba Convert logic system test cases into unit tests.
Still TODO for auto-plugins/logic:

 * property-based tests for logic system
 * user documentation
 * (optional) 'about plugins' or similar to show more information about the auto-plugins for a project
 * (deferred) allow AutoPlugin to inject Commands directly?
 * (deferred) provide AutoPlugin functionality to arbitrary scopes instead of just at the Project level?
2014-01-24 14:37:04 -05:00
Mark Harrah 9264099594 API docs, better terminology for negative cycle checking in logic system. 2014-01-24 14:36:46 -05:00
Mark Harrah 1afd1931c4 Translate errors from logic system to Natures system. 2014-01-24 14:36:46 -05:00
Mark Harrah 5add7306c2 Acyclic negation checking in logic system that backs auto-plugins. 2014-01-24 14:36:36 -05:00
Mark Harrah 359170b0f4 Test for automatic handling of AutoImport, AutoPlugin, and Build from binary plugins. 2014-01-24 14:36:36 -05:00
Mark Harrah 09c76f29a3 Discover all sbt-related modules (not just Plugin) and write names to resources for use from binaries. 2014-01-24 14:36:20 -05:00
Mark Harrah 7a38338509 logic system/auto-plugins: Provide deprecated methods for binary compatibility 2014-01-24 14:35:59 -05:00
Mark Harrah 30658f98bb API documentation and comments related to natures 2014-01-24 14:34:15 -05:00
Mark Harrah b8619f4aae Main part of integrating natures into project loading. 2014-01-24 14:34:15 -05:00
Mark Harrah 322f6de655 Logic system supporting auto plugins and initial outline of AutoPlugin and Natures types.
* Not integrated into project loading
 * Doesn't yet check that negation is acyclic before execution
2014-01-24 14:30:12 -05:00
Dan Sanduleac ba4d57b120 Fix binary compatibility with 0.13 2014-01-23 12:07:37 +00:00
Josh Suereth 1d627797d7 Merge pull request #1093 from xerial/add-sbt-sonatype
Add link to sbt-sonatype plugin
2014-01-21 05:31:37 -08:00
Taro L. Saito 45cc2fd111 Add link to sbt-sonatype plugin 2014-01-21 22:15:11 +09:00
Josh Suereth 09d3487167 Merge pull request #1092 from gkossakowski/scala-2.11-compat
Build for Scala 2.11
2014-01-20 08:19:56 -08:00
Grzegorz Kossakowski ff0fd6eec6 Update dependencies to Scala 2.11.0-M7.
I had to sprinkle some excludes due to dependency of scala-compiler M7 on
M6 modules. Those excludes won't be needed by the time M8 is out.
2014-01-18 01:09:24 +01:00
Adriaan Moors 034eb26af9 Scala 2.11 modules now under org.scala-lang.modules
Using 1.0-RC2 for scala-xml, 1.0-RC1 for scala-parser-combinators.
2014-01-18 00:04:32 +01:00
Dan Sanduleac 0199a93ffb Expose overwrite flag in IvyActions.publish, and by default only overwrite if it's a snapshot 2014-01-17 10:45:57 +00:00
Josh Suereth c699e66342 Merge pull request #1082 from jsuereth/wip/sbt-server-api-fixes
Fixes to the internal API hooks for the sbt server.
2014-01-14 09:47:38 -08:00
Josh Suereth 2abe7574df Fixes to the internal API hooks for the sbt server.
* Alter the TaskProgress listener key to be `State => TaskProgress` so it
  can be instantiated from the current server/sbt state.
* Expose the xsbti.Reporter interface for compilation through to sbt builds.
2014-01-14 12:42:40 -05:00