Browse Source

Merge branch 'develop' into feature/redesign-mainwindow

Jan-Peter Klein 2 months ago
parent
commit
6ff640648f

+ 2 - 0
.github/workflows/win-exe.yml

@@ -390,12 +390,14 @@ jobs:
     needs: [publish]
     with:
       url: ${{ needs.publish.outputs.download-url-msi }}
+    secrets: inherit
 
   allowlist-exe:
     uses: ./.github/workflows/av-whitelist.yml
     needs: [publish]
     with:
       url: ${{ needs.publish.outputs.download-url-exe }}
+    secrets: inherit
 
   notify-winget:
     name: Notify for winget-release

+ 0 - 1
README.md

@@ -31,7 +31,6 @@ Cryptomator is provided free of charge as an open-source project despite the hig
   <tbody>
     <tr>
       <td><a href="https://mowcapital.com/"><img src="https://cryptomator.org/img/sponsors/mowcapital.svg" alt="Mow Capital" height="28"></a></td>
-      <td><a href="https://www.easeus.com/"><img src="https://cryptomator.org/img/sponsors/easeus.png" alt="EaseUS" height="40"></a></td>
       <td><a href="https://www.hassmann-it-forensik.de/"><img src="https://cryptomator.org/img/sponsors/hassmannitforensik.png" alt="Hassmann IT-Forensik" height="40"></a></td>
     </tr>
   </tbody>

+ 1 - 1
dist/linux/appimage/build.sh

@@ -32,7 +32,7 @@ if [ "${CPU_ARCH}" = "aarch64" ]; then
 fi
 
 # download javaFX jmods
-JAVAFX_JMODS_URL="https://download2.gluonhq.com/openjfx/${JAVAFX_VERSION}/openjfx-21.0.1_linux-${JAVAFX_ARCH}_bin-jmods.zip"
+JAVAFX_JMODS_URL="https://download2.gluonhq.com/openjfx/${JAVAFX_VERSION}/openjfx-${JAVAFX_VERSION}_linux-${JAVAFX_ARCH}_bin-jmods.zip"
 
 
 curl -L ${JAVAFX_JMODS_URL} -o openjfx-jmods.zip

+ 0 - 1
dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml

@@ -68,7 +68,6 @@
 	<developer id="de.skymatic">
 		<name>Skymatic GmbH</name>
 	</developer>
-		
 
 	<content_rating type="oars-1.1">
 		<content_attribute id="social-info">mild</content_attribute> <!-- update checker connects to https://api.cryptomator.org/updates/latestVersion.json -->

+ 3 - 3
pom.xml

@@ -62,15 +62,15 @@
 
 		<!-- build-time dependencies -->
 		<jetbrains.annotations.version>24.1.0</jetbrains.annotations.version>
-		<dependency-check.version>9.2.0</dependency-check.version>
+		<dependency-check.version>10.0.2</dependency-check.version>
 		<jacoco.version>0.8.12</jacoco.version>
 		<license-generator.version>2.4.0</license-generator.version>
 		<junit-tree-reporter.version>1.2.1</junit-tree-reporter.version>
 		<mvn-compiler.version>3.13.0</mvn-compiler.version>
 		<mvn-resources.version>3.3.1</mvn-resources.version>
-		<mvn-dependency.version>3.7.0</mvn-dependency.version>
+		<mvn-dependency.version>3.7.1</mvn-dependency.version>
 		<mvn-surefire.version>3.3.0</mvn-surefire.version>
-		<mvn-jar.version>3.4.1</mvn-jar.version>
+		<mvn-jar.version>3.4.2</mvn-jar.version>
 	</properties>
 
 	<dependencies>

+ 2 - 0
src/main/java/org/cryptomator/ui/preferences/PreferencesComponent.java

@@ -30,6 +30,8 @@ public interface PreferencesComponent {
 		selectedTabProperty().set(selectedTab);
 		Stage stage = window();
 		stage.setScene(scene().get());
+		stage.setMinWidth(420);
+		stage.setMinHeight(300);
 		stage.show();
 		stage.requestFocus();
 		return stage;

+ 1 - 1
src/main/java/org/cryptomator/ui/preferences/PreferencesController.java

@@ -37,7 +37,7 @@ public class PreferencesController implements FxController {
 		this.env = env;
 		this.window = window;
 		this.selectedTabProperty = selectedTabProperty;
-		this.updateAvailable = updateChecker.latestVersionProperty().isNotNull();
+		this.updateAvailable = updateChecker.updateAvailableProperty();
 	}
 
 	@FXML

+ 0 - 2
src/main/resources/fxml/preferences.fxml

@@ -7,8 +7,6 @@
 		 xmlns="http://javafx.com/javafx"
 		 fx:id="tabPane"
 		 fx:controller="org.cryptomator.ui.preferences.PreferencesController"
-		 minWidth="-Infinity"
-		 maxWidth="-Infinity"
 		 prefWidth="650"
 		 tabMinWidth="60"
 		 tabClosingPolicy="UNAVAILABLE"