Skip to content
This repository was archived by the owner on Sep 8, 2022. It is now read-only.

Build for Scala 2.11.7, 2.12.0-M1, 2.12.0-M2 and 2.12.0-M3 #43

Merged
merged 2 commits into from
Dec 4, 2015

Conversation

szeiger
Copy link
Contributor

@szeiger szeiger commented Dec 3, 2015

To be tagged as release 1.0.11.

@szeiger szeiger force-pushed the wip/release-1.0.11 branch from f480422 to 10f9080 Compare December 3, 2015 19:42
else
sys.error(s"don't know what Scala versions to build on $java")
}

scalaXmlVersion := "1.0.4"
scalaXmlVersion := {
if(scalaVersion.value == "2.12.0-M3") "1.0.5" else "1.0.4"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

won't this break as soon as we do M4? how about if(scalaVersion.value == "2.12.0-M2") "1.0.4" else "1.0.5"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When we do M4 (and it's not binary compatible), we need to update scala-partest anyway (and scala-xml may well be an even newer version then), so I don't think it really makes a difference which way you write that check.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, the way it is at the moment is easier. We need 1.0.5 for 2.12.0-M3 and 1.0.4 for 2.12.0-M2, 2.12.0-M1 and 2.11.

@szeiger
Copy link
Contributor Author

szeiger commented Dec 3, 2015

Do not release / tag this yet. Another bugfix is coming.

It used to be searched in ./build but that doesn’t work for the sbt
build, where it is actually under ./build-sbt. The correct path is
already on the partest classpath, so we can simply pull it from there
with `findArtifact` instead of using `findJar`.

Some other obsolete uses of `findJar` along with `buildPackLibDir` are
also removed.
@szeiger
Copy link
Contributor Author

szeiger commented Dec 3, 2015

Added the bugfix. From my POV this is ready to be released so I can use it from the Scala build.

@adriaanm
Copy link
Contributor

adriaanm commented Dec 4, 2015

LGTM

adriaanm added a commit that referenced this pull request Dec 4, 2015
Build for Scala 2.11.7, 2.12.0-M1, 2.12.0-M2 and 2.12.0-M3
@adriaanm adriaanm merged commit 047cb32 into scala:master Dec 4, 2015
lrytz pushed a commit to lrytz/scala-partest that referenced this pull request May 9, 2018
Build for Scala 2.11.7, 2.12.0-M1, 2.12.0-M2 and 2.12.0-M3
lrytz pushed a commit to lrytz/scala-partest that referenced this pull request May 9, 2018
Build for Scala 2.11.7, 2.12.0-M1, 2.12.0-M2 and 2.12.0-M3
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants