Commit Graph

174 Commits

Author SHA1 Message Date
Ralph Plawetzki
8139cb8c38
Add jdk.security.auth module to rules 2023-01-22 20:05:13 +01:00
Ralph Plawetzki
f1f5f7e02f
Add jdk.security.auth module as it's required by dbus-java-core 2023-01-22 17:59:20 +01:00
Armin Schrenk
90408504e2
Merge branch 'develop' into feature/mount-provider
# Conflicts:
#	pom.xml
#	src/main/java/org/cryptomator/common/vaults/Vault.java
#	src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java
2023-01-20 15:27:48 +01:00
Armin Schrenk
24d472ed8b
Merge branch 'develop' into feature/mount-provider
# Conflicts:
#	dist/linux/appimage/build.sh
#	dist/linux/debian/rules
2023-01-11 16:01:27 +01:00
Ralph Plawetzki
0e0e00f116
Remove stuff not needed when run locally
From: changes requested for PR #2624
2023-01-08 14:10:38 +01:00
Ralph Plawetzki
77c0a3e265
Update build.sh to .github/workflows/appimage.yml 2023-01-07 15:31:32 +01:00
Julian Raufelder
9182c415eb
Hello 2023 🎉 2023-01-04 13:35:58 +01:00
Armin Schrenk
fd5aeaf90a Merge branch 'develop' into feature/mount-setting-per-vault 2023-01-02 13:47:30 +01:00
Armin Schrenk
8009205da7
Merge branch 'main' into develop
# Conflicts:
#	pom.xml
2022-12-14 20:07:24 +01:00
Armin Schrenk
fd76c89393
update metainfo 2022-12-14 20:02:12 +01:00
Sebastian Stenzel
4fda4a2b2e
fix makefile 2022-12-12 09:09:25 +01:00
Sebastian Stenzel
ffaf7ad360
adjust package dependencies to new mount api and jfuse 2022-12-12 09:03:56 +01:00
Sebastian Stenzel
76689705f5
remove LD_PRELOAD workaround, which should no longer be required with jfuse 2022-12-12 08:54:18 +01:00
Armin Schrenk
36ed4554b2
Fixes #2570
Dabian build: Make libffi7 a runtime dependency and preload it.
2022-12-09 15:12:04 +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
Armin Schrenk
0e9b115647
debian build: use correct package names 2022-12-07 11:43:59 +01:00
Armin Schrenk
5ba137dda5
Add additional build dependencies to debian build 2022-12-07 11:11:31 +01:00
Sebastian Stenzel
db928ba034
try fixing debian build 2022-12-06 20:49:09 +01:00
Armin Schrenk
d8b71db8e5
bump metainfo.xml 2022-12-06 15:27:17 +01:00
Sebastian Stenzel
ba7029968d try fixing dpkg-shlibdeps: error: cannot find library libgtk-x11-2.0.so.0 ... 2022-11-30 11:16:38 +01:00
Sebastian Stenzel
a3fc68ab6f jlink javafx.* modules from arch-dependent jmod path 2022-11-30 11:16:38 +01:00
Sebastian Stenzel
abf944a130 add required openjfx jmods to debian source package 2022-11-30 11:16:38 +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
Sebastian Stenzel
1f01923169
build on Ubuntu Focal 2022-10-14 13:44:50 +02:00
Sebastian Stenzel
6367cc2dfb
depend on coffeelibs-jdk-19 2022-10-14 13:10:37 +02:00
Julian Raufelder
26ecd67a79
Update linux common metainfo.xml file 2022-10-11 15:33:44 +02:00
Armin Schrenk
67dd1548cc
finalize release 2022-08-31 15:47:23 +02:00
Ralph Plawetzki
8290df9ea6
Pass on CLI parameters for Cryptomator started as an AppImage or installed from PPA
Fixes #2301
2022-08-01 18:17:41 +02:00
Armin Schrenk
57110ff417
add release to metainfo 2022-07-27 11:57:45 +02:00
Armin Schrenk
d5bdea4a75
fix debian build script
Fixes #2352
2022-07-27 11:57:00 +02:00
Armin Schrenk
9209e7698c
add release info to linux metainfo file 2022-07-26 13:23:31 +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
Julian Raufelder
12ef32835c
Prepare 1.6.10
[ci skip]
2022-05-03 16:15:33 +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
Julian Raufelder
d127121007
Update metainfo.xml to 1.6.9
[ci skip]
2022-04-26 19:51:43 +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
Sebastian Stenzel
2108a77e12
adjusted build scripts for Cryptomator Hub 2022-04-08 20:45:22 +02:00
Sebastian Stenzel
2ce7e84e3c
Merge branch 'develop' into feature/gtk2-launcher 2022-04-04 06:58:07 +02:00
Sebastian Stenzel
ec2524f6ff
use correct StartupWMClass (fixes #1955)
[ci skip]
2022-04-02 10:06:15 +02:00
Sebastian Stenzel
828f32d3f6
Merge branch 'develop' into feature/gtk2-launcher 2022-03-31 08:57:27 +02:00
Julian Raufelder
732fc2f3dd
Update metainfo.xml to 1.6.8
[ci skip]
2022-03-30 17:17:48 +02:00
Sebastian Stenzel
504a384225
fix envsubst 2022-03-18 17:58:21 +01:00
Sebastian Stenzel
b565f1d0c0
remove unused java binaries from jlinked runtime image 2022-03-18 17:26:28 +01:00
Sebastian Stenzel
fab70ef8c9
run Cryptomator binaries instead of java from AppImage launcher .sh 2022-03-18 17:25:04 +01:00
Ralph Plawetzki
a32f5bb6d9 Use updated Cryptomator screenshots (1.6.5)
They do appstream-util validate
2022-03-07 11:59:54 +01:00
Sebastian Stenzel
0c6f4297a2
display version as x.y.z deb-1234 instead of x.y.z ppa-1234 2022-03-03 10:40:40 +01:00
Sebastian Stenzel
f7c4fc5fda
fix .deb binary build 2022-02-28 11:00:08 +01:00
Sebastian Stenzel
8ee47aad0f
remove version entirely (should have been 1.0, but not required) 2022-02-25 09:58:47 +01:00
Sebastian Stenzel
6553e48ea3
use oars-1.1 as suggested by @x80486 2022-02-25 09:33:15 +01:00
Sebastian Stenzel
10999b2725
renamed .appdata.xml to .metainfo.xml as suggested by @x80486 2022-02-25 09:28:58 +01:00
Sebastian Stenzel
02fe63c7bc
version of the spec, not version of the software
see https://specifications.freedesktop.org/desktop-entry-spec/latest/ar01s06.html
2022-02-25 09:28:14 +01:00
Sebastian Stenzel
7d9aab46a8
fix broken path during mimetype installation 2022-02-24 16:27:28 +01:00
Sebastian Stenzel
69ff0e44f5
fix build 2022-02-24 12:00:02 +01:00
Sebastian Stenzel
ec1c255bb4
update appstream metadata 2022-02-24 10:56:36 +01:00
Sebastian Stenzel
43e936d117
rename mimetype file 2022-02-24 10:56:23 +01:00
Sebastian Stenzel
90da61e495
adjust ppa build to use "common" resources 2022-02-24 10:41:40 +01:00
Sebastian Stenzel
d38c19cffc
adjust appimage build to use "common" resources 2022-02-24 10:38:32 +01:00
Sebastian Stenzel
0556bcd576
move metadata to "common" dir 2022-02-24 10:26:37 +01:00
Sebastian Stenzel
d6ccb41027 add modules required for JFR 2022-01-26 19:47:51 +01:00
httpjamesm
f1fdd7960c
Update copyright years from 2021 to 2022 to reflect the new year (#2015) 2022-01-10 10:01:07 +01:00
Sebastian Stenzel
c5b6d8f81f
target Ubuntu Bionic in PPA release (#1909) 2021-11-10 12:20:52 +01:00
what-next-github
9408117028
Including pluginDir to linux/appimage/build.sh (#1850) 2021-11-02 10:40:41 +01:00
Tobias Hagemann
a6b50bde75
Merge pull request #1796 from PBillodeau/fix/linux-build
Relative paths in linux build are incorrect
2021-10-19 13:51:00 +02:00
Sebastian Stenzel
6c6f6baf12
Update to JDK 17 (#1828)
fixes #1404
2021-10-08 14:59:24 +02:00
Julian Raufelder
5eac665a93
Fixes #1814
Add missing backslash while setting the pluginDir
2021-09-27 18:50:26 +02:00
PBillodeau
aa7ee65d99
Update build version variable
Add path to pom.xml and move after preconditions
2021-09-27 09:54:43 -05:00
PBillodeau
279db5ffd0
Merge branch 'cryptomator:develop' into fix/linux-build 2021-09-27 09:51:20 -05:00
PBillodeau
772e3ae68a
Apply suggestions from code review
Co-authored-by: Tobias Hagemann <tobias.hagemann@gmail.com>
2021-09-27 09:50:51 -05:00
Sebastian Stenzel
d07c018670
adjust appimage launcher script to comply with appdir built during CI
fixes #1806
2021-09-23 14:01:07 +02:00
PBillodeau
96d37096c1 Relative paths in linux build are incorrect 2021-09-18 14:07:42 -05:00
Sebastian Stenzel
9e66f4b93e
Release to PPA (#1791)
Create a Debian source package and dput it to the cryptomator-beta staging repo
2021-09-16 13:01:34 +02:00
Sebastian Stenzel
e85a989e44
minor adjustments
[ci skip]
2021-07-22 14:36:02 +02:00
Sebastian Stenzel
3563ed3394
restructured dist/ dir 2021-07-22 14:09:06 +02:00