-
Notifications
You must be signed in to change notification settings - Fork 59
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.
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
merge 2.12.x to 2.13.x, unfreeze, refreeze #980
Conversation
unfreeze project SHAs
this will make it easier to merge changes from 2.12.x onto the other branches
fix sttp (downgrade sbt)
queued: https://scala-ci.typesafe.com/job/scala-2.13.x-integrate-community-build/2631/ PR doesn't include a refreeze commit yet (since the freeze script needs a Jenkins run to use as reference) |
3ac063b
to
045be61
Compare
I'm hitting a tough problem with scala-parallel-collections where if I use sbt 1.3.2, junit somehow isn't on the classpath, but I can't downgrade to 1.2.8 because the latest mima doesn't work there it were some random third-party project I'd probably just freeze or fork it, but scala-parallel-collections is one where it seems pretty important that we track master I will dig into the junit classpath thing and try and find a solution or workaround, I already tried and failed once a week or two ago, but I'll try again. |
I found a workaround, |
notes to self needs revisiting/reporting
doneakkatest failure reproducible outside dbuild, reported upstream maybe donescalametaweird coursier dependency problem, let's just freeze scalameta monix[monix] [error] **** Missing dependency: the library io.monix#implicitbox is not provided (in space "scala.main") by any project in this configuration file. ah, just need to add this: // dependency of monix twitter-utilweird investigation steps:
possible next steps:
what about looking at the s-p-c JAR and seeing if the classes are missing? hmm, what about trying to reproduce it outside dbuild using scala-js
huh, this looks similar to the twitter-util thing! fast-string-interpolator
avro4swtf is this
can we reproduce outside dbuild?
upstream PR submitted |
5a6d851
to
32a3e5e
Compare
rebased. split the scala-parallel-collections trouble out as #981 |
I haven't seen this fail on Jenkins, but I have seen it fail locally. we just want it to extract, anyway; we can revisit when we move to ScalaTest 3.1
geting close! https://scala-ci.typesafe.com/job/scala-2.13.x-integrate-community-build/2644/artifact/logs/monix-build.log monix needs older cats, I think? https://scala-ci.typesafe.com/job/scala-2.13.x-integrate-community-build/2644/artifact/logs/akka-http-build.log akka-http test failure, perhaps intermittent? but seen twice so far, maybe it's consistent |
973d43e
to
358f0e6
Compare
74e0bca
to
df012da
Compare
notably, this adds the
configs/unfrozen-refs.conf
file from 2.12.x (but with appropriate 2.13.x contents), so we have both the frozen and unfrozen states always in version control