Skip to content
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

Import correct resolver from librarymanagement #746

Merged
merged 5 commits into from Jan 31, 2018
Merged

Import correct resolver from librarymanagement #746

merged 5 commits into from Jan 31, 2018

Conversation

leonardehrenfried
Copy link
Collaborator

This might be a solution for #745 by importing the correct version of the Resolver type from sbt.librarymanagement rather than sbt thereby sidestepping the issue described here: sbt/librarymanagement#190 (comment)

@leonardehrenfried
Copy link
Collaborator Author

Ok, this doesn't work on 0.13, as sbt.librarymanagement.Resolver isn't in sbt-compat yet.

I've added a PR for this: dwijnand/sbt-compat#8

@leonardehrenfried
Copy link
Collaborator Author

I'm getting test failures that seem unrelated:

Line 1:
  expected: org.webjars.bower:jquery:3.2.1:compile
  got:      org.webjars.bower:jquery:3.3.1:compile
X coursier.test.CentralNexus3ProxyTests.versionInterval 14081ms 
  utest.AssertionError: assert(result == expected)
  result: scala.collection.immutable.Vector[String] = Vector(org.webjars.bower:jquery:3.3.1:compile,
   org.webjars.bower:jquery-mousewheel:3.1.13:compile, org.webjars.bower:malihu-custom-scrollbar-plu
  gin:3.1.5:compile)
  expected: Seq[String] = WrappedArray(org.webjars.bower:jquery:3.2.1:compile, org.webjars.bower:jqu
  ery-mousewheel:3.1.13:compile, org.webjars.bower:malihu-custom-scrollbar-plugin:3.1.5:compile)

jquery 3.3.0 and 3.3.1 were released two days ago. Seems that the real world has changed. I'm going to fix the test, if that's ok.

@leonardehrenfried
Copy link
Collaborator Author

Closing and reopening to rerun CI.

@leonardehrenfried
Copy link
Collaborator Author

Ok, now I'm officially confused.

When I change the test expectation, the test fails because it is expecting version 3.2.1, which is the old version of jquery.

Can you help?

@alexarchambault
Copy link
Member

alexarchambault commented Jan 22, 2018

@leonardehrenfried I'll have a look. I think the failing test might need to be put behind a condition like that one. The main tests just rely on what's in this repo, so shouldn't need to be updated like this. But the tests are also run via docker-based Nexus proxies, which download stuff… The isActualCentral condition makes things not run there.

@alexarchambault
Copy link
Member

@leonardehrenfried Rebase if you'd like (as the nexus proxy tests are disabled), CI should be fine then.

@leonardehrenfried
Copy link
Collaborator Author

Ok, rebased.

@alexarchambault
Copy link
Member

@leonardehrenfried You want this to be merged, right? (I mean, it's not just for testing?)

@leonardehrenfried
Copy link
Collaborator Author

leonardehrenfried commented Jan 31, 2018 via email

@alexarchambault
Copy link
Member

Ok, merging then!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants