Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Support for C#'s `packages.*.config` lockfile type
- `phylum firewall log` command to browse firewall activity log

### Fixed

- Gradle manifests incorrectly retained on Windows

## 7.1.5 - 2024-11-26

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion lockfile/src/java.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ impl Parse for GradleLock {
let (_, entries) = gradle_dep::parse(data)
.finish()
.map_err(|e| anyhow!(convert_error(data, e)))
.context("Failed to parse requirements file")?;
.context("Failed to parse gradle lockfile")?;
Ok(entries)
}

Expand Down
41 changes: 39 additions & 2 deletions lockfile/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -372,9 +372,8 @@ pub fn find_depfiles_at(root: impl AsRef<Path>) -> Vec<(PathBuf, LockfileFormat)
// Legacy Gradle (before v7) lockfiles are in a subdirectory,
// so we truncate these directories to get the effective
// directory these lockfiles were created for.
let dir_str = lockfile_dir.to_string_lossy();
if lockfile_format == &LockfileFormat::Gradle
&& dir_str.ends_with("/gradle/dependency-locks")
&& lockfile_dir.ends_with("gradle/dependency-locks")
{
lockfile_dir = lockfile_dir.parent().unwrap().parent().unwrap();
}
Expand Down Expand Up @@ -764,4 +763,42 @@ mod tests {
let expected = vec![(tempdir.path().join("go.mod"), LockfileFormat::GoMod)];
assert_eq!(lockable_files, expected);
}

#[test]
fn skip_build_gradle_with_legacy_lockfiles() {
// Create desired directory structure.
let tempdir = tempfile::tempdir().unwrap();
let files = [
tempdir.path().join("build.gradle"),
tempdir.path().join("gradle/dependency-locks/compile.lockfile"),
tempdir.path().join("gradle/dependency-locks/default.lockfile"),
tempdir.path().join("gradle/dependency-locks/runtime.lockfile"),
];
for file in &files {
let dir = file.parent().unwrap();
fs::create_dir_all(dir).unwrap();
File::create(file).unwrap();
}

// Find lockfiles.
let mut lockfiles = find_depfiles_at(tempdir.path());

// Compare results.
lockfiles.sort_unstable();
let expected = vec![
(
tempdir.path().join("gradle/dependency-locks/compile.lockfile"),
LockfileFormat::Gradle,
),
(
tempdir.path().join("gradle/dependency-locks/default.lockfile"),
LockfileFormat::Gradle,
),
(
tempdir.path().join("gradle/dependency-locks/runtime.lockfile"),
LockfileFormat::Gradle,
),
];
assert_eq!(lockfiles, expected);
}
}
Loading