Skip to content

Commit 1338c90

Browse files
committed
2.13: fix some projects, remove others
trying to get down to a minimal core of green projects plus projects that are very high priority to get green references #710
1 parent 774c22c commit 1338c90

File tree

1 file changed

+48
-82
lines changed

1 file changed

+48
-82
lines changed

configs/community.dbuild

+48-82
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# surely-not-100%-complete/accurate list, but,
22
# the following 2.12 projects are currently not included in 2.13
33
#
4+
# * needs updating for 2.13 new collections:
5+
# json4s, scala-collections-laws, scala-async, utest and friends
6+
# (acyclic, geny, scalatags, fansi, fastparse)
47
# * better-files (compile error, problem with @tailrec + singleton types?
58
# didn't I see something similar in another project?)
69
# * akka-more: doesn't compile, opened https://github.com/akka/akka/issues/24535
@@ -158,6 +161,15 @@ build += {
158161
{
159162
name: "cloc-plugin"
160163
uri: "https://github.com/SethTisue/cloc-plugin.git"
164+
extra.sbt-version: ${vars.sbt-1-version}
165+
extra.commands: ${vars.default-commands} [
166+
// Scaladoc generation fails because the wrong scala-xml version is used,
167+
// (resulting in an error about scala.collection.SeqLike being missing).
168+
// not worth investigating, we don't need to testdoc generation on this project,
169+
// and scala-xml will be out of the bootstrap before much longer anyway
170+
"set publishArtifact in packageDoc := false"
171+
// "set sources in doc in Compile := List()"
172+
]
161173
}
162174
{
163175
name: "scala"
@@ -185,7 +197,7 @@ build += {
185197
}
186198
{
187199
name: "scala-xml"
188-
uri: "https://github.com/scala/scala-xml.git"
200+
uri: "https://github.com/scala/scala-xml.git#newCollectionsBootstrap" # was master
189201
// this gives us "scala-xml_2.12" which is what we want, sbt 1 will get
190202
// upset if there are two different kinds of scala-xml dependencies
191203
// floating around (https://github.com/scala/community-builds/issues/679)
@@ -229,6 +241,8 @@ build += {
229241
// work around https://github.com/scala/community-builds/issues/575
230242
// (in a community build context, we don't need MiMa to run)
231243
"set every ScalaModulePlugin.mimaPreviousVersion := None"
244+
// Scaladoc generation fails because the wrong scala-xml version is used
245+
"set every publishArtifact in packageDoc := false"
232246
]
233247
}
234248

@@ -245,6 +259,8 @@ build += {
245259
extra.commands: ${vars.default-commands} [
246260
// too fragile
247261
"removeScalacOptions -Xfatal-warnings"
262+
// Scaladoc generation fails because the wrong scala-xml version is used
263+
"set publishArtifact in packageDoc in stubs := false"
248264
]
249265
}
250266

@@ -310,6 +326,8 @@ build += {
310326
extra.commands: ${vars.default-commands} [
311327
// Deprecated optimizer settings
312328
"removeScalacOptions -Xfatal-warnings"
329+
// Scaladoc generation fails because the wrong scala-xml version is used,
330+
"set every publishArtifact in packageDoc := false"
313331
]
314332
}
315333

@@ -357,6 +375,15 @@ build += {
357375
]
358376
}
359377

378+
${vars.base} {
379+
name: "scala-collection-compat"
380+
uri: ${vars.uris.scala-collection-compat-uri}
381+
extra.commands: ${vars.default-commands} [
382+
// Scaladoc generation fails because the wrong scala-xml version is used,
383+
"set publishArtifact in packageDoc := false"
384+
]
385+
}
386+
360387
${vars.base} {
361388
name: "scalaz"
362389
uri: ${vars.uris.scalaz-uri}
@@ -410,18 +437,15 @@ build += {
410437
]
411438
}
412439

413-
${vars.base} {
414-
name: "scala-async"
415-
uri: ${vars.uris.scala-async-uri}
416-
}
417-
418440
${vars.base} {
419441
name: "sbt-testng"
420442
uri: ${vars.uris.sbt-testng-uri}
421443
extra.projects: ["sbt-testng-interface"] // just the interface, we don't need to build the plugin
422444
extra.options: ["-Dbintray.user=dummy", "-Dbintray.pass=dummy"]
423445
extra.commands: ${vars.default-commands} [
424446
"set every bintrayReleaseOnPublish := false"
447+
// Scaladoc generation fails because the wrong scala-xml version is used,
448+
"set every publishArtifact in packageDoc := false"
425449
]
426450
}
427451

@@ -438,45 +462,24 @@ build += {
438462
check-missing: false // ignore missing scalafmt
439463
}
440464

441-
// forked (January 2018) to explicitly eta-expand in a few places
442-
${vars.base} {
443-
name: "utest"
444-
uri: ${vars.uris.utest-uri}
445-
// no Scala.js plz
446-
extra.projects: ["utestJVM"]
447-
// running tests on 2.13 disabled (January 2018); problem reported upstream
448-
// at https://github.com/lihaoyi/utest/issues/149
449-
extra.test-tasks: ["compile"]
450-
}
451-
452-
${vars.base} {
453-
name: "acyclic"
454-
uri: ${vars.uris.acyclic-uri}
455-
}
456-
457465
${vars.base} {
458466
name: "sourcecode"
459467
uri: ${vars.uris.sourcecode-uri}
460468
// no Scala.js plz
461469
extra.projects: ["sourcecodeJVM"]
462-
}
463-
464-
${vars.base} {
465-
name: "fastparse"
466-
uri: ${vars.uris.fastparse-uri}
467-
extra.projects: [
468-
"fastparseJVM" // no Scala.js plz
469-
"scalaparseJVM" // not essential to include, but hey
470-
]
471470
extra.commands: ${vars.default-commands} [
472-
// literal types break one test
473-
"set executeTests in scalaparseJVM in Test := Tests.Output(TestResult.Passed, Map(), Iterable())"
471+
// Scaladoc generation fails because the wrong scala-xml version is used
472+
"set publishArtifact in packageDoc in jvm := false"
474473
]
475474
}
476475

477476
${vars.base} {
478477
name: "macro-paradise"
479478
uri: ${vars.uris.macro-paradise-uri}
479+
extra.commands: ${vars.default-commands} [
480+
// too fragile
481+
"removeScalacOptions -Xfatal-warnings"
482+
]
480483
}
481484

482485
${vars.base} {
@@ -506,12 +509,20 @@ build += {
506509
name: "machinist"
507510
uri: ${vars.uris.machinist-uri}
508511
extra.projects: ["machinistJVM"] // no Scala.js please
512+
extra.commands: ${vars.default-commands} [
513+
// Scaladoc generation fails because the wrong scala-xml version is used
514+
"set every publishArtifact in packageDoc := false"
515+
]
509516
}
510517

511518
${vars.base} {
512519
name: "kind-projector"
513520
uri: ${vars.uris.kind-projector-uri}
514521
extra.sbt-version: ${vars.sbt-1-version}
522+
extra.commands: ${vars.default-commands} [
523+
// Scaladoc generation fails because the wrong scala-xml version is used
524+
"set every publishArtifact in packageDoc := false"
525+
]
515526
}
516527

517528
${vars.base} {
@@ -593,16 +604,6 @@ build += {
593604
uri: ${vars.uris.cachecontrol-uri}
594605
}
595606

596-
// 3.5 is the current stable branch (as of Oct 2016)
597-
// there is also a brand-new development branch, 3.6, we should
598-
// maybe switch to at some point
599-
${vars.base} {
600-
name: "json4s"
601-
uri: ${vars.uris.json4s-uri}
602-
// TODO: exclude subprojects we don't want, rather than naming a few we want. probably adding more would work?
603-
extra.projects: ["json4s-native", "json4s-jackson", "json4s-ast"]
604-
}
605-
606607
${vars.base} {
607608
name: "catalysts"
608609
uri: ${vars.uris.catalysts-uri}
@@ -624,16 +625,6 @@ build += {
624625
check-missing: false // ignore missing scalafmt
625626
}
626627

627-
${vars.base} {
628-
name: "scalatags"
629-
uri: ${vars.uris.scalatags-uri}
630-
extra.projects: ["scalatagsJVM"] // no Scala.js
631-
extra.commands: ${vars.default-commands} [
632-
// their build.sbt has 'scalaVersion.value startsWith "2.12."', so that doesn't get 2.13
633-
"set unmanagedSourceDirectories in (scalatagsJVM, Compile) += baseDirectory.value / \"scalatags\" / \"shared\" / \"src\" / \"main\" / \"scala-2.11\""
634-
]
635-
}
636-
637628
${vars.base} {
638629
name: "minitest"
639630
uri: ${vars.uris.minitest-uri}
@@ -647,14 +638,6 @@ build += {
647638
extra.exclude: ["coreJS", "testingJS"]
648639
}
649640

650-
// forked (October 2017) because utest 0.6.0 (we track utest master) made
651-
// a source-incompatible change but fansi is still on 0.5.3
652-
${vars.base} {
653-
name: "fansi"
654-
uri: ${vars.uris.fansi-uri}
655-
extra.projects: ["fansiJVM"] // no Scala.js
656-
}
657-
658641
// dependency of scalafix
659642
// (we use allanrenucci's fork because that's where `organization` is set
660643
// as scalafix expects; it's where 0.1.4 was apparently published from,
@@ -664,15 +647,13 @@ build += {
664647
uri: ${vars.uris.scala-xml-quote-uri}
665648
}
666649

667-
${vars.base} {
668-
name: "geny"
669-
uri: ${vars.uris.geny-uri}
670-
extra.projects: ["genyJVM"] // no Scala.js plz
671-
}
672-
673650
${vars.base} {
674651
name: "scalaj-http"
675652
uri: ${vars.uris.scalaj-http-uri}
653+
extra.commands: ${vars.default-commands} [
654+
// Scaladoc generation fails because the wrong scala-xml version is used
655+
"set every publishArtifact in packageDoc := false"
656+
]
676657
}
677658

678659
${vars.base} {
@@ -694,21 +675,6 @@ build += {
694675
]
695676
}
696677

697-
// once https://github.com/scala/scala-collections-laws/pull/18
698-
// is merged we can track master
699-
${vars.base} {
700-
name: "scala-collections-laws"
701-
uri: ${vars.uris.scala-collections-laws-uri}
702-
// as per the repo readme
703-
extra.options: ["-XX:MaxMetaspaceSize=1G", "-Xmx6G"]
704-
// note that we're not actually doing
705-
// `runMain tests.generated.collection.Test_All` which is what
706-
// the repo readme says to do. dbuild doesn't let us set
707-
// extra.test-tasks to a task that takes arguments. (anyway,
708-
// it's not clear it's really necessary or appropriate to
709-
// actually run the whole thing as part of the community build?)
710-
}
711-
712678
${vars.base} {
713679
name: "scalalib"
714680
uri: ${vars.uris.scalalib-uri}

0 commit comments

Comments
 (0)