Merge branch 'develop' into l10n_develop

.github/workflows/android-release-to-org-openfoodfacts-scanner.yml

@@ -63,7 +63,7 @@ jobs:
       - run: echo Release type ${{ inputs.RELEASE_TYPE }} + Build type ${{ inputs.BUILD_TYPE }} + Tag name null if not github release ${{ inputs.TAG_NAME }}
 
       - name: Setup Java JDK
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
         with:
           distribution: 'zulu'
           java-version: ${{ env.JAVA_VERSION }}

.github/workflows/crowdin.yml

@@ -13,7 +13,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: crowdin action
-      uses: crowdin/github-action@v2.0.0
+      uses: crowdin/github-action@v2.1.1
       continue-on-error: true
       with:
         # Upload sources to Crowdin

.github/workflows/ios-release-to-org-openfoodfacts-scanner.yml

@@ -61,7 +61,7 @@ jobs:
         run: bundle install
         working-directory: ./packages/smooth_app/android/
       - name: Setup Java JDK
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
         with:
           distribution: 'zulu'
           java-version: ${{ env.JAVA_VERSION }}
@@ -110,7 +110,7 @@ jobs:
           VERSION_CODE: ${{ inputs.VERSION_CODE }}
 
       - name: Build app
-        run: cd ./packages/smooth_app && cd ios && rm -rf Pods && rm Podfile.lock && flutter pub get && pod install && cd .. && flutter build ios --release --no-codesign -t lib/entrypoints/ios/main_ios.dart
+        run: cd ./packages/smooth_app && cd ios && rm -rf Pods && rm -f Podfile.lock && flutter pub get && pod install && cd .. && flutter build ios --release --no-codesign -t lib/entrypoints/ios/main_ios.dart
         env:
           GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}

.github/workflows/on-demand.yml

@@ -0,0 +1,102 @@
+# This file contains actions that can be performed on PRs by issuing a comment
+name: 🕹️ On demand PR action
+
+on:
+  issue_comment:
+    types: [created, edited]
+
+jobs:
+  # Action to update test results by issuing /lint
+  run_lint:
+    name: "On demand linting"
+    if: |
+      github.event.issue.pull_request &&
+      (github.event.comment.body == '/lint') &&
+      contains(fromJSON('["COLLABORATOR", "CONTRIBUTOR", "MEMBER", "OWNER"]'), github.event.comment.author_association)
+    runs-on: ubuntu-latest
+    steps:
+    - name: Get branch name
+      # see https://github.com/actions/checkout/issues/331
+      id: get-branch
+      run: echo ::set-output name=branch::$(gh pr view $PR_NO --repo $REPO --json headRefName --jq '.headRefName')
+      env:
+        REPO: ${{ github.repository }}
+        PR_NO: ${{ github.event.issue.number }}
+        GITHUB_TOKEN: ${{ secrets.RELEASE_PLEASE_TOKEN }}
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 1
+        # grab the PR branch
+        ref: ${{ steps.get-branch.outputs.branch }}
+        # We can't use GITHUB_TOKEN here because, github actions can't trigger actions
+        # see: https://docs.github.com/en/actions/security-guides/automatic-token-authentication#using-the-github_token-in-a-workflow
+        # So this is a personal access token
+        token: ${{ secrets.RELEASE_PLEASE_TOKEN }}
+    # we need origin/main to have comparison linting work !
+    - name: Fetch origin/develop
+      run: |
+        git remote set-branches --add origin develop
+        git fetch origin
+    - name: Run linting
+      run: XXXXXXXX
+    - name: Push changes if needed
+      uses: stefanzweifel/git-auto-commit-action@v5
+      with:
+        commit_message: "chore: Linting changes"
+        branch: ${{ github.event.pull_request.head.ref }}
+        commit_user_name: Open Food Facts Bot
+        commit_user_email: [email protected]
+        commit_author: Open Food Facts Bot <[email protected]>
+        push_options: ""
+        status_options: '--untracked-files=no'
+        skip_dirty_check: false
+        create_branch: no
+
+  delete_3_letter_translation_files:
+    name: "On demand deletion of 3-letter translation files"
+    if: |
+      github.event.issue.pull_request &&
+      (github.event.comment.body == '/lint') &&
+      contains(fromJSON('["COLLABORATOR", "CONTRIBUTOR", "MEMBER", "OWNER"]'), github.event.comment.author_association)
+    runs-on: ubuntu-latest
+    steps:
+    - name: Get branch name
+      # see https://github.com/actions/checkout/issues/331
+      id: get-branch
+      run: echo ::set-output name=branch::$(gh pr view $PR_NO --repo $REPO --json headRefName --jq '.headRefName')
+      env:
+        REPO: ${{ github.repository }}
+        PR_NO: ${{ github.event.issue.number }}
+        GITHUB_TOKEN: ${{ secrets.RELEASE_PLEASE_TOKEN }}
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 1
+        # grab the PR branch
+        ref: ${{ steps.get-branch.outputs.branch }}
+        # We can't use GITHUB_TOKEN here because, github actions can't trigger actions
+        # see: https://docs.github.com/en/actions/security-guides/automatic-token-authentication#using-the-github_token-in-a-workflow
+        # So this is a personal access token
+        token: ${{ secrets.RELEASE_PLEASE_TOKEN }}
+    # we need origin/main to have comparison linting work !
+    - name: Fetch origin/develop
+      run: |
+        git remote set-branches --add origin develop
+        git fetch origin
+    - name: Deletion of 3-letter translation files (1/2)
+      run: packages/smooth_app/ios/Runner/remove.sh
+    - name: Deletion of 3-letter translation files (2/2)
+      run: packages/smooth_app/lib/l10n/remove_3_letter_locales.sh
+    - name: Push changes if needed
+      uses: stefanzweifel/git-auto-commit-action@v5
+      with:
+        commit_message: "chore: Deletion of 3-letter translation files"
+        branch: ${{ github.event.pull_request.head.ref }}
+        commit_user_name: Open Food Facts Bot
+        commit_user_email: [email protected]
+        commit_author: Open Food Facts Bot <[email protected]>
+        push_options: ""
+        status_options: '--untracked-files=no'
+        skip_dirty_check: false
+        create_branch: no

.github/workflows/postsubmit.yml

@@ -16,10 +16,10 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Java JDK
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: 17
 
       # Get the flutter version from ./flutter-version.txt
       - run: echo "FLUTTER_VERSION=$(cat flutter-version.txt)" >> $GITHUB_OUTPUT

.github/workflows/waldo_sessions.yml

@@ -27,10 +27,10 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Java JDK
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: 17
 
       # Get the flutter version from ./flutter-version.txt
       - run: echo "FLUTTER_VERSION=$(cat flutter-version.txt)" >> $GITHUB_OUTPUT

crowdin.yml

@@ -2,6 +2,7 @@ project_id_env: CROWDIN_PROJECT_ID
 api_token_env: CROWDIN_PERSONAL_TOKEN
 pull_request_title: "chore: New translations to review and merge"
 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' 
+pull_request_labels : 'translations'
 files:
   - source: /packages/smooth_app/lib/l10n/app_en.arb
     dist: /packages/smooth_app/lib/l10n/app_en.arb

packages/app_store/uri_store/pubspec.yaml

@@ -13,7 +13,7 @@ dependencies:
   app_store_shared:
     path: ../shared
 
-  url_launcher: 6.1.3
+  url_launcher: 6.3.0
 
 dev_dependencies:
   flutter_test:

packages/smooth_app/android/Gemfile.lock

@@ -11,25 +11,25 @@ GEM
       base64
       nkf
       rexml
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.945.0)
-    aws-sdk-core (3.197.1)
+    aws-partitions (1.958.0)
+    aws-sdk-core (3.201.3)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.85.0)
-      aws-sdk-core (~> 3, >= 3.197.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.152.3)
-      aws-sdk-core (~> 3, >= 3.197.0)
+    aws-sdk-kms (1.88.0)
+      aws-sdk-core (~> 3, >= 3.201.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.156.0)
+      aws-sdk-core (~> 3, >= 3.201.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.8)
-    aws-sigv4 (1.8.0)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.9.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.2.0)
@@ -44,7 +44,7 @@ GEM
     domain_name (0.6.20240107)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.110.0)
+    excon (0.111.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -66,15 +66,15 @@ GEM
     faraday-httpclient (1.0.1)
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
-    faraday-net_http (1.0.1)
+    faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.3.1)
-    fastlane (2.221.1)
+    fastlane (2.222.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -162,7 +162,7 @@ GEM
     json (2.7.2)
     jwt (2.8.2)
       base64
-    mini_magick (4.13.1)
+    mini_magick (4.13.2)
     mini_mime (1.1.5)
     multi_json (1.15.0)
     multipart-post (2.4.1)
@@ -172,7 +172,7 @@ GEM
     optparse (0.5.0)
     os (1.1.4)
     plist (3.7.1)
-    public_suffix (5.1.1)
+    public_suffix (6.0.1)
     rake (13.2.1)
     representable (3.2.0)
       declarative (< 0.1.0)

packages/smooth_app/devtools_options.yaml

@@ -0,0 +1,3 @@
+description: This file stores settings for Dart & Flutter DevTools.
+documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
+extensions:

packages/smooth_app/ios/Gemfile.lock

@@ -11,25 +11,25 @@ GEM
       base64
       nkf
       rexml
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.945.0)
-    aws-sdk-core (3.197.1)
+    aws-partitions (1.958.0)
+    aws-sdk-core (3.201.3)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.85.0)
-      aws-sdk-core (~> 3, >= 3.197.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.152.3)
-      aws-sdk-core (~> 3, >= 3.197.0)
+    aws-sdk-kms (1.88.0)
+      aws-sdk-core (~> 3, >= 3.201.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.156.0)
+      aws-sdk-core (~> 3, >= 3.201.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.8)
-    aws-sigv4 (1.8.0)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.9.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.2.0)
@@ -45,7 +45,7 @@ GEM
     domain_name (0.6.20240107)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.110.0)
+    excon (0.111.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -67,15 +67,15 @@ GEM
     faraday-httpclient (1.0.1)
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
-    faraday-net_http (1.0.1)
+    faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.3.1)
-    fastlane (2.221.1)
+    fastlane (2.222.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -163,7 +163,7 @@ GEM
     json (2.7.2)
     jwt (2.8.2)
       base64
-    mini_magick (4.13.1)
+    mini_magick (4.13.2)
     mini_mime (1.1.5)
     multi_json (1.15.0)
     multipart-post (2.4.1)
@@ -173,7 +173,7 @@ GEM
     optparse (0.5.0)
     os (1.1.4)
     plist (3.7.1)
-    public_suffix (5.1.1)
+    public_suffix (6.0.1)
     rake (13.2.1)
     representable (3.2.0)
       declarative (< 0.1.0)