From 6379696749bfb871211dd74dbb1068f81dce801c Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Mon, 24 Jul 2017 15:31:27 -0700 Subject: [PATCH 01/11] add scalafmt --- configs/community.dbuild | 35 +++++++++++++++++++++++++++++++++++ configs/project-refs.conf | 3 +++ 2 files changed, 38 insertions(+) diff --git a/configs/community.dbuild b/configs/community.dbuild index 174e2d213..f7a24dcf4 100644 --- a/configs/community.dbuild +++ b/configs/community.dbuild @@ -1078,6 +1078,41 @@ build += { ] } + // forked (July 2017) to remove coursier and sbt-idea-plugin + ${vars.base} { + name: "scalafmt" + uri: ${vars.uris.scalafmt-uri} + extra.exclude: [ + // our artifactory doesn't have sbt-idea-plugin; we could add it, + // but this subproject seems inessential/irrelevant actually + "intellij" + // uses coursier (as a library, I think) + "bootstrap" + ] + } + + // 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"] // 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 df2068adb..51f6daeb9 100644 --- a/configs/project-refs.conf +++ b/configs/project-refs.conf @@ -45,6 +45,8 @@ vars.uris: { macro-compat-uri: "https://github.com/milessabin/macro-compat.git" macro-paradise-uri: "https://github.com/scalacommunitybuild/paradise.git#community-build-2.12" mima-uri: "https://github.com/typesafehub/migration-manager.git#scala-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" minitest-uri: "https://github.com/monix/minitest.git" monix-uri: "https://github.com/monix/monix.git#series/2.x" monocle-uri: "https://github.com/julien-truffaut/Monocle.git" @@ -77,6 +79,7 @@ vars.uris: { 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" + 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" scalameter-uri: "https://github.com/scalameter/scalameter.git" From 067990b38abd5da81f08c443dc0b576e04f6af1e Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Mon, 24 Jul 2017 18:08:00 -0700 Subject: [PATCH 02/11] try again with refreshed fork of scalafmt --- configs/community.dbuild | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/configs/community.dbuild b/configs/community.dbuild index 317940860..3489a7eba 100644 --- a/configs/community.dbuild +++ b/configs/community.dbuild @@ -1092,13 +1092,9 @@ build += { ${vars.base} { name: "scalafmt" uri: ${vars.uris.scalafmt-uri} - extra.exclude: [ - // our artifactory doesn't have sbt-idea-plugin; we could add it, - // but this subproject seems inessential/irrelevant actually - "intellij" - // uses coursier (as a library, I think) - "bootstrap" - ] + // 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 From 6d366d0fec496a0567c0fd5caaa2e59245bb55c0 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Mon, 24 Jul 2017 18:19:54 -0700 Subject: [PATCH 03/11] scalafmt needs more of metaconfig --- configs/community.dbuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/community.dbuild b/configs/community.dbuild index 3489a7eba..e00d65497 100644 --- a/configs/community.dbuild +++ b/configs/community.dbuild @@ -1116,7 +1116,7 @@ build += { ${vars.base} { name: "metaconfig" uri: ${vars.uris.metaconfig-uri} - extra.projects: ["metaconfig-hoconJVM"] // no Scala.js plz + extra.projects: ["metaconfig-hoconJVM", "metaconfig-typesafe-config"] // no Scala.js plz } ${vars.base} { From 15051da1349b2971c2d7d03b861e251df2f78342 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 25 Jul 2017 11:10:37 -0700 Subject: [PATCH 04/11] wip --- configs/community.dbuild | 2 -- configs/project-refs.conf | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/configs/community.dbuild b/configs/community.dbuild index e00d65497..606629d80 100644 --- a/configs/community.dbuild +++ b/configs/community.dbuild @@ -1043,8 +1043,6 @@ 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 diff --git a/configs/project-refs.conf b/configs/project-refs.conf index 5c8621fce..d71305d9e 100644 --- a/configs/project-refs.conf +++ b/configs/project-refs.conf @@ -82,7 +82,7 @@ vars.uris: { 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" - 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" From 46119b134675ea21d6deffaea7f48d04273aec5c Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 25 Jul 2017 11:18:30 -0700 Subject: [PATCH 05/11] wip --- configs/community.dbuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/community.dbuild b/configs/community.dbuild index 90178210e..a16ffb27e 100644 --- a/configs/community.dbuild +++ b/configs/community.dbuild @@ -1047,8 +1047,8 @@ build += { 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" ] From 870ac40482190adefa3de2241fc9941eb4b1e4d4 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 25 Jul 2017 11:27:45 -0700 Subject: [PATCH 06/11] wip --- configs/community.dbuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/community.dbuild b/configs/community.dbuild index a16ffb27e..343144fd7 100644 --- a/configs/community.dbuild +++ b/configs/community.dbuild @@ -1057,7 +1057,7 @@ 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\"" ] } From 695f4a11b06dac260a3c3ec902c1b95ea5f61382 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 25 Jul 2017 11:36:47 -0700 Subject: [PATCH 07/11] wip --- configs/community.dbuild | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configs/community.dbuild b/configs/community.dbuild index 343144fd7..c7fd00430 100644 --- a/configs/community.dbuild +++ b/configs/community.dbuild @@ -1059,6 +1059,10 @@ build += { "set unmanagedSourceDirectories in (scalametaJVM, Compile) += (baseDirectory in scalametaJVM).value / \"src\" / \"main\" / \"scala-2.12\"" "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 From 1b2d430168c40be935d7f5076a99c98d6b21dcee Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 25 Jul 2017 11:52:35 -0700 Subject: [PATCH 08/11] wip --- configs/project-refs.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/project-refs.conf b/configs/project-refs.conf index d71305d9e..51fdb340e 100644 --- a/configs/project-refs.conf +++ b/configs/project-refs.conf @@ -79,7 +79,7 @@ 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/SethTisue/scalameta.git#refresh" From a102bce03d77aef18100f81157114088cc89e638 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 25 Jul 2017 11:57:23 -0700 Subject: [PATCH 09/11] wip --- configs/community.dbuild | 7 ------- 1 file changed, 7 deletions(-) diff --git a/configs/community.dbuild b/configs/community.dbuild index c7fd00430..1ea829c9a 100644 --- a/configs/community.dbuild +++ b/configs/community.dbuild @@ -1076,13 +1076,6 @@ 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 From b0a1a7aacd989c25f3f7a36e052bb67ae954f09b Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 25 Jul 2017 12:03:20 -0700 Subject: [PATCH 10/11] wip --- configs/community.dbuild | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/community.dbuild b/configs/community.dbuild index 1ea829c9a..27f0a630c 100644 --- a/configs/community.dbuild +++ b/configs/community.dbuild @@ -1065,10 +1065,8 @@ build += { 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} { @@ -1080,6 +1078,8 @@ build += { "cli" // requires scalatex-site which requires Scala.js "readme" + // no Scala.js plz + "coreJS", "diffJS" ] } From dcb49a73542f7843d4a9117efd0bc12887109dc9 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 25 Jul 2017 12:35:34 -0700 Subject: [PATCH 11/11] wip --- configs/community.dbuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/community.dbuild b/configs/community.dbuild index 27f0a630c..f9bdcfe41 100644 --- a/configs/community.dbuild +++ b/configs/community.dbuild @@ -1080,6 +1080,8 @@ build += { "readme" // no Scala.js plz "coreJS", "diffJS" + // no Dotty stuff plz + "testsOutputDotty" ] }