Commit Graph

34 Commits

Author SHA1 Message Date
Eugene Yokota dd4b33105b add Gigahorse 2017-05-15 16:34:38 -04:00
jvican 1a11fd86a3
Disable parallel execution 2017-05-09 11:02:34 +02:00
jvican d42ea869d0
Apply formatting 2017-04-26 22:55:38 +02:00
jvican 712c83f859
Configure scalafmt and disable scalariform 2017-04-26 22:53:17 +02:00
Eugene Yokota 9dd1dff6cb Bump util 2017-01-13 22:48:32 -05:00
Eugene Yokota 9d812f4d98 Cross publish to Scala 2.12 2017-01-07 00:49:45 -05:00
Dale Wijnand 71fddd5e3f
Upgrade from sbt/datatype to sbt/contraband 2017-01-05 15:42:29 +00:00
Dale Wijnand 7c221ef97f
Include managed sources in packageSrc 2016-12-14 10:31:11 +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
Dale Wijnand f2efa10af1
Switch to sbt-datatype, sjson-new & Vectors 2016-11-15 23:59:34 +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
Antonio Cunei a1f9b5ed64 Change bintray repo, see sbt #1696 2016-09-28 11:30:10 +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 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 87b3ca04c0 Don't depend on other projects' tests 2016-05-11 14:12:10 -04:00
Eugene Yokota 4abaec8622 Fix dependencies 2016-05-10 00:38:26 -04:00
Martin Duhem 65adc869d4 Implement static launcher for sbt
This is a combination of 13 commits. I squashed these 13 commits to make
forward porting those changes easier, since some commit undo the changes
of other commits.

The PRs that include these changes can be found at
https://github.com/sbt/sbt/pull/2564 and
https://github.com/sbt/sbt/pull/2576.

Static launcher, get bridge sources from resources

This commit introduces a new "static" launcher that does not use Ivy to
gather all the artifacts that it requires, but rather expect them to be
immediately available.

To be able to use sbt without Internet access, we add a new
`ComponentCompiler` that is able to retrieve the bridge sources from the
resources on classpath and compile it.

Fix classpath issues in static launcher

The launcher defines a top classloader that willbe used by all
`ScalaInstance`s. Previously, this top classloader had a parent that
contained the scala library 2.10, which prevented the correct
compilation of the compiler bridge for scala 2.11.

Also, we no longer need the scala-reflect JAR.

Tests for FakeResolver

Add `scala-reflect.jar` to JARs of `StaticScalaProvider`

It turns out we need to have `scala-reflect.jar` on classpath to compile
the compiler bridge for the static scala instance of the launcher.

Comply to Ivy's specification in `FakeResolver`

Remove `CompilerBridgeProvider` and `ResourceBridgeProvider`

It turns out that we can leverage the`FakeResolver` that has been
implemented to use with the static launcher, and resolve a "fake
compiler bridge" using it, rather than copying it from the resources.

This also has the advantage of not requiring to change the build
definition.

Fix NPE in FakeResolver

Add compiler bridge sources to fake resolver

This allows sbt to resolve the compiler bridge sources when using the
static launcher

Don't hardcode sbt version in static launcher

Add scala compiler and library to fake resolver

This allows us to still resolve them if we have no other resolver
configured.

Add `RepositoriesParser`

This parser is used by the static launcher to parse the definition of
resolvers that override the build resolvers.

Support repositories override in static launcher

The static launcher will now parse user-defined repositories like the
usual launcher does.

Specifically, the static launcher now uses the following configuration:

 - `sbt.boot.directory`: specifies the boot directory that sbt will use.
   Defaults to `~/.sbt/boot`.
 - `sbt.override.build.repos`: indicate whether we want to override the
   build resolvers. Defaults to false.
 - `sbt.repository.config`: specifies the path to the files that
   contains repositories definition. Defaults to
   `${sbt.boot.directory}/repositories`.

Notes for sbt/sbt#2564 & sbt/sbt#2576
2016-04-27 10:14:47 +02:00
Dale Wijnand 1bcefc6686 Bump sbt-houserules to add MiMa
See sbt/sbt#2383
2016-02-14 21:16:34 +00:00
Martin Duhem 84e7c5a360 Bump Scala version in .travis.yml and build.sbt 2015-12-24 09:07:02 +01:00
Martin Duhem 9a2b007a92 Remove more redundant settings 2015-09-18 09:05:43 +01:00
Martin Duhem 9cd670ac34 Remove redundant Bintray settings 2015-09-18 00:57:18 +01:00
Martin Duhem 699dcfdee5 Update to latest sbt-houserules, formatting 2015-09-16 14:57:00 +02:00
Martin Duhem 6822671f01 Add recommended compiler flags, fix warnings
Remove `JavaNet1Repository` which was deprecated.
2015-09-10 16:08:59 +02:00
Eugene Yokota 9a42d645e9 Publish test artifacts 2015-09-07 04:40:23 -04:00
Eugene Yokota dbf9dc7450 bump to util 0.1.0-M2 and migrated to scalatest 2015-09-05 05:32:07 -04:00
Eugene Yokota 734923fbae Bintray 2015-09-02 03:25:37 -04:00
Eugene Yokota 277c754e36 Merge #1 2015-09-02 03:03:20 -04:00
Eugene Yokota 7939e385c1 Bintray 2015-09-02 02:59:00 -04:00
Eugene Yokota e81b378214 Depend on sbt/util 2015-08-20 01:33:22 -04:00
Eugene Yokota 887cb7cc3e Code gen no longer needed 2015-08-19 04:13:08 -04:00
Eugene Yokota 319054fa32 Add build.sbt 2015-08-19 03:56:08 -04:00