Magic-Mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2024-10-06 16:53:31 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Remove Guava dependency and update Dagger
Some checks are pending
Build / Compile and Test (push) Waiting to run
Details

Browse Source
This commit is contained in:
Armin Schrenk 2024-10-01 17:19:31 +02:00 committed by GitHub
parent 03403e53bc
commit 0a968b60aa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pom.xml
View File

@ -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>

6
src/main/java/module-info.java
View File

@ -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;