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

Fix for #52 - Eliminate Duplicate Licenses #54

Merged

Conversation

iankerr
Copy link
Contributor

@iankerr iankerr commented Sep 14, 2018

This is is a proposed fix for issue #52

I changed the HtmlReport class a bit to lookup licenses in the license map by url and name, and group them all together in the report.

Also:
-adds elements for all licenses (including "no license) - not just the ones in the license map
-updates tests to reflect my changes
-adds more names/urls for the Apache 2.0 license
-adds the CC0 1.0 Universal license to the map

@jaredsburrows
Copy link
Owner

@iankerr Since I merged your other PR, can you fix your conflicts?

@iankerr
Copy link
Contributor Author

iankerr commented Sep 18, 2018

Hmmm... I merged in your recent changes, and now the build is failing.

Error: "Could not create an instance of Tooling API implementation using the specified Gradle distribution 'https://services.gradle.org/distributions/gradle-3.4-bin.zip'"

Any idea what's wrong?

@jaredsburrows jaredsburrows merged commit 9a8a3a5 into jaredsburrows:master Dec 19, 2018
jaredsburrows added a commit that referenced this pull request Dec 19, 2018
jaredsburrows added a commit that referenced this pull request Dec 19, 2018
@jaredsburrows
Copy link
Owner

Sorry. I merged without fixing the build. Do you mind pushing this back up so we can merge it?

@iankerr
Copy link
Contributor Author

iankerr commented Dec 19, 2018

I've re-created the pull request: #57 ...hopefully that's what you're asking for?

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