From c3dee40d4784d240f27a5657705e213a0bf899de Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Apr 2023 08:56:54 +0200 Subject: [PATCH 01/21] build(deps): Bump gradle/gradle-build-action from 2.4.0 to 2.4.1 (#4969) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [gradle/gradle-build-action](https://github.com/gradle/gradle-build-action) from 2.4.0 to 2.4.1.
Release notes

Sourced from gradle/gradle-build-action's releases.

v2.4.1

This patch release updates a number of dependencies, including xmljs which was reported to have a security vulnerability (https://nvd.nist.gov/vuln/detail/CVE-2023-0842). There is no evidence that this vulnerability affected the gradle-build-action.

Full changelog: https://github.com/gradle/gradle-build-action/compare/v2.4.0...v2.4.1

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=gradle/gradle-build-action&package-manager=github_actions&previous-version=2.4.0&new-version=2.4.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/android-integration.yml | 10 +++++----- .github/workflows/android-release.yml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/android-integration.yml b/.github/workflows/android-integration.yml index f9a912a4e58b..93f71bb30ac9 100644 --- a/.github/workflows/android-integration.yml +++ b/.github/workflows/android-integration.yml @@ -27,7 +27,7 @@ jobs: java-version: ${{ env.JAVA_VERSION }} - name: Run detekt - uses: gradle/gradle-build-action@v2.4.0 + uses: gradle/gradle-build-action@v2.4.1 with: arguments: detekt @@ -54,7 +54,7 @@ jobs: java-version: ${{ env.JAVA_VERSION }} - name: Run unit tests - uses: gradle/gradle-build-action@v2.4.0 + uses: gradle/gradle-build-action@v2.4.1 with: arguments: > testObfPlaystoreDebugUnitTest @@ -81,7 +81,7 @@ jobs: run: 'echo "ndk.dir=${ANDROID_HOME}/ndk-bundle" > local.properties' - name: Assemble debug APKs - uses: gradle/gradle-build-action@v2.4.0 + uses: gradle/gradle-build-action@v2.4.1 with: arguments: assembleDebug @@ -138,7 +138,7 @@ jobs: run: "echo \"org.gradle.jvmargs=-Xmx4096m\" >> gradle.properties" - name: Lint sources - uses: gradle/gradle-build-action@v2.4.0 + uses: gradle/gradle-build-action@v2.4.1 with: arguments: lint --stacktrace @@ -168,7 +168,7 @@ jobs: java-version: ${{ env.JAVA_VERSION }} - name: Generate documentation - uses: gradle/gradle-build-action@v2.4.0 + uses: gradle/gradle-build-action@v2.4.1 with: arguments: dokkaHtml diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml index 1f077bcde0ca..5c8277156981 100644 --- a/.github/workflows/android-release.yml +++ b/.github/workflows/android-release.yml @@ -28,7 +28,7 @@ jobs: java-version: ${{ env.JAVA_VERSION }} - name: Run unit tests - uses: gradle/gradle-build-action@v2.4.0 + uses: gradle/gradle-build-action@v2.4.1 with: arguments: > testObfPlaystoreDebugUnitTest From 649e6c8925e711b8e0433b8dbb28d9d824b093db Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Apr 2023 22:32:51 +0200 Subject: [PATCH 02/21] build(deps): Bump mockk from 1.13.4 to 1.13.5 (#4966) Bumps `mockk` from 1.13.4 to 1.13.5. Updates `io.mockk:mockk` from 1.13.4 to 1.13.5
Commits

Updates `io.mockk:mockk-agent-jvm` from 1.13.4 to 1.13.5
Commits

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7ca60f022b9a..b9dfb2efe7a6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -20,7 +20,7 @@ eventbus = "3.3.1" junit5 = "5.8.2" androidx-hilt = "1.0.0" org-mockito = "4.6.1" -mockk = "1.13.4" +mockk = "1.13.5" com-squareup-retrofit2 = "2.6.4" androidx-test-espresso = "3.4.0" truth = "1.1.3" From f24e54f5b791f2db6bfdf45c70fe69faddaf598f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Apr 2023 20:54:29 +0200 Subject: [PATCH 03/21] build(deps): Bump fastlane from 2.212.1 to 2.212.2 (#4971) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [fastlane](https://github.com/fastlane/fastlane) from 2.212.1 to 2.212.2.
Release notes

Sourced from fastlane's releases.

2.212.2 Improvements and fix for some App Store Connect APIs

  • [ci] Only run all mac jobs on master and version bump branches (#21088) via Josh Holtz (@​joshdholtz)
  • [spaceship] remove deprecated attributes from apps requests (#21187) via Kohki Miki (@​giginet)
  • [snapshot] fix resolve deadlock in LatestOsVersion#version_for_os (#20329) via stbix (@​stbix)
  • [deliver] Implements verify with altool for Xcode 14 validation (#20738) via Pol Piella Abadia (@​polpielladev)
  • [action][ensure_git_status_clean] fix incorrect "ignored" param handling (#20976) via Iulian Onofrei (@​revolter)
  • [spaceship] increase limit for build query in distribute to handle multiple platforms (#21087) via Eric Lindvall (@​eric)
Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=fastlane&package-manager=bundler&previous-version=2.212.1&new-version=2.212.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9111012d1071..065146b85817 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,21 +3,21 @@ GEM specs: CFPropertyList (3.0.6) rexml - addressable (2.8.1) + addressable (2.8.4) public_suffix (>= 2.0.2, < 6.0) artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.2.0) - aws-partitions (1.716.0) - aws-sdk-core (3.170.0) + aws-partitions (1.748.0) + aws-sdk-core (3.171.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.62.0) + aws-sdk-kms (1.63.0) aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.119.1) + aws-sdk-s3 (1.120.1) aws-sdk-core (~> 3, >= 3.165.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) @@ -67,7 +67,7 @@ GEM faraday_middleware (1.2.0) faraday (~> 1.0) fastimage (2.2.6) - fastlane (2.212.1) + fastlane (2.212.2) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -113,8 +113,8 @@ GEM os (~> 1.1, >= 1.1.4) fastlane-plugin-versioning_android (0.1.1) gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.34.0) - google-apis-core (>= 0.9.1, < 2.a) + google-apis-androidpublisher_v3 (0.39.0) + google-apis-core (>= 0.11.0, < 2.a) google-apis-core (0.11.0) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.16.2, < 2.a) @@ -135,7 +135,7 @@ GEM google-cloud-errors (~> 1.0) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) - google-cloud-errors (1.3.0) + google-cloud-errors (1.3.1) google-cloud-storage (1.44.0) addressable (~> 2.8) digest-crc (~> 0.4) @@ -144,7 +144,7 @@ GEM google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (1.3.0) + googleauth (1.5.2) faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) memoist (~> 0.16) @@ -200,7 +200,6 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.8.2) - unf_ext (0.0.8.2-x64-mingw32) unicode-display_width (1.8.0) versionomy (0.5.0) blockenspiel (~> 0.5) From 7135cc98497d83fffdf5807cfb1c46763c6570a7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Apr 2023 09:56:44 +0000 Subject: [PATCH 04/21] build(deps): Bump gradle/gradle-build-action from 2.4.1 to 2.4.2 Bumps [gradle/gradle-build-action](https://github.com/gradle/gradle-build-action) from 2.4.1 to 2.4.2. - [Release notes](https://github.com/gradle/gradle-build-action/releases) - [Commits](https://github.com/gradle/gradle-build-action/compare/v2.4.1...v2.4.2) --- updated-dependencies: - dependency-name: gradle/gradle-build-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/android-integration.yml | 10 +++++----- .github/workflows/android-release.yml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/android-integration.yml b/.github/workflows/android-integration.yml index 93f71bb30ac9..444315048fd4 100644 --- a/.github/workflows/android-integration.yml +++ b/.github/workflows/android-integration.yml @@ -27,7 +27,7 @@ jobs: java-version: ${{ env.JAVA_VERSION }} - name: Run detekt - uses: gradle/gradle-build-action@v2.4.1 + uses: gradle/gradle-build-action@v2.4.2 with: arguments: detekt @@ -54,7 +54,7 @@ jobs: java-version: ${{ env.JAVA_VERSION }} - name: Run unit tests - uses: gradle/gradle-build-action@v2.4.1 + uses: gradle/gradle-build-action@v2.4.2 with: arguments: > testObfPlaystoreDebugUnitTest @@ -81,7 +81,7 @@ jobs: run: 'echo "ndk.dir=${ANDROID_HOME}/ndk-bundle" > local.properties' - name: Assemble debug APKs - uses: gradle/gradle-build-action@v2.4.1 + uses: gradle/gradle-build-action@v2.4.2 with: arguments: assembleDebug @@ -138,7 +138,7 @@ jobs: run: "echo \"org.gradle.jvmargs=-Xmx4096m\" >> gradle.properties" - name: Lint sources - uses: gradle/gradle-build-action@v2.4.1 + uses: gradle/gradle-build-action@v2.4.2 with: arguments: lint --stacktrace @@ -168,7 +168,7 @@ jobs: java-version: ${{ env.JAVA_VERSION }} - name: Generate documentation - uses: gradle/gradle-build-action@v2.4.1 + uses: gradle/gradle-build-action@v2.4.2 with: arguments: dokkaHtml diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml index 5c8277156981..ac196e97986a 100644 --- a/.github/workflows/android-release.yml +++ b/.github/workflows/android-release.yml @@ -28,7 +28,7 @@ jobs: java-version: ${{ env.JAVA_VERSION }} - name: Run unit tests - uses: gradle/gradle-build-action@v2.4.1 + uses: gradle/gradle-build-action@v2.4.2 with: arguments: > testObfPlaystoreDebugUnitTest From 9ca7359f5b816e5404d4383833eb95c37bfa9bcd Mon Sep 17 00:00:00 2001 From: Pierre Slamich Date: Sat, 22 Apr 2023 12:20:04 +0200 Subject: [PATCH 05/21] ci: better crowdin PRs --- .github/workflows/crowdin.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/crowdin.yml b/.github/workflows/crowdin.yml index 6c9e606c17fd..25247356ebf7 100644 --- a/.github/workflows/crowdin.yml +++ b/.github/workflows/crowdin.yml @@ -47,7 +47,8 @@ jobs: # The title of the new pull request pull_request_title: "chore: New Crowdin translations to review and merge" # The contents of the pull request - # pull_request_body: # optional + pull_request_body: '### What\n- Automated pull request pulling in new or updated translations from Crowdin (https://translate.openfoodfacts.org).\n## Checklist\n- [ ] Check that they are no bad translations. If there are, correct them directly in Crowdin so that they are not resynced again. Then you can correct them here as well, or wait 24 hours for the sync to happen automatically.\n- [ ] Put extra attention on Acholi, which is used mistakenly as a sandbox by people discovering the self-service translation button on Open Food Facts\n- [ ] Once you are happy, that automated checks pass, you can approve the PR and merge it.\n### Part of\n- Translations' + # The contents of the pull request # To add labels for created pull request pull_request_labels: "translations" # Create pull request to specified branch instead of default one From e66349fd7baf75268ce3c645c456c0b7597b2b6f Mon Sep 17 00:00:00 2001 From: VaiTon Date: Fri, 31 Mar 2023 19:11:15 +0200 Subject: [PATCH 06/21] chore: upgrade AGP to 7.4.2 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b9dfb2efe7a6..def35774e4d4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,7 +11,7 @@ greendao = "3.3.0" hilt = "2.45" dagger = "2.45" # https://developer.android.com/studio/releases/gradle-plugin -android-gradle = "7.3.1" +android-gradle = "7.4.2" # https://developer.android.com/jetpack/androidx/releases/lifecycle android-lifecycle = "2.6.1" # https://github.com/greenrobot/EventBus From 801b461b20d58b09a119c5e294db52197826c33b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Apr 2023 17:56:00 +0200 Subject: [PATCH 07/21] build(deps): Bump crowdin/github-action from 1.7.1 to 1.8.0 (#4976) Bumps [crowdin/github-action](https://github.com/crowdin/github-action) from 1.7.1 to 1.8.0.
Release notes

Sourced from crowdin/github-action's releases.

v1.8.0

Updated

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=crowdin/github-action&package-manager=github_actions&previous-version=1.7.1&new-version=1.8.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/crowdin-per-language.yml | 2 +- .github/workflows/crowdin.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/crowdin-per-language.yml b/.github/workflows/crowdin-per-language.yml index b4ee81252f8e..66365b4c74fa 100644 --- a/.github/workflows/crowdin-per-language.yml +++ b/.github/workflows/crowdin-per-language.yml @@ -17,7 +17,7 @@ jobs: - name: Checkout uses: actions/checkout@v3 - name: Matrix - uses: crowdin/github-action@v1.7.1 + uses: crowdin/github-action@v1.8.0 with: upload_translations: false # default is false download_translations: true diff --git a/.github/workflows/crowdin.yml b/.github/workflows/crowdin.yml index 25247356ebf7..01dbb2d03d0f 100644 --- a/.github/workflows/crowdin.yml +++ b/.github/workflows/crowdin.yml @@ -13,7 +13,7 @@ jobs: uses: actions/checkout@v3 - name: Sync translations with Crowdin - uses: crowdin/github-action@v1.7.1 + uses: crowdin/github-action@v1.8.0 with: # default is false # Use this option to upload translations for a single specified language From ed8aad633d3fe30ee20e5cc18b9ffe315042712a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Apr 2023 10:00:29 +0000 Subject: [PATCH 08/21] build(deps): Bump junit5 from 5.8.2 to 5.9.3 Bumps `junit5` from 5.8.2 to 5.9.3. Updates `org.junit.jupiter:junit-jupiter` from 5.8.2 to 5.9.3 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.8.2...r5.9.3) Updates `org.junit.jupiter:junit-jupiter-engine` from 5.8.2 to 5.9.3 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.8.2...r5.9.3) Updates `org.junit.vintage:junit-vintage-engine` from 5.8.2 to 5.9.3 - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.8.2...r5.9.3) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.junit.vintage:junit-vintage-engine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index def35774e4d4..0bce427cb701 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,7 +17,7 @@ android-lifecycle = "2.6.1" # https://github.com/greenrobot/EventBus eventbus = "3.3.1" # https://junit.org/junit5/ -junit5 = "5.8.2" +junit5 = "5.9.3" androidx-hilt = "1.0.0" org-mockito = "4.6.1" mockk = "1.13.5" From bd1815dd7e35caa147c36b7203e46125a84de262 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Apr 2023 10:02:56 +0000 Subject: [PATCH 09/21] build(deps): Bump org-mockito from 4.6.1 to 5.3.1 Bumps `org-mockito` from 4.6.1 to 5.3.1. Updates `org.mockito:mockito-core` from 4.6.1 to 5.3.1 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.6.1...v5.3.1) Updates `org.mockito:mockito-junit-jupiter` from 4.6.1 to 5.3.1 - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.6.1...v5.3.1) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.mockito:mockito-junit-jupiter dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0bce427cb701..ff34c3ec76aa 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -19,7 +19,7 @@ eventbus = "3.3.1" # https://junit.org/junit5/ junit5 = "5.9.3" androidx-hilt = "1.0.0" -org-mockito = "4.6.1" +org-mockito = "5.3.1" mockk = "1.13.5" com-squareup-retrofit2 = "2.6.4" androidx-test-espresso = "3.4.0" From d041b82953583d4b02ddb8606774c3d0a3c505a5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Apr 2023 09:59:55 +0000 Subject: [PATCH 10/21] build(deps): Bump org.junit:junit-bom from 5.9.2 to 5.9.3 Bumps [org.junit:junit-bom](https://github.com/junit-team/junit5) from 5.9.2 to 5.9.3. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.9.2...r5.9.3) --- updated-dependencies: - dependency-name: org.junit:junit-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- app/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index d96e0f24bc3c..5765fa67d333 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -135,7 +135,7 @@ dependencies { // Unit Testing testImplementation(libs.bundles.testing) - testImplementation(platform("org.junit:junit-bom:5.9.2")) + testImplementation(platform("org.junit:junit-bom:5.9.3")) testImplementation(libs.junit.jupiter) testRuntimeOnly(libs.junit.jupiter.engine) testRuntimeOnly(libs.junit.vintage.engine) From 7f8a56dbeefb31ddcd300dd195ea6b578107658c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Apr 2023 10:00:24 +0000 Subject: [PATCH 11/21] build(deps): Bump org.robolectric:robolectric from 4.8.1 to 4.10 Bumps [org.robolectric:robolectric](https://github.com/robolectric/robolectric) from 4.8.1 to 4.10. - [Release notes](https://github.com/robolectric/robolectric/releases) - [Commits](https://github.com/robolectric/robolectric/compare/robolectric-4.8.1...robolectric-4.10) --- updated-dependencies: - dependency-name: org.robolectric:robolectric dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ff34c3ec76aa..93701ff2abee 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -126,7 +126,7 @@ showcaseview = "com.github.mreram:showcaseview:1.0.5" # Unit Testing androidx-arch-core-testing = "androidx.arch.core:core-testing:2.1.0" junit = "junit:junit:4.13.2" -robolectric = "org.robolectric:robolectric:4.8.1" +robolectric = "org.robolectric:robolectric:4.10" mockito-core = { module = "org.mockito:mockito-core", version.ref = "org-mockito" } mockito-kotlin = "org.mockito.kotlin:mockito-kotlin:4.0.0" mockito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter", version.ref = "org-mockito" } From 0be22da903ed86405ff4d04ae7c04403e82eabac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 27 Apr 2023 10:00:01 +0000 Subject: [PATCH 12/21] build(deps): Bump io.sentry:sentry-android from 6.17.0 to 6.18.0 Bumps [io.sentry:sentry-android](https://github.com/getsentry/sentry-java) from 6.17.0 to 6.18.0. - [Release notes](https://github.com/getsentry/sentry-java/releases) - [Changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-java/compare/6.17.0...6.18.0) --- updated-dependencies: - dependency-name: io.sentry:sentry-android dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 93701ff2abee..9070a2a71fb0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -119,7 +119,7 @@ android-image-cropper = "com.github.CanHub:Android-Image-Cropper:3.1.3" # UI Component : Chips Input nachos = "com.github.hootsuite:nachos:1.2.0" # Crash analytics -sentry-android = "io.sentry:sentry-android:6.17.0" +sentry-android = "io.sentry:sentry-android:6.18.0" matomo = "com.github.matomo-org:matomo-sdk-android:4.1.4" # ShowCaseView dependency showcaseview = "com.github.mreram:showcaseview:1.0.5" From 9cff9b9323cd583c918e8c94fc3a0ca9c891e3a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 May 2023 12:38:14 +0200 Subject: [PATCH 13/21] build(deps): Bump crowdin/github-action from 1.8.0 to 1.8.1 (#4993) Bumps [crowdin/github-action](https://github.com/crowdin/github-action) from 1.8.0 to 1.8.1.
Release notes

Sourced from crowdin/github-action's releases.

v1.8.1

Updated

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=crowdin/github-action&package-manager=github_actions&previous-version=1.8.0&new-version=1.8.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/crowdin-per-language.yml | 2 +- .github/workflows/crowdin.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/crowdin-per-language.yml b/.github/workflows/crowdin-per-language.yml index 66365b4c74fa..fe10ecfcda54 100644 --- a/.github/workflows/crowdin-per-language.yml +++ b/.github/workflows/crowdin-per-language.yml @@ -17,7 +17,7 @@ jobs: - name: Checkout uses: actions/checkout@v3 - name: Matrix - uses: crowdin/github-action@v1.8.0 + uses: crowdin/github-action@v1.8.1 with: upload_translations: false # default is false download_translations: true diff --git a/.github/workflows/crowdin.yml b/.github/workflows/crowdin.yml index 01dbb2d03d0f..fe49dafcbc55 100644 --- a/.github/workflows/crowdin.yml +++ b/.github/workflows/crowdin.yml @@ -13,7 +13,7 @@ jobs: uses: actions/checkout@v3 - name: Sync translations with Crowdin - uses: crowdin/github-action@v1.8.0 + uses: crowdin/github-action@v1.8.1 with: # default is false # Use this option to upload translations for a single specified language From abad45234efde806d0ce997f7a78d1b345333818 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 May 2023 10:01:07 +0000 Subject: [PATCH 14/21] build(deps): Bump kotlin-coroutines from 1.6.4 to 1.7.1 Bumps `kotlin-coroutines` from 1.6.4 to 1.7.1. Updates `org.jetbrains.kotlinx:kotlinx-coroutines-core` from 1.6.4 to 1.7.1 - [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases) - [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md) - [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.6.4...1.7.1) Updates `org.jetbrains.kotlinx:kotlinx-coroutines-android` from 1.6.4 to 1.7.1 - [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases) - [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md) - [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.6.4...1.7.1) Updates `org.jetbrains.kotlinx:kotlinx-coroutines-test` from 1.6.4 to 1.7.1 - [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases) - [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md) - [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.6.4...1.7.1) --- updated-dependencies: - dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-android dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-test dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9070a2a71fb0..0c5094519bf8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ # https://kotlinlang.org/docs/releases.html#release-details kotlin = "1.8.20" # https://github.com/Kotlin/kotlinx.coroutines -kotlin-coroutines = "1.6.4" +kotlin-coroutines = "1.7.1" # https://github.com/FasterXML/jackson jackson = "2.12.3" # https://greenrobot.org/greendao/ From e3b16361ca13cc0144983635b1853bba30167581 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 May 2023 10:01:38 +0000 Subject: [PATCH 15/21] build(deps): Bump hilt from 2.45 to 2.46.1 Bumps `hilt` from 2.45 to 2.46.1. Updates `com.google.dagger:hilt-android-gradle-plugin` from 2.45 to 2.46.1 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.45...dagger-2.46.1) Updates `com.google.dagger:hilt-android` from 2.45 to 2.46.1 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.45...dagger-2.46.1) Updates `com.google.dagger:hilt-compiler` from 2.45 to 2.46.1 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.45...dagger-2.46.1) Updates `com.google.dagger:hilt-android-testing` from 2.45 to 2.46.1 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.45...dagger-2.46.1) Updates `com.google.dagger:hilt-android-compiler` from 2.45 to 2.46.1 - [Release notes](https://github.com/google/dagger/releases) - [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/dagger/compare/dagger-2.45...dagger-2.46.1) --- updated-dependencies: - dependency-name: com.google.dagger:hilt-android-gradle-plugin dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.google.dagger:hilt-android dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.google.dagger:hilt-compiler dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.google.dagger:hilt-android-testing dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.google.dagger:hilt-android-compiler dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0c5094519bf8..fc48b43da43e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,7 +8,7 @@ jackson = "2.12.3" # https://greenrobot.org/greendao/ greendao = "3.3.0" # https://github.com/googlecodelabs/android-hilt -hilt = "2.45" +hilt = "2.46.1" dagger = "2.45" # https://developer.android.com/studio/releases/gradle-plugin android-gradle = "7.4.2" From 3628e72ee59c254a922dfb4475cafeeab62aea57 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 May 2023 10:01:04 +0000 Subject: [PATCH 16/21] build(deps): Bump io.sentry:sentry-android from 6.18.0 to 6.19.0 Bumps [io.sentry:sentry-android](https://github.com/getsentry/sentry-java) from 6.18.0 to 6.19.0. - [Release notes](https://github.com/getsentry/sentry-java/releases) - [Changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-java/compare/6.18.0...6.19.0) --- updated-dependencies: - dependency-name: io.sentry:sentry-android dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fc48b43da43e..06159b547f90 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -119,7 +119,7 @@ android-image-cropper = "com.github.CanHub:Android-Image-Cropper:3.1.3" # UI Component : Chips Input nachos = "com.github.hootsuite:nachos:1.2.0" # Crash analytics -sentry-android = "io.sentry:sentry-android:6.18.0" +sentry-android = "io.sentry:sentry-android:6.19.0" matomo = "com.github.matomo-org:matomo-sdk-android:4.1.4" # ShowCaseView dependency showcaseview = "com.github.mreram:showcaseview:1.0.5" From 7ae4aa27b004dc07120e4ee6af06170585fec1a8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Apr 2023 09:18:31 +0000 Subject: [PATCH 17/21] build(deps): Bump org.jetbrains.kotlin:kotlin-gradle-plugin Bumps [org.jetbrains.kotlin:kotlin-gradle-plugin](https://github.com/JetBrains/kotlin) from 1.8.20 to 1.8.21. - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.8.21/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.8.20...v1.8.21) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 06159b547f90..163ec523b2a5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] # https://kotlinlang.org/docs/releases.html#release-details -kotlin = "1.8.20" +kotlin = "1.8.21" # https://github.com/Kotlin/kotlinx.coroutines kotlin-coroutines = "1.7.1" # https://github.com/FasterXML/jackson From f11ecffc308b02108ae8c8701973a1e578919318 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 May 2023 12:13:18 +0200 Subject: [PATCH 18/21] build(deps): Bump JamesIves/github-pages-deploy-action from 4.4.1 to 4.4.2 (#5001) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [JamesIves/github-pages-deploy-action](https://github.com/JamesIves/github-pages-deploy-action) from 4.4.1 to 4.4.2.
Release notes

Sourced from JamesIves/github-pages-deploy-action's releases.

v4.4.2

What's Changed

  • Dependency updates

Full Changelog: https://github.com/JamesIves/github-pages-deploy-action/compare/v4...v4.4.2

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=JamesIves/github-pages-deploy-action&package-manager=github_actions&previous-version=4.4.1&new-version=4.4.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/android-integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android-integration.yml b/.github/workflows/android-integration.yml index 444315048fd4..c5b930592d40 100644 --- a/.github/workflows/android-integration.yml +++ b/.github/workflows/android-integration.yml @@ -173,7 +173,7 @@ jobs: arguments: dokkaHtml - name: Deploy documentation to Github Pages - uses: JamesIves/github-pages-deploy-action@v4.4.1 + uses: JamesIves/github-pages-deploy-action@v4.4.2 with: branch: gh-pages folder: app/build/dokka/html/ From 545050e233363714ff5429c58b99166af4504d39 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 May 2023 14:18:56 +0200 Subject: [PATCH 19/21] build(deps): Bump crowdin/github-action from 1.8.1 to 1.9.0 (#5004) Bumps [crowdin/github-action](https://github.com/crowdin/github-action) from 1.8.1 to 1.9.0.
Release notes

Sourced from crowdin/github-action's releases.

v1.9.0

Updated

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=crowdin/github-action&package-manager=github_actions&previous-version=1.8.1&new-version=1.9.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/crowdin-per-language.yml | 2 +- .github/workflows/crowdin.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/crowdin-per-language.yml b/.github/workflows/crowdin-per-language.yml index fe10ecfcda54..5406c911a388 100644 --- a/.github/workflows/crowdin-per-language.yml +++ b/.github/workflows/crowdin-per-language.yml @@ -17,7 +17,7 @@ jobs: - name: Checkout uses: actions/checkout@v3 - name: Matrix - uses: crowdin/github-action@v1.8.1 + uses: crowdin/github-action@v1.9.0 with: upload_translations: false # default is false download_translations: true diff --git a/.github/workflows/crowdin.yml b/.github/workflows/crowdin.yml index fe49dafcbc55..773a2e57f08f 100644 --- a/.github/workflows/crowdin.yml +++ b/.github/workflows/crowdin.yml @@ -13,7 +13,7 @@ jobs: uses: actions/checkout@v3 - name: Sync translations with Crowdin - uses: crowdin/github-action@v1.8.1 + uses: crowdin/github-action@v1.9.0 with: # default is false # Use this option to upload translations for a single specified language From e98d29461a9af7cc62496b930ba2fdd099ba54d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Jun 2023 13:46:29 +0200 Subject: [PATCH 20/21] build(deps): Bump org.sonarqube from 3.4.0.2513 to 4.2.0.3129 (#5008) Bumps org.sonarqube from 3.4.0.2513 to 4.2.0.3129. [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.sonarqube&package-manager=gradle&previous-version=3.4.0.2513&new-version=4.2.0.3129)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 163ec523b2a5..9a975c4d0f12 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -226,7 +226,7 @@ testing = [ [plugins] resourceplaceholders = "de.timfreiheit.resourceplaceholders:0.2" dokka = "org.jetbrains.dokka:1.7.0" -sonarqube = "org.sonarqube:3.4.0.2513" +sonarqube = "org.sonarqube:4.2.0.3129" detekt = "io.gitlab.arturbosch.detekt:1.20.0" versions = "com.github.ben-manes.versions:0.41.0" updates = "nl.littlerobots.version-catalog-update:0.5.1" From 94eb87310bbf2b81ddaf1b18932fe7513aa33b72 Mon Sep 17 00:00:00 2001 From: VaiTon Date: Wed, 7 Jun 2023 22:00:08 +0200 Subject: [PATCH 21/21] Make more explicit the redirect to the new app --- README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 126c59d3ddec..eead7c44eafa 100644 --- a/README.md +++ b/README.md @@ -3,14 +3,16 @@ Open Food Facts - Android app ============================= -_The new Open Food Facts app is located [HERE](https://github.com/openfoodfacts/smooth-app)_ - -**Note: This codebase is currently only deployed for Open Beauty Facts, Open Pet Food Facts and Open Products Facts apps.** - Open Food Facts is collaborative food products database made by everyone, for everyone. Open Food Facts contributors gathers information and data on food products from around the world, using mobile apps.
+> ### ⚠️ WARNING +> +> The new Open Food Facts app is located [HERE](https://github.com/openfoodfacts/smooth-app) +> +> **Note: This codebase is currently only deployed for Open Beauty Facts, Open Pet Food Facts and Open Products Facts apps.** + [![Project Status](https://opensource.box.com/badges/active.svg)](https://opensource.box.com/badges) [![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=openfoodfacts_openfoodfacts-androidapp&metric=alert_status)](https://sonarcloud.io/dashboard/index/openfoodfacts_openfoodfacts-androidapp) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/openfoodfacts/localized.svg)](https://crowdin.com/project/openfoodfacts)