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

1143 Commits

Author SHA1 Message Date
Dale Wijnand fb049d181b
Add prefix support to Binary/Full 2017-03-31 10:48:45 +01:00
Dale Wijnand 87e8d87811
Allow for some customization in CrossVersion results 
The old way to customize CrossVersion results was a `String => String`
function called 'remapVersion', removed in
301ec787f2.

That was removed because it's not possible to serialise Function1s, and
we want to serialise CrossVersion (and therefore ModuleID, etc) to be
able to transfer them in sbt server.

This commit reintroduces a less-powerful way to vary the results of
apply CrossVersion, but just providing the opportunity to define a
suffix. From looking at the users of CrossVersion (Scala.js'
sbt-scalajs-plugin & Scala Native's sbt-crossproject) this looks to be
sufficient.
 2017-03-31 10:24:16 +01:00
Dale Wijnand 92cc7c4cb1
Remove some compile warnings 2017-03-31 10:19:47 +01:00
Eugene Yokota d6f0924689 Util 1.0.0-M20 2017-03-22 13:59:51 -04:00
Dale Wijnand b57922efaf Merge pull request #75 from sbt/wip/bump 
sbt-contraband 0.3.0-M4
 2017-03-18 21:00:27 +00:00
Eugene Yokota 016db588d4 sbt-contraband 0.3.0-M4 2017-03-17 23:03:37 -04:00
Dale Wijnand ed6b57ff38 Merge pull request #51 from jroper/resolving-debug 
Log resolving messages at debug level
 2017-03-10 13:48:32 +00:00
eugene yokota 58e83e59fd Merge pull request #74 from dwijnand/build-warnings 
Remove build warnings
 2017-03-02 16:30:52 +01:00
Dale Wijnand 31a7407640
Remove build warnings 
Also collapse into one meta-build sbt file.. imo a better alternative
toa adding a 5th single-line sbt file.
 2017-03-02 14:42:36 +01:00
Eugene Yokota c793c33740 fix test 2017-02-15 23:41:23 -05:00
Eugene Yokota caecbbabe7 util 1.0.0-M19 2017-02-15 23:12:01 -05:00
eugene yokota 55a204e82d Merge pull request #73 from sbt/fport/2828 
[fport] Apply binary version conflict check to Compile related configs
 2017-01-15 23:14:56 -05:00
Eugene Yokota 27397de8cf Adjust to upstream 2017-01-15 22:54:15 -05:00
Eugene Yokota 95a209b033 Apply binary version conflict check to Compile related configs 
Fixes #1466 Ref #2786

Even after fixing the mediator issue, we still have spurious binary
version conflict warning that does not account for sandbox
configurations.

This change follows the scalaVersionConfigs work.
 2017-01-15 20:55:02 -05:00
Eugene Yokota a809e8744e Bump up Ivy 
Fixes #2015
 2017-01-15 20:55:02 -05:00
Eugene Yokota c12c9c6187 Apply scalaVersion enforcement to Compile related configs 
Fixes #2786. Ref #2634.

sbt 0.13.12 added Ivy mediator that enforces scalaOrganization and
scalaVersion for Scala toolchain artifacts.
This turns out to be a bit too aggressive because Ivy configurations
can be used as an independent dependency graph that does not rely on
the scalaVersion used by Compile configuration. By enforcing
scalaVersion in those graph causes runtime failure.

This change checks if the configuration extends Default, Compile,
Provided, or Optional before enforcing scalaVersion.
 2017-01-15 20:52:58 -05:00
eugene yokota c3f5805574 Merge pull request #72 from sbt/fport/2757 
[fport] CrossVersion.patch
 2017-01-15 20:51:21 -05:00
eugene yokota 604492d677 Merge pull request #71 from sbt/fport/2731 
[fport] Forward port "Support wildcard exclusions"
 2017-01-15 09:38:39 -05:00
eugene yokota b49ff25933 Merge pull request #70 from sbt/fport/template_resolver 
[fport] Adds DefaultLibraryManagement
 2017-01-15 09:38:28 -05:00
Miles Sabin f495291edd fport: CrossVersion.patch 
CrossVersion.full strips off -bin-suffix.
Ref https://github.com/sbt/sbt/pull/2757
 2017-01-15 07:55:40 -05:00
Eugene Yokota 5380b2fe73 Forward port "Support wildcard exclusions" 
Ref https://github.com/sbt/sbt/pull/2731
 2017-01-15 05:36:39 -05:00
Eugene Yokota 5b752c8522 Adds DefaultLibraryManagement 
https://github.com/sbt/sbt/pull/2780/
 2017-01-15 03:00:14 -05:00
eugene yokota 3afc15d075 Merge pull request #69 from sbt/fport/2642 
[fport] Fixes merged ModuleID dropping configuration specification
 2017-01-14 07:40:14 -05:00
Eugene Yokota df53eefbb0 Fixes merged ModuleID dropping configuration specification 
Fixes #2002/#1500

Given a dependency graph such as:

    libraryDependencies += "com.google.guava" % "guava-tests" % "18.0"
    libraryDependencies += "com.google.guava" % "guava-tests" % "18.0"
% "test" classifier "tests"

previous releases of sbt would drop the Test configuration from the
classifier "tests" artifacts, and end up including the test JARs into
the Compile configuration instead of the Test configuration, which
would result in runtime error.

This fix configures the explicit artifacts into the configuration
during merge even when it says `"*"`.
 2017-01-14 07:05:52 -05:00
Eugene Yokota 9dd1dff6cb Bump util 2017-01-13 22:48:32 -05:00
eugene yokota 7f58dd6261 Merge pull request #66 from sbt/wip/212 
Cross publish to Scala 2.12
 2017-01-07 00:55:07 -05:00
Eugene Yokota 9d812f4d98 Cross publish to Scala 2.12 2017-01-07 00:49:45 -05:00
eugene yokota 0f9babaa31 Merge pull request #65 from dwijnand/upgrades 
Upgrade from sbt/datatype to sbt/contraband, + fixes and cleanups
 2017-01-05 12:32:56 -05:00
Dale Wijnand 6fc84b09e9
Only build on jdk8 
As of https://github.com/sbt/util/pull/66 sbt/util is built and
published using jdk8.

Trying to use jdk7 will fail with "Unsupported major.minor version
52.0", e.g. for xsbti/Logger.
 2017-01-05 17:14:30 +00:00
Eugene Yokota a87ed10dc7
Move ModuleID toString out 2017-01-05 15:42:34 +00:00
Eugene Yokota 4ca5b5ae0a
Change publicationDate to java.util.Calendar 
This migrates to java.util.Calendar, which is better than
java.util.Date and is supported by sjson-new out of the box.
 2017-01-05 15:42:34 +00:00
Dale Wijnand 71fddd5e3f
Upgrade from sbt/datatype to sbt/contraband 2017-01-05 15:42:29 +00:00
Dale Wijnand 946f307082
Implement JsonFormat[NodeSeq] like it was in IvyCache 2017-01-05 13:42:16 +00:00
Dale Wijnand 06c7f382ad
Cleanup & simplify Deps 2017-01-05 13:42:12 +00:00
eugene yokota b0f97eaa37 Merge pull request #64 from dwijnand/add-back-SbtExclusionRule-companion-implicit-lifts 
Add back SbtExclusionRule companion implicit lifts
 2016-12-31 00:26:37 -05:00
eugene yokota c08a28b352 Merge pull request #63 from dwijnand/fix-ConfigurationReport.toString 
Fix ConfigurationReport.toString
 2016-12-31 00:25:34 -05:00
Dale Wijnand 04904ed34d
Add back SbtExclusionRule companion implicit lifts 2016-12-30 17:11:18 +00:00
Dale Wijnand 19f40a1668
Fix ConfigurationReport.toString 
Move the toString implementation from ConfigurationReportExtra to inside
the ConfigurationReport JSON schema definition, that way the synthetic
toString generated by contraband doesn't override the carefully defined
one.
 2016-12-28 16:15:13 +00:00
eugene yokota 6319da53c1 Merge pull request #62 from dwijnand/add-managed-srcs 
Include managed sources in packageSrc
 2016-12-14 14:31:19 -05:00
Dale Wijnand 7c221ef97f
Include managed sources in packageSrc 2016-12-14 10:31:11 +00:00
Dale Wijnand e209499544
Avoid source file path clash with generated sources 2016-12-14 10:31:11 +00:00
Dale Wijnand 030dcf2cf4 Merge pull request #61 from dwijnand/monorepo 
One MavenRepository to rule them all? Refs #60
 2016-12-06 10:00:55 +00:00
Dale Wijnand 1bf74ddffa
Make MavenRepository the top level class 
Also reintroduce "isCache".
 2016-12-06 09:48:23 +00:00
Dale Wijnand 85e7cf68a5 Merge pull request #59 from dwijnand/lm-root 
Id the root project as lmRoot
 2016-11-17 01:07:04 +00:00
Dale Wijnand f9a066fe92
Id the root project as lmRoot 
.. like sbt/util and sbt/zinc name their root projects
 2016-11-17 00:40:15 +00:00
eugene yokota e90b167b4e Merge pull request #58 from dwijnand/contraband 
Switch to sbt-datatype, sjson-new & Vectors
 2016-11-16 10:36:56 -05:00
Dale Wijnand af1c19034b
Remove unused imports 2016-11-16 11:17:27 +00:00
Dale Wijnand 3192b3ee1a
Remove unused warnings 2016-11-16 11:14:42 +00:00
Dale Wijnand f6c98f69b9
Organise contraband descriptor by package name & alphabetically 2016-11-16 10:52:42 +00:00
Dale Wijnand b2b606f8aa
Actually, just kill the crazy MyCrazyReferences idea 2016-11-16 10:43:16 +00:00