Skip to content

build scala-xml again #309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 28, 2016
Merged

build scala-xml again #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3d4a6d
start building scala-xml again
SethTisue Sep 26, 2016
06d4121
Merge remote-tracking branch 'origin/2.12.x' into build-scala-xml-again
SethTisue Sep 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions common.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@
vars: {
scala-version : ""
scala-version : ${?scala_ref} // TODO: change param name in jenkins job -- allow overriding scala-version using the scala_version environment variable
scala-binary-version : ""
scala-binary-version : ${?scala_build_bootstrap_opt} // TODO: change param name in jenkins job
scala-xml-version : "1.0.5"
scala-xml-version : ${?scala_xml_version}

// TODO: merge required changes upstream to get rid of our forks, maintaining our one won't scale
browse-ref : "SethTisue/browse.git#topic/2.12-compat"
Expand Down
9 changes: 5 additions & 4 deletions community.dbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,12 @@ build += {
system: aether
uri: "aether:org.scala-lang#scala-compiler;"${vars.scala-version}
}
// override scalaVersion here since otherwise we get
// whatever random Scala version the module has
{
set-version: ${vars.scala-xml-version}
name: scala-xml
system: aether
uri: "aether:org.scala-lang.modules#scala-xml_"${vars.scala-binary-version}";"${vars.scala-xml-version}
name: "scala-xml"
uri: "https://github.com/"${vars.scala-xml-ref}
extra.commands: "set scalaVersion := \""${vars.scala-version}"\""
}
]
}
Expand Down