Skip to content

Commit

Permalink
Merge branch 'develop' into utk-folder-delete
Browse files Browse the repository at this point in the history
  • Loading branch information
utkarsh006 authored Sep 12, 2023
2 parents fee46ac + 2d3cd50 commit 800a331
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 18 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/android-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

steps:
- name: Checkout sources
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up JDK
uses: actions/setup-java@v3
Expand All @@ -49,7 +49,7 @@ jobs:

steps:
- name: Checkout sources
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up JDK
uses: actions/setup-java@v3
Expand All @@ -73,7 +73,7 @@ jobs:

steps:
- name: Checkout sources
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up JDK
uses: actions/setup-java@v3
Expand Down Expand Up @@ -127,7 +127,7 @@ jobs:

steps:
- name: Checkout sources
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up JDK
uses: actions/setup-java@v3
Expand Down Expand Up @@ -163,7 +163,7 @@ jobs:

steps:
- name: Checkout sources
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up JDK
uses: actions/setup-java@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/android-release-sentry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

steps:
- name: Checkout sources
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Decrypt api json file
run: cd ./fastlane/envfiles && ./decrypt_secrets.sh
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/android-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

steps:
- name: Checkout sources
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up JDK
uses: actions/setup-java@v3
Expand All @@ -46,7 +46,7 @@ jobs:

steps:
- name: Checkout sources
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up JDK
uses: actions/setup-java@v3
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:

steps:
- name: Checkout sources
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up JDK
uses: actions/setup-java@v3
Expand Down Expand Up @@ -136,7 +136,7 @@ jobs:

steps:
- name: Checkout sources
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up JDK
uses: actions/setup-java@v3
Expand Down Expand Up @@ -180,7 +180,7 @@ jobs:

steps:
- name: Checkout sources
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up JDK
uses: actions/setup-java@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/crowdin-per-language.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
lc: [it, fr, de, id, nl, da, es, pt, pt_PT, ar, ca, he]
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Matrix
uses: crowdin/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/crowdin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

steps:
- name: Checkout sources
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Sync translations with Crowdin
uses: crowdin/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ktlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: "checkout"
uses: "actions/checkout@v3"
uses: "actions/checkout@v4"
- name: "ktlint"
uses: "vroy/gha-kotlin-linter@v4"
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ Open Food Facts is collaborative food products database made by everyone, for ev
[![Open Source Helpers](https://www.codetriage.com/openfoodfacts/openfoodfacts-androidapp/badges/users.svg)](https://www.codetriage.com/openfoodfacts/openfoodfacts-androidapp)
<br>

- [Join the Play Store Beta](https://play.google.com/store/apps/details?id=org.openfoodfacts.scanner) (rather stable) - [Join the Play Store internal build](https://play.google.com/apps/internaltest/4699092342921529278) (bleeding edge). You might need communicating your email for whitelisting to teolemon on slack (or pierre at openfoodfacts org).

- [Open Beauty Facts](https://play.google.com/store/apps/details?id=org.openbeautyfacts.scanner), [Open Pet Food Facts](https://play.google.com/store/apps/details?id=org.openpetfoodfacts.scanner) and [Open Products Facts](https://play.google.com/store/apps/details?id=org.openproductsfacts.scanner) are also built from this codebase.

<details><summary><h2> What is Open Food Facts? </h2></summary>
Expand All @@ -33,7 +31,7 @@ Open Food Facts is a database of food products with ingredients, allergens, nutr
### Made by everyone

Open Food Facts is a non-profit association of volunteers.
25000+ contributors like you have added 1,7M+ products from 150 countries using our Android or iPhone apps to scan barcodes and upload pictures of products and their labels.
25000+ contributors like you have added 3M+ products from 150 countries using our Android or iPhone apps to scan barcodes and upload pictures of products and their labels.

### For everyone

Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ testing = [
[plugins]
resourceplaceholders = "de.timfreiheit.resourceplaceholders:0.2"
dokka = "org.jetbrains.dokka:1.7.0"
sonarqube = "org.sonarqube:4.2.0.3129"
sonarqube = "org.sonarqube:4.3.1.3277"
detekt = "io.gitlab.arturbosch.detekt:1.23.1"
versions = "com.github.ben-manes.versions:0.41.0"
updates = "nl.littlerobots.version-catalog-update:0.5.1"

0 comments on commit 800a331

Please sign in to comment.