From 2b03477d312bee59585fa63705c980a80bb0cfb9 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Mon, 19 Aug 2024 16:36:31 +0200 Subject: [PATCH 1/6] prepare 1.14.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index be0a40dcd..cc329063f 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.cryptomator cryptomator - 1.13.0 + 1.14.0 Cryptomator Desktop App From b450ab028d91bb72e95f057c2cddfa7f496e213a Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Tue, 20 Aug 2024 17:42:32 +0200 Subject: [PATCH 2/6] Update mac-dmg.yml macos-11 is no more --- .github/workflows/mac-dmg.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index 63c4db0f6..d26537834 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -32,7 +32,7 @@ jobs: fail-fast: false matrix: include: - - os: macos-11 + - os: macos-13 architecture: x64 output-suffix: x64 xcode-path: '/Applications/Xcode_13.2.1.app' From 414d81dc06a75c0cf78f359df6c998fff2136879 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Tue, 20 Aug 2024 18:17:08 +0200 Subject: [PATCH 3/6] Update mac-dmg.yml Switch to macOS-12 due to errors --- .github/workflows/mac-dmg.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index d26537834..fdfda1f71 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -32,7 +32,7 @@ jobs: fail-fast: false matrix: include: - - os: macos-13 + - os: macos-12 architecture: x64 output-suffix: x64 xcode-path: '/Applications/Xcode_13.2.1.app' From 2f311c1dfe72861bd655a5a2802d3db1d710ce4b Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Mon, 16 Sep 2024 17:29:24 +0200 Subject: [PATCH 4/6] use final releases --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 482ae93a3..77b467004 100644 --- a/pom.xml +++ b/pom.xml @@ -33,11 +33,11 @@ org.ow2.asm,org.apache.jackrabbit,org.apache.httpcomponents - 2.7.0-beta1 - 1.4.0-beta2 - 1.3.0-beta1 + 2.7.0 + 1.4.0 + 1.3.0 1.2.4 - 1.5.0-beta4 + 1.5.0 5.0.0 2.0.6 From 80e101456b6f6f3da25d6843974528c8eb5c97ac Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Mon, 16 Sep 2024 17:35:22 +0200 Subject: [PATCH 5/6] adjust keychainManager to new API --- .../org/cryptomator/common/keychain/KeychainManager.java | 2 +- .../org/cryptomator/common/keychain/MapKeychainAccess.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/cryptomator/common/keychain/KeychainManager.java b/src/main/java/org/cryptomator/common/keychain/KeychainManager.java index 48b0a0ed5..b2af2725f 100644 --- a/src/main/java/org/cryptomator/common/keychain/KeychainManager.java +++ b/src/main/java/org/cryptomator/common/keychain/KeychainManager.java @@ -44,7 +44,7 @@ public class KeychainManager implements KeychainAccessProvider { } @Override - public void storePassphrase(String key, String displayName, CharSequence passphrase) throws KeychainAccessException { + public void storePassphrase(String key, String displayName, CharSequence passphrase, boolean ignored) throws KeychainAccessException { getKeychainOrFail().storePassphrase(key, displayName, passphrase); setPassphraseStored(key, true); } diff --git a/src/test/java/org/cryptomator/common/keychain/MapKeychainAccess.java b/src/test/java/org/cryptomator/common/keychain/MapKeychainAccess.java index c4baa96fa..73c8da522 100644 --- a/src/test/java/org/cryptomator/common/keychain/MapKeychainAccess.java +++ b/src/test/java/org/cryptomator/common/keychain/MapKeychainAccess.java @@ -5,6 +5,7 @@ *******************************************************************************/ package org.cryptomator.common.keychain; +import org.cryptomator.integrations.keychain.KeychainAccessException; import org.cryptomator.integrations.keychain.KeychainAccessProvider; import java.util.HashMap; @@ -20,7 +21,7 @@ class MapKeychainAccess implements KeychainAccessProvider { } @Override - public void storePassphrase(String key, String displayName,CharSequence passphrase) { + public void storePassphrase(String key, String displayName,CharSequence passphrase, boolean ignored) { char[] pw = new char[passphrase.length()]; for (int i = 0; i < passphrase.length(); i++) { pw[i] = passphrase.charAt(i); @@ -39,7 +40,7 @@ class MapKeychainAccess implements KeychainAccessProvider { } @Override - public void changePassphrase(String key, String displayName, CharSequence passphrase) { + public void changePassphrase(String key, String displayName, CharSequence passphrase) throws KeychainAccessException { map.get(key); storePassphrase(key, displayName, passphrase); } From a606bcb81e3a985b934fc021493270acf8b23f9b Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Tue, 17 Sep 2024 09:59:22 +0200 Subject: [PATCH 6/6] finalize 1.14.0 --- dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml b/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml index e2a51ae88..ded761dbb 100644 --- a/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml +++ b/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml @@ -74,6 +74,9 @@ + + https://github.com/cryptomator/cryptomator/releases/1.14.0 + https://github.com/cryptomator/cryptomator/releases/1.13.0