File tree 1 file changed +5
-1
lines changed
1 file changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -105,7 +105,6 @@ options.cleanup: {
105
105
build += {
106
106
sbt-version: ${vars.sbt-version}
107
107
extraction-version: ${vars.scala-version}
108
- cross-version: disabled
109
108
110
109
space: scala
111
110
@@ -117,6 +116,7 @@ build += {
117
116
{
118
117
name: "scala"
119
118
system: assemble
119
+ cross-version: binary
120
120
extra.parts.projects: [
121
121
{
122
122
set-version: ${vars.scala-version}
@@ -140,6 +140,10 @@ build += {
140
140
{
141
141
name: "scala-xml"
142
142
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
143
147
// override sbt version here since otherwise we get
144
148
// whatever random sbt version the module has
145
149
extra.sbt-version: ${vars.sbt-version}
You can’t perform that action at this time.
0 commit comments