Commit Graph

1188 Commits

Author SHA1 Message Date
Josh Suereth 9504d4a3de Merge pull request #2027 from cunei/wip-fix-2001
Do not emit in the pom dependencies that are only sources or docs
2015-05-27 18:43:50 -04:00
Josh Suereth 1b256f9f72 Merge pull request #2025 from PanAeon/panaeon/fix-history
Prevent history command(s) from going into an infinite loop
2015-05-24 13:19:41 -04:00
Vitalii Voloshyn 8f43c2f58c Prevent history command(s) from going into an infinite loop [1562] 2015-05-18 13:33:31 +03:00
Josh Suereth 50fcdf5a78 Merge pull request #1970 from matthewfarwell/test-exclude
Test exclude
2015-05-11 15:27:06 -04:00
David Perez 54a739a733 Merge branch '0.13.8' into 0.13 2015-05-08 09:33:40 +02:00
David Perez b70acf84f3 Issue 2008: provide more diagnostic info for undefined setting 2015-05-08 09:29:41 +02:00
Josh Suereth 6a4a990b98 Merge pull request #1984 from sbt/wip/nightly-and-release
call bintrayRelease on nightly
2015-04-22 11:12:03 -04:00
Eugene Yokota ca3c29efbc call bintrayRelease on nightly 2015-04-22 00:28:47 -04:00
eugene yokota 827fb5a0fc Merge pull request #1983 from sbt/wip/nightly-bintray
publish nightlies to bintray
2015-04-21 20:51:19 -07:00
eugene yokota c98ad7db07 Merge pull request #1981 from sbt/wip/move-to-bintray
publish to bintray
2015-04-20 15:24:57 -07:00
Eugene Yokota feca1f6fad publish nightlies to bintray 2015-04-20 12:51:18 -04:00
Eugene Yokota 5a7bb765df publish to bintray 2015-04-20 10:56:37 -04:00
Josh Suereth 1330ce5be4 Merge pull request #1964 from sbt/fix/1958
Various workarounds to get Travis CI less flaky
2015-04-20 10:18:15 -04:00
eugene yokota b68da80781 Merge pull request #1960 from asflierl/0.13
Honor overwrite flag when publishing locally.
2015-04-14 11:54:10 -07:00
eugene yokota b371b3f038 Merge pull request #1950 from ajsquared/0.13
Add retrieveManagedSync
2015-04-10 12:48:17 -07:00
eugene yokota a35cbc9439 Merge pull request #1946 from dwijnand/rename-root-project-to-sbtRoot
Rename root project to sbtRoot.
2015-04-07 14:50:27 -07:00
eugene yokota d6f7dbdddc Merge pull request #1945 from dwijnand/make-use-of-0.13.8-settings-syntax
Make use of the nicer Project settings syntax in 0.13.8.
2015-04-07 14:49:55 -07:00
eugene yokota fd5a70fb30 Merge pull request #1944 from sbt/wip/fix-aether-range-query
Wip/fix aether range query
2015-03-27 13:01:19 -07:00
Dale Wijnand 5f37efa4f5 Rename root project to sbtRoot.
This is mostly for IntelliJ IDEA.

Currently IntelliJ IDEA's Scala (and SBT) plugin defines:

* the project name (as seen in the window title and in the "open recent
  project" list) from `name`
* the root module (as seen in the project view and in project structure)
  from `id`
* doesn't use `moduleName` at all

After this change the sbt project is no longer identified as "root".

I was undecided between `sbtRoot` and `sbtRootProj`, and went with the
shorter option. I'm happy to revise this decision.
2015-03-27 01:35:36 +00:00
Dale Wijnand c2325f590b Make use of the nicer Project settings syntax in 0.13.8. 2015-03-27 01:19:26 +00:00
eugene yokota 610c79290b Merge pull request #1942 from ajozwik/patch-1
Updated to 0.13.9-SNAPSHOT
2015-03-26 09:03:56 -07:00
Josh Suereth 0ca14fdf86 Merge pull request #1938 from sbt/wip/launcher-as-module
Removing launcher in favor of re-wrapping sbt/launcher module
2015-03-26 08:13:46 -04:00
eugene yokota 26aeb3a22f Merge pull request #1941 from sbt/wip/1940
Wip/1940
2015-03-25 15:11:58 -07:00
David Perez fc3a22f02b Merge remote-tracking branch 'upstream/0.13' into 0.13 2015-03-25 16:12:54 +01:00
David Perez c7c9898b4e Merge remote-tracking branch 'origin/0.13.7' into 0.13 2015-03-25 16:01:15 +01:00
eugene yokota 877bd15f6d Merge pull request #1935 from sbt/wip/nine
Merging 0.13.8 and bumping up to 0.13.9-SNAPSHOT
2015-03-25 06:12:46 -07:00
Josh Suereth 41900ae028 Remove unused proguard configuration. 2015-03-24 18:37:57 -04:00
Josh Suereth aa7de28217 fix launcher re-publication.
* The rebundled sbt launcher is now pushed into the old location again.
2015-03-24 18:32:56 -04:00
Josh Suereth 3121ed9678 Add sonatype-snapshots resolver to the list for the launcher module snapshots. 2015-03-24 16:16:55 -04:00
Josh Suereth 4f1e1f61fc Migrate to using the sbt/launcher module, rather than having the code embedded.
* Remove launch/* code/tests, as these are in the sbt/launcher project.
* Create a new project which will resolve launcher module from sonatype-snapshots,
  and repackage it for the currently building version of sbt.
* Remove ComponentManagerTest which was relying DIRECTLY on launcher classes.
  We'll need to reconfigure this shortly to enable the tests again.

Remaining TODOs -

* Update resolvers so people can find the launcher.
* Add ComponentManagerTest back.
* Re-publish the sbt-launch.jar in the location it used to be published.
2015-03-24 16:12:51 -04:00
Josh Suereth 3496288845 Start using launcher interface from sbt/launcher module. 2015-03-24 11:14:13 -04:00
Eugene Yokota 08893b27b6 0.13.9-SNAPSHOT 2015-03-23 13:27:27 -04:00
Eugene Yokota 8764c64533 bumping up to 0.13.8 2015-03-20 12:56:39 -04:00
eugene yokota 0162f80924 Merge pull request #1904 from sbt/fix/1763
Use pickler for cached resolution
2015-03-10 08:02:40 -04:00
Eugene Yokota 45813fb692 Roll back the use of sbt/serialization for update caching 2015-03-10 05:12:17 -04:00
Eugene Yokota 2959e870d7 catch PicklingException 2015-03-09 22:38:08 -04:00
Eugene Yokota 374ede5594 Don't catch throwable 2015-03-09 21:22:58 -04:00
Eugene Yokota 3952bd8e14 Write JSON to file without String. #1763 2015-03-09 21:22:58 -04:00
Eugene Yokota e6cc43123a Use pickler to cache UpdateReport for update task. #1763 2015-03-09 21:22:58 -04:00
Eugene Yokota 862e72b2dc Implement pickler for UpdateReport. #1763 2015-03-09 21:22:57 -04:00
eugene yokota c278ff0a5d Merge pull request #1906 from sbt/wip/build-fixes
build fixes of the day
2015-03-09 14:51:52 -04:00
Eugene Yokota 6be84b62aa Remove "so clean" 2015-03-09 12:57:52 -04:00
eugene yokota 163dbe0c59 Merge pull request #1885 from sbt/wip/fix-ansi-escape
Fix ANSI escape sequences.
2015-02-28 18:14:51 -05:00
Josh Suereth 7cd6b18cf3 Fix ANSI escape sequences.
Now we handle the CSI (ESC + [).

Fixes #1143
2015-02-28 08:30:59 -05:00
eugene yokota 809397626e Merge pull request #1880 from sbt/wip/build-fix-again
Fixing precompiled and nightly build
2015-02-25 15:46:36 -05:00
Eugene Yokota 4bfeb7f88d Fixing precompiled and nightly build
We noticed that -SNAPSHOT is being published as our nightly.
This is because "wow" command (or ++) does not replay version injected
by stamp-version.
2015-02-25 12:31:21 -05:00
eugene yokota 2f20b71074 Merge pull request #1853 from hcoles/0.13
Fix #1368 - getResources should never return null
2015-02-24 22:55:10 -05:00
eugene yokota 4801e65431 Merge pull request #1873 from sbt/fix/1730c
Fixes #1711, #1730. Cached resolution: fixes internal project
2015-02-24 18:58:47 -05:00
eugene yokota 68433402b8 Merge pull request #1867 from sbt/wip/fix-nightly
Adds release-nightly command
2015-02-24 15:01:15 -05:00
Eugene Yokota 80c3a44bb6 Adds release-nightly command 2015-02-20 21:09:43 -05:00