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.

Sign up for GitHub

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

Jump to bottom

Prevent artifact locations that are directories from being opened as zip files #182

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −0
Open

Prevent artifact locations that are directories from being opened as zip files #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...ses-plugin/src/main/groovy/com/google/android/gms/oss/licenses/plugin/LicensesTask.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,10 @@ class LicensesTask extends DefaultTask {
}

protected void addGooglePlayServiceLicenses(File artifactFile) {
if (artifactFile.isDirectory()) {
return
}

ZipFile licensesZip = new ZipFile(artifactFile)
JsonSlurper jsonSlurper = new JsonSlurper()

Expand Down
9 changes: 9 additions & 0 deletions ...ses-plugin/src/test/java/com/google/android/gms/oss/licenses/plugin/LicensesTaskTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,15 @@ public void testAddGooglePlayServiceLicenses_withoutDuplicate() throws IOExcepti
assertTrue(licensesTask.licensesMap.containsKey("JSR 305"));
}

@Test
public void testAddGooglePlayServiceLicenses_artifactLocationIsDirectory() throws IOException {
try {
licensesTask.addGooglePlayServiceLicenses(licensesTask.getOutputDir());
} catch (Exception e) {
fail("This test should not throw an Exception.");
}
}

@Test
public void testAppendLicense() throws IOException {
licensesTask.appendLicense("license1", "test".getBytes(UTF_8));
Expand Down