@@ -242,7 +242,7 @@ build += {
242
242
// (in a community build context, we don't need MiMa to run)
243
243
"set every ScalaModulePlugin.mimaPreviousVersion := None"
244
244
// Scaladoc generation fails because the wrong scala-xml version is used
245
- "set every publishArtifact in packageDoc := false"
245
+ "set publishArtifact in packageDoc in `scala-parser-combinatorsJVM` := false"
246
246
]
247
247
}
248
248
@@ -292,6 +292,7 @@ build += {
292
292
]
293
293
}
294
294
295
+ // using Lukas's 2.13-friendly fork
295
296
${vars.base} {
296
297
name: "scalacheck"
297
298
uri: ${vars.uris.scalacheck-uri}
@@ -300,7 +301,7 @@ build += {
300
301
// because of new unused warnings in 2.12.2
301
302
"removeScalacOptions -Xfatal-warnings"
302
303
// Scaladoc generation fails because the wrong scala-xml version is used,
303
- "set every publishArtifact in packageDoc := false"
304
+ "set publishArtifact in packageDoc in jvm := false"
304
305
]
305
306
}
306
307
@@ -313,6 +314,10 @@ build += {
313
314
extra.settings: ${vars.base.extra.settings} [
314
315
"conflictWarning in ThisBuild := ConflictWarning.disable"
315
316
]
317
+ extra.commands: ${vars.default-commands} [
318
+ // Scaladoc generation fails because the wrong scala-xml version is used
319
+ "set publishArtifact in packageDoc in scalacticMacro := false"
320
+ ]
316
321
}
317
322
318
323
${vars.base} {
@@ -327,7 +332,7 @@ build += {
327
332
// Deprecated optimizer settings
328
333
"removeScalacOptions -Xfatal-warnings"
329
334
// Scaladoc generation fails because the wrong scala-xml version is used,
330
- "set every publishArtifact in packageDoc := false"
335
+ "set publishArtifact in packageDoc := false"
331
336
]
332
337
}
333
338
@@ -445,7 +450,7 @@ build += {
445
450
extra.commands: ${vars.default-commands} [
446
451
"set every bintrayReleaseOnPublish := false"
447
452
// Scaladoc generation fails because the wrong scala-xml version is used,
448
- "set every publishArtifact in packageDoc := false"
453
+ "set publishArtifact in packageDoc := false"
449
454
]
450
455
}
451
456
@@ -511,17 +516,18 @@ build += {
511
516
extra.projects: ["machinistJVM"] // no Scala.js please
512
517
extra.commands: ${vars.default-commands} [
513
518
// Scaladoc generation fails because the wrong scala-xml version is used
514
- "set every publishArtifact in packageDoc := false"
519
+ "set publishArtifact in packageDoc in machinistJVM := false"
515
520
]
516
521
}
517
522
523
+ // using Seth's 2.13-friendly fork
518
524
${vars.base} {
519
525
name: "kind-projector"
520
526
uri: ${vars.uris.kind-projector-uri}
521
527
extra.sbt-version: ${vars.sbt-1-version}
522
528
extra.commands: ${vars.default-commands} [
523
529
// Scaladoc generation fails because the wrong scala-xml version is used
524
- "set every publishArtifact in packageDoc := false"
530
+ "set publishArtifact in packageDoc := false"
525
531
]
526
532
}
527
533
@@ -652,7 +658,7 @@ build += {
652
658
uri: ${vars.uris.scalaj-http-uri}
653
659
extra.commands: ${vars.default-commands} [
654
660
// Scaladoc generation fails because the wrong scala-xml version is used
655
- "set every publishArtifact in packageDoc := false"
661
+ "set publishArtifact in packageDoc := false"
656
662
]
657
663
}
658
664
0 commit comments