Allow .module files to be uploaded #843
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tobias
reviewed
Aug 13, 2022
src/clojars/routes/repo.clj
Outdated
Comment on lines
165
to
169
| (defn find-module [dir] | ||
| (->> dir | ||
| file-seq | ||
| (filter module?) | ||
| first)) |
There was a problem hiding this comment.
Minor: you could use clojars.util/filter-some here instead:
Suggested change
| (defn find-module [dir] | |
| (->> dir | |
| file-seq | |
| (filter module?) | |
| first)) | |
| (defn find-module [dir] | |
| (util/filter-some module? (file-seq dir))) |
There was a problem hiding this comment.
Done! Also added a new commit to do the same in find-pom for consistency. I can drop that commit, if you'd prefer not to have that function changed.
There was a problem hiding this comment.
Thanks for cleaning up that usage as well! We'll keep the commit.
Gradle module files [1] are Gradle's alternative to POM files. They have a similar goal of defining the primary component group/artifact/version that was published along with its dependencies. Additionally they allow declaring variants of the main component that may have different dependencies or capabilities. We're doing very minimal validation, parsing it as JSON and validating the top-level component group/module/version the upload path (as is already done for POM files). [1] https://docs.gradle.org/current/userguide/publishing_gradle_module_metadata.html Fixes #835
For consistency with the find-module function.
|
I merged and deployed this as part of Clojars 177. Let me know if you see any issues with it, and thanks for the contribution! |
Just did a quick test and everything works great! I appreciate the quick reviews and feedback. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Gradle module files [1] are Gradle's alternative to POM files. They have a similar goal of defining the primary component
group/artifact/version that was published along with its dependencies. Additionally they allow declaring variants of the main
component that may have different dependencies or capabilities.
We're doing very minimal validation, parsing it as JSON and validating the top-level component group/module/version the upload path (as is already done for POM files).
It does look like Gradle uploads
maven-metadata.xmllast, so I believe this should fit in with how the existing validation works. I think this is the line in Gradle's code that implies the order.[1] https://docs.gradle.org/current/userguide/publishing_gradle_module_metadata.html
Fixes #835
This was my first crack at it. Open to any feedback or changes that you'd like to see.