mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-19 17:16:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/modular

Browse Source 
# Conflicts:
#	pom.xml
#	src/main/resources/license/THIRD-PARTY.txt
This commit is contained in:
Sebastian Stenzel
2021-06-26 17:48:13 +02:00
parent 94e26da693 46691f057e
commit 429ca6cfd0
52 changed files with 368 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,11 +23,10 @@ module org.cryptomator.desktop {
requires org.slf4j;
requires org.apache.commons.lang3;
requires dagger;
requires com.auth0.jwt;
/* TODO: filename-based modules: */
requires static javax.inject; /* ugly dagger/guava crap */
requires java.jwt;
requires com.fasterxml.jackson.databind; // TODO: tmp fix, waiting for https://github.com/auth0/java-jwt/pull/484
requires logback.classic;
requires logback.core;