Skip to content

Commit f47a1e4

Browse files
committed
fix handling of scala-xml version numbers
fixes #679
1 parent fc75450 commit f47a1e4

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

configs/community.dbuild

+5-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ options.cleanup: {
105105
build += {
106106
sbt-version: ${vars.sbt-version}
107107
extraction-version: ${vars.scala-version}
108-
cross-version: disabled
109108

110109
space: scala
111110

@@ -117,6 +116,7 @@ build += {
117116
{
118117
name: "scala"
119118
system: assemble
119+
cross-version: binary
120120
extra.parts.projects: [
121121
{
122122
set-version: ${vars.scala-version}
@@ -140,6 +140,10 @@ build += {
140140
{
141141
name: "scala-xml"
142142
uri: "https://github.com/scala/scala-xml.git"
143+
// this gives us "scala-xml_2.12" which is what we want, sbt 1 will get
144+
// upset if there are two different kinds of scala-xml dependencies
145+
// floating around (https://github.com/scala/community-builds/issues/679)
146+
cross-version: standard
143147
// override sbt version here since otherwise we get
144148
// whatever random sbt version the module has
145149
extra.sbt-version: ${vars.sbt-version}

0 commit comments

Comments
 (0)