diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index 1b3b4f0b9..764af2d9a 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -8,6 +8,11 @@ on: version: description: 'Version' required: false + notarize: + description: 'Notarize' + required: true + default: false + type: boolean env: JAVA_VERSION: 20 @@ -222,7 +227,7 @@ jobs: env: VERSION_NO: ${{ needs.get-version.outputs.semVerNum }} - name: Notarize .dmg - if: startsWith(github.ref, 'refs/tags/') + if: startsWith(github.ref, 'refs/tags/') || inputs.notarize uses: cocoalibs/xcode-notarization-action@v1 with: app-path: 'Cryptomator-*.dmg' diff --git a/pom.xml b/pom.xml index f1f42b093..871611ea0 100644 --- a/pom.xml +++ b/pom.xml @@ -35,9 +35,9 @@ 2.6.6 1.3.0 - 1.2.0 + 1.2.2 1.2.0 - 1.3.0-beta5 + 1.3.0-beta6 3.0.0 2.0.0 2.0.3 diff --git a/src/main/java/org/cryptomator/common/locationpresets/OneDriveWindowsLocationPresetsProvider.java b/src/main/java/org/cryptomator/common/locationpresets/OneDriveWindowsLocationPresetsProvider.java index 7dcfde239..1d5bffd70 100644 --- a/src/main/java/org/cryptomator/common/locationpresets/OneDriveWindowsLocationPresetsProvider.java +++ b/src/main/java/org/cryptomator/common/locationpresets/OneDriveWindowsLocationPresetsProvider.java @@ -83,8 +83,8 @@ public final class OneDriveWindowsLocationPresetsProvider implements LocationPre throw new TimeoutException(cmdDescription + " timed out after " + timeoutSeconds + "s"); } if (process.exitValue() != 0) { - @SuppressWarnings("resource") var stdout = process.inputReader(StandardCharsets.UTF_8).lines().collect(Collectors.joining("\n")); - @SuppressWarnings("resource") var stderr = process.errorReader(StandardCharsets.UTF_8).lines().collect(Collectors.joining("\n")); + @SuppressWarnings("resource") var stdout = process.inputReader(StandardCharsets.ISO_8859_1).lines().collect(Collectors.joining("\n")); + @SuppressWarnings("resource") var stderr = process.errorReader(StandardCharsets.ISO_8859_1).lines().collect(Collectors.joining("\n")); throw new CommandFailedException(cmdDescription, process.exitValue(), stdout, stderr); } }