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

11930 Commits

Author SHA1 Message Date
Eugene Yokota 2e3ceb2d92 Zinc 1.3.0-M4 2019-04-28 17:27:10 -04:00
Eugene Yokota f5444f7715 Merge branch 'develop' into pr/4617 2019-04-28 17:22:54 -04:00
eugene yokota a3cebd3ade
Merge pull request #4614 from eed3si9n/wip/coursier 
Coursier dependency resolution  integration
 2019-04-27 15:52:57 -04:00
Eugene Yokota f999f6a62e always reresolve sbt artifacts when using Coursier 
Ref #4589

This requires sbt server tests to resolve sbt off of local.
 2019-04-27 14:31:13 -04:00
Eugene Yokota 96ad731e8c Use allExcludeDependencies 2019-04-26 18:06:10 -04:00
Eugene Yokota 8c0f13a24a manually expand ivy.home 
Ref coursier/coursier#1124
 2019-04-26 17:51:17 -04:00
Eugene Yokota f354a626c7 use lm-coursier-shaded 
This uses lm-coursier-shaded, and follows along the changes in https://github.com/coursier/sbt-coursier/pull/58.
 2019-04-26 17:33:14 -04:00
Eugene Yokota 258a8930a5 bump Scala 2.11 to 2.11.12 because we use JDK 11 2019-04-26 12:27:38 -04:00
Eugene Yokota 24db77edc5 copy some tests from coursier/sbt-coursier 
Copying over sbt-coursier integration tests that do not depend on Coursier-specific things, but excercises sbt integration.
 2019-04-26 12:27:38 -04:00
Eugene Yokota 7658f14762 Add maven-plugin and test-jar to classpathTypes 
Ref https://github.com/sbt/sbt-native-packager/issues/1053
Ref https://github.com/coursier/coursier/issues/450
 2019-04-26 12:27:38 -04:00
Eugene Yokota 464325ad1d add a simpler version of snapshot-resolution 
Ivy is able to check for SNAPSHOT across different resolvers.
Coursier seems to be sticky about the resolver within the TTL (24h).
 2019-04-26 12:27:38 -04:00
Eugene Yokota ca53934941 fix csrCachePath 2019-04-26 12:27:38 -04:00
Eugene Yokota 4b4359f7b1 mark dependency-management/dynamic-revision pending 2019-04-26 12:27:38 -04:00
Eugene Yokota 795601f594 mark dependency-management/url pending 
Ref https://github.com/coursier/coursier/issues/1127
 2019-04-26 12:27:38 -04:00
Eugene Yokota 9a666b5418 use Ivy for some tests 2019-04-26 12:27:38 -04:00
Eugene Yokota b47ed4e62a mark dependency-management/default-resolvers pending 2019-04-26 12:27:38 -04:00
Eugene Yokota 944e955d06 put sbtCp ahead of resolved JARs 
Ref https://github.com/sbt/sbt/pull/4443
Ref https://github.com/coursier/coursier/issues/1128

This is a workaround for Coursier not excluding sbt modules.
 2019-04-26 12:27:38 -04:00
Eugene Yokota 5614cfcbb6 Move log to outer task 2019-04-26 12:27:38 -04:00
Eugene Yokota 697b2b534a add additional resolver to help Coursier 2019-04-26 12:27:38 -04:00
Eugene Yokota e206e797fe set up specific dependencyResolution instances 2019-04-26 12:27:38 -04:00
Eugene Yokota 9b0ffde519 disable metadata-only-resolver test 2019-04-26 12:25:52 -04:00
Eugene Yokota 6a99906386 manually expand ivy.home 
Ref https://github.com/coursier/coursier/issues/1124
 2019-04-26 12:25:52 -04:00
Eugene Yokota 35a0ee4321 relax dependency-management/compiler-bridge-binary 2019-04-26 12:25:52 -04:00
Eugene Yokota 21782a51f0 write info.apiURL to ivy.xml 
Ref https://github.com/coursier/coursier/issues/1123
 2019-04-26 12:25:52 -04:00
Eugene Yokota 38f94a6e31 Coursier dependency resolution integration 
This adds dependency to LM implemented using Coursier.
I had to copy paste a bunch of code from sbt-coursier-shared to break the dependency to sbt.

`Global / useCoursier := false` or `-Dsbt.coursier=false` be used to opt-out of using Coursier for the dependency resolution.
 2019-04-26 12:25:52 -04:00
eugene yokota 42bc2ea04d
Merge pull request #4631 from eatkins/previous 
Allow calling TaskKey.previous in input tasks
 2019-04-25 22:48:35 -04:00
Ethan Atkins 81ce14d58c Allow calling TaskKey.previous in input tasks 
I discovered that it wasn't possible to call .previous in an input task.
While I understand why you can't call .previous on an InputKey, I think
it makes sense to allow calling .previous on a TaskKey within an input
task.
 2019-04-25 15:58:01 -07:00
Eugene Yokota 3be8efc36e make Global / cancelable true by default 
Fixes #3252
 2019-04-25 12:14:37 -04:00
eugene yokota 3269eae533
Merge pull request #4606 from eed3si9n/wip/update 
trim update and add updateFull
 2019-04-25 12:13:22 -04:00
Dale Wijnand 9a56c0d005
Cleanup zinc-lm-integration 2019-04-25 12:01:33 +01:00
Dale Wijnand e978357e47
In-source zinc's LM integration code 2019-04-25 11:57:37 +01:00
Dale Wijnand b9b520f79e
Merge remote-tracking branch 'zinc-lm-intergration/bring-back-a-piece-of-zinc' into zinc-lm-integration 
* zinc-lm-intergration/bring-back-a-piece-of-zinc: (90 commits)
  Add scala-integration resolver
  call it compiler-bridge_2.13
  bump Scala bridge to use 2.13.0-RC1
  Break the dependency on LM, and thus Ivy
  Skip Scala 2.10 and Scala 2.11 components for JDK 11
  Refactor compiler bridge unit test
  Fix the several typos detected by github.com/client9/misspell
  Got rid of multiple warnigns
  include only scala-library into the boot classpath during run
  Drop "final" modifier from private case classes, to prevent false positive. Refer https://issues.scala-lang.org/browse/SI-4440
  Support scala 2.13.0-pre-* & 2.13.0-M1
  Split compiler bridge tests to another subproject
  Remove unused imports + variables
  Add back, re-configure & re-enable Scalafmt
  Use Scala 2.12.3
  Remove any reference to `F0` and `F1`
  Adapt Zinc to use the new LibraryManagement API
  Fix ScalaFmt wiring
  Add scalaCompiler variant that accepts ModuleID
  Bump all the modules
  ...
 2019-04-25 11:57:36 +01:00
Eugene Yokota 6c7faf2b86 trim update and add updateFull 
Fixes #4438

This slims down update's UpdateReport by removing evicted modules
caller information. The larger the graph, the effect would be more
pronounced. For example, I saw a graph reduce from 5.9MB to 1.1MB in JSON file.
 2019-04-23 14:08:17 -04:00
eugene yokota 4074cb32d3
Merge pull request #4605 from eed3si9n/wip/bumplm 
bump to lm 1.3.0-M3
 2019-04-23 13:52:08 -04:00
Eugene Yokota 3a355f6025 refactor project/transitive-plugins 2019-04-23 12:55:25 -04:00
eugene yokota 9b71ee1d6e
Merge pull request #4459 from alexarchambault/topic/update-classifiers-dependency-resolution 
Have updateClassifiers use the dependencyResolution task
 2019-04-21 19:18:01 -04:00
eugene yokota 0087f360aa
Merge pull request #4604 from eed3si9n/wip/progress2 
move super shell rendering to logger
 2019-04-21 17:58:58 -04:00
Eugene Yokota 2a206a6c40 Util 1.3.0-M6 2019-04-21 16:56:50 -04:00
eugene yokota 3568b13a2e
Merge pull request #196 from eed3si9n/wip/lock 
move super shell rendering to ConsoleAppender
 2019-04-21 15:40:11 -04:00
Eugene Yokota 465ff8e10a Make loggers synchronized 
This is to workaround for "[success]" logs displaying after the prompt is displayed.
 2019-04-21 04:03:22 -04:00
Eugene Yokota e28e052b5b move super shell rendering to ConsoleAppender 
Ref https://github.com/sbt/sbt/issues/4583
This moves the super shell rendering to ConsoleAppender with several improvements.

Instead of scrolling up, supershell is now changed to normal scrolling down, with more traditional cursor position. Before printing out the logs, last known progress reports are wiped out. In addition, there's now 5 lines of blank lines to accomodate for `println(...)` by tasks.
 2019-04-21 03:59:19 -04:00
Eugene Yokota 95761b2ea1 Undo cursor tweaks around prompt 2019-04-20 23:51:13 -04:00
eugene yokota 67dc4ca44b
Merge pull request #197 from eed3si9n/wip/scalafmt 
sbt-scalafmt 2.0.0
 2019-04-20 23:38:35 -04:00
Eugene Yokota c4d6efe5af move super shell rendering to logger 
Fixes #4583
Ref https://github.com/sbt/util/pull/196
 2019-04-20 23:32:42 -04:00
Eugene Yokota 98ec0075f4 apply formatting 2019-04-20 23:23:13 -04:00
Eugene Yokota 2ac7501c7c sbt-scalafmt 2.0.0 2019-04-20 23:21:31 -04:00
eugene yokota 00f292524f
Merge pull request #4623 from eed3si9n/wip/scalafmt 
sbt-scalafmt 2.0.0
 2019-04-20 19:56:24 -04:00
Eugene Yokota 621a72e49a workaround Scalafmt regex 
Ref https://github.com/scalameta/scalafmt/issues/1404
 2019-04-20 14:18:10 -04:00
Eugene Yokota 1e157b991a apply formatting 2019-04-20 03:23:54 -04:00
Eugene Yokota 78c007c910 sbt-scalafmt 2.0.0 2019-04-20 03:23:08 -04:00