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

Started working on supporting sbt 1.0 cross building #158

Merged
merged 2 commits into from Aug 23, 2017
Merged

Conversation

@jroper
Copy link
Member

@jroper jroper commented Aug 14, 2017

Most things compile, except for OpCacheIO needs to be migrated to the new json based sbt cache API. Moving to that API is fairly involved, it requires rewriting all the sbinary formats to sjson-new formats, which I don't have time for right now.

Cross building with sbt 0.13 has been maintained, using scala-sbt-* folders for non source compatible changes.

Most things compile, except for OpCacheIO needs to be migrated to the
new json based sbt cache API.
@jroper jroper mentioned this pull request Aug 14, 2017
1 of 1 task complete
/**
* Support for reading and writing cache files.
*
* TODO: CONVERT TO NEW SBT CACHE API

This comment has been minimized.

@jroper

jroper Aug 14, 2017
Author Member

Basically, this whole file needs to be rewritten.

}

private def generateWebJars(target: File, lib: String, cache: File, classLoader: ClassLoader): Seq[File] = {
withWebJarExtractor(target / lib, cache, classLoader) {
(e, to) =>
e.extractAllWebJarsTo(to)
}
target.***.get
target.**(AllPassFilter).get

This comment has been minimized.

@jroper

jroper Aug 14, 2017
Author Member

allPaths doesn't exist in sbt 0.13.16 (as far as I can see), this is needed to cross build.

* Migrated incremental compilation serialization to sjson based
* Fixed scripted tests against sbt 1.0
@jroper jroper force-pushed the jroper:sbt-1.0 branch from 57c2a62 to c114aa0 Aug 14, 2017
@jroper
Copy link
Member Author

@jroper jroper commented Aug 14, 2017

Upgrade should be complete now.

@jroper
Copy link
Member Author

@jroper jroper commented Aug 18, 2017

@gmethvin this look ok to you?

@joan38
Copy link

@joan38 joan38 commented Aug 21, 2017

It would be cool if we could move forward with this.

@joan38
Copy link

@joan38 joan38 commented Aug 22, 2017

Are we merging this? This is the only plugin currenlty blocking us to use 1.0...

@jroper jroper merged commit 5765d77 into sbt:master Aug 23, 2017
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@jroper jroper deleted the jroper:sbt-1.0 branch Aug 23, 2017
@joan38
Copy link

@joan38 joan38 commented Aug 23, 2017

Great thanks @jroper

@jroper
Copy link
Member Author

@jroper jroper commented Aug 23, 2017

sbt-web 1.4.2 has been released including cross build against sbt 1.0.

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

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.