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

1121 Commits

Author SHA1 Message Date
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
Dale Wijnand 301ec787f2
Drop "serialising" Function1. It's easily fallible 2016-11-16 10:11:41 +00:00
Dale Wijnand e7ba7fa9a4
Switch to FooFunctions naming convention for contraband companion parents 2016-11-16 09:55:43 +00:00
Dale Wijnand 5475a3c01c
Switch to FooExtra naming convention for contraband parents 2016-11-16 01:41:47 +00:00
Dale Wijnand f2efa10af1
Switch to sbt-datatype, sjson-new & Vectors 2016-11-15 23:59:34 +00:00
Dale Wijnand 52c1826366 Merge pull request #54 from dwijnand/reunite 
Add props to define source dependencies on io & util
 2016-11-15 17:16:06 +00:00
Dale Wijnand 8c4a969c9a
Add props to define source dependencies on io & util 
Use either -Dsbtio.path / -Dsbtutil.path on the command line
or sbtio.path= / sbtutil.path= in project/local.properties
 2016-11-02 14:27:12 +00:00
cunei bc7ed0d784 Fix to bintray repo (#53) 2016-10-07 13:36:32 -05:00
cunei cc94687716 Merge pull request #52 from cunei/1.0-toni1 
Change bintray repo, see sbt #1696
 2016-10-07 12:05:13 -05:00
eugene yokota 7c10beab42 Merge pull request #50 from milessabin/topic/scala-artifacts 
Configurable explicit list of artifacts for Scala binary version check
 2016-09-30 11:15:28 -04:00
James Roper 3cb3d8d221 Log resolving messages at debug level 
For great justice.
 2016-09-29 19:38:22 +10:00
Antonio Cunei a1f9b5ed64 Change bintray repo, see sbt #1696 2016-09-28 11:30:10 +02:00
Miles Sabin cee81e3bb0 Configurable explicit list of artifacts for Scala binary version check 2016-08-22 11:00:09 +01:00
Dale Wijnand 138787f55e Add Resolver.sbtIvyRepo (#49) 
.. deprecate & rename SbtPluginRepositoryRoot to SbtRepositoryRoot.
 2016-07-15 07:57:04 +01:00
eugene yokota 19e1cc9d2f Merge pull request #48 from dwijnand/CrossVersion-and-ModuleId-equality 
Make CrossVersion & ModuleId more commonly equal
 2016-07-07 22:29:02 -04:00
Dale Wijnand ffcad3cdad Make CrossVersion & ModuleId more commonly equal 
Two instance of functions defined in the same way don't equal themselves, but
the same instance of a function does. So by using a val idStringFun for full and
binary, and making Binary and Full case classes there are much better chances
that ModuleId's defined in the same way will be equal.
 2016-07-08 03:10:37 +01:00
eugene yokota e7ca095303 Merge pull request #47 from dwijnand/cleanups 
Cleanups
 2016-06-21 23:20:09 +02:00
eugene yokota 797362e06c Merge pull request #46 from dwijnand/ivy-paths-to-string 
Give IvyPaths a nicer toString
 2016-06-21 23:19:40 +02:00
Dale Wijnand 9706577c67 Drop Scala 2.10, add openjdk7 2016-06-21 17:51:16 +01:00
Dale Wijnand 931b7d7af5 Remove unused and unused imports 
Note that the pickler/sbt-serlization macros are bringing in unused imports..
 2016-06-21 16:06:40 +01:00
Dale Wijnand 9dd4014553 Give IvyPaths a nicer toString 2016-06-21 14:13:15 +01:00
Dale Wijnand 9bf0da7bec Remove scripted test, forward-port fallout 2016-06-17 09:04:49 +02:00
Dale Wijnand 7db91141e1 Remove re-setting publishArtifact in Test, defined in commonSettings 
> show root/test:publishArtifact
    [info] lm/test:publishArtifact
    [info] 	false
    [info] root/test:publishArtifact
    [info] 	false
    > git diff
    [info] diff --git a/build.sbt b/build.sbt
    [info] index fed7303..6f1fb03 100644
    [info] --- a/build.sbt
    [info] +++ b/build.sbt
    [info] @@ -37,7 +37,6 @@ lazy val root = (project in file(".")).
    [info]      publish := {},
    [info]      publishLocal := {},
    [info]      publishArtifact in Compile := false,
    [info] -    publishArtifact in Test := false,
    [info]      publishArtifact := false,
    [info]      customCommands
    [info]    )
    [info] @@ -50,7 +49,6 @@ lazy val lm = (project in file("librarymanagement")).
    [info]        utilLogging, sbtIO, utilTesting % Test,
    [info]        utilCollection, utilCompletion, ivy, jsch, sbtSerialization, scalaReflect.value, launcherInterface),
    [info]      resourceGenerators in Compile <+= (version, resourceManaged, streams, compile in Compile) map Util.generateVersionFile,
    [info] -    publishArtifact in Test := false,
    [info]      binaryIssueFilters ++= Seq()
    [info]    )
    [info]
    RELOAD > reload
    [info] Loading global plugins from /Users/dnw/.dotfiles/.sbt/0.13/plugins
    [info] Loading project definition from /d/sbt-library-management/project
    [info] Set current project to LM Root (in build file:/d/sbt-library-management/)
    > show root/test:publishArtifact
    [info] lm/test:publishArtifact
    [info] 	false
    [info] root/test:publishArtifact
    [info] 	false
 2016-06-17 09:03:23 +02:00