Skip to content

Commit 2641392

Browse files
committed
further progress on new collections
references #710
1 parent dda4143 commit 2641392

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

configs/community.dbuild

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ build += {
242242
// (in a community build context, we don't need MiMa to run)
243243
"set every ScalaModulePlugin.mimaPreviousVersion := None"
244244
// 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"
246246
]
247247
}
248248

@@ -292,6 +292,7 @@ build += {
292292
]
293293
}
294294

295+
// using Lukas's 2.13-friendly fork
295296
${vars.base} {
296297
name: "scalacheck"
297298
uri: ${vars.uris.scalacheck-uri}
@@ -300,7 +301,7 @@ build += {
300301
// because of new unused warnings in 2.12.2
301302
"removeScalacOptions -Xfatal-warnings"
302303
// 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"
304305
]
305306
}
306307

@@ -313,6 +314,10 @@ build += {
313314
extra.settings: ${vars.base.extra.settings} [
314315
"conflictWarning in ThisBuild := ConflictWarning.disable"
315316
]
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+
]
316321
}
317322

318323
${vars.base} {
@@ -327,7 +332,7 @@ build += {
327332
// Deprecated optimizer settings
328333
"removeScalacOptions -Xfatal-warnings"
329334
// Scaladoc generation fails because the wrong scala-xml version is used,
330-
"set every publishArtifact in packageDoc := false"
335+
"set publishArtifact in packageDoc := false"
331336
]
332337
}
333338

@@ -445,7 +450,7 @@ build += {
445450
extra.commands: ${vars.default-commands} [
446451
"set every bintrayReleaseOnPublish := false"
447452
// Scaladoc generation fails because the wrong scala-xml version is used,
448-
"set every publishArtifact in packageDoc := false"
453+
"set publishArtifact in packageDoc := false"
449454
]
450455
}
451456

@@ -511,17 +516,18 @@ build += {
511516
extra.projects: ["machinistJVM"] // no Scala.js please
512517
extra.commands: ${vars.default-commands} [
513518
// 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"
515520
]
516521
}
517522

523+
// using Seth's 2.13-friendly fork
518524
${vars.base} {
519525
name: "kind-projector"
520526
uri: ${vars.uris.kind-projector-uri}
521527
extra.sbt-version: ${vars.sbt-1-version}
522528
extra.commands: ${vars.default-commands} [
523529
// Scaladoc generation fails because the wrong scala-xml version is used
524-
"set every publishArtifact in packageDoc := false"
530+
"set publishArtifact in packageDoc := false"
525531
]
526532
}
527533

@@ -652,7 +658,7 @@ build += {
652658
uri: ${vars.uris.scalaj-http-uri}
653659
extra.commands: ${vars.default-commands} [
654660
// Scaladoc generation fails because the wrong scala-xml version is used
655-
"set every publishArtifact in packageDoc := false"
661+
"set publishArtifact in packageDoc := false"
656662
]
657663
}
658664

configs/project-refs.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ vars.uris: {
5353
jawn-0-10-uri: "https://github.com/non/jawn.git#v0.10.4"
5454
jawn-0-11-uri: "https://github.com/non/jawn.git#v0.11.1"
5555
json4s-uri: "https://github.com/json4s/json4s.git#3.5"
56-
kind-projector-uri: "https://github.com/non/kind-projector.git"
56+
kind-projector-uri: "https://github.com/SethTisue/kind-projector.git#new-collections" # was non, master
5757
kxbmap-configs-uri: "https://github.com/kxbmap/configs.git"
5858
lagom-uri: "https://github.com/lagom/lagom.git"
5959
lift-json-uri: "https://github.com/lift/framework.git"

0 commit comments

Comments
 (0)