luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,404 Commits 29 Branches 314 Tags 76 MiB
Commit Graph

4404 Commits

Author SHA1 Message Date
eugene yokota b72065c258 Merge pull request #2372 from dwijnand/update-sbt-plugins-in-1.0.x 
FPORT: Upgrade sbt plugins. Fixes #2368
 2016-01-16 14:50:34 -05:00
Dale Wijnand de10d81f07 Upgrade sbt plugins. Fixes #2368 
Cherry-picked 84cba9669c from branch 0.13 to 1.0.x

Tested manually:

  $ grep 'version.*:=' build.sbt
  version := "0.13.10-SNAPSHOT",
  $ git archive --prefix=sbt-0.13.10-SNAPSHOT/ -o ~/Desktop/sbt-0.13.10-SNAPSHOT.tgz HEAD
  $ cd ~/Desktop
  $ ls
  sbt-0.13.10-SNAPSHOT.tgz
  $ tar xfz sbt-0.13.10-SNAPSHOT.tgz
  $ cd sbt-0.13.10-SNAPSHOT/
  $ sbt info
  [info] Loading global plugins from /Users/dnw/.dotfiles/.sbt/0.13/plugins
  [info] Loading project definition from /Users/dnw/Desktop/sbt-0.13.10-SNAPSHOT/project
  [info] Updating {file:/Users/dnw/Desktop/sbt-0.13.10-SNAPSHOT/project/}sbt-0-13-10-snapshot-build...
  [info] Resolving org.fusesource.jansi#jansi;1.4 ...
  [info] Done updating.
  [warn] There may be incompatibilities among your library dependencies.
  [warn] Here are some of the libraries that were evicted:
  [warn]  * com.typesafe.sbt:sbt-site:0.8.1 -> 0.8.2
  [warn] Run 'evicted' to see detailed eviction warnings
  [info] Compiling 12 Scala sources to /Users/dnw/Desktop/sbt-0.13.10-SNAPSHOT/project/target/scala-2.10/sbt-0.13/classes...
  [info] This is sbt 0.13.9
  [info] The current project is {file:/Users/dnw/Desktop/sbt-0.13.10-SNAPSHOT/}sbtRoot 0.13.10-SNAPSHOT
  [info] The current project is built against Scala 2.10.6
  [info] Available Plugins: sbt.plugins.IvyPlugin, sbt.plugins.JvmPlugin, sbt.plugins.CorePlugin...
  [info] sbt, sbt plugins, and build definitions are using Scala 2.10.5
 2016-01-16 12:19:09 +00:00
eugene yokota 40e598f641 Merge pull request #2356 from dwijnand/drop-sealed-from-Append-typeclasses 
Drop sealed from the typeclasses in Append
 2016-01-08 12:19:33 -05:00
Dale Wijnand c5949268ef Drop sealed from the typeclasses in Append 
Forward port of #2322
 2016-01-08 16:45:06 +01:00
eugene yokota a9d80cf38c Merge pull request #2281 from eamelink/bugfix-1982 
Fix search result highlighting on Windows
 2015-11-27 15:36:50 -05:00
eugene yokota d0344c54e8 Merge pull request #2287 from xuwei-k/inputTask-typo 
fix typo
 2015-11-25 10:51:13 -05:00
xuwei-k 84e8f20080 fix typo 2015-11-25 20:01:22 +09:00
Erik Bakker 995ccf85a6 Fix search result highlighting on Windows 
Use only ANSI color codes that are supported by Windows
 2015-11-20 22:08:03 +01:00
Dale Wijnand 3bc013f19b Merge pull request #2273 from jkinkead/release_notes 
Release notes for apiURL change.
 2015-11-12 18:51:06 +00:00
Jesse Kinkead a631c635e2 Fix link refs. 2015-11-12 09:52:23 -08:00
Jesse Kinkead ce4ae7a475 Release notes for apiURL change. 2015-11-12 09:32:16 -08:00
eugene yokota 49a4055c24 Merge pull request #2262 from jkinkead/api_url_always_checked-1.0.x 
Always export apiURL even if autoAPIMappings is false.
 2015-11-11 11:38:21 -05:00
Jesse Kinkead 0ecc2543ec Always export apiURL even if autoAPIMappings is false. 2015-11-04 10:51:54 -08:00
eugene yokota 2c4583e312 Merge pull request #2226 from sbt/wip/build-imports 
Make object Import to alias types and values
 2015-10-02 04:31:46 -04:00
Eugene Yokota 7bb934ff8c fix scripted dependency-management/cache-update 2015-10-02 02:35:31 -04:00
Eugene Yokota 7c7ed07dd4 fix scripted dependency-management/cache-update 2015-10-02 01:32:41 -04:00
Eugene Yokota de9e68da52 fix dependency-management/scala-home 2015-10-02 00:39:18 -04:00
Eugene Yokota 5c5cf1ad6a dependency-management/ivy-settings-a started working again 
There's a part where it hits Maven Central to get the compiler
interface.
It probably synced.
 2015-10-02 00:35:29 -04:00
Eugene Yokota f14692f0b1 changes due to bumping up librarymangement to 0.1.0-M4 2015-10-02 00:25:45 -04:00
Eugene Yokota 5b9d90e089 set dependency-management/ivy-settings-a pending 2015-10-01 23:28:52 -04:00
Eugene Yokota 814ceeab79 librarymanagement 0.1.0-M3 to use internal syntax 2015-10-01 23:28:27 -04:00
Eugene Yokota 21f0315544 set project-load/sha-conflict to pending 2015-10-01 15:46:28 -04:00
Eugene Yokota 98dfeda7c3 Fixes scripted source-dependencies/inherited-macros 2015-10-01 15:43:41 -04:00
Eugene Yokota 08515c3329 Fixes scripted source-dependencies/abstract-type-override 2015-10-01 15:41:05 -04:00
Eugene Yokota 3f5c7c747a set project/source-plugin to pending 2015-10-01 15:38:30 -04:00
Eugene Yokota 725dd28149 set project/continuations to pending 2015-10-01 15:37:02 -04:00
Eugene Yokota f926a39187 set ivy-deps-management/update-classifiers-snapshot-srcs to pending 
See also sbt/librarymanagement#7
 2015-10-01 15:32:32 -04:00
Eugene Yokota 7688517c38 Fixes java/no-scala-tool 2015-10-01 15:21:24 -04:00
Eugene Yokota e37de734f5 Make dependency-management/gh-1484-npe pending 
We don't have sbt plugins yet for 1.0.
 2015-10-01 04:04:54 -04:00
Eugene Yokota 0e5e7e2826 Fix dependency-management/exclude-scala 2015-10-01 04:01:36 -04:00
Eugene Yokota b8bc58d248 Fix dependency-management/artifact 2015-10-01 03:58:20 -04:00
Eugene Yokota 05a33042ef Update Travis settings 2015-10-01 03:40:39 -04:00
Eugene Yokota 6542886681 Fix scripted/compiler-project tests 2015-10-01 03:40:25 -04:00
Eugene Yokota b81a6cc2da Fix scripted api tests 2015-10-01 03:27:24 -04:00
Eugene Yokota 4b154cbe7a Fix actions/join test 2015-10-01 03:03:44 -04:00
Eugene Yokota b92b2c7109 Mechanically add import Import._ 2015-10-01 02:45:38 -04:00
Eugene Yokota 9eb718ae45 Fixes actions/depends-on 2015-10-01 01:57:02 -04:00
Martin Duhem e12d7c7657 Add content of old `sbt.classpath` to `object Import` 2015-09-30 11:30:38 +02:00
Martin Duhem 9d9d449485 Fix source-dependencies/macro-annotation 2015-09-30 11:30:19 +02:00
Martin Duhem da6fa75f92 Change binarySbtVersion for maven resolver plugin, fix some builds 2015-09-29 19:16:45 -04:00
Martin Duhem 72edbfa177 Create `object Import` for source compat 2015-09-29 19:16:45 -04:00
eugene yokota ab1d376e11 Merge pull request #2224 from sbt/wip/incremental_bump 
bumping up incrementalcompiler to the latest and using Doc object
 2015-09-29 10:47:30 -04:00
Eugene Yokota cda5ff84c7 Use the new Doc object from incrementalcompiler 2015-09-28 22:56:34 -04:00
Eugene Yokota 51f1aaf429 bump incrementalcompiler to 0.1.0-M1-168cb7a4877917e01917e35b9b82a62afe5c2a01 2015-09-28 22:55:50 -04:00
Eugene Yokota 97e21b62c9 Merge 2015-09-17 17:11:57 -04:00
Eugene Yokota 741984ea82 incrementalcompiler bump 2015-09-17 17:10:19 -04:00
Martin Duhem a2abb6eeb6 Update to latest version of incremental, fix imports 2015-09-16 10:16:03 +02:00
eugene yokota 3e5449f02d Merge pull request #2206 from Duhemm/modularize 
Bump version number
 2015-09-15 19:07:38 -04:00
Martin Duhem 09c322a7b1 Bump version number 2015-09-16 00:19:05 +02:00
Eugene Yokota ba7ffa5d4d Fix compiler bridge name 2015-09-15 03:06:35 -04:00