Skip to content

add scalafix+scalameta+scalaparse+scalatex+ammonite-ops+geny+scalaj-http #472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 10, 2017
Merged

add scalafix+scalameta+scalaparse+scalatex+ammonite-ops+geny+scalaj-http #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 64 additions & 3 deletions community.dbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,10 @@ build += {
${vars.base} {
name: "scala-records"
uri: ${vars.uris.scala-records-uri}
extra.exclude: ["coreJS"]
extra.exclude: [
"coreJS" // no Scala.js please
"root" // dbuild thinks it tries to publish root#root
]
}

${vars.base} {
Expand Down Expand Up @@ -388,8 +391,10 @@ build += {
${vars.base} {
name: "fastparse"
uri: ${vars.uris.fastparse-uri}
// no Scala.js plz
extra.projects: ["fastparseJVM"]
extra.projects: [
"fastparseJVM" // no Scala.js plz
"scalaparseJVM" // dependency of Scala.meta (!)
]
// TODO: tests depend on lambda toString looking like e.g `<function1>`
extra.test-tasks: ["compile"]
}
Expand Down Expand Up @@ -984,4 +989,60 @@ build += {
extra.exclude: ["plugin"] // we never build sbt plugins
}

// forked to remove the usual bintray gunk
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we provide some additional configuration on our side (e.g. -Dsbt.prohibit.publish=true) to make sure you don't need to maintain your fork?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

with this particular plugin, I don't think so, sadly. a bunch of other projects are affected, too. the ticket is lightbend-labs/dbuild#158

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(I actually did try -Dsbt.prohibit.publish=true before forking, to no avail.)

${vars.base} {
name: "scalameta"
uri: ${vars.uris.scalameta-uri}
// else, bintray stuff goes boom
extra.options: ["-Dsbt.prohibit.publish=true"]
extra.exclude: ["readme"] // requires scalatex-site which requires Scala.js
}

// forked to remove wartremover and coursier
${vars.base} {
name: "scalafix"
uri: ${vars.uris.scalafix-uri}
extra.exclude: [
"scalafix-sbt" // we never build sbt plugins
"scalafix-nsc" // depends on circe which we don't have yet
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note, most scalafix tests are currently in scalafix-nsc, core has a limited amount of tests. These tests depend on various projects (circe, shapeless,...) to reproduce bugs that surfaced in larger integration tests.

// this didn't work; I decided to postpone any investigation. dbuild output an
// immensely long error (tens of megabytes), enough to choke Jenkins
"scalafix-tests"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I would exclude this directory. Here's where I run rewrites against a mini scalafix community-build. This involves cloning other projects and compiling them.

// Missing dependency: the library com.github.alexarchambault#case-app
"cli"
// requires scalatex-site which requires Scala.js
"readme"
]
}

${vars.base} {
name: "scalatex"
uri: ${vars.uris.scalatex-uri}
extra.exclude: [
"scalatexSbtPlugin" // we never build sbt plugins
"site", "readme", "scrollspy" // these use Scala.js
]
}

// for now we're just building ammonite-ops, not all of ammonite.
// ammonite-ops is the piece scalatex needed. trying to build all
// projects here resulted in a circular ammonite/scalatex dependency.
// we might look into that some other time.
${vars.base} {
name: "ammonite"
uri: ${vars.uris.ammonite-uri}
extra.projects: ["ops"]
}

${vars.base} {
name: "geny"
uri: ${vars.uris.geny-uri}
extra.projects: ["genyJVM"] // no Scala.js plz
}

${vars.base} {
name: "scalaj-http"
uri: ${vars.uris.scalaj-http-uri}
}

]}
6 changes: 6 additions & 0 deletions project-refs.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ vars.uris: {
akka-sse-uri: "https://github.com/scalacommunitybuild/akka-sse.git#community-build-2.12"
akka-uri: "https://github.com/akka/akka.git#release-2.4"
algebra-uri: "https://github.com/typelevel/algebra.git"
ammonite-uri: "https://github.com/lihaoyi/ammonite.git"
argonaut-uri: "https://github.com/argonaut-io/argonaut.git"
async-uri: "https://github.com/scala/async.git"
atto-uri: "https://github.com/tpolecat/atto.git#series/0.5.x"
Expand All @@ -22,6 +23,7 @@ vars.uris: {
fs2-uri: "https://github.com/functional-streams-for-scala/fs2.git#series/0.9"
fs2-cats-uri: "https://github.com/functional-streams-for-scala/fs2-cats.git"
genjavadoc-uri: "https://github.com/typesafehub/genjavadoc.git"
geny-uri: "https://github.com/lihaoyi/geny.git"
http4s-uri: "https://github.com/http4s/http4s.git#ae219210dd445b7c0c039f985aaf6e11faef59d4"
http4s-websocket-uri: "https://github.com/http4s/http4s-websocket.git"
jackson-module-scala-uri: "https://github.com/FasterXML/jackson-module-scala.git"
Expand Down Expand Up @@ -64,12 +66,16 @@ vars.uris: {
scala-stm-uri: "https://github.com/nbronson/scala-stm.git"
scala-swing-uri: "https://github.com/scala/scala-swing.git#2.0.x"
scalacheck-uri: "https://github.com/rickynils/scalacheck.git#1.13.x"
scalafix-uri: "https://github.com/scalacommunitybuild/scalafix.git#community-build-2.12"
scalaj-http-uri: "https://github.com/scalaj/scalaj-http.git"
scalameta-uri: "https://github.com/scalacommunitybuild/scalameta.git#community-build-2.12"
scalameter-uri: "https://github.com/scalameter/scalameter.git"
scalamock-uri: "https://github.com/scalacommunitybuild/ScalaMock.git#community-build-2.12"
scalaprops-uri: "https://github.com/scalaprops/scalaprops.git"
scalariform-uri: "https://github.com/scala-ide/scalariform.git"
scalatags-uri: "https://github.com/lihaoyi/scalatags.git"
scalatest-uri: "https://github.com/scalatest/scalatest.git#3.0.x"
scalatex-uri: "https://github.com/lihaoyi/scalatex.git"
scalaz-uri: "https://github.com/scalaz/scalaz.git#series/7.2.x"
scalikejdbc-uri: "https://github.com/scalikejdbc/scalikejdbc.git"
scodec-bits-uri: "https://github.com/scodec/scodec-bits.git#series/1.1.x"
Expand Down