Skip to content

add scalafmt #634

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 23 commits into from
Nov 21, 2017
Merged

add scalafmt #634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
07746bb
wip: do the spaces split (without adding stuff yet)
SethTisue Nov 14, 2017
234466d
Merge remote-tracking branch 'origin/2.12.x' into add-scalafmt-spaces
SethTisue Nov 14, 2017
35ed963
wip
SethTisue Nov 14, 2017
fae4c67
Merge remote-tracking branch 'origin/2.12.x' into add-scalafmt-spaces
SethTisue Nov 14, 2017
32c2522
wip
SethTisue Nov 14, 2017
d837862
wip
SethTisue Nov 14, 2017
e324ee6
wip
SethTisue Nov 14, 2017
53d0f04
wip
SethTisue Nov 14, 2017
2fbe2ab
wip
SethTisue Nov 14, 2017
e65a843
wip
SethTisue Nov 14, 2017
6d21224
Merge remote-tracking branch 'origin/2.12.x' into add-scalafmt-spaces
SethTisue Nov 20, 2017
216f4f4
Merge remote-tracking branch 'origin/2.12.x' into add-scalafmt-spaces
SethTisue Nov 20, 2017
7729f04
wip
SethTisue Nov 21, 2017
e9cd9d3
wip
SethTisue Nov 21, 2017
c314430
wip
SethTisue Nov 21, 2017
59c65f6
wip
SethTisue Nov 21, 2017
d13b7bd
wip
SethTisue Nov 21, 2017
bfcc0ab
wip
SethTisue Nov 21, 2017
42d76bd
wip
SethTisue Nov 21, 2017
22eb2e0
wip
SethTisue Nov 21, 2017
1c04a75
Merge remote-tracking branch 'origin/2.12.x' into add-scalafmt-spaces
SethTisue Nov 21, 2017
0625624
wip
SethTisue Nov 21, 2017
fc1bac2
wip
SethTisue Nov 21, 2017
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
241 changes: 167 additions & 74 deletions configs/community.dbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
//// about spaces

// currently we have three spaces: default, jawn_0_10, jawn_0_11.
// the split is because sbt 1 uses jawn 0.10.x (via its dependency
// currently we have five spaces.

// the jawn split is because sbt 1 uses jawn 0.10.x (via its dependency
// on sjson-new) and the sbt team is worried about the possible
// impact of upgrading on binary compatibility of sbt plugins.
// but in the meantime the whole Typelevel ecosystem is moving onto
// jawn 0.11, and the two versions are source-incompatible.

// the scalameta split is because we want to have both scalafmt
// and scalafix, but the latter uses scalameta 2.x while the
// former is stuck in scalameta 1.x land. (this is easy to
// keep segregated since scalafmt and scalafix tend to be
// build-level dependencies, not project-level dependencies.)

//// from environment

vars: {
Expand Down Expand Up @@ -95,7 +102,7 @@ build += {
cross-version: disabled

space.from: default
space.to: [ default, jawn_0_10, jawn_0_11 ]
space.to: [ default, jawn_0_10, jawn_0_11, scalameta_1, scalameta_2 ]

projects: [
{
Expand Down Expand Up @@ -147,7 +154,7 @@ build += {
build += {

space.from: default
space.to: [ default, jawn_0_10, jawn_0_11 ]
space.to: [ default, jawn_0_10, jawn_0_11, scalameta_1, scalameta_2 ]

check-missing: [ true, false ]
cross-version: [ disabled, standard ]
Expand Down Expand Up @@ -977,30 +984,6 @@ build += {
extra.options: ["-Dbintray.user=dummy", "-Dbintray.pass=dummy"]
}

// forked (updated September 2017) to remove coursier.
// refreshing the fork should be approached with caution;
// see Olafur's remarks at
// https://github.com/scala/community-builds/issues/499#issuecomment-287307613
// about the instability of both scalameta and scalafix.
${vars.base} {
name: "scalameta"
uri: ${vars.uris.scalameta-uri}
// else, bintray stuff goes boom
extra.options: ["-Dsbt.prohibit.publish=true"]
extra.projects: ["scalametaJVM", "contribJVM", "semanticdbScalac"] // no Scala.js
extra.exclude: [
// we never build sbt plugins or benchmarks
"benchmarks"
]
// use right version-specific source directories regardless of our weird dbuild Scala version numbers
extra.commands: ${vars.default-commands} [
"set unmanagedSourceDirectories in (commonJVM, Compile) += (baseDirectory in commonJVM).value / \"src\" / \"main\" / \"scala-2.12\""
"set unmanagedSourceDirectories in (dialectsJVM, Compile) += (baseDirectory in dialectsJVM).value / \"src\" / \"main\" / \"scala-2.12\""
"set unmanagedSourceDirectories in (scalametaJVM, Compile) += (baseDirectory in scalametaJVM).value / \"src\" / \"main\" / \"scala-2.12\""
"set unmanagedSourceDirectories in (semanticdbScalac, Compile) += (baseDirectory in semanticdbScalac).value / \"src\" / \"main\" / \"scala-2.12.4\""
]
}

// dependency of scalafix
// (we use allanrenucci's fork because that's where `organization` is set
// as scalafix expects; it's where 0.1.4 was apparently published from,
Expand All @@ -1010,13 +993,6 @@ build += {
uri: ${vars.uris.scala-xml-quote-uri}
}

// dependency of scalafix
${vars.base} {
name: "metaconfig"
uri: ${vars.uris.metaconfig-uri}
extra.projects: ["metaconfig-hoconJVM", "metaconfig-typesafe-config"] // no Scala.js plz
}

${vars.base} {
name: "geny"
uri: ${vars.uris.geny-uri}
Expand Down Expand Up @@ -1076,19 +1052,6 @@ build += {
extra.projects: ["lensesJVM"] // no Scala.js plz
}

// adding (September 2017) because scalafix's "cli" subproject uses it.
// forked to remove coursier and upgrade sbt-bintray
${vars.base} {
name: "semanticdb-sbt"
uri: ${vars.uris.semanticdb-sbt-uri}
extra.options: ["-Dbintray.user=dummy", "-Dbintray.pass=dummy"]
extra.commands: ${vars.default-commands} [
"set every bintrayReleaseOnPublish := false"
]
// this is enough for scalafix
extra.projects: ["runtime"]
}

// adding (September 2017) because scalafix's "cli" subproject uses it.
// forked to modify some version number manipulation code to be
// dbuild-friendly; we can unfork once
Expand Down Expand Up @@ -1243,7 +1206,8 @@ build += {
build += {

space.from: jawn_0_10
space.to: [ jawn_0_10 ]
// to scalameta spaces to provide ammonite-ops
space.to: [ jawn_0_10, scalameta_1, scalameta_2 ]

check-missing: [ true, false ]
cross-version: [ disabled, standard ]
Expand Down Expand Up @@ -1364,31 +1328,6 @@ build += {
extra.options: ["-Xms1g", "-Xmx4g", "-Xss2m", "-XX:MaxMetaspaceSize=256m"]
}

// (here in this space because of ammonite-ops dependency)
// forked (refreshed September 2017) to remove coursier
// caution, refreshing the fork any further can be problematic;
// see Olafur's remarks at
// https://github.com/scala/community-builds/issues/499#issuecomment-287307613
// about the instability of both scalameta and scalafix
${vars.base} {
name: "scalafix"
uri: ${vars.uris.scalafix-uri}
extra.exclude: [
// we never build sbt plugins
"scalafix-sbt"
// requires scalatex-site which requires Scala.js
"readme"
// no Scala.js please
"coreJS", "diffJS"
// Scala 2.10 based
"testsInputSbt"
// do I *look* like Dotty?
"testsOutputDotty"
// can't expand macros compiled by previous versions of Scala
"testsOutputSbt"
]
}

]}

//// space: jawn_0_11
Expand Down Expand Up @@ -1516,3 +1455,157 @@ build += {
}

]}

//// space: scalameta_1

build += {

space.from: scalameta_1
space.to: [ scalameta_1 ]

check-missing: [ true, false ]
cross-version: [ disabled, standard ]
extraction-version: ${vars.scala-version}
sbt-version: ${vars.sbt-version}

projects: [

// forked (refreshed November 2017) to disable bintray stuff, IntelliJ stuff,
// and to remove a failing git-based test
${vars.base} {
name: "scalafmt"
uri: ${vars.uris.scalafmt-uri}
extra.projects: ["coreJVM", "cli", "tests"]
}

// dependency of scalafmt. frozen at an old version because that's what
// scalafmt expects. (over in the other scalameta space, scalafix expects
// a newer version.)
${vars.base} {
name: "metaconfig-old"
uri: ${vars.uris.metaconfig-old-uri}
extra.projects: ["metaconfig-hoconJVM", "metaconfig-typesafe-config"] // no Scala.js plz
}

// dependency of scalafmt
// forked (July 2017) for dbuild friendliness
${vars.base} {
name: "meta-paradise"
uri: ${vars.uris.meta-paradise-uri}
// only goal right now (November 2017) is to get scalafmt in, so, let's just
// add the project we actually need and not worry about the rest
extra.projects: ["paradise"]
// use right version-specific source directory regardless of our weird dbuild Scala version number
extra.commands: [
"set unmanagedSourceDirectories in (paradise, Compile) += (baseDirectory in paradise).value / \"src\" / \"main\" / \"scala-2.12.2\""
]
}

// dependency of scalafmt
${vars.base} {
name: "scalameta-1"
uri: ${vars.uris.scalameta-1-uri}
// else, bintray stuff goes boom
extra.options: ["-Dsbt.prohibit.publish=true"]
extra.projects: ["scalametaJVM", "testkit"] // no Scala.js. just the minimum scalafmt needs?
extra.exclude: [
// we never build sbt plugins or benchmarks
"benchmarks"
]
extra.commands: ${vars.default-commands} [
// Disable fatal Scaladoc warnings, too fragile
"removeScalacOptions -Xfatal-warnings"
// use right version-specific source directories regardless of our weird dbuild Scala version numbers
"set unmanagedSourceDirectories in (commonJVM, Compile) += (baseDirectory in commonJVM).value / \"src\" / \"main\" / \"scala-2.12\""
"set unmanagedSourceDirectories in (dialectsJVM, Compile) += (baseDirectory in dialectsJVM).value / \"src\" / \"main\" / \"scala-2.12\""
"set unmanagedSourceDirectories in (scalametaJVM, Compile) += (baseDirectory in scalametaJVM).value / \"src\" / \"main\" / \"scala-2.12\""
"set unmanagedSourceDirectories in (scalahost, Compile) += (baseDirectory in scalahost).value / \"src\" / \"main\" / \"scala-2.12.1\""
]
}

]}

//// space: scalameta_2

build += {

space.from: scalameta_2
space.to: [ scalameta_2 ]

check-missing: [ true, false ]
cross-version: [ disabled, standard ]
extraction-version: ${vars.scala-version}
sbt-version: ${vars.sbt-version}

projects: [

// forked (updated September 2017) to remove coursier.
// refreshing the fork should be approached with caution;
// see Olafur's remarks at
// https://github.com/scala/community-builds/issues/499#issuecomment-287307613
// about the instability of both scalameta and scalafix.
${vars.base} {
name: "scalameta-2"
uri: ${vars.uris.scalameta-2-uri}
// else, bintray stuff goes boom
extra.options: ["-Dsbt.prohibit.publish=true"]
extra.projects: ["scalametaJVM", "contribJVM", "semanticdbScalac"] // no Scala.js
extra.exclude: [
// we never build sbt plugins or benchmarks
"benchmarks"
]
// use right version-specific source directories regardless of our weird dbuild Scala version numbers
extra.commands: ${vars.default-commands} [
"set unmanagedSourceDirectories in (commonJVM, Compile) += (baseDirectory in commonJVM).value / \"src\" / \"main\" / \"scala-2.12\""
"set unmanagedSourceDirectories in (dialectsJVM, Compile) += (baseDirectory in dialectsJVM).value / \"src\" / \"main\" / \"scala-2.12\""
"set unmanagedSourceDirectories in (scalametaJVM, Compile) += (baseDirectory in scalametaJVM).value / \"src\" / \"main\" / \"scala-2.12\""
"set unmanagedSourceDirectories in (semanticdbScalac, Compile) += (baseDirectory in semanticdbScalac).value / \"src\" / \"main\" / \"scala-2.12.4\""
]
}

// adding (September 2017) because scalafix's "cli" subproject uses it.
// forked to remove coursier and upgrade sbt-bintray
${vars.base} {
name: "semanticdb-sbt"
uri: ${vars.uris.semanticdb-sbt-uri}
extra.options: ["-Dbintray.user=dummy", "-Dbintray.pass=dummy"]
extra.commands: ${vars.default-commands} [
"set every bintrayReleaseOnPublish := false"
]
// this is enough for scalafix
extra.projects: ["runtime"]
}

// dependency of scalafix
${vars.base} {
name: "metaconfig-new"
uri: ${vars.uris.metaconfig-new-uri}
extra.projects: ["metaconfig-hoconJVM", "metaconfig-typesafe-config"] // no Scala.js plz
}

// (here in this space because of ammonite-ops dependency)
// forked (refreshed September 2017) to remove coursier
// caution, refreshing the fork any further can be problematic;
// see Olafur's remarks at
// https://github.com/scala/community-builds/issues/499#issuecomment-287307613
// about the instability of both scalameta and scalafix
${vars.base} {
name: "scalafix"
uri: ${vars.uris.scalafix-uri}
extra.exclude: [
// we never build sbt plugins
"scalafix-sbt"
// requires scalatex-site which requires Scala.js
"readme"
// no Scala.js please
"coreJS", "diffJS"
// Scala 2.10 based
"testsInputSbt"
// do I *look* like Dotty?
"testsOutputDotty"
// can't expand macros compiled by previous versions of Scala
"testsOutputSbt"
]
}

]}
8 changes: 6 additions & 2 deletions configs/project-refs.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ vars.uris: {
machinist-uri: "https://github.com/typelevel/machinist.git"
macro-compat-uri: "https://github.com/milessabin/macro-compat.git"
macro-paradise-uri: "https://github.com/scalacommunitybuild/paradise.git#community-build-2.12"
metaconfig-uri: "https://github.com/olafurpg/metaconfig.git"
meta-paradise-uri: "https://github.com/scalacommunitybuild/paradise.git#community-build-2.12-meta-paradise"
metaconfig-old-uri: "https://github.com/olafurpg/metaconfig.git#b13e6bbbf"
metaconfig-new-uri: "https://github.com/olafurpg/metaconfig.git"
mima-uri: "https://github.com/lightbend/migration-manager.git"
minitest-uri: "https://github.com/monix/minitest.git"
monix-uri: "https://github.com/monix/monix.git#18f91fdf5" # was master
Expand Down Expand Up @@ -95,10 +97,12 @@ vars.uris: {
scalacheck-uri: "https://github.com/rickynils/scalacheck.git#9b71bb3dfe186c03292faa59976487af2ee23caa"
scalacheck-shapeless-uri: "https://github.com/alexarchambault/scalacheck-shapeless.git"
scalafix-uri: "https://github.com/scalacommunitybuild/scalafix.git#community-build-2.12"
scalafmt-uri: "https://github.com/scalacommunitybuild/scalafmt.git#community-build-2.12"
scalaj-http-uri: "https://github.com/scalaj/scalaj-http.git"
scalachess-uri: "https://github.com/ornicar/scalachess.git"
scalalib-uri: "https://github.com/ornicar/scalalib.git"
scalameta-uri: "https://github.com/scalacommunitybuild/scalameta.git#community-build-2.12"
scalameta-1-uri: "https://github.com/scalacommunitybuild/scalameta.git#community-build-2.12-scalameta1" # was v1.7.0
scalameta-2-uri: "https://github.com/scalacommunitybuild/scalameta.git#community-build-2.12"
scalameter-uri: "https://github.com/scalameter/scalameter.git"
scalamock-uri: "https://github.com/paulbutcher/ScalaMock.git#1e84ffe" # was master
scalapb-lenses-uri: "https://github.com/scalapb/Lenses.git"
Expand Down