106 Commits

Author SHA1 Message Date
Sebastian Stenzel
4c47204f92 Merge branch 'develop' into feature/app-update 2025-11-24 14:34:44 +01:00
Sebastian Stenzel
c2cd4f5bbf update compiler.xml
[ci skip]
2025-11-12 11:55:59 +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
Sebastian Stenzel
c36f1bc8d0 moved update mechanism classes to integrations-* 2025-11-07 13:59:10 +01:00
Sebastian Stenzel
59560193ee adjust to new multi-step update API 2025-10-21 11:32:45 +02: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
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
cdcd43a805 first draft for JDK 25 migration (including comments) 2025-09-25 12:28:12 +02:00
Sebastian Stenzel
d5245009f4 Merge branch 'feature/self-update-poc' into feature/app-update
# Conflicts:
#	src/main/java/org/cryptomator/ui/preferences/UpdatesPreferencesController.java
#	src/main/resources/fxml/preferences_updates.fxml
2025-08-09 09:26:38 +02:00
Ralph Plawetzki
354225bf1e Switch on Windows Hello (#3808)
---------

Co-authored-by: Armin Schrenk <armin.schrenk@skymatic.de>
2025-06-04 11:25:45 +02:00
Armin Schrenk
941b4e3652 Feature: JavaFX 24 (#3882) 2025-06-03 15:51:37 +02:00
Armin Schrenk
7c86e5e39a update pom to use JDK 24 2025-04-24 15:53:17 +02:00
Armin Schrenk
31482d7d18 [skip ci] update ide files 2025-02-11 12:37:45 +01:00
Armin Schrenk
cd830f27a0 update IDE file 2025-02-03 12:54:34 +01:00
Armin Schrenk
fdf03d2fdc enable JDK23 for IDE 2024-12-10 17:15:34 +01:00
Armin Schrenk
1c868a644f remove unused/obsolete static variable 2024-10-29 09:44:50 +01:00
Armin Schrenk
e5003c1783 use quick access service in unlock/lock 2024-06-27 17:47:05 +02:00
Armin Schrenk
dac517a6fb update project ot jdk 22
Note: dependency bumps regarding jdk22 compatiblilty are missing!
2024-05-02 16:59:45 +02:00
Sebastian Stenzel
0009940e1e adjusted after dependency update 2024-03-14 12:09:10 +01:00
Armin Schrenk
a013ae3d91 [ci skip] change mountPointDir for macOS-Dev-run profile
aligns production build
2024-02-14 10:29:14 +01:00
Sebastian Stenzel
174225c60e add timeout to OAuth2 requests 2023-10-20 12:03:07 +02:00
Sebastian Stenzel
70805665bf use features of Java 21 with --enable-preview 2023-09-18 19:21:56 +02:00
Sebastian Stenzel
4043e3f71f build using JDK 21 2023-09-06 16:22:41 +02:00
Armin Schrenk
1a153e1f6e Merge branch 'develop' into libappindicator 2023-07-26 14:18:42 +02:00
JaniruTEC
11a0136cb9 Fixed run configurations
See: #2982
2023-07-04 13:55:42 +02:00
Ralph Plawetzki
449e330992 Merge branch cryptomator/develop 2023-07-01 18:45:45 +02:00
Armin Schrenk
067814d5db Merge pull request #2957 from cryptomator/feature/preprocess-properties
Feature: Preprocess JVM properties at app start to adjust to OS environment.

Closes #2838
2023-06-30 12:38:55 +02:00
Sebastian Stenzel
287584429b update code style
remove line break from `new Object() {}`

[ci skip]
2023-06-29 22:45:57 +02:00
Armin Schrenk
ce596698e3 stick to a unified path separator for cryptomator properties 2023-06-29 17:58:52 +02:00
Armin Schrenk
ebea8ef7e5 adjust windows buildscripts to use appdata instead of userhome/hard/coded/path 2023-06-20 17:32:23 +02:00
Armin Schrenk
ec645a4bb9 replace ~ by @{userhome} on unix systems 2023-06-20 16:37:32 +02:00
Sebastian Stenzel
6bb69ea8d3 Merge branch 'develop' into libappindicator 2023-05-10 20:21:54 +02:00
Ralph Plawetzki
6e858746c1 Keep change to JDK 20 outside of this PR 2023-05-10 06:35:52 +02:00
Armin Schrenk
151ef6c7b2 upgrade to jdk20
* use pattern matching preview feature
* bump fuse-nio-adapter
2023-05-08 19:12:35 +02:00
Ralph Plawetzki
317f3c3458 Move stuff to integrations-linux 2023-04-30 17:08:08 +02:00
Ralph Plawetzki
97cede12b7 Update to JDK 20 2023-04-27 18:39:46 +02:00
Ralph Plawetzki
6da107f4db Add AppindicatorTrayMenuController 2023-04-26 18:24:01 +02:00
Armin Schrenk
20e820c903 update IDE specific files 2023-02-24 12:48:41 +01:00
Sebastian Stenzel
4029f86a0d reveal OR copy mount point depending on chosen mounter 2022-11-10 14:11:06 +01:00
Sebastian Stenzel
31c69f145e use a fallback mount point absed on -Dcryptomator.mountPointsDir=... vm param 2022-11-07 18:17:20 +01:00
Sebastian Stenzel
b5a00f5ebe added --enable-preview --enable-native-access to run config 2022-11-07 18:07:45 +01:00
Armin Schrenk
0f84d0c990 adapt to new APIs 2022-11-07 14:49:56 +01:00
Sebastian Stenzel
69641ed3b6 Merge branch 'develop' into feature/jdk19
[ci skip]
2022-10-14 13:55:15 +02:00
Sebastian Stenzel
7bc5a336e4 dependency bump 2022-10-06 16:48:12 +02:00
Sebastian Stenzel
d19e77432e build with jdk 19 2022-09-21 09:28:37 +02:00
Sebastian Stenzel
649e029d4f added cryptomator.integrationsMac.keychainServiceName system property 2022-08-05 11:09:49 +02:00
Armin Schrenk
677634930d Fix windows run config [ci skip] 2022-07-26 13:03:43 +02:00
Armin Schrenk
8662abae5a Merge branch 'feature/hub' into develop
# Conflicts:
#	.idea/runConfigurations/Cryptomator_Windows.xml
#	.idea/runConfigurations/Cryptomator_Windows_Dev.xml
#	dist/win/build.ps1
#	src/main/java/org/cryptomator/common/Environment.java
2022-07-26 12:29:33 +02:00
Armin Schrenk
d814c1cfca Update integrations-win lib (#2331)
* update to integrations-win 1.1.2

* refactor environment class to reduce maintenance

* fix test

Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
2022-07-11 15:59:54 +02:00
Armin Schrenk
45f038bae2 Merge branch 'develop' into feature/hub
# Conflicts:
#	dist/mac/dmg/build.sh
#	dist/win/build.ps1
#	pom.xml
2022-06-22 09:55:02 +02:00