Skip to content

Commit 1e26e37

Browse files
overheadhunteroverheadhunter
committed
Merge branch 'release/2.0.0'
2 parents 70a809c + c982bee commit 1e26e37

File tree

105 files changed

+2204
-1821
lines changed

Some content is hidden

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

105 files changed

+2204
-1821
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
- uses: actions/checkout@v2
1111
- uses: actions/setup-java@v1
1212
with:
13-
java-version: 11
13+
java-version: 16
1414
- uses: actions/cache@v2
1515
with:
1616
path: ~/.m2/repository

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
fetch-depth: 2
2121
- uses: actions/setup-java@v1
2222
with:
23-
java-version: 11
23+
java-version: 16
2424
- uses: actions/cache@v2
2525
with:
2626
path: ~/.m2/repository

‎.github/workflows/publish-central.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
ref: "refs/tags/${{ github.event.inputs.tag }}"
1616
- uses: actions/setup-java@v1
1717
with:
18-
java-version: 11
18+
java-version: 16
1919
server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
2020
server-username: MAVEN_USERNAME # env variable for username in deploy
2121
server-password: MAVEN_PASSWORD # env variable for token in deploy
@@ -32,6 +32,11 @@ jobs:
3232
- name: Deploy
3333
run: mvn deploy -B -DskipTests -Psign,deploy-central --no-transfer-progress
3434
env:
35+
MAVEN_OPTS: >
36+
--add-opens=java.base/java.util=ALL-UNNAMED
37+
--add-opens=java.base/java.lang.reflect=ALL-UNNAMED
38+
--add-opens=java.base/java.text=ALL-UNNAMED
39+
--add-opens=java.desktop/java.awt.font=ALL-UNNAMED
3540
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
3641
MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
3742
MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}

‎.github/workflows/publish-github.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
- uses: actions/checkout@v2
1111
- uses: actions/setup-java@v1
1212
with:
13-
java-version: 11
13+
java-version: 16
1414
gpg-private-key: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
1515
gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
1616
- uses: actions/cache@v2
@@ -35,6 +35,6 @@ jobs:
3535
SLACK_ICON_EMOJI: ':bot:'
3636
SLACK_CHANNEL: 'cryptomator-desktop'
3737
SLACK_TITLE: "Published ${{ github.event.repository.name }} ${{ github.event.release.tag_name }}"
38-
SLACK_MESSAGE: "Ready to <https://github.com/${{ github.repository }}/actions?query=workflow%3A%22Publish+to+Maven+Central%22|deploy to Maven Central>."
38+
SLACK_MESSAGE: "Ready to <https://github.com/${{ github.repository }}/actions/workflows/publish-central.yml|deploy to Maven Central>."
3939
SLACK_FOOTER:
40-
MSG_MINIMAL: true
40+
MSG_MINIMAL: true

‎.idea/codeStyles/Project.xml‎

Lines changed: 78 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/misc.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
![cryptomator](cryptomator.png)
22

33
[![Build](https://github.com/cryptomator/cryptofs/workflows/Build/badge.svg)](https://github.com/cryptomator/cryptofs/actions?query=workflow%3ABuild)
4-
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/7248ca7d466843f785f79f33374302c2)](https://www.codacy.com/app/cryptomator/cryptofs)
5-
[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/7248ca7d466843f785f79f33374302c2)](https://www.codacy.com/app/cryptomator/cryptofs?utm_source=github.com&utm_medium=referral&utm_content=cryptomator/cryptofs&utm_campaign=Badge_Coverage)
4+
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/7248ca7d466843f785f79f33374302c2)](https://www.codacy.com/gh/cryptomator/cryptofs/dashboard)
5+
[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/7248ca7d466843f785f79f33374302c2)](https://www.codacy.com/gh/cryptomator/cryptofs/dashboard)
66
[![Known Vulnerabilities](https://snyk.io/test/github/cryptomator/cryptofs/badge.svg)](https://snyk.io/test/github/cryptomator/cryptofs)
77

88
**CryptoFS:** Implementation of the [Cryptomator](https://github.com/cryptomator/cryptomator) encryption scheme.
@@ -93,7 +93,7 @@ For more details on how to use the constructed `FileSystem`, you may consult the
9393

9494
### Dependencies
9595

96-
* Java 11
96+
* Java 16 (will be updated to 17 in late 2021)
9797
* Maven 3
9898

9999
### Run Maven

‎pom.xml‎

Lines changed: 30 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>org.cryptomator</groupId>
44
<artifactId>cryptofs</artifactId>
5-
<version>1.9.14</version>
5+
<version>2.0.0</version>
66
<name>Cryptomator Crypto Filesystem</name>
77
<description>This library provides the Java filesystem provider used by Cryptomator.</description>
88
<url>https://github.com/cryptomator/cryptofs</url>
@@ -15,17 +15,24 @@
1515

1616
<properties>
1717
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
18+
<maven.compiler.release>16</maven.compiler.release>
1819

1920
<!-- dependencies -->
20-
<cryptolib.version>1.4.1</cryptolib.version>
21-
<dagger.version>2.29.1</dagger.version>
22-
<guava.version>30.0-jre</guava.version>
23-
<slf4j.version>1.7.30</slf4j.version>
21+
<cryptolib.version>2.0.0</cryptolib.version>
22+
<jwt.version>3.18.1</jwt.version>
23+
<dagger.version>2.37</dagger.version>
24+
<guava.version>30.1.1-jre</guava.version>
25+
<slf4j.version>1.7.31</slf4j.version>
2426

2527
<!-- test dependencies -->
26-
<junit.jupiter.version>5.6.2</junit.jupiter.version>
27-
<mockito.version>3.3.3</mockito.version>
28+
<junit.jupiter.version>5.7.2</junit.jupiter.version>
29+
<mockito.version>3.11.2</mockito.version>
2830
<hamcrest.version>2.2</hamcrest.version>
31+
32+
<!-- build plugin dependencies -->
33+
<dependency-check.version>6.2.2</dependency-check.version>
34+
<jacoco.version>0.8.7</jacoco.version>
35+
<nexus-staging.version>1.6.8</nexus-staging.version>
2936
</properties>
3037

3138
<licenses>
@@ -59,26 +66,27 @@
5966
<artifactId>cryptolib</artifactId>
6067
<version>${cryptolib.version}</version>
6168
</dependency>
69+
<dependency>
70+
<groupId>com.auth0</groupId>
71+
<artifactId>java-jwt</artifactId>
72+
<version>${jwt.version}</version>
73+
</dependency>
74+
<dependency>
75+
<groupId>com.google.dagger</groupId>
76+
<artifactId>dagger</artifactId>
77+
<version>${dagger.version}</version>
78+
</dependency>
6279
<dependency>
6380
<groupId>com.google.guava</groupId>
6481
<artifactId>guava</artifactId>
6582
<version>${guava.version}</version>
6683
</dependency>
67-
68-
<!-- Logging -->
6984
<dependency>
7085
<groupId>org.slf4j</groupId>
7186
<artifactId>slf4j-api</artifactId>
7287
<version>${slf4j.version}</version>
7388
</dependency>
7489

75-
<!-- DI -->
76-
<dependency>
77-
<groupId>com.google.dagger</groupId>
78-
<artifactId>dagger</artifactId>
79-
<version>${dagger.version}</version>
80-
</dependency>
81-
8290
<!-- Test -->
8391
<dependency>
8492
<groupId>org.junit.jupiter</groupId>
@@ -114,33 +122,11 @@
114122

115123
<build>
116124
<plugins>
117-
<plugin>
118-
<groupId>org.apache.maven.plugins</groupId>
119-
<artifactId>maven-enforcer-plugin</artifactId>
120-
<version>3.0.0-M3</version>
121-
<executions>
122-
<execution>
123-
<id>enforce-java</id>
124-
<goals>
125-
<goal>enforce</goal>
126-
</goals>
127-
<configuration>
128-
<rules>
129-
<requireJavaVersion>
130-
<message>You need at least JDK 11.0.3 to build this project.</message>
131-
<version>[11.0.3,)</version>
132-
</requireJavaVersion>
133-
</rules>
134-
</configuration>
135-
</execution>
136-
</executions>
137-
</plugin>
138125
<plugin>
139126
<groupId>org.apache.maven.plugins</groupId>
140127
<artifactId>maven-compiler-plugin</artifactId>
141128
<version>3.8.1</version>
142129
<configuration>
143-
<release>8</release>
144130
<showWarnings>true</showWarnings>
145131
<annotationProcessorPaths>
146132
<path>
@@ -154,19 +140,12 @@
154140
<plugin>
155141
<groupId>org.apache.maven.plugins</groupId>
156142
<artifactId>maven-surefire-plugin</artifactId>
157-
<version>2.22.2</version>
143+
<version>3.0.0-M5</version>
158144
</plugin>
159145
<plugin>
160146
<groupId>org.apache.maven.plugins</groupId>
161147
<artifactId>maven-jar-plugin</artifactId>
162148
<version>3.2.0</version>
163-
<configuration>
164-
<archive>
165-
<manifestEntries>
166-
<Automatic-Module-Name>org.cryptomator.cryptofs</Automatic-Module-Name>
167-
</manifestEntries>
168-
</archive>
169-
</configuration>
170149
</plugin>
171150
<plugin>
172151
<artifactId>maven-source-plugin</artifactId>
@@ -182,7 +161,7 @@
182161
</plugin>
183162
<plugin>
184163
<artifactId>maven-javadoc-plugin</artifactId>
185-
<version>3.2.0</version>
164+
<version>3.3.0</version>
186165
<executions>
187166
<execution>
188167
<id>attach-javadocs</id>
@@ -217,14 +196,6 @@
217196
<tag><name>serialData</name></tag>
218197
<tag><name>see</name></tag>
219198
</tags>
220-
<!-- Used for javax.annotation.Generated in dagger-generated code. Can be removed when using JDK 11+ -->
221-
<additionalDependencies>
222-
<additionalDependency>
223-
<groupId>javax.annotation</groupId>
224-
<artifactId>jsr250-api</artifactId>
225-
<version>1.0</version>
226-
</additionalDependency>
227-
</additionalDependencies>
228199
</configuration>
229200
</plugin>
230201
</plugins>
@@ -238,7 +209,7 @@
238209
<plugin>
239210
<groupId>org.owasp</groupId>
240211
<artifactId>dependency-check-maven</artifactId>
241-
<version>6.1.0</version>
212+
<version>${dependency-check.version}</version>
242213
<configuration>
243214
<cveValidForHours>24</cveValidForHours>
244215
<failBuildOnCVSS>0</failBuildOnCVSS>
@@ -265,7 +236,7 @@
265236
<plugin>
266237
<groupId>org.jacoco</groupId>
267238
<artifactId>jacoco-maven-plugin</artifactId>
268-
<version>0.8.6</version>
239+
<version>${jacoco.version}</version>
269240
<executions>
270241
<execution>
271242
<id>prepare-agent</id>
@@ -291,7 +262,7 @@
291262
<plugins>
292263
<plugin>
293264
<artifactId>maven-gpg-plugin</artifactId>
294-
<version>1.6</version>
265+
<version>3.0.1</version>
295266
<executions>
296267
<execution>
297268
<id>sign-artifacts</id>
@@ -326,7 +297,7 @@
326297
<plugin>
327298
<groupId>org.sonatype.plugins</groupId>
328299
<artifactId>nexus-staging-maven-plugin</artifactId>
329-
<version>1.6.8</version>
300+
<version>${nexus-staging.version}</version>
330301
<extensions>true</extensions>
331302
<configuration>
332303
<serverId>ossrh</serverId>

‎src/main/java/module-info.java‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
import org.cryptomator.cryptofs.CryptoFileSystemProvider;
2+
3+
import java.nio.file.spi.FileSystemProvider;
4+
5+
module org.cryptomator.cryptofs {
6+
requires transitive org.cryptomator.cryptolib;
7+
requires com.google.common;
8+
requires org.slf4j;
9+
requires dagger;
10+
requires com.auth0.jwt;
11+
12+
// filename-based module required by dagger
13+
// we will probably need to live with this for a while:
14+
// https://github.com/javax-inject/javax-inject/issues/33
15+
// May be provided by another lib during runtime
16+
requires static javax.inject;
17+
18+
exports org.cryptomator.cryptofs;
19+
exports org.cryptomator.cryptofs.common;
20+
exports org.cryptomator.cryptofs.migration;
21+
exports org.cryptomator.cryptofs.migration.api;
22+
23+
provides FileSystemProvider with CryptoFileSystemProvider;
24+
}

0 commit comments

Comments
 (0)