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

Update scrimage to 4.x from 2.x & fix copying resources #529

Merged
merged 7 commits into from
Jan 26, 2021

Conversation

sloshy
Copy link
Contributor

@sloshy sloshy commented Jan 15, 2021

Scrimage, a dependency of sbt-microsites, has actually been significantly out of date for some time, probably due to a dependency name change from scrimage-core to scrimage-scala for the Scala-specific dependencies. This updates the library, and replaces the one usage of it using the latest syntax.

EDIT: The scope of this has expanded slightly to also fixing the build, by rewriting the copyJARResourcesTo function (now copyResourcesFromFileSystem) to work with arbitrary filesystems. While I'm not entirely sure what the cause of the build issues was, this issue might have had something to do with the specific JDK I am using (adoptopenjdk 8) as the issue was nonexistent before, and only popped up recently in the build.

@sloshy sloshy requested a review from rafaparadela January 15, 2021 22:12
@github-actions github-actions bot added the dependency-update A dependency version update label Jan 15, 2021
@sloshy sloshy mentioned this pull request Jan 15, 2021
BenFradet
BenFradet previously approved these changes Jan 18, 2021
Copy link
Contributor

@BenFradet BenFradet left a comment

Choose a reason for hiding this comment

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

👍

@sloshy sloshy removed the request for review from rafaparadela January 18, 2021 15:50
@sloshy sloshy changed the title Update scrimage to 4.x from 2.x Update scrimage to 4.x from 2.x & rewrite copying from JARs Jan 19, 2021
@sloshy sloshy changed the title Update scrimage to 4.x from 2.x & rewrite copying from JARs Update scrimage to 4.x from 2.x & fix copying resources Jan 19, 2021
@sloshy sloshy added the bug Something isn't working label Jan 19, 2021
@sloshy
Copy link
Contributor Author

sloshy commented Jan 20, 2021

Currently working with the scripted tests, as these are failing now. The new copying resources code isn't quite matching up and I've got a lead on where to fix it at least. Hold off on reviewing for now.

@sloshy
Copy link
Contributor Author

sloshy commented Jan 20, 2021

The build is "fixed" in terms of, if you pull this branch locally and run sbt ci-test, it will work assuming you have jekyll set up. Apparently there's a problem with the jekyll setup on GitHub Actions, so I've logged that in a comment on #531. For all intents and purposes I think this PR is technically reviewable again. Please run the tests locally if you want to confirm that it's just github having a jekyll problem.

@sloshy sloshy mentioned this pull request Jan 26, 2021
@sloshy sloshy merged commit 289f229 into master Jan 26, 2021
@sloshy sloshy deleted the dep/scrimage-4 branch January 26, 2021 16:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working dependency-update A dependency version update
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants