Skip to content

Update dependencies to latest version and enable dependabot #36

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

Merged
DavyLandman merged 3 commits into from
Apr 15, 2025
Merged

Update dependencies to latest version and enable dependabot #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
48ecdb3
Using latest versions of dependencies
DavyLandman Apr 15, 2025
e881010
Configure dependabot
DavyLandman Apr 15, 2025
3ade460
Fixed null annotations
DavyLandman Apr 15, 2025
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
29 changes: 29 additions & 0 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
version: 2
updates:
- package-ecosystem: "maven"
directory: "/"
schedule:
interval: "monthly"
open-pull-requests-limit: 10
groups:
upstream-libs:
patterns:
- "*"
exclude-patterns:
- "*checkerframework*"
- "*maven.plugins*"
checker-framework:
patterns:
- "*checkerframework*"
maven-plugins:
patterns:
- "*maven.plugins*"

- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "monthly"
groups:
gh-actions:
patterns:
- "*" # group all GH action upgrades in a single PR
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<checkerframework.version>3.42.0</checkerframework.version>
<junit.version>5.10.2</junit.version>
<log4j.version>2.23.0</log4j.version>
<checkerframework.version>3.49.2</checkerframework.version>
<junit.version>5.12.2</junit.version>
<log4j.version>2.24.3</log4j.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
</properties>
Expand Down Expand Up @@ -204,7 +204,7 @@
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>4.2.2</version>
<version>4.3.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/engineering/swat/watch/impl/overflows/IndexingRescanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;

import engineering.swat.watch.WatchEvent;
Expand All @@ -59,7 +60,7 @@ public IndexingRescanner(Executor exec, Path path, WatchScope scope) {
new Indexer(path, scope).walkFileTree(); // Make an initial scan to populate the index
}

private static class PathMap<V> {
private static class PathMap<V extends @NonNull Object > {
private final Map<Path, Map<Path, V>> values = new ConcurrentHashMap<>();
// ^^^^ ^^^^
// Parent File name (regular file or directory)
Expand All @@ -85,7 +86,7 @@ public Set<Path> getFileNames(Path parent) {
return apply(this::remove, p);
}

private static <V> @Nullable V apply(BiFunction<Path, Path, @Nullable V> action, Path p) {
private static <V extends @Nullable Object> V apply(BiFunction<Path, Path, V> action, Path p) {
var parent = p.getParent();
var fileName = p.getFileName();
if (parent != null && fileName != null) {
Expand Down