File tree Expand file tree Collapse file tree 2 files changed +38
-0
lines changed
Expand file tree Collapse file tree 2 files changed +38
-0
lines changed Original file line number Diff line number Diff line change @@ -1088,6 +1088,41 @@ build += {
10881088 ]
10891089 }
10901090
1091+ // forked (July 2017) to remove coursier and sbt-idea-plugin
1092+ ${vars.base} {
1093+ name: "scalafmt"
1094+ uri: ${vars.uris.scalafmt-uri}
1095+ extra.exclude: [
1096+ // our artifactory doesn't have sbt-idea-plugin; we could add it,
1097+ // but this subproject seems inessential/irrelevant actually
1098+ "intellij"
1099+ // uses coursier (as a library, I think)
1100+ "bootstrap"
1101+ ]
1102+ }
1103+
1104+ // dependency of scalafmt
1105+ // forked (July 2017) for dbuild friendliness
1106+ ${vars.base} {
1107+ name: "meta-paradise"
1108+ uri: ${vars.uris.meta-paradise-uri}
1109+ // main goal right now (July 2017) is to get scalafmt in, so, let's just
1110+ // add the project we actually need and not worry about the rest
1111+ extra.projects: ["paradise"]
1112+ // use right version-specific source directory regardless of our weird dbuild Scala version number
1113+ extra.commands: [
1114+ "set unmanagedSourceDirectories in (paradise, Compile) += (baseDirectory in paradise).value / \"src\" / \"main\" / \"scala-2.12.2\""
1115+ ]
1116+ }
1117+
1118+ // dependency of scalafmt
1119+ // forked (July 2017) to remove coursier
1120+ ${vars.base} {
1121+ name: "metaconfig"
1122+ uri: ${vars.uris.metaconfig-uri}
1123+ extra.projects: ["metaconfig-hoconJVM"] // no Scala.js plz
1124+ }
1125+
10911126 ${vars.base} {
10921127 name: "scalatex"
10931128 uri: ${vars.uris.scalatex-uri}
Original file line number Diff line number Diff line change @@ -45,6 +45,8 @@ vars.uris: {
4545 machinist-uri: "https://github.com/typelevel/machinist.git"
4646 macro-compat-uri: "https://github.com/milessabin/macro-compat.git"
4747 macro-paradise-uri: "https://github.com/scalacommunitybuild/paradise.git#community-build-2.12"
48+ meta-paradise-uri: "https://github.com/SethTisue/paradise.git#community-build-2.12"
49+ metaconfig-uri: "https://github.com/scalacommunitybuild/metaconfig.git#community-build-2.12"
4850 mima-uri: "https://github.com/typesafehub/migration-manager.git"
4951 minitest-uri: "https://github.com/monix/minitest.git"
5052 monix-uri: "https://github.com/monix/monix.git#series/2.x"
@@ -78,6 +80,7 @@ vars.uris: {
7880 scala-swing-uri: "https://github.com/scala/scala-swing.git#2.0.x"
7981 scalacheck-uri: "https://github.com/rickynils/scalacheck.git#9b71bb3dfe186c03292faa59976487af2ee23caa"
8082 scalafix-uri: "https://github.com/scalacommunitybuild/scalafix.git#community-build-2.12"
83+ scalafmt-uri: "https://github.com/scalacommunitybuild/scalafmt.git#community-build-2.12"
8184 scalaj-http-uri: "https://github.com/scalaj/scalaj-http.git"
8285 scalameta-uri: "https://github.com/scalacommunitybuild/scalameta.git#community-build-2.12"
8386 scalameter-uri: "https://github.com/scalameter/scalameter.git"
You can’t perform that action at this time.
0 commit comments