Commit Graph

17940 Commits

Author SHA1 Message Date
Dale Wijnand 37f4e8311e Add -Ywarn-unused & -Ywarn-unused-import, & fix warnings 2016-06-19 11:42:31 +01:00
Dale Wijnand 121e7f5d9e Add -Ywarn-unused & -Ywarn-unused-import, & fix warnings 2016-06-19 11:42:31 +01:00
Dale Wijnand 28a40163e7 Sync Scala 2.11 version in .travis.yml 2016-06-19 11:24:50 +01:00
Dale Wijnand 1651df2090 Fix compilation warnings, migrate to blackbox.Context 2016-06-19 11:16:02 +01:00
Dale Wijnand d0826ff13c Fix compilation warnings, migrate to blackbox.Context 2016-06-19 11:16:02 +01:00
Dale Wijnand 8989549cb6 Remove scalacOptions already set by house rules 2016-06-19 11:16:02 +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
Dale Wijnand 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
eugene yokota 0539410fdd Merge pull request #128 from Duhemm/wip/compiler-api
Minimal API for `ScalaCompiler`, expose in `Compilers`
2016-06-08 01:30:51 -04:00
eugene yokota c903e7ca28 Merge pull request #2635 from milessabin/topic/scala-override
Override scala organization and version transitively at the Ivy level
2016-06-06 22:28:00 -04:00
Miles Sabin 1e9bb93285 Override scala organization and version transitively at the Ivy level 2016-06-05 09:46:00 +01:00
eugene yokota 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
eugene yokota 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
Miles Sabin 52867b8c95 Override scala organization and version transitively at the Ivy level 2016-06-02 22:15:06 +01:00
eugene yokota b6bd05b3a7 Merge pull request #2631 from larroy/1.0.x
Fix typo: paralleism -> parallelism
2016-06-02 11:59:41 -04:00
Alexandre Archambault 05dffeb7b5
Add release notes for 1.0.0-M12-1 2016-06-01 23:30:55 +02:00
Martin Duhem 7799afdef8 Generate `ClasspathOptions` with sbt-datatype
Also rename the previous object called `ClasspathOptions` to
`ClasspathOptionsUtil`.
2016-06-01 16:22:58 +02:00
Alexandre Archambault e1d6f352f5 Merge pull request #270 from alexarchambault/topic/plugin-errors
Better plugin errors
2016-05-31 19:44:42 +02:00
Alexandre Archambault 5720001974 Merge pull request #269 from alexarchambault/topic/ttl
Add support for TTL (cache)
2016-05-31 19:44:23 +02:00
Alexandre Archambault 387d88d717
Accept non-finite durations as TTL 2016-05-31 15:18:33 +02:00
Alexandre Archambault b76fbf363a
Add support for TTL 2016-05-31 15:18:29 +02:00
Alexandre Archambault 6e27a7fc6e
Slightly better error messages from plugin 2016-05-31 13:43:30 +02:00
Alexandre Archambault e688828f7a
Keep resolution error infos in ad hoc ADT 2016-05-31 13:43:27 +02:00
Alexandre Archambault 201ef286db
Stacktrace-less exceptions in SBT plugin 2016-05-31 13:43:23 +02:00
Alexandre Archambault 6aad1c6310
Add scaladoc 2016-05-31 13:41:56 +02:00
Alexandre Archambault bde69ecb10 Merge pull request #267 from alexarchambault/topic/scala-org
Take into account scalaOrganization setting
2016-05-30 20:42:50 +02:00
Alexandre Archambault d6155160e7
Take into account scalaOrganization setting 2016-05-30 13:15:02 +02:00
Alexandre Archambault 4b2651be3f Merge pull request #264 from alexarchambault/topic/better-intransitive
Better --intransitive option from the command-line tools
2016-05-30 10:27:26 +02:00
Alexandre Archambault 0a38127d2f Merge pull request #265 from alexarchambault/topic/ivy-version-intervals
Add support for version intervals for Ivy repositories
2016-05-30 10:27:18 +02:00
Alexandre Archambault 1553d0b9d9
Add support for Ivy version ranges 2016-05-30 00:40:41 +02:00
Alexandre Archambault 24235c12cc
Change module name of root project not to confuse sbt-coursier 2016-05-29 23:45:55 +02:00
Alexandre Archambault baa9c17d20
Better --intransitive option from the command-line tools
--intransitive accepts a dependency as argument, and adds it as
intransitive dependency - other dependencies are left untouched
2016-05-29 23:42:02 +02:00
eugene yokota e4e3e54c33 Merge pull request #108 from ipsq/ipsq-patch-1
Corrected spelling mistake in sbt.bat
2016-05-29 13:35:19 -04:00
Johannes Rudolph 8ff4397b5a Merge pull request #103 from alkersan/master
Replaced http CDN links with https, fixes #102
2016-05-29 14:19:22 +02:00
Alexandre Archambault c5fb28f982 Merge pull request #262 from alexarchambault/topic/use-dependency-version
Keep version actually used to fetch metadata, to get artifacts
2016-05-29 12:59:59 +02:00
Dmytro Aleksandrov e52bb48278 Replaced http CDN links with https 2016-05-29 13:44:36 +03:00
Alexandre Archambault 2ddfe5f3b2 Keep version actually used to fetch metadata, to get artifacts
In case the one given by the metadata is wrong
2016-05-28 17:15:05 +02:00
Martijn Riemers 1705b58fde Corrected spelling mistake in sbt.bat 2016-05-28 12:27:53 +02:00
Pedro Larroy f5e8c8736f Fix typo: paralleism -> parallelism 2016-05-26 07:38:27 +00:00
Martin Duhem 1756d73724 Workaround for sbt/sbt#2620 2016-05-24 17:51:24 +02:00
Martin Duhem ba274e05ac Re-enable caching and updating minigraph in cached resolution 2016-05-24 17:14:00 +02:00
Martin Duhem 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
Alexandre Archambault 3ffba8b974 Merge pull request #257 from alexarchambault/topic/updates
Various things for 1.0.0-M12-1
2016-05-23 09:54:22 +02:00
Alexandre Archambault 527b1eca96
Disable progress bar by default if CI or Emacs detected 2016-05-22 21:59:05 +02:00
Alexandre Archambault 3045ebbfd0
Get credentials from SBT key `credentials` if available 2016-05-22 21:59:02 +02:00
Alexandre Archambault 84d75655fa
Add a few words about credentials in README 2016-05-22 21:58:37 +02:00
Alexandre Archambault 7c1813c2cc
Bump module versions in README, fix typos, add back lost chunks 2016-05-22 21:56:01 +02:00
Alexandre Archambault 0d79cf0ed1
Update contributor list 2016-05-19 00:35:18 +02:00
Alexandre Archambault 1deec8ea91
Update release notes 2016-05-19 00:21:13 +02:00