diff --git a/configs/community.dbuild b/configs/community.dbuild index 375fba945..f9bdcfe41 100644 --- a/configs/community.dbuild +++ b/configs/community.dbuild @@ -1043,14 +1043,12 @@ build += { ${vars.base} { name: "scalameta" uri: ${vars.uris.scalameta-uri} - // else, bintray stuff goes boom - extra.options: ["-Dsbt.prohibit.publish=true"] extra.projects: ["scalametaJVM"] // no Scala.js extra.exclude: [ // requires scalatex-site which requires Scala.js "readme" - // we never build sbt plugins or benchmarks - "scalahostSbt", "benchmarks" + // we never build benchmarks + "benchmarks" // test failures it doesn't seem worth investigating; pulls down external source trees "contribJVM" ] @@ -1059,14 +1057,16 @@ build += { "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\"" + "set unmanagedSourceDirectories in (scalahostNsc, Compile) += (baseDirectory in scalahostNsc).value / \"src\" / \"main\" / \"scala-2.12.1\"" ] + // [scalameta] [error] Failed tests: + // [scalameta] [error] scala.meta.tests.io.NIOPathTest + // [scalameta] [error] scala.meta.tests.io.IOFileTest + extra.test-tasks: "compile" } - // forked (February 2017) to remove wartremover and coursier - // fork tweaked March 2017 to alter scalameta dependency - // caution, refreshing the fork any further could be problematic; - // see Olafur's comment at + // forked (July 2017) to remove coursier. + // caution, refreshing the fork is always problematic; see Olafur's comment at // https://github.com/scala/community-builds/issues/499#issuecomment-287307613 // about the instability of both scalameta and scalafix ${vars.base} { @@ -1074,20 +1074,48 @@ build += { uri: ${vars.uris.scalafix-uri} extra.exclude: [ "scalafix-sbt" // we never build sbt plugins - // "These tests depend on various projects (circe, shapeless,...) to - // reproduce bugs that surfaced in larger integration tests" - // says Olaf. depends on circe which we don't have here yet - "scalafix-nsc" - // didn't work, and anyway, Olafur says it isn't appropriate to include; - // it "involves cloning other projects and compiling them" - "scalafix-tests" // Missing dependency: the library com.github.alexarchambault#case-app "cli" // requires scalatex-site which requires Scala.js "readme" + // no Scala.js plz + "coreJS", "diffJS" + // no Dotty stuff plz + "testsOutputDotty" ] } + // forked (July 2017) to remove coursier and sbt-idea-plugin + ${vars.base} { + name: "scalafmt" + uri: ${vars.uris.scalafmt-uri} + // let's keep our ambitions modest for now (July 2017) + // and just try to build core (and no Scala.js plz, of course) + extra.projects: ["coreJVM"] + } + + // dependency of scalafmt + // forked (July 2017) for dbuild friendliness + ${vars.base} { + name: "meta-paradise" + uri: ${vars.uris.meta-paradise-uri} + // main goal right now (July 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 + // forked (July 2017) to remove coursier + ${vars.base} { + name: "metaconfig" + uri: ${vars.uris.metaconfig-uri} + extra.projects: ["metaconfig-hoconJVM", "metaconfig-typesafe-config"] // no Scala.js plz + } + ${vars.base} { name: "scalatex" uri: ${vars.uris.scalatex-uri} diff --git a/configs/project-refs.conf b/configs/project-refs.conf index 0697cf63b..51fdb340e 100644 --- a/configs/project-refs.conf +++ b/configs/project-refs.conf @@ -45,6 +45,8 @@ 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" + meta-paradise-uri: "https://github.com/SethTisue/paradise.git#community-build-2.12" + metaconfig-uri: "https://github.com/scalacommunitybuild/metaconfig.git#community-build-2.12" mima-uri: "https://github.com/typesafehub/migration-manager.git" minitest-uri: "https://github.com/monix/minitest.git" monix-uri: "https://github.com/monix/monix.git#series/2.x" @@ -77,9 +79,10 @@ 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#9b71bb3dfe186c03292faa59976487af2ee23caa" - scalafix-uri: "https://github.com/scalacommunitybuild/scalafix.git#community-build-2.12" + scalafix-uri: "https://github.com/SethTisue/scalafix.git#refresh" + scalafmt-uri: "https://github.com/scalacommunitybuild/scalafmt.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" + scalameta-uri: "https://github.com/SethTisue/scalameta.git#refresh" scalameter-uri: "https://github.com/scalameter/scalameter.git" scalamock-uri: "https://github.com/scalacommunitybuild/ScalaMock.git#community-build-2.12" scalapb-lenses-uri: "https://github.com/scalapb/Lenses.git"