Skip to content

Commit 46e8c9f

Browse files
infeoinfeo
committed
Merge branch 'release/1.0.0'
2 parents 59da5b6 + 11b6c9f commit 46e8c9f

File tree

43 files changed

+88
-35
lines changed

Some content is hidden

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

43 files changed

+88
-35
lines changed

‎.crowdin.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
commit_message: '[ci skip]'
2+
files:
3+
- source: /src/main/resources/WinIntegrationsBundle.properties
4+
translation: /src/main/resources/WinIntegrationsBundle_%two_letters_code%.properties
5+
escape_quotes: 0
6+
escape_special_characters: 0

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ jobs:
2020
- name: Ensure to use tagged version
2121
if: startsWith(github.ref, 'refs/tags/')
2222
shell: bash
23-
run: |
24-
mvn versions:set --file ./pom.xml -DnewVersion=${GITHUB_REF##*/}
23+
run: mvn versions:set --file ./pom.xml -DnewVersion=${GITHUB_REF##*/}
2524
- name: Build and Test
2625
id: buildAndTest
2726
run: mvn -B clean install -Pdependency-check

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ jobs:
2828
restore-keys: |
2929
${{ runner.os }}-maven-
3030
- name: Enforce project version ${{ github.event.inputs.tag }}
31-
run: mvn versions:set -B -DnewVersion=${{ github.event.inputs.tag }}
31+
run: mvn versions:set -B -DnewVersion="${{ github.event.inputs.tag }}"
3232
- name: Deploy
33-
run: mvn deploy -B -DskipTests -Psign,deploy-central --no-transfer-progress
33+
run: mvn deploy -B -DskipTests -Psign -Pdeploy-central --no-transfer-progress
3434
env:
3535
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
3636
MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}

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

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,9 @@ jobs:
2020
restore-keys: |
2121
${{ runner.os }}-maven-
2222
- name: Enforce project version ${{ github.event.release.tag_name }}
23-
run: mvn versions:set -B -DnewVersion=${{ github.event.release.tag_name }}
23+
run: mvn versions:set -B -DnewVersion="${{ github.event.release.tag_name }}"
2424
- name: Deploy
25-
run: mvn deploy -B -DskipTests -Psign,deploy-github --no-transfer-progress
25+
run: mvn deploy -B -DskipTests -Psign -Pdeploy-github --no-transfer-progress
2626
env:
2727
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
28-
MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
29-
- name: Slack Notification
30-
uses: rtCamp/action-slack-notify@v2
31-
env:
32-
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
33-
SLACK_USERNAME: 'Cryptobot'
34-
SLACK_ICON:
35-
SLACK_ICON_EMOJI: ':bot:'
36-
SLACK_CHANNEL: 'cryptomator-desktop'
37-
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>."
39-
SLACK_FOOTER:
40-
MSG_MINIMAL: true
28+
MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}

‎pom.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>org.cryptomator</groupId>
77
<artifactId>integrations-win</artifactId>
8-
<version>1.0.1-beta1</version>
8+
<version>1.0.0</version>
99

1010
<name>Cryptomator Integrations for Windows</name>
1111
<description>Provides optional Windows services used by Cryptomator</description>
@@ -36,14 +36,14 @@
3636
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3737

3838
<!-- runtime dependencies -->
39-
<api.version>1.0.0-beta2</api.version>
40-
<slf4j.version>1.7.30</slf4j.version>
41-
<guava.version>30.0-jre</guava.version>
42-
<gson.version>2.8.6</gson.version>
39+
<api.version>1.0.0</api.version>
40+
<slf4j.version>1.7.32</slf4j.version>
41+
<guava.version>31.0-jre</guava.version>
42+
<gson.version>2.8.8</gson.version>
4343

4444
<!-- test dependencies -->
45-
<junit.jupiter.version>5.6.2</junit.jupiter.version>
46-
<mockito.version>3.3.3</mockito.version>
45+
<junit.jupiter.version>5.8.1</junit.jupiter.version>
46+
<mockito.version>3.12.4</mockito.version>
4747
</properties>
4848

4949
<licenses>
@@ -130,7 +130,7 @@
130130
<plugin>
131131
<groupId>org.apache.maven.plugins</groupId>
132132
<artifactId>maven-enforcer-plugin</artifactId>
133-
<version>3.0.0-M3</version>
133+
<version>3.0.0</version>
134134
<executions>
135135
<execution>
136136
<id>check-preconditions</id>
@@ -151,7 +151,7 @@
151151
<plugin>
152152
<groupId>org.codehaus.mojo</groupId>
153153
<artifactId>exec-maven-plugin</artifactId>
154-
<version>1.6.0</version>
154+
<version>3.0.0</version>
155155
<executions>
156156
<execution>
157157
<goals>
@@ -199,11 +199,11 @@
199199
<plugin>
200200
<groupId>org.apache.maven.plugins</groupId>
201201
<artifactId>maven-surefire-plugin</artifactId>
202-
<version>2.22.2</version>
202+
<version>3.0.0-M5</version>
203203
</plugin>
204204
<plugin>
205205
<artifactId>maven-source-plugin</artifactId>
206-
<version>3.2.0</version>
206+
<version>3.2.1</version>
207207
<executions>
208208
<execution>
209209
<id>attach-sources</id>
@@ -215,7 +215,7 @@
215215
</plugin>
216216
<plugin>
217217
<artifactId>maven-javadoc-plugin</artifactId>
218-
<version>3.2.0</version>
218+
<version>3.3.1</version>
219219
<executions>
220220
<execution>
221221
<id>attach-javadocs</id>
@@ -265,7 +265,7 @@
265265
<plugin>
266266
<groupId>org.owasp</groupId>
267267
<artifactId>dependency-check-maven</artifactId>
268-
<version>6.1.0</version>
268+
<version>6.3.1</version>
269269
<configuration>
270270
<cveValidForHours>24</cveValidForHours>
271271
<failBuildOnCVSS>0</failBuildOnCVSS>
@@ -290,7 +290,7 @@
290290
<plugins>
291291
<plugin>
292292
<artifactId>maven-gpg-plugin</artifactId>
293-
<version>1.6</version>
293+
<version>3.0.1</version>
294294
<executions>
295295
<execution>
296296
<id>sign-artifacts</id>

‎src/main/java/org/cryptomator/windows/common/Localization.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package org.cryptomator.windows.common;
2+
3+
import java.util.ResourceBundle;
4+
5+
public enum Localization {
6+
INSTANCE;
7+
8+
private final ResourceBundle resourceBundle = ResourceBundle.getBundle("WinIntegrationsBundle");
9+
10+
public static ResourceBundle get() {
11+
return INSTANCE.resourceBundle;
12+
}
13+
14+
}

‎src/main/java/org/cryptomator/windows/keychain/WindowsProtectedKeychainAccess.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.google.gson.reflect.TypeToken;
99
import org.cryptomator.integrations.keychain.KeychainAccessException;
1010
import org.cryptomator.integrations.keychain.KeychainAccessProvider;
11+
import org.cryptomator.windows.common.Localization;
1112
import org.slf4j.Logger;
1213
import org.slf4j.LoggerFactory;
1314

@@ -84,6 +85,11 @@ private static Path resolveHomeDir(Path path) {
8485
}
8586
}
8687

88+
@Override
89+
public String displayName() {
90+
return Localization.get().getString("org.cryptomator.windows.keychain.displayName");
91+
}
92+
8793
@Override
8894
public void storePassphrase(String key, CharSequence passphrase) throws KeychainAccessException {
8995
loadKeychainEntriesIfNeeded();

‎src/main/java/org/cryptomator/windows/uiappearance/WinUiAppearanceProvider.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.cryptomator.windows.uiappearance;
22

33
import org.cryptomator.integrations.uiappearance.Theme;
4-
import org.cryptomator.integrations.uiappearance.UiAppearanceException;
54
import org.cryptomator.integrations.uiappearance.UiAppearanceListener;
65
import org.cryptomator.integrations.uiappearance.UiAppearanceProvider;
76

@@ -42,7 +41,7 @@ public synchronized void addListener(UiAppearanceListener listener) {
4241
@Override
4342
public synchronized void removeListener(UiAppearanceListener listener) {
4443
registeredListeners.remove(listener);
45-
if (registeredListeners.isEmpty()) {
44+
if (appearanceObserver != null && registeredListeners.isEmpty()) {
4645
this.appearanceObserver.interrupt();
4746
this.appearanceObserver = null;
4847
}

‎src/main/resources/WinIntegrationsBundle.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.cryptomator.windows.keychain.displayName=Windows Data Protection

‎src/main/resources/WinIntegrationsBundle_ar.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.cryptomator.windows.keychain.displayName=حماية بيانات ويندوز

0 commit comments

Comments
 (0)