diff --git a/.github/workflows/autoApproveDependabot.yml b/.github/workflows/autoApproveDependabot.yml deleted file mode 100644 index eda6392b5a..0000000000 --- a/.github/workflows/autoApproveDependabot.yml +++ /dev/null @@ -1,35 +0,0 @@ -# synced from @nextcloud/android-config - -# SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors -# SPDX-FileCopyrightText: 2023 Álvaro Brey -# SPDX-License-Identifier: GPL-3.0-or-later - -name: Auto approve dependabot - -on: - pull_request_target: - branches: - - main - - master - - stable-* - -permissions: - contents: read - -concurrency: - group: dependabot-approve-${{ github.head_ref || github.run_id }} - cancel-in-progress: true - -jobs: - auto-approve: - name: Auto approve dependabot - runs-on: ubuntu-latest - if: github.actor == 'dependabot[bot]' - permissions: - # needed to approve the PR - pull-requests: write - - steps: - - uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363 # v4.0.0 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/autoApproveRenovate.yml b/.github/workflows/renovate-approve-merge.yml similarity index 71% rename from .github/workflows/autoApproveRenovate.yml rename to .github/workflows/renovate-approve-merge.yml index f5e3f0cea2..48b98e91ac 100644 --- a/.github/workflows/autoApproveRenovate.yml +++ b/.github/workflows/renovate-approve-merge.yml @@ -1,7 +1,10 @@ -# SPDX-FileCopyrightText: 2023-2024 Nextcloud GmbH and Nextcloud contributors -# SPDX-FileCopyrightText: 2023 Álvaro Brey -# SPDX-FileCopyrightText: 2023 Andy Scherzinger -# SPDX-License-Identifier: GPL-3.0-or-later +# This workflow is provided via the organization template repository +# +# https://github.com/nextcloud/.github +# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization +# +# SPDX-FileCopyrightText: Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: MIT name: Auto approve renovate PRs @@ -30,6 +33,12 @@ jobs: contents: write steps: + - name: Disabled on forks + if: ${{ github.event.pull_request.head.repo.full_name != github.repository }} + run: | + echo 'Can not approve PRs from forks' + exit 1 + - uses: mdecoleman/pr-branch-name@55795d86b4566d300d237883103f052125cc7508 # v3.0.0 id: branchname with: diff --git a/.github/workflows/screenShotTest.yml b/.github/workflows/screenShotTest.yml index 36d74c6782..e5126b66d1 100644 --- a/.github/workflows/screenShotTest.yml +++ b/.github/workflows/screenShotTest.yml @@ -99,7 +99,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: scripts/uploadReport.sh "${{ secrets.LOG_USERNAME }}" "${{ secrets.LOG_PASSWORD }}" ${{github.event.number}} "${{ matrix.color }}-${{ matrix.scheme }}" "Screenshot" ${{github.event.number}} - name: Archive Espresso results - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6 + uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0 if: ${{ always() }} with: name: Report-${{ matrix.color }}-${{ matrix.scheme }} diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index a6fc95f1cd..866fd22603 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -49,7 +49,7 @@ jobs: fail_ci_if_error: true - name: Upload jacoco artifacts if: ${{ failure() }} - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6 + uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0 with: name: test-results path: app/build/reports/tests/testGplayDebugUnitTest/ diff --git a/app/build.gradle b/app/build.gradle index ff54ebf39f..7a632d425d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,7 +16,7 @@ import org.gradle.internal.jvm.Jvm buildscript { dependencies { classpath "com.android.tools.build:gradle:$androidPluginVersion" - classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.20' + classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.21' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.6" classpath "commons-httpclient:commons-httpclient:3.1@jar" // remove after entire switch to lib v2 diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 2cbf892722..d57f8cc054 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -409,7 +409,7 @@ Aktualisiere Index… Verwende bestehenden Warte auf die Fertigstellung aller Synchronisierungen … - Der aktuelle Ordnername ist ungültig. Bitte benennen Sie den Ordner um. Weiterleitung zum Stammverzeichnis + Der aktuelle Ordnername ist unzulässig. Bitte benennen Sie den Ordner um. Weiterleitung zum Stammverzeichnis Der Ordnerpfad enthält reservierte Namen oder ungültige Zeichen Der Name endet mit einem Leerzeichen oder einem Punkt .%s ist eine unzulässige Dateierweiterung diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index d9b0692278..9f4861d733 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -193,7 +193,7 @@ A importación está programada e comezará en breve Non se atopou ningún ficheiro Non foi posíbel atopar a súa última copia de seguranza! - Copiado no portapapeis. + Copiado no portapapeis Produciuse un erro ao tentar copiar este ficheiro ou cartafol. Non é posíbel copiar un cartafol nun dos seus propios subcartafoles Este ficheiro xa existe no cartafol de destino diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 00fc6d0db1..6669fe9a8e 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -480,6 +480,7 @@ в каталозі %1$s Також завантажити існуючі файли Завантаження тільки під час заряджання + Внутрішня двостороння синхронізація Поки не впроваджено Неправильний URL Приховано diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 20f2762a44..e007647bb1 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -10574,6 +10574,11 @@ + + + + + @@ -10655,6 +10660,11 @@ + + + + +