Merge branch 'develop' into release/3.9.0

.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.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.0
+        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.0
+        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.0
+        uses: gradle/gradle-build-action@v2.4.2
         with:
           arguments: lint --stacktrace
 
@@ -168,12 +168,12 @@ jobs:
           java-version: ${{ env.JAVA_VERSION }}
 
       - name: Generate documentation
-        uses: gradle/gradle-build-action@v2.4.0
+        uses: gradle/gradle-build-action@v2.4.2
         with:
           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/

.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.2
         with:
           arguments: >
             testObfPlaystoreDebugUnitTest

.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.9.0
       with:
          upload_translations: false # default is false
          download_translations: true

.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.9.0
       with:
          # default is false
         # Use this option to upload translations for a single specified language
@@ -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

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)

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.
 
 <br>
 
+> ### ⚠️ 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)

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)

gradle/libs.versions.toml

@@ -1,26 +1,26 @@
 [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.6.4"
+kotlin-coroutines = "1.7.1"
 # https://github.com/FasterXML/jackson
 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.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
 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.4"
+org-mockito = "5.3.1"
+mockk = "1.13.5"
 com-squareup-retrofit2 = "2.6.4"
 androidx-test-espresso = "3.4.0"
 truth = "1.1.3"
@@ -119,14 +119,14 @@ 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.19.0"
 matomo = "com.github.matomo-org:matomo-sdk-android:4.1.4"
 # ShowCaseView dependency
 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" }
@@ -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"