From 0a968b60aa97b7ba21c9390ac128581ac439d49d Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 1 Oct 2024 17:19:31 +0200
Subject: [PATCH] Remove Guava dependency and update Dagger

---
 pom.xml                        | 36 ++++++----------------------------
 src/main/java/module-info.java |  6 +++---
 2 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/pom.xml b/pom.xml
index ae12f90a4..4ae743546 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,9 +43,8 @@
 
 		<!-- 3rd party dependencies -->
 		<commons-lang3.version>3.16.0</commons-lang3.version>
-		<dagger.version>2.51.1</dagger.version>
+		<dagger.version>2.52</dagger.version>
 		<easybind.version>2.2</easybind.version>
-		<guava.version>33.3.0-jre</guava.version>
 		<jackson.version>2.17.2</jackson.version>
 		<javafx.version>22.0.2</javafx.version>
 		<jwt.version>4.4.0</jwt.version>
@@ -191,39 +190,16 @@
 		</dependency>
 
 		<!-- Google -->
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>${guava.version}</version>
-			<exclusions>
-				<!-- see https://github.com/google/guava/wiki/UseGuavaInYourBuild#what-about-guavas-own-dependencies -->
-				<exclusion>
-					<groupId>com.google.guava</groupId>
-					<artifactId>listenablefuture</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.google.code.findbugs</groupId>
-					<artifactId>jsr305</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.checkerframework</groupId>
-					<artifactId>checker-qual</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.google.errorprone</groupId>
-					<artifactId>error_prone_annotations</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.google.j2objc</groupId>
-					<artifactId>j2objc-annotations</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
 		<dependency>
 			<groupId>com.google.dagger</groupId>
 			<artifactId>dagger</artifactId>
 			<version>${dagger.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>jakarta.inject</groupId>
+			<artifactId>jakarta.inject-api</artifactId>
+			<version>2.0.1</version>
+		</dependency>
 
 		<!-- JUnit / Mockito / Hamcrest -->
 		<dependency>
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 3d4194bb3..55a6162d6 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -42,13 +42,13 @@ open module org.cryptomator.desktop {
 	requires com.nulabinc.zxcvbn;
 	requires com.tobiasdiez.easybind;
 	requires dagger;
-	requires java.compiler;
 	requires io.github.coffeelibs.tinyoauth2client;
 	requires org.slf4j;
 	requires org.apache.commons.lang3;
 
-	/* TODO: filename-based modules: */
-	requires static javax.inject; /* ugly dagger/guava crap */
+	/* dagger bs */
+	requires jakarta.inject;
+	requires java.compiler;
 
 	uses org.cryptomator.common.locationpresets.LocationPresetsProvider;