mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-18 00:26:54 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,176 Commits 29 Branches 213 Tags
74fc77ab8dccd331e48ea7dabd2ec5e01fdd2bcd
Commit Graph

439 Commits

Author SHA1 Message Date
Armin Schrenk
74fc77ab8d fix pom inconsistency 2026-02-17 15:21:16 +01:00
Armin Schrenk
044dbcb11f Update cryptofs to version 2.10.0-beta3 2026-02-17 15:13:46 +01:00
Armin Schrenk
bc0bb38e4c remove dagger formatting due to compile error 2026-02-17 12:45:46 +01:00
dependabot[bot]
a77e90738a Bump the java-production-dependencies group across 1 directory with 11 updates 
Bumps the java-production-dependencies group with 11 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [org.cryptomator:cryptolib](https://github.com/cryptomator/cryptolib) | `2.2.1` | `2.2.2` |
| [org.cryptomator:fuse-nio-adapter](https://github.com/cryptomator/fuse-nio-adapter) | `5.1.0` | `6.0.0` |
| [ch.qos.logback:logback-core](https://github.com/qos-ch/logback) | `1.5.19` | `1.5.31` |
| [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) | `1.5.19` | `1.5.31` |
| org.apache.commons:commons-lang3 | `3.19.0` | `3.20.0` |
| [com.fasterxml.jackson.core:jackson-databind](https://github.com/FasterXML/jackson) | `2.20.0` | `2.21.0` |
| com.fasterxml.jackson.datatype:jackson-datatype-jsr310 | `2.20.0` | `2.21.0` |
| [com.google.dagger:dagger](https://github.com/google/dagger) | `2.57.2` | `2.59.1` |
| [com.google.dagger:dagger-compiler](https://github.com/google/dagger) | `2.57.2` | `2.59.1` |
| [com.github.ben-manes.caffeine:caffeine](https://github.com/ben-manes/caffeine) | `3.2.2` | `3.2.3` |
| [org.cryptomator:integrations-linux](https://github.com/cryptomator/integrations-linux) | `1.7.0-beta3` | `1.7.0-beta4` |



Updates `org.cryptomator:cryptolib` from 2.2.1 to 2.2.2
- [Release notes](https://github.com/cryptomator/cryptolib/releases)
- [Changelog](https://github.com/cryptomator/cryptolib/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/cryptomator/cryptolib/compare/2.2.1...2.2.2)

Updates `org.cryptomator:fuse-nio-adapter` from 5.1.0 to 6.0.0
- [Release notes](https://github.com/cryptomator/fuse-nio-adapter/releases)
- [Changelog](https://github.com/cryptomator/fuse-nio-adapter/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/cryptomator/fuse-nio-adapter/compare/5.1.0...6.0.0)

Updates `ch.qos.logback:logback-core` from 1.5.19 to 1.5.31
- [Release notes](https://github.com/qos-ch/logback/releases)
- [Commits](https://github.com/qos-ch/logback/compare/v_1.5.19...v_1.5.31)

Updates `ch.qos.logback:logback-classic` from 1.5.19 to 1.5.31
- [Release notes](https://github.com/qos-ch/logback/releases)
- [Commits](https://github.com/qos-ch/logback/compare/v_1.5.19...v_1.5.31)

Updates `ch.qos.logback:logback-classic` from 1.5.19 to 1.5.31
- [Release notes](https://github.com/qos-ch/logback/releases)
- [Commits](https://github.com/qos-ch/logback/compare/v_1.5.19...v_1.5.31)

Updates `org.apache.commons:commons-lang3` from 3.19.0 to 3.20.0

Updates `com.fasterxml.jackson.core:jackson-databind` from 2.20.0 to 2.21.0
- [Commits](https://github.com/FasterXML/jackson/commits)

Updates `com.fasterxml.jackson.datatype:jackson-datatype-jsr310` from 2.20.0 to 2.21.0

Updates `com.fasterxml.jackson.datatype:jackson-datatype-jsr310` from 2.20.0 to 2.21.0

Updates `com.google.dagger:dagger` from 2.57.2 to 2.59.1
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.57.2...dagger-2.59.1)

Updates `com.google.dagger:dagger-compiler` from 2.57.2 to 2.59.1
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.57.2...dagger-2.59.1)

Updates `com.github.ben-manes.caffeine:caffeine` from 3.2.2 to 3.2.3
- [Release notes](https://github.com/ben-manes/caffeine/releases)
- [Commits](https://github.com/ben-manes/caffeine/compare/v3.2.2...v3.2.3)

Updates `com.google.dagger:dagger-compiler` from 2.57.2 to 2.59.1
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.57.2...dagger-2.59.1)

Updates `org.cryptomator:integrations-linux` from 1.7.0-beta3 to 1.7.0-beta4
- [Release notes](https://github.com/cryptomator/integrations-linux/releases)
- [Changelog](https://github.com/cryptomator/integrations-linux/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/cryptomator/integrations-linux/compare/1.7.0-beta3...1.7.0-beta4)

---
updated-dependencies:
- dependency-name: org.cryptomator:cryptolib
  dependency-version: 2.2.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: org.cryptomator:fuse-nio-adapter
  dependency-version: 6.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: java-production-dependencies
- dependency-name: ch.qos.logback:logback-core
  dependency-version: 1.5.31
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: ch.qos.logback:logback-classic
  dependency-version: 1.5.31
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: ch.qos.logback:logback-classic
  dependency-version: 1.5.31
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: org.apache.commons:commons-lang3
  dependency-version: 3.20.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: java-production-dependencies
- dependency-name: com.fasterxml.jackson.core:jackson-databind
  dependency-version: 2.21.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: java-production-dependencies
- dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310
  dependency-version: 2.21.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: java-production-dependencies
- dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310
  dependency-version: 2.21.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: java-production-dependencies
- dependency-name: com.google.dagger:dagger
  dependency-version: 2.59.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: java-production-dependencies
- dependency-name: com.google.dagger:dagger-compiler
  dependency-version: 2.59.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: java-production-dependencies
- dependency-name: com.github.ben-manes.caffeine:caffeine
  dependency-version: 3.2.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: com.google.dagger:dagger-compiler
  dependency-version: 2.59.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: java-production-dependencies
- dependency-name: org.cryptomator:integrations-linux
  dependency-version: 1.7.0-beta4
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
 2026-02-16 06:06:54 +00:00
Armin Schrenk
8105dbc236 Closes #4058 2025-12-30 12:31:45 +01:00
Armin Schrenk
98d2442deb For hub vaults set filesystem owner 2025-12-11 14:34:45 +01:00
Sebastian Stenzel
7a2944cbea bump integrations version 2025-11-24 14:39:17 +01:00
Sebastian Stenzel
d3d57312ba Merge branch 'develop' into feature/app-update 
# Conflicts:
#	.github/workflows/appimage.yml
#	.github/workflows/check-jdk-updates.yml
#	.github/workflows/debian.yml
#	.github/workflows/mac-dmg-x64.yml
#	.github/workflows/mac-dmg.yml
#	.github/workflows/win-exe.yml
 2025-11-12 11:50:21 +01:00
Sebastian Stenzel
593a64c9bd Bump JDK to version 25 (#4031) 
* first draft for JDK 25 migration (including comments)

* fix unresolvable version in setup-java action

* switch to official `openjdk-25-jdk` ubuntu package

see https://packages.ubuntu.com/search?suite=jammy&arch=any&searchon=names&keywords=openjdk-25

* update jacoco to support JDK 25

* use jdk 25.0.1 for building the app

# Conflicts:
#	.github/workflows/win-exe.yml

* Use correct SHA256 value for openjfx linux arm64

* zulu version is different to temurin :rolling_eyes:

* fix check-jdk-updates

---------

Co-authored-by: Armin Schrenk <armin.schrenk@skymatic.de>
 2025-11-12 10:50:37 +01:00
Armin Schrenk
81f45012f3 [skip ci] Merge branch 'main' into develop 2025-11-12 10:45:38 +01:00
Sebastian Stenzel
c36f1bc8d0 moved update mechanism classes to integrations-* 2025-11-07 13:59:10 +01:00
Sebastian Stenzel
a6b31e19b9 Merge branch 'feature/jdk25' into feature/app-update 
# Conflicts:
#	.idea/compiler.xml
#	pom.xml
 2025-10-17 17:03:43 +02:00
Sebastian Stenzel
8a44115234 update jacoco to support JDK 25 2025-10-17 15:25:18 +02:00
Sebastian Stenzel
3e458060bc Merge branch 'develop' into feature/jdk25 
# Conflicts:
#	.github/workflows/debian.yml
#	.github/workflows/dependency-check.yml
#	.github/workflows/win-exe.yml
#	.idea/misc.xml
#	dist/linux/debian/control
 2025-10-17 12:27:28 +02:00
Armin Schrenk
8bb451261e Merge branch 'develop' into release/1.18.0 2025-10-16 16:43:01 +02:00
dependabot[bot]
e6e04078fa Bump the java-production-dependencies group across 1 directory with 5 updates (#4007) 2025-10-14 11:16:41 +00:00
Armin Schrenk
e3f6b5f812 Feature: JFX 25 (#4013) 
Closes #3902. References https://github.com/cryptomator/cryptomator/issues/3453 and references https://github.com/cryptomator/cryptomator/pull/3825
 2025-10-14 13:15:49 +02:00
Armin Schrenk
e50c949b62 Bump com.nimbusds:nimbus-jose-jwt from version 9.37.3 to version 10.5 
Addresses shaded vulnerability in CVE-2025-53864 (OSSINDEX)
 2025-10-13 11:50:54 +02:00
Armin Schrenk
153f9b485c prepare 1.18.0 2025-09-26 13:38:53 +02:00
Armin Schrenk
cdcd43a805 first draft for JDK 25 migration (including comments) 2025-09-25 12:28:12 +02:00
dependabot[bot]
2d29b1a76f Bump the java-production-dependencies group across 1 directory with 5 updates (#3988) 
Closes #3883, closes #3932, closes #3982

Bumps the java-production-dependencies group with 5 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [org.cryptomator:fuse-nio-adapter](https://github.com/cryptomator/fuse-nio-adapter) | `5.0.5` | `5.1.0` |
| [org.cryptomator:integrations-api](https://github.com/cryptomator/integrations-api) | `1.6.0` | `1.7.0` |
| [org.cryptomator:integrations-mac](https://github.com/cryptomator/integrations-mac) | `1.4.0` | `1.4.1` |
| [org.cryptomator:integrations-linux](https://github.com/cryptomator/integrations-linux) | `1.6.0` | `1.6.1` |
| [org.cryptomator:integrations-win](https://github.com/cryptomator/integrations-win) | `1.5.0` | `1.5.1` |



Updates `org.cryptomator:fuse-nio-adapter` from 5.0.5 to 5.1.0
- [Release notes](https://github.com/cryptomator/fuse-nio-adapter/releases)
- [Changelog](https://github.com/cryptomator/fuse-nio-adapter/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/cryptomator/fuse-nio-adapter/compare/5.0.5...5.1.0)

Updates `org.cryptomator:integrations-api` from 1.6.0 to 1.7.0
- [Release notes](https://github.com/cryptomator/integrations-api/releases)
- [Changelog](https://github.com/cryptomator/integrations-api/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/cryptomator/integrations-api/compare/1.6.0...1.7.0)

Updates `org.cryptomator:integrations-mac` from 1.4.0 to 1.4.1
- [Release notes](https://github.com/cryptomator/integrations-mac/releases)
- [Changelog](https://github.com/cryptomator/integrations-mac/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/cryptomator/integrations-mac/compare/1.4.0...1.4.1)

Updates `org.cryptomator:integrations-linux` from 1.6.0 to 1.6.1
- [Release notes](https://github.com/cryptomator/integrations-linux/releases)
- [Changelog](https://github.com/cryptomator/integrations-linux/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/cryptomator/integrations-linux/compare/1.6.0...1.6.1)

Updates `org.cryptomator:integrations-win` from 1.5.0 to 1.5.1
- [Release notes](https://github.com/cryptomator/integrations-win/releases)
- [Changelog](https://github.com/cryptomator/integrations-win/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/cryptomator/integrations-win/compare/1.5.0...1.5.1)

---
updated-dependencies:
- dependency-name: org.cryptomator:fuse-nio-adapter
  dependency-version: 5.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: java-production-dependencies
- dependency-name: org.cryptomator:integrations-api
  dependency-version: 1.7.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: java-production-dependencies
- dependency-name: org.cryptomator:integrations-mac
  dependency-version: 1.4.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: org.cryptomator:integrations-linux
  dependency-version: 1.6.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: org.cryptomator:integrations-win
  dependency-version: 1.5.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2025-09-22 15:47:26 +02:00
dependabot[bot]
7fe7e1f5bf Bump org.mockito:mockito-core in the java-test-dependencies group (#3985) 2025-09-22 13:20:37 +00:00
dependabot[bot]
a4d9703cf4 Bump the maven-build-plugins group with 3 updates (#3984) 2025-09-22 13:12:52 +00:00
dependabot[bot]
c9a3a775cc Bump the java-production-dependencies group across 1 directory with 9 updates (#3978) 2025-09-16 15:08:10 +00:00
dependabot[bot]
e7cac42d5d Bump the maven-build-plugins group across 1 directory with 2 updates (#3977) 2025-09-16 14:27:31 +00:00
dependabot[bot]
a84ac94701 Bump the java-test-dependencies group across 1 directory with 3 updates (#3956) 2025-09-16 14:18:18 +00:00
Ralph Plawetzki
1f1e336d57 Start FlatpakUpdater 2025-07-30 19:21:33 +02:00
Armin Schrenk
e24719ed19 [skip ci] Merge branch 'main' into develop 2025-06-24 16:28:03 +02:00
Armin Schrenk
9af9362a7b Merge branch 'develop' into release/1.17.0 2025-06-24 16:07:29 +02:00
dependabot[bot]
feb9fb689e Bump the java-production-dependencies group with 2 updates (#3901) 2025-06-17 11:58:45 +00:00
Armin Schrenk
fbeeaa4c93 prepare 1.17.0 2025-06-11 12:38:38 +02:00
dependabot[bot]
115a4216ee Bump org.owasp:dependency-check-maven in the maven-build-plugins group (#3896) 2025-06-11 10:31:11 +00:00
dependabot[bot]
403d469dff Bump the java-production-dependencies group across 1 directory with 5 updates (#3891) 2025-06-11 10:30:44 +00:00
dependabot[bot]
e6a0339878 Bump org.owasp:dependency-check-maven in the maven-build-plugins group (#3890) 2025-06-11 10:25:43 +00:00
dependabot[bot]
2b0c2cf90a Bump the java-test-dependencies group across 1 directory with 2 updates (#3875) 2025-06-11 10:25:08 +00:00
Armin Schrenk
0d4f373311 enable native access for javafx.graphics during tests 
references #3882
 2025-06-03 16:52:31 +02:00
Armin Schrenk
941b4e3652 Feature: JavaFX 24 (#3882) 2025-06-03 15:51:37 +02:00
Armin Schrenk
7d2c4992af update pom and adjust classes to new keychain api. (#3877) 2025-06-02 10:28:52 +02:00
Armin Schrenk
cba6ed9875 Merge branch 'develop' into feature/jdk-24 2025-05-21 16:08:38 +02:00
Armin Schrenk
c39c4be1cd Merge branch 'main' into develop 
# Conflicts:
#	pom.xml
 2025-05-15 08:59:15 +02:00
Armin Schrenk
f797491a17 prepare 1.16.2 2025-05-15 00:50:12 +02:00
Armin Schrenk
cff83b6ac6 closes #3852 2025-05-15 00:47:35 +02:00
Armin Schrenk
e43bb37758 prepare 1.16.1 2025-04-30 12:12:59 +02:00
Armin Schrenk
2eb9f0fca8 Fixes #3838 2025-04-30 12:12:04 +02:00
Armin Schrenk
08e9f130e4 [skip ci] Merge branch 'main' into develop 2025-04-29 11:28:38 +02:00
Armin Schrenk
cf32e794c8 Merge branch 'develop' into release/1.16.0 2025-04-29 11:26:48 +02:00
Armin Schrenk
b1893c63d4 Bump cryptofs from version 2.9.0-beta2 to 2.9.0 2025-04-28 13:00:21 +02:00
Armin Schrenk
7c86e5e39a update pom to use JDK 24 2025-04-24 15:53:17 +02:00
Armin Schrenk
b7fa1ae6d8 Merge branch 'develop' into release/1.16.0 
# Conflicts:
#	src/main/java/org/cryptomator/common/vaults/Vault.java
#	src/main/java/org/cryptomator/ui/eventview/EventListCellController.java
#	src/main/java/org/cryptomator/ui/eventview/EventListCellFactory.java
#	src/main/java/org/cryptomator/ui/eventview/EventViewController.java
#	src/main/java/org/cryptomator/ui/eventview/EventViewModule.java
#	src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java
#	src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java
#	src/main/resources/css/dark_theme.css
#	src/main/resources/css/light_theme.css
#	src/main/resources/fxml/eventview.fxml
#	src/main/resources/fxml/vault_detail_unlocked.fxml
#	src/main/resources/fxml/vault_list.fxml
#	src/main/resources/i18n/strings.properties
 2025-04-15 11:41:39 +02:00
dependabot[bot]
5d2a243c55 Bump the java-test-dependencies group across 1 directory with 2 updates (#3776) 2025-04-15 08:59:50 +00:00