04904ed34d
Add back SbtExclusionRule companion implicit lifts
2016-12-30 17:11:18 +00:00
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
6319da53c1
Merge pull request #62 from dwijnand/add-managed-srcs
...
Include managed sources in packageSrc
2016-12-14 14:31:19 -05:00
7c221ef97f
Include managed sources in packageSrc
2016-12-14 10:31:11 +00:00
e209499544
Avoid source file path clash with generated sources
2016-12-14 10:31:11 +00:00
030dcf2cf4
Merge pull request #61 from dwijnand/monorepo
...
One MavenRepository to rule them all? Refs #60
2016-12-06 10:00:55 +00:00
1bf74ddffa
Make MavenRepository the top level class
...
Also reintroduce "isCache".
2016-12-06 09:48:23 +00:00
85e7cf68a5
Merge pull request #59 from dwijnand/lm-root
...
Id the root project as lmRoot
2016-11-17 01:07:04 +00:00
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
e90b167b4e
Merge pull request #58 from dwijnand/contraband
...
Switch to sbt-datatype, sjson-new & Vectors
2016-11-16 10:36:56 -05:00
af1c19034b
Remove unused imports
2016-11-16 11:17:27 +00:00
3192b3ee1a
Remove unused warnings
2016-11-16 11:14:42 +00:00
f6c98f69b9
Organise contraband descriptor by package name & alphabetically
2016-11-16 10:52:42 +00:00
b2b606f8aa
Actually, just kill the crazy MyCrazyReferences idea
2016-11-16 10:43:16 +00:00
301ec787f2
Drop "serialising" Function1. It's easily fallible
2016-11-16 10:11:41 +00:00
e7ba7fa9a4
Switch to FooFunctions naming convention for contraband companion parents
2016-11-16 09:55:43 +00:00
5475a3c01c
Switch to FooExtra naming convention for contraband parents
2016-11-16 01:41:47 +00:00
f2efa10af1
Switch to sbt-datatype, sjson-new & Vectors
2016-11-15 23:59:34 +00:00
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
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
bc7ed0d784
Fix to bintray repo ( #53 )
2016-10-07 13:36:32 -05:00
cc94687716
Merge pull request #52 from cunei/1.0-toni1
...
Change bintray repo, see sbt #1696
2016-10-07 12:05:13 -05:00
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
3cb3d8d221
Log resolving messages at debug level
...
For great justice.
2016-09-29 19:38:22 +10:00
a1f9b5ed64
Change bintray repo, see sbt #1696
2016-09-28 11:30:10 +02:00
cee81e3bb0
Configurable explicit list of artifacts for Scala binary version check
2016-08-22 11:00:09 +01:00
138787f55e
Add Resolver.sbtIvyRepo ( #49 )
...
.. deprecate & rename SbtPluginRepositoryRoot to SbtRepositoryRoot.
2016-07-15 07:57:04 +01:00
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
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
e7ca095303
Merge pull request #47 from dwijnand/cleanups
...
Cleanups
2016-06-21 23:20:09 +02:00
797362e06c
Merge pull request #46 from dwijnand/ivy-paths-to-string
...
Give IvyPaths a nicer toString
2016-06-21 23:19:40 +02:00
9706577c67
Drop Scala 2.10, add openjdk7
2016-06-21 17:51:16 +01:00
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
9dd4014553
Give IvyPaths a nicer toString
2016-06-21 14:13:15 +01:00
9bf0da7bec
Remove scripted test, forward-port fallout
2016-06-17 09:04:49 +02:00
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
76a1f12b10
Remove scalacOptions that are already defined in sbt-houserules
...
> show lm/scalacOptions
[info] List(-encoding, utf8, -deprecation, -feature, -unchecked, -Xlint, -language:higherKinds,
-language:implicitConversions, -Xfuture, -Yinline-warnings, -Yno-adapted-args, -Ywarn-dead-code,
-Ywarn-numeric-widen, -Ywarn-value-discard, -encoding, utf8, -deprecation, -feature, -unchecked, -Xlint,
-language:higherKinds, -language:implicitConversions, -Xfuture, -Yinline-warnings, -Xfatal-warnings,
-Yno-adapted-args, -Ywarn-dead-code, -Ywarn-numeric-widen, -Ywarn-value-discard)
[success] Total time: 0 s, completed 17-Jun-2016 09:00:40
> git diff
[info] diff --git a/build.sbt b/build.sbt
[info] index 254bb64..fed7303 100644
[info] --- a/build.sbt
[info] +++ b/build.sbt
[info] @@ -16,21 +16,7 @@ def commonSettings: Seq[Setting[_]] = Seq(
[info] incOptions := incOptions.value.withNameHashing(true),
[info] crossScalaVersions := Seq(scala210, scala211),
[info] resolvers += Resolver.sonatypeRepo("public"),
[info] - scalacOptions ++= Seq(
[info] - "-encoding", "utf8",
[info] - "-deprecation",
[info] - "-feature",
[info] - "-unchecked",
[info] - "-Xlint",
[info] - "-language:higherKinds",
[info] - "-language:implicitConversions",
[info] - "-Xfuture",
[info] - "-Yinline-warnings",
[info] - "-Xfatal-warnings",
[info] - "-Yno-adapted-args",
[info] - "-Ywarn-dead-code",
[info] - "-Ywarn-numeric-widen",
[info] - "-Ywarn-value-discard"),
[info] + scalacOptions += "-Xfatal-warnings",
[info] previousArtifact := None, // Some(organization.value %% moduleName.value % "1.0.0"),
[info] publishArtifact in Compile := true,
[info] publishArtifact in Test := false
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 lm/scalacOptions
[info] List(-encoding, utf8, -deprecation, -feature, -unchecked, -Xlint, -language:higherKinds,
-language:implicitConversions, -Xfuture, -Yinline-warnings, -Yno-adapted-args, -Ywarn-dead-code,
-Ywarn-numeric-widen, -Ywarn-value-discard, -Xfatal-warnings)
2016-06-17 09:01:32 +02:00
65a3162b43
Merge pull request #43 from Duhemm/fport/workaround-2620
...
FPORT: Fix for sbt/sbt#2435 and Workaround for sbt/sbt#2620
2016-06-04 12:43:34 -04:00
d2e6133704
Merge pull request #44 from milessabin/topic/scala-override
...
Override scala organization and version transitively at the Ivy level
2016-06-03 13:15:51 -04:00
52867b8c95
Override scala organization and version transitively at the Ivy level
2016-06-02 22:15:06 +01:00
1756d73724
Workaround for sbt/sbt#2620
2016-05-24 17:51:24 +02:00
ba274e05ac
Re-enable caching and updating minigraph in cached resolution
2016-05-24 17:14:00 +02:00
92ca28e25a
Use configuration of evicted nodes with cached resolution
...
Consider a configuration where we have two projects, A and B.
A has a library dependency on "a" % "b" % "1.0.0" % "compile->runtime"
and "a" % "b" % "1.0.0" % "compile->runtime2"
B depends on project A, and has a library dependency on
"a" % "b" % "1.0.1" % "compile->runtime".
Note that project B depends on a more recent version of "a" % "b" than
project A, and that it depends ONLY on it's "runtime" configuration.
However, when compiling project B, we expect to have on the classpath
project A, and "a" % "b" % "1.0.1" % "compile->runtime" AND
"a" % "b" % "1.0.1" % "compile->runtime2" because it is part of the
compile configuration of project A.
This commit changes the cached resolution engine so that it behaves like
that, by first resolving dependencies on other project and then ensuring
that the dependent project specifies dependencies on the same
configurations.
Mark test dependency-management/cached-resolution-configurations as
passing.
2016-05-24 17:13:45 +02:00
e1068ef49d
Merge pull request #41 from sbt/wip/testmixup
...
Don't depend on other projects' tests
2016-05-11 15:25:38 -04:00
87b3ca04c0
Don't depend on other projects' tests
2016-05-11 14:12:10 -04:00
eaa30370dc
Merge pull request #38 from sbt/wip/fixdependencies
...
Fix dependencies
2016-05-11 13:23:35 -04:00
4abaec8622
Fix dependencies
2016-05-10 00:38:26 -04:00
97a9a4efaf
Merge pull request #37 from ddworak/fport/2499
...
FPORT: Fix a few typos
2016-05-08 13:28:32 -04:00
a70c79a731
fix typos
2016-05-08 12:53:19 +02:00
77fd2203f9
Merge pull request #36 from Duhemm/fport/2500
...
FPORT: Fix sbt/sbt#2431
2016-05-06 12:43:09 -04:00
Dale Wijnand
eugene yokota
cunei
James Roper
Miles Sabin
Martin Duhem
ddworak