Skip to content
This repository was archived by the owner on Mar 14, 2025. It is now read-only.

Commit 214a00b

Browse files
Merge branch 'develop' into release/0.1.0
2 parents 3240336 + 5288086 commit 214a00b

File tree

62 files changed

+3220
-177
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+3220
-177
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,8 @@ pom.xml.versionsBackup
1010
.idea/**/tasks.xml
1111
.idea/dictionaries
1212
.idea/**/libraries/
13+
.idea/.name
14+
.idea/encodings.xml
15+
.idea/compiler.xml
16+
.idea/jarRepositories.xml
1317
*.iml

.idea/.name

Lines changed: 0 additions & 1 deletion
This file was deleted.

.idea/codeStyles/Project.xml

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/codeStyles/codeStyleConfig.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/compiler.xml

Lines changed: 0 additions & 16 deletions
This file was deleted.

.idea/encodings.xml

Lines changed: 0 additions & 7 deletions
This file was deleted.

.idea/jarRepositories.xml

Lines changed: 0 additions & 35 deletions
This file was deleted.

pom.xml

Lines changed: 45 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,16 @@
1313

1414
<properties>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
16-
1716
<guava.version>29.0-jre</guava.version>
17+
18+
<okhttp.version>4.7.2</okhttp.version>
19+
<okhttp-digest.version>2.3</okhttp-digest.version>
20+
<okhttp.mockwebserver.version>4.7.2</okhttp.mockwebserver.version>
21+
<kxml2.version>2.3.0</kxml2.version>
22+
23+
<slf4j.version>1.7.28</slf4j.version>
24+
<logback.version>1.2.3</logback.version>
25+
1826
<junit.jupiter.version>5.6.2</junit.jupiter.version>
1927
<mockito.version>3.3.3</mockito.version>
2028
<hamcrest.version>2.2</hamcrest.version>
@@ -49,7 +57,36 @@
4957
<artifactId>guava</artifactId>
5058
<version>${guava.version}</version>
5159
</dependency>
52-
60+
61+
<!-- Logging -->
62+
<dependency>
63+
<groupId>org.slf4j</groupId>
64+
<artifactId>slf4j-api</artifactId>
65+
<version>${slf4j.version}</version>
66+
</dependency>
67+
<dependency>
68+
<groupId>org.slf4j</groupId>
69+
<artifactId>slf4j-simple</artifactId>
70+
<version>${slf4j.version}</version>
71+
</dependency>
72+
73+
<!-- WebDAV -->
74+
<dependency>
75+
<groupId>com.squareup.okhttp3</groupId>
76+
<artifactId>okhttp</artifactId>
77+
<version>${okhttp.version}</version>
78+
</dependency>
79+
<dependency>
80+
<groupId>com.burgstaller</groupId>
81+
<artifactId>okhttp-digest</artifactId>
82+
<version>${okhttp-digest.version}</version>
83+
</dependency>
84+
<dependency>
85+
<groupId>net.sf.kxml</groupId>
86+
<artifactId>kxml2</artifactId>
87+
<version>${kxml2.version}</version>
88+
</dependency>
89+
5390
<!-- Test -->
5491
<dependency>
5592
<groupId>org.junit.jupiter</groupId>
@@ -69,6 +106,12 @@
69106
<version>${hamcrest.version}</version>
70107
<scope>test</scope>
71108
</dependency>
109+
<dependency>
110+
<groupId>com.squareup.okhttp3</groupId>
111+
<artifactId>mockwebserver</artifactId>
112+
<version>${okhttp.mockwebserver.version}</version>
113+
<scope>test</scope>
114+
</dependency>
72115
</dependencies>
73116

74117
<build>

src/main/java/module-info.java

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/main/java/org/cryptomator/cloudaccess/CloudAccess.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ private CloudAccess() {
1616
* @param folder An existing folder on the (local) default file system.
1717
* @return A cloud access provider that provides access to the given local directory.
1818
*/
19-
static CloudProvider toLocalFileSystem(Path folder) {
19+
public static CloudProvider toLocalFileSystem(Path folder) {
2020
return new LocalFsCloudProvider(folder);
2121
}
2222

0 commit comments

Comments
 (0)