Commit Graph

63 Commits

Author SHA1 Message Date
Armin Schrenk
85c52c60c5 Revert "update javafx to 21.0.2"
This reverts commit 93184abd3c.
2024-02-02 10:45:34 +01:00
Armin Schrenk
93184abd3c update javafx to 21.0.2 2024-01-30 12:55:33 +01:00
Armin Schrenk
8bf0acf35f build release artifacts with javafx 21.0.1
references 7d281e2878
2024-01-15 16:35:34 +01:00
Armin Schrenk
8f32b46b30 set no jlink compression for build artifacts
references 00fc2a9837
2024-01-12 13:18:05 +01:00
Armin Schrenk
00fc2a9837 remove deprecate compress options and use default ones
see also https://bugs.openjdk.org/browse/JDK-8301124?jql=text%20~%20%22compress%22
2024-01-11 22:59:08 +01:00
Armin Schrenk
517e05c378 use stable version of winfsp-uninstaller 2024-01-11 22:35:51 +01:00
Armin Schrenk
56624fc079 Replace URL files by hardcoded links in build scripts 2023-10-16 16:35:17 +02:00
Armin Schrenk
218c5243e3 Merge branch 'develop' into feature/uninstall-old-winfsp 2023-10-16 16:29:57 +02:00
Armin Schrenk
38a5d40b64 Merge branch 'develop' into feature/uninstall-old-winfsp 2023-10-11 16:14:26 +02:00
Armin Schrenk
7bc47fe6d7 Really fixes #3130 2023-09-28 18:33:26 +02:00
Armin Schrenk
625334c6c8 fix windows build script 2023-09-25 16:02:31 +02:00
Armin Schrenk
0130c7cce6 fix local windows build script [ci skip] 2023-09-11 09:50:41 +02:00
Armin Schrenk
e9ef122e7f Merge branch 'develop' into feature/uninstall-old-winfsp 2023-08-14 15:13:11 +02:00
Armin Schrenk
8bbcb86bfc fix windows build script 2023-08-09 20:59:13 +02:00
Armin Schrenk
abdc8672f1 update org.openjdk:javafx from 20.0.1 to 20.0.2 2023-08-09 20:41:14 +02:00
Armin Schrenk
b76a311ddc Replace winfsp-uninstaller by downloadlink 2023-07-19 16:24:44 +02:00
Armin Schrenk
f1d4bd4cd4 Closes #2989 2023-07-13 12:22:46 +02:00
Armin Schrenk
e92b80bdf4 fix local win build script to download jfxmods 2023-07-04 12:42:55 +02:00
Armin Schrenk
9d81b2312f fix local build script to parse two digit verison nums correctly 2023-07-04 12:41:58 +02:00
Armin Schrenk
511dbe355a Fixes #2982 2023-07-04 12:41:06 +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
210b891616 block exe installation if winFsp is outdated 2023-02-24 12:50:20 +01:00
Armin Schrenk
3dff3a8664 Fixes #2682
* allow windows installer to remove same version
* add revisionNumber to installer version
2023-02-14 11:20:22 +01:00
Armin Schrenk
c45a00377d Merge branch 'develop' into feature/mount-provider
# Conflicts:
#	.github/workflows/appimage.yml
#	.github/workflows/mac-dmg.yml
#	.github/workflows/win-exe.yml
#	pom.xml
#	src/main/java/org/cryptomator/common/vaults/WebDavVolume.java
#	src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java
2022-12-07 17:01:56 +01:00
Sebastian Stenzel
6325c6f450 fixed java options required for panama 2022-11-25 14:42:18 +01:00
Armin Schrenk
dd79b46d72 add --enable-preview flag to java runtime options 2022-11-25 12:21:37 +01:00
Armin Schrenk
1b0eb34734 set loopback alias via parameter in ps1 script 2022-11-21 13:46:12 +01:00
Armin Schrenk
79952418f4 only use lower characters in loopback alias 2022-11-21 13:26:14 +01:00
Armin Schrenk
65e26971ff make loopback alias depend on appName 2022-11-21 13:12:32 +01:00
Armin Schrenk
13debaafbe set loopback alias in Cryptomator app during build time 2022-11-18 13:34:38 +01:00
Armin Schrenk
043184cf53 set loopback device alias during build
instead of hardcode
2022-11-18 12:36:10 +01: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
f7ddb6e714 Update and deduplicate winfsp download link
Fixes #2117
2022-07-18 14:56:39 +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
Armin Schrenk
75093f1c09 Make lauchner class configurable 2022-05-12 16:12:20 +02:00
Armin Schrenk
3e6d81ef1b Use parameter for main jar glob pattern 2022-05-12 09:15:04 +02:00
Armin Schrenk
80696972cb allow upgrade-uuid to be customized in build script 2022-05-11 13:00:32 +02:00
Armin Schrenk
3524f273de Merge branch 'develop' into feature/parameterize-win-build-script
# Conflicts:
#	dist/win/build.ps1
2022-05-11 12:48:31 +02:00
Armin Schrenk
fb3d64c43f update integrations-win dependency 2022-05-11 12:41:33 +02:00
Armin Schrenk
90d43f28d9 eradicate last hard coded app name occurences in build script 2022-05-11 12:25:53 +02:00
Armin Schrenk
a29f10a504 refactor build scipt to be easiert customizable 2022-05-11 12:22:29 +02:00
Sebastian Stenzel
9f0e269baf Merge branch 'develop' into feature/hub
# Conflicts:
#	pom.xml
#	src/main/resources/license/THIRD-PARTY.txt
2022-04-28 12:55:55 +02:00
Armin Schrenk
8f97235b9a Merge pull request #2189 from cryptomator/feature/on-the-fly-license
Generate app license on release/ installer build and remove commited third party file
2022-04-27 13:05:53 +02:00
Sebastian Stenzel
d1c4eda072 Merge branch 'develop' into feature/hub
# Conflicts:
#	.github/workflows/appimage.yml
#	dist/linux/appimage/build.sh
#	dist/linux/debian/rules
#	dist/mac/dmg/build.sh
#	dist/win/build.ps1
2022-04-25 15:30:56 +02:00
Armin Schrenk
2f17d80fe6 Revert "removed license dir, renamed merge file and adjusted paths"
This reverts commit d053367f83.
2022-04-22 11:51:22 +02:00
Armin Schrenk
d053367f83 removed license dir, renamed merge file and adjusted paths 2022-04-22 09:49:04 +02:00
Armin Schrenk
c1801e3d22 fixed typo 2022-04-20 12:12:25 +02:00
Armin Schrenk
bff0194f3e Fixed wrong file format and url of lcense merge file 2022-04-20 12:12:00 +02:00