mirror of
https://github.com/cryptomator/cryptomator.git
synced 2026-09-24 17:05:00 +00:00
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
  dependabot[bot]andGitHub
|
1cd1f725ad |
@@ -48,9 +48,6 @@ on:
|
|||||||
- 'dist/linux/common/**'
|
- 'dist/linux/common/**'
|
||||||
- 'dist/linux/resources/**'
|
- 'dist/linux/resources/**'
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
env:
|
env:
|
||||||
JAVA_DIST: 'temurin'
|
JAVA_DIST: 'temurin'
|
||||||
JAVA_VERSION: '26.0.1+8'
|
JAVA_VERSION: '26.0.1+8'
|
||||||
|
|||||||
@@ -9,9 +9,6 @@ on:
|
|||||||
description: 'Source or Release tag'
|
description: 'Source or Release tag'
|
||||||
required: false
|
required: false
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
get-version:
|
get-version:
|
||||||
uses: ./.github/workflows/get-version.yml
|
uses: ./.github/workflows/get-version.yml
|
||||||
|
|||||||
@@ -34,8 +34,6 @@ on:
|
|||||||
type: boolean
|
type: boolean
|
||||||
default: false
|
default: false
|
||||||
|
|
||||||
permissions: {}
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
download-file:
|
download-file:
|
||||||
name: Downloads the file into the VM
|
name: Downloads the file into the VM
|
||||||
|
|||||||
@@ -17,10 +17,6 @@ defaults:
|
|||||||
run:
|
run:
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
pull-requests: read
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
test:
|
test:
|
||||||
name: Compile and Test
|
name: Compile and Test
|
||||||
|
|||||||
@@ -15,8 +15,6 @@ env:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
permissions: {}
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
check-version:
|
check-version:
|
||||||
name: Checkout latest jdk version
|
name: Checkout latest jdk version
|
||||||
|
|||||||
@@ -32,9 +32,6 @@ env:
|
|||||||
OPENJFX_JMODS_AARCH64: 'https://download2.gluonhq.com/openjfx/25.0.3/openjfx-25.0.3_linux-aarch64_bin-jmods.zip'
|
OPENJFX_JMODS_AARCH64: 'https://download2.gluonhq.com/openjfx/25.0.3/openjfx-25.0.3_linux-aarch64_bin-jmods.zip'
|
||||||
OPENJFX_JMODS_AARCH64_HASH: 'e3fd682354346845d2944a2da2b1ff2b6cb9259d92027f2f9c121b9b93c5e42f'
|
OPENJFX_JMODS_AARCH64_HASH: 'e3fd682354346845d2944a2da2b1ff2b6cb9259d92027f2f9c121b9b93c5e42f'
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
get-version:
|
get-version:
|
||||||
uses: ./.github/workflows/get-version.yml
|
uses: ./.github/workflows/get-version.yml
|
||||||
|
|||||||
@@ -5,9 +5,6 @@ on:
|
|||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
check-dependencies:
|
check-dependencies:
|
||||||
uses: skymatic/workflows/.github/workflows/run-dependency-check.yml@8356563bf7b8d1c8d693f75ca487e8f57573cec9 # v3.1.0
|
uses: skymatic/workflows/.github/workflows/run-dependency-check.yml@8356563bf7b8d1c8d693f75ca487e8f57573cec9 # v3.1.0
|
||||||
|
|||||||
@@ -4,9 +4,6 @@ on:
|
|||||||
schedule:
|
schedule:
|
||||||
- cron: '0/15 * * * *' # run every 15 min - don't forget to adjust the "interval" in the json sent to the metrics endpoint
|
- cron: '0/15 * * * *' # run every 15 min - don't forget to adjust the "interval" in the json sent to the metrics endpoint
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
report-download-stats:
|
report-download-stats:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|||||||
@@ -16,8 +16,6 @@ defaults:
|
|||||||
jobs:
|
jobs:
|
||||||
get-version:
|
get-version:
|
||||||
uses: ./.github/workflows/get-version.yml
|
uses: ./.github/workflows/get-version.yml
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
with:
|
with:
|
||||||
version: ''
|
version: ''
|
||||||
|
|
||||||
@@ -25,9 +23,6 @@ jobs:
|
|||||||
name: Compile and Test
|
name: Compile and Test
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: get-version
|
needs: get-version
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
pull-requests: read
|
|
||||||
if: needs.get-version.outputs.versionType != 'unknown'
|
if: needs.get-version.outputs.versionType != 'unknown'
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
|
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
|
||||||
@@ -76,8 +71,6 @@ jobs:
|
|||||||
build-exe-and-msi:
|
build-exe-and-msi:
|
||||||
needs: [get-version, create-release-draft]
|
needs: [get-version, create-release-draft]
|
||||||
uses: ./.github/workflows/win-exe.yml
|
uses: ./.github/workflows/win-exe.yml
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
with:
|
with:
|
||||||
semVerNum: ${{needs.get-version.outputs.semVerNum}}
|
semVerNum: ${{needs.get-version.outputs.semVerNum}}
|
||||||
revisionNum: ${{needs.get-version.outputs.revNum}}
|
revisionNum: ${{needs.get-version.outputs.revNum}}
|
||||||
@@ -87,8 +80,6 @@ jobs:
|
|||||||
build-dmg-arm64:
|
build-dmg-arm64:
|
||||||
needs: [get-version, create-release-draft]
|
needs: [get-version, create-release-draft]
|
||||||
uses: ./.github/workflows/mac-dmg.yml
|
uses: ./.github/workflows/mac-dmg.yml
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
with:
|
with:
|
||||||
semVerNum: ${{needs.get-version.outputs.semVerNum}}
|
semVerNum: ${{needs.get-version.outputs.semVerNum}}
|
||||||
revisionNum: ${{needs.get-version.outputs.revNum}}
|
revisionNum: ${{needs.get-version.outputs.revNum}}
|
||||||
@@ -98,8 +89,6 @@ jobs:
|
|||||||
build-dmg-x64:
|
build-dmg-x64:
|
||||||
needs: [get-version, create-release-draft]
|
needs: [get-version, create-release-draft]
|
||||||
uses: ./.github/workflows/mac-dmg-x64.yml
|
uses: ./.github/workflows/mac-dmg-x64.yml
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
with:
|
with:
|
||||||
semVerNum: ${{needs.get-version.outputs.semVerNum}}
|
semVerNum: ${{needs.get-version.outputs.semVerNum}}
|
||||||
revisionNum: ${{needs.get-version.outputs.revNum}}
|
revisionNum: ${{needs.get-version.outputs.revNum}}
|
||||||
@@ -109,8 +98,6 @@ jobs:
|
|||||||
build-appimages:
|
build-appimages:
|
||||||
needs: [get-version, create-release-draft]
|
needs: [get-version, create-release-draft]
|
||||||
uses: ./.github/workflows/appimage.yml
|
uses: ./.github/workflows/appimage.yml
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
with:
|
with:
|
||||||
semVerNum: ${{needs.get-version.outputs.semVerNum}}
|
semVerNum: ${{needs.get-version.outputs.semVerNum}}
|
||||||
revisionNum: ${{needs.get-version.outputs.revNum}}
|
revisionNum: ${{needs.get-version.outputs.revNum}}
|
||||||
@@ -120,8 +107,6 @@ jobs:
|
|||||||
update-sha256sums:
|
update-sha256sums:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: [get-version, build-exe-and-msi, build-dmg-arm64, build-dmg-x64, build-appimages]
|
needs: [get-version, build-exe-and-msi, build-dmg-arm64, build-dmg-x64, build-appimages]
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
env:
|
env:
|
||||||
TAG: ${{ github.ref_name }}
|
TAG: ${{ github.ref_name }}
|
||||||
SEMVER: ${{ needs.get-version.outputs.semVerStr }}
|
SEMVER: ${{ needs.get-version.outputs.semVerStr }}
|
||||||
|
|||||||
@@ -6,9 +6,6 @@ on:
|
|||||||
discussion_comment:
|
discussion_comment:
|
||||||
types: [created, edited, deleted]
|
types: [created, edited, deleted]
|
||||||
|
|
||||||
permissions:
|
|
||||||
discussions: read
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
update-error-db:
|
update-error-db:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|||||||
@@ -28,9 +28,6 @@ env:
|
|||||||
JAVA_DIST: 'temurin'
|
JAVA_DIST: 'temurin'
|
||||||
JAVA_VERSION: 26
|
JAVA_VERSION: 26
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
determine-version:
|
determine-version:
|
||||||
name: 'Determines the version following semver'
|
name: 'Determines the version following semver'
|
||||||
|
|||||||
@@ -23,9 +23,6 @@ on:
|
|||||||
- 'dist/linux/common/**'
|
- 'dist/linux/common/**'
|
||||||
- 'dist/linux/resources/**'
|
- 'dist/linux/resources/**'
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
get-version:
|
get-version:
|
||||||
uses: ./.github/workflows/get-version.yml
|
uses: ./.github/workflows/get-version.yml
|
||||||
|
|||||||
@@ -23,9 +23,6 @@ on:
|
|||||||
- 'dist/linux/common/**'
|
- 'dist/linux/common/**'
|
||||||
- 'dist/linux/resources/**'
|
- 'dist/linux/resources/**'
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
get-version:
|
get-version:
|
||||||
uses: ./.github/workflows/get-version.yml
|
uses: ./.github/workflows/get-version.yml
|
||||||
|
|||||||
@@ -62,9 +62,6 @@ env:
|
|||||||
VERSION_SUFFIX: ${{ inputs.semVerSuffix || ''}}
|
VERSION_SUFFIX: ${{ inputs.semVerSuffix || ''}}
|
||||||
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
name: Build Cryptomator.app for ${{ matrix.output-suffix }}
|
name: Build Cryptomator.app for ${{ matrix.output-suffix }}
|
||||||
@@ -195,6 +192,7 @@ jobs:
|
|||||||
-Dlicense.includedScopes=compile
|
-Dlicense.includedScopes=compile
|
||||||
-Dlicense.excludedGroups=^org\.cryptomator
|
-Dlicense.excludedGroups=^org\.cryptomator
|
||||||
-Dlicense.failOnMissing=true
|
-Dlicense.failOnMissing=true
|
||||||
|
-Dlicense.licenseMergesUrl=file://${{ github.workspace }}/license/merges
|
||||||
- name: Install codesign certificate
|
- name: Install codesign certificate
|
||||||
run: |
|
run: |
|
||||||
# create variables
|
# create variables
|
||||||
|
|||||||
@@ -60,9 +60,6 @@ env:
|
|||||||
VERSION_SUFFIX: ${{ inputs.semVerSuffix || ''}}
|
VERSION_SUFFIX: ${{ inputs.semVerSuffix || ''}}
|
||||||
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
name: Build Cryptomator.app for ${{ matrix.output-suffix }}
|
name: Build Cryptomator.app for ${{ matrix.output-suffix }}
|
||||||
@@ -194,6 +191,7 @@ jobs:
|
|||||||
-Dlicense.includedScopes=compile
|
-Dlicense.includedScopes=compile
|
||||||
-Dlicense.excludedGroups=^org\.cryptomator
|
-Dlicense.excludedGroups=^org\.cryptomator
|
||||||
-Dlicense.failOnMissing=true
|
-Dlicense.failOnMissing=true
|
||||||
|
-Dlicense.licenseMergesUrl=file://${{ github.workspace }}/license/merges
|
||||||
- name: Install codesign certificate
|
- name: Install codesign certificate
|
||||||
run: |
|
run: |
|
||||||
# create variables
|
# create variables
|
||||||
|
|||||||
@@ -4,8 +4,6 @@ on:
|
|||||||
release:
|
release:
|
||||||
types: [published]
|
types: [published]
|
||||||
|
|
||||||
permissions: {}
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
notify:
|
notify:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
@@ -144,3 +142,4 @@ jobs:
|
|||||||
token: ${{ secrets.CRYPTOBOT_WORKFLOW_DISPATCH_TOKEN }}
|
token: ${{ secrets.CRYPTOBOT_WORKFLOW_DISPATCH_TOKEN }}
|
||||||
repository: cryptomator/docs
|
repository: cryptomator/docs
|
||||||
client-payload: '{ "version": "${{ github.event.release.tag_name }}", "release": ${{ toJson(github.event.release.assets) }} }'
|
client-payload: '{ "version": "${{ github.event.release.tag_name }}", "release": ${{ toJson(github.event.release.assets) }} }'
|
||||||
|
|
||||||
|
|||||||
@@ -11,9 +11,6 @@ defaults:
|
|||||||
run:
|
run:
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
test:
|
test:
|
||||||
name: Compile and Test
|
name: Compile and Test
|
||||||
|
|||||||
@@ -14,9 +14,6 @@ env:
|
|||||||
JAVA_DIST: 'temurin'
|
JAVA_DIST: 'temurin'
|
||||||
JAVA_VERSION: 26
|
JAVA_VERSION: 26
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
check-preconditions:
|
check-preconditions:
|
||||||
name: Validate commits pushed to release/hotfix branch to fulfill release requirements
|
name: Validate commits pushed to release/hotfix branch to fulfill release requirements
|
||||||
|
|||||||
@@ -71,9 +71,6 @@ defaults:
|
|||||||
run:
|
run:
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-msi:
|
build-msi:
|
||||||
name: Build .msi Installer
|
name: Build .msi Installer
|
||||||
@@ -272,6 +269,7 @@ jobs:
|
|||||||
"-Dlicense.includedScopes=compile"
|
"-Dlicense.includedScopes=compile"
|
||||||
"-Dlicense.excludedGroups=^org\.cryptomator"
|
"-Dlicense.excludedGroups=^org\.cryptomator"
|
||||||
"-Dlicense.failOnMissing=true"
|
"-Dlicense.failOnMissing=true"
|
||||||
|
"-Dlicense.licenseMergesUrl=file:///${{ github.workspace }}/license/merges"
|
||||||
shell: pwsh
|
shell: pwsh
|
||||||
- name: Create file association file from template
|
- name: Create file association file from template
|
||||||
working-directory: dist/win
|
working-directory: dist/win
|
||||||
@@ -386,6 +384,7 @@ jobs:
|
|||||||
"-Dlicense.includedScopes=compile"
|
"-Dlicense.includedScopes=compile"
|
||||||
"-Dlicense.excludedGroups=^org\.cryptomator"
|
"-Dlicense.excludedGroups=^org\.cryptomator"
|
||||||
"-Dlicense.failOnMissing=true"
|
"-Dlicense.failOnMissing=true"
|
||||||
|
"-Dlicense.licenseMergesUrl=file:///${{ github.workspace }}/license/merges"
|
||||||
shell: pwsh
|
shell: pwsh
|
||||||
- name: Download WinFsp
|
- name: Download WinFsp
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@@ -7,8 +7,6 @@ on:
|
|||||||
description: 'Release tag'
|
description: 'Release tag'
|
||||||
required: true
|
required: true
|
||||||
|
|
||||||
permissions: {}
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
winget:
|
winget:
|
||||||
name: Publish winget package
|
name: Publish winget package
|
||||||
|
|||||||
+2
-16
@@ -9,18 +9,8 @@ Changes to prior versions can be found on the [Github release page](https://gith
|
|||||||
|
|
||||||
|
|
||||||
## [Unreleased](https://github.com/cryptomator/cryptomator/compare/1.19.3...HEAD)
|
## [Unreleased](https://github.com/cryptomator/cryptomator/compare/1.19.3...HEAD)
|
||||||
### Fixed
|
|
||||||
* Fixed "Locate encrypted file" opening the file instead of revealing it in the file manager on Linux ([#4272](https://github.com/cryptomator/cryptomator/issues/4272))
|
|
||||||
* Fixed password retrieval from keychain not working while the system keychain is locked on Linux ([#4294](https://github.com/cryptomator/cryptomator/pull/4294), [#4301](https://github.com/cryptomator/cryptomator/pull/4301), [#4302](https://github.com/cryptomator/cryptomator/pull/4302))
|
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
* Improved usability of the trust on first use dialog ([#4295](https://github.com/cryptomator/cryptomator/pull/4295))
|
* Updated Jackson to 2.21.6
|
||||||
* Migrated code to common JDK 25 APIs and constructs
|
|
||||||
* Added Maven profile to run the app from the command line ([#4317](https://github.com/cryptomator/cryptomator/pull/4317))
|
|
||||||
* Updated dependencies:
|
|
||||||
- `org.cryptomator:integrations-linux` from 1.7.0 to 1.8.0-beta1
|
|
||||||
- `com.fasterxml.jackson.core:jackson-databind` from 2.21.4 to 2.21.6
|
|
||||||
- `com.fasterxml.jackson.datatype:jackson-datatype-jsr310` from 2.21.4 to 2.21.6
|
|
||||||
|
|
||||||
|
|
||||||
## [1.19.3](https://github.com/cryptomator/cryptomator/releases/1.19.3) - 2026-06-29
|
## [1.19.3](https://github.com/cryptomator/cryptomator/releases/1.19.3) - 2026-06-29
|
||||||
@@ -29,8 +19,7 @@ Changes to prior versions can be found on the [Github release page](https://gith
|
|||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
* Fixed Cryptomator file extensions were not registered on Windows ([#4219](https://github.com/cryptomator/cryptomator/issues/4219))
|
* Fixed Cryptomator file extensions were not registered on Windows ([#4219](https://github.com/cryptomator/cryptomator/issues/4219))
|
||||||
* Fixed warning was displayed when accessing update tab in settings even though an update check did not ran ([#4194](https://github.com/cryptomator/cryptomator/pull/4194))
|
* Fixed warning was displayed when accessing update tab in settings even though an update check did not ran ([#4199](https://github.com/cryptomator/cryptomator/pull/4199))
|
||||||
* Fixed the same vault could be added several times to the vault list ([#4243](https://github.com/cryptomator/cryptomator/pull/4243))
|
|
||||||
* Fixed several Decrypt Name dialogs could be opened on the same vault ([#4164](https://github.com/cryptomator/cryptomator/pull/4164))
|
* Fixed several Decrypt Name dialogs could be opened on the same vault ([#4164](https://github.com/cryptomator/cryptomator/pull/4164))
|
||||||
* Fixed not all mount options in vault specific settings could be displayed ([#4227](https://github.com/cryptomator/cryptomator/pull/4227))
|
* Fixed not all mount options in vault specific settings could be displayed ([#4227](https://github.com/cryptomator/cryptomator/pull/4227))
|
||||||
* Fixed localhost alias on Windows was not removed on uninstall ([#3993](https://github.com/cryptomator/cryptomator/issues/3993))
|
* Fixed localhost alias on Windows was not removed on uninstall ([#3993](https://github.com/cryptomator/cryptomator/issues/3993))
|
||||||
@@ -42,9 +31,6 @@ Changes to prior versions can be found on the [Github release page](https://gith
|
|||||||
* Drop signing with Actalis issued certificate ([#4169](https://github.com/cryptomator/cryptomator/pull/4169), [#4262](https://github.com/cryptomator/cryptomator/pull/4262))
|
* Drop signing with Actalis issued certificate ([#4169](https://github.com/cryptomator/cryptomator/pull/4169), [#4262](https://github.com/cryptomator/cryptomator/pull/4262))
|
||||||
* Fix dagger binding graph issues ([#4147](https://github.com/cryptomator/cryptomator/pull/4147))
|
* Fix dagger binding graph issues ([#4147](https://github.com/cryptomator/cryptomator/pull/4147))
|
||||||
* Added flatpak build to CI ([#4199](https://github.com/cryptomator/cryptomator/pull/4199))
|
* Added flatpak build to CI ([#4199](https://github.com/cryptomator/cryptomator/pull/4199))
|
||||||
* Added monthly distribution builds to CI ([#4187](https://github.com/cryptomator/cryptomator/pull/4187))
|
|
||||||
* Replaced Guava cache with Caffeine
|
|
||||||
* Updated translations ([#4223](https://github.com/cryptomator/cryptomator/pull/4223))
|
|
||||||
* Updated dependencies:
|
* Updated dependencies:
|
||||||
- `org.cryptomator:webdav-nio-adapter` from 3.0.1 to 3.0.2
|
- `org.cryptomator:webdav-nio-adapter` from 3.0.1 to 3.0.2
|
||||||
- `org.cryptomator:integrations-api` from 1.8.0 to 1.9.0
|
- `org.cryptomator:integrations-api` from 1.8.0 to 1.9.0
|
||||||
|
|||||||
Vendored
+2
-1
@@ -143,7 +143,8 @@ cp ../embedded.provisionprofile ${APP_NAME}.app/Contents/
|
|||||||
-Dlicense.fileTemplate=resources/licenseTemplate.ftl \
|
-Dlicense.fileTemplate=resources/licenseTemplate.ftl \
|
||||||
-Dlicense.includedScopes=compile \
|
-Dlicense.includedScopes=compile \
|
||||||
-Dlicense.excludedGroups=^org\.cryptomator \
|
-Dlicense.excludedGroups=^org\.cryptomator \
|
||||||
-Dlicense.failOnMissing=true
|
-Dlicense.failOnMissing=true \
|
||||||
|
-Dlicense.licenseMergesUrl=file://$(pwd)/../../../license/merges
|
||||||
|
|
||||||
# codesign
|
# codesign
|
||||||
if [ -n "${CODESIGN_IDENTITY}" ] && [ -n "${TEAM_IDENTIFIER}" ]; then
|
if [ -n "${CODESIGN_IDENTITY}" ] && [ -n "${TEAM_IDENTIFIER}" ]; then
|
||||||
|
|||||||
Vendored
+4
-2
@@ -213,7 +213,8 @@ Invoke-CommandWithExitCheck -Command `
|
|||||||
"-Dlicense.outputDirectory=$buildDir\resources\", `
|
"-Dlicense.outputDirectory=$buildDir\resources\", `
|
||||||
"-Dlicense.includedScopes=compile", `
|
"-Dlicense.includedScopes=compile", `
|
||||||
"-Dlicense.excludedGroups=^org\.cryptomator", `
|
"-Dlicense.excludedGroups=^org\.cryptomator", `
|
||||||
"-Dlicense.failOnMissing=true")
|
"-Dlicense.failOnMissing=true", `
|
||||||
|
"-Dlicense.licenseMergesUrl=file:///$buildDir/../../license/merges")
|
||||||
|
|
||||||
# patch app dir
|
# patch app dir
|
||||||
Copy-Item "contrib\*" -Destination "$AppName"
|
Copy-Item "contrib\*" -Destination "$AppName"
|
||||||
@@ -259,7 +260,8 @@ Invoke-CommandWithExitCheck -Command `
|
|||||||
"-Dlicense.outputDirectory=$buildDir\bundle\resources\", `
|
"-Dlicense.outputDirectory=$buildDir\bundle\resources\", `
|
||||||
"-Dlicense.includedScopes=compile", `
|
"-Dlicense.includedScopes=compile", `
|
||||||
"-Dlicense.excludedGroups=^org\.cryptomator", `
|
"-Dlicense.excludedGroups=^org\.cryptomator", `
|
||||||
"-Dlicense.failOnMissing=true")
|
"-Dlicense.failOnMissing=true", `
|
||||||
|
"-Dlicense.licenseMergesUrl=file:///$buildDir/../../license/merges")
|
||||||
|
|
||||||
# download Winfsp
|
# download Winfsp
|
||||||
$winfspMsiUrl= 'https://github.com/winfsp/winfsp/releases/download/v2.1/winfsp-2.1.25156.msi'
|
$winfspMsiUrl= 'https://github.com/winfsp/winfsp/releases/download/v2.1/winfsp-2.1.25156.msi'
|
||||||
|
|||||||
+2
-2
@@ -1,7 +1,7 @@
|
|||||||
Apache License v2.0|Apache License, Version 2.0|The Apache License, Version 2.0|The Apache Software License, Version 2.0|Apache 2.0|Apache Software License - Version 2.0|Apache-2.0
|
Apache License v2.0|Apache License, Version 2.0|The Apache License, Version 2.0|The Apache Software License, Version 2.0|Apache 2.0|Apache Software License - Version 2.0|Apache-2.0
|
||||||
MIT License|MIT|The MIT License (MIT)|The MIT License|MIT license
|
MIT License|MIT|The MIT License (MIT)|The MIT License|MIT license
|
||||||
LGPL 2.1|LGPL, version 2.1|GNU Lesser/Library General Public License version 2|GNU Lesser General Public License Version 2.1|GNU Lesser General Public License|LGPL-2.1-only
|
LGPL 2.1|LGPL, version 2.1|GNU Lesser/Library General Public License version 2|GNU Lesser General Public License Version 2.1|GNU Lesser General Public License
|
||||||
GPLv2|GNU General Public License Version 2
|
GPLv2|GNU General Public License Version 2
|
||||||
GPLv2+CE|CDDL + GPLv2 with classpath exception
|
GPLv2+CE|CDDL + GPLv2 with classpath exception
|
||||||
Eclipse Public License - Version 1.0|Eclipse Public License - v 1.0
|
Eclipse Public License - Version 1.0|Eclipse Public License - v 1.0
|
||||||
Eclipse Public License - Version 2.0|Eclipse Public License - v 2.0|EPL-2.0
|
Eclipse Public License - Version 2.0|Eclipse Public License - v 2.0
|
||||||
@@ -46,33 +46,33 @@
|
|||||||
<!-- 3rd party dependencies -->
|
<!-- 3rd party dependencies -->
|
||||||
<caffeine.version>3.2.4</caffeine.version>
|
<caffeine.version>3.2.4</caffeine.version>
|
||||||
<commons-lang3.version>3.20.0</commons-lang3.version>
|
<commons-lang3.version>3.20.0</commons-lang3.version>
|
||||||
<dagger.version>2.59.2</dagger.version>
|
<dagger.version>2.60.1</dagger.version>
|
||||||
<easybind.version>2.2</easybind.version>
|
<easybind.version>2.2</easybind.version>
|
||||||
<jackson.version>2.21.6</jackson.version>
|
<jackson.version>2.21.6</jackson.version>
|
||||||
<javafx.version>25.0.3</javafx.version>
|
<javafx.version>25.0.3</javafx.version>
|
||||||
<jwt.version>4.5.2</jwt.version>
|
<jwt.version>4.6.1</jwt.version>
|
||||||
<nimbus-jose.version>10.5</nimbus-jose.version>
|
<nimbus-jose.version>10.5</nimbus-jose.version>
|
||||||
<logback.version>1.5.35</logback.version>
|
<logback.version>1.6.3</logback.version>
|
||||||
<slf4j.version>2.0.18</slf4j.version>
|
<slf4j.version>2.0.19</slf4j.version>
|
||||||
<tinyoauth2.version>0.8.1</tinyoauth2.version>
|
<tinyoauth2.version>0.8.1</tinyoauth2.version>
|
||||||
<zxcvbn.version>1.9.0</zxcvbn.version>
|
<zxcvbn.version>1.9.0</zxcvbn.version>
|
||||||
|
|
||||||
<!-- test dependencies -->
|
<!-- test dependencies -->
|
||||||
<junit.jupiter.version>6.1.0</junit.jupiter.version>
|
<junit.jupiter.version>6.1.3</junit.jupiter.version>
|
||||||
<mockito.version>5.23.0</mockito.version>
|
<mockito.version>5.23.0</mockito.version>
|
||||||
<hamcrest.version>3.0</hamcrest.version>
|
<hamcrest.version>3.0</hamcrest.version>
|
||||||
|
|
||||||
<!-- build-time dependencies -->
|
<!-- build-time dependencies -->
|
||||||
<jetbrains.annotations.version>26.1.0</jetbrains.annotations.version>
|
<jetbrains.annotations.version>26.1.0</jetbrains.annotations.version>
|
||||||
<dependency-check.version>12.2.2</dependency-check.version>
|
<dependency-check.version>13.0.0</dependency-check.version>
|
||||||
<jacoco.version>0.8.15</jacoco.version>
|
<jacoco.version>0.8.15</jacoco.version>
|
||||||
<license-generator.version>2.7.1</license-generator.version>
|
<license-generator.version>2.7.1</license-generator.version>
|
||||||
<mvn-compiler.version>3.15.0</mvn-compiler.version>
|
<mvn-compiler.version>3.16.0</mvn-compiler.version>
|
||||||
<mvn-resources.version>3.5.0</mvn-resources.version>
|
<mvn-resources.version>3.5.0</mvn-resources.version>
|
||||||
<mvn-dependency.version>3.11.0</mvn-dependency.version>
|
<mvn-dependency.version>3.11.0</mvn-dependency.version>
|
||||||
<mvn-surefire.version>3.5.6</mvn-surefire.version>
|
<mvn-surefire.version>3.6.0</mvn-surefire.version>
|
||||||
<mvn-jar.version>3.5.0</mvn-jar.version>
|
<mvn-jar.version>3.5.1</mvn-jar.version>
|
||||||
<mvn-exec.version>3.5.1</mvn-exec.version>
|
<mvn-exec.version>3.6.4</mvn-exec.version>
|
||||||
|
|
||||||
<!-- Property used by surefire to determine jacoco engine -->
|
<!-- Property used by surefire to determine jacoco engine -->
|
||||||
<surefire.jacoco.args></surefire.jacoco.args>
|
<surefire.jacoco.args></surefire.jacoco.args>
|
||||||
@@ -272,7 +272,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.google.jimfs</groupId>
|
<groupId>com.google.jimfs</groupId>
|
||||||
<artifactId>jimfs</artifactId>
|
<artifactId>jimfs</artifactId>
|
||||||
<version>1.3.1</version>
|
<version>1.3.2</version>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
@@ -426,9 +426,6 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
<artifactId>license-maven-plugin</artifactId>
|
<artifactId>license-maven-plugin</artifactId>
|
||||||
<configuration>
|
|
||||||
<licenseMergesUrl>${project.baseUri}license/merges</licenseMergesUrl>
|
|
||||||
</configuration>
|
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>add-third-party</id>
|
<id>add-third-party</id>
|
||||||
@@ -440,6 +437,7 @@
|
|||||||
<thirdPartyFilename>THIRD-PARTY.txt</thirdPartyFilename>
|
<thirdPartyFilename>THIRD-PARTY.txt</thirdPartyFilename>
|
||||||
<includedScopes>compile</includedScopes>
|
<includedScopes>compile</includedScopes>
|
||||||
<excludedGroups>org\.cryptomator</excludedGroups>
|
<excludedGroups>org\.cryptomator</excludedGroups>
|
||||||
|
<licenseMergesUrl>file:///${project.basedir}/license/merges</licenseMergesUrl>
|
||||||
<fileTemplate>${project.basedir}/src/main/resources/license/template.ftl</fileTemplate>
|
<fileTemplate>${project.basedir}/src/main/resources/license/template.ftl</fileTemplate>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
|
|||||||
@@ -96,7 +96,7 @@ public class ChangePasswordController implements FxController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void updatePasswordInSystemkeychain() {
|
private void updatePasswordInSystemkeychain() {
|
||||||
if (keychain.isSupported()) {
|
if (keychain.isSupported() && !keychain.isLocked()) {
|
||||||
try {
|
try {
|
||||||
keychain.changePassphrase(vault.getId(), vault.getDisplayName(), newPasswordController.passwordField.getCharacters());
|
keychain.changePassphrase(vault.getId(), vault.getDisplayName(), newPasswordController.passwordField.getCharacters());
|
||||||
LOG.info("Successfully updated password in system keychain for {}", vault.getDisplayName());
|
LOG.info("Successfully updated password in system keychain for {}", vault.getDisplayName());
|
||||||
|
|||||||
+1
-1
@@ -24,7 +24,7 @@ public interface MasterkeyFileLoadingModule {
|
|||||||
@Named("savedPassword")
|
@Named("savedPassword")
|
||||||
@KeyLoadingScoped
|
@KeyLoadingScoped
|
||||||
static Optional<char[]> provideStoredPassword(KeychainManager keychain, @KeyLoading Vault vault) {
|
static Optional<char[]> provideStoredPassword(KeychainManager keychain, @KeyLoading Vault vault) {
|
||||||
if (!keychain.isSupported()) {
|
if (!keychain.isSupported() || keychain.isLocked()) {
|
||||||
return Optional.empty();
|
return Optional.empty();
|
||||||
} else {
|
} else {
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ public class MasterkeyOptionsController implements FxController {
|
|||||||
this.recoveryKeyWindow = recoveryKeyWindow;
|
this.recoveryKeyWindow = recoveryKeyWindow;
|
||||||
this.forgetPasswordWindow = forgetPasswordWindow;
|
this.forgetPasswordWindow = forgetPasswordWindow;
|
||||||
this.keychain = keychain;
|
this.keychain = keychain;
|
||||||
if (keychain.isSupported()) {
|
if (keychain.isSupported() && !keychain.isLocked()) {
|
||||||
this.passwordSaved = keychain.getPassphraseStoredProperty(vault.getId()).orElse(false);
|
this.passwordSaved = keychain.getPassphraseStoredProperty(vault.getId()).orElse(false);
|
||||||
} else {
|
} else {
|
||||||
this.passwordSaved = new SimpleBooleanProperty(false);
|
this.passwordSaved = new SimpleBooleanProperty(false);
|
||||||
|
|||||||
Reference in New Issue
Block a user