Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] develop from openfoodfacts:develop #10

Merged
merged 12 commits into from
Apr 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
// https://github.com/microsoft/vscode-dev-containers/tree/v0.224.3/containers/ubuntu
{
"image": "docker.io/cirrusci/flutter:stable",
"image": "ghcr.io/cirruslabs/flutter:3.16.7",
"forwardPorts": [
3000
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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/setup-java@v4.0.0
uses: actions/setup-java@v4.2.1
with:
distribution: 'zulu'
java-version: ${{ env.JAVA_VERSION }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/crowdin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
uses: actions/checkout@v4

- name: crowdin action
uses: crowdin/github-action@v1.19.0
uses: crowdin/github-action@v1.20.2
continue-on-error: true
with:
# Upload sources to Crowdin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
run: bundle install
working-directory: ./packages/smooth_app/android/
- name: Setup Java JDK
uses: actions/setup-java@v4.0.0
uses: actions/setup-java@v4.2.1
with:
distribution: 'zulu'
java-version: ${{ env.JAVA_VERSION }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/postsubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup Java JDK
uses: actions/setup-java@v4.0.0
uses: actions/setup-java@v4.2.1
with:
distribution: 'zulu'
java-version: 11
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/waldo_sessions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fetch-depth: 0

- name: Setup Java JDK
uses: actions/setup-java@v4.0.0
uses: actions/setup-java@v4.2.1
with:
distribution: 'zulu'
java-version: 11
Expand Down
2 changes: 1 addition & 1 deletion packages/smooth_app/android/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/tianhaoz95/fastlane-plugin-flutter_version
revision: e00d0f6178b4fa3cd116ccf95f4cc71b3734fd09
revision: aa92b678f4fe842d8c1428e45cea4cba837fdfea
specs:
fastlane-plugin-flutter_version (1.1.15)

Expand Down
Binary file added packages/smooth_app/assets/animations/off
Binary file not shown.
2 changes: 1 addition & 1 deletion packages/smooth_app/ios/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/tianhaoz95/fastlane-plugin-flutter-version
revision: e00d0f6178b4fa3cd116ccf95f4cc71b3734fd09
revision: aa92b678f4fe842d8c1428e45cea4cba837fdfea
specs:
fastlane-plugin-flutter_version (1.1.15)

Expand Down
1,138 changes: 569 additions & 569 deletions packages/smooth_app/lib/l10n/app_zh.arb

Large diffs are not rendered by default.

76 changes: 38 additions & 38 deletions packages/smooth_app/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@ packages:
dependency: "direct main"
description:
name: assorted_layout_widgets
sha256: "7761293820450b1219364e8351dee81c3a828ba062da4b67490742fca2d3949b"
sha256: "7d7688db393f02b8811f28bacdd9d791cf218f5805dee925f913a1849858e192"
url: "https://pub.dev"
source: hosted
version: "9.0.0"
version: "9.0.1"
async:
dependency: "direct main"
description:
Expand Down Expand Up @@ -209,10 +209,10 @@ packages:
dependency: "direct main"
description:
name: camera
sha256: "1f9010f0689774380fbcd7d6b7820a5157e8e97685fa66d619e1d1f58b3fdf93"
sha256: "9499cbc2e51d8eb0beadc158b288380037618ce4e30c9acbc4fae1ac3ecb5797"
url: "https://pub.dev"
source: hosted
version: "0.10.5+5"
version: "0.10.5+9"
camera_android:
dependency: transitive
description:
Expand Down Expand Up @@ -329,10 +329,10 @@ packages:
dependency: "direct main"
description:
name: crop_image
sha256: "12aada0b838365f9be08077814b75fe3113384987ad46119d56b042c1c613045"
sha256: "67d379ea927f4a9e48bf3d314a74bff7d86cdefd4a58af4554b37daa3c10bb9c"
url: "https://pub.dev"
source: hosted
version: "1.0.11"
version: "1.0.12"
cross_file:
dependency: transitive
description:
Expand Down Expand Up @@ -595,42 +595,50 @@ packages:
dependency: "direct main"
description:
name: flutter_image_compress
sha256: f159d2e8c4ed04b8e36994124fd4a5017a0f01e831ae3358c74095c340e9ae5e
sha256: "4edadb0ca2f957b85190e9c3aa728569b91b64b6e06e0eec5b622d47a8692ab2"
url: "https://pub.dev"
source: hosted
version: "2.1.0"
version: "2.2.0"
flutter_image_compress_common:
dependency: transitive
description:
name: flutter_image_compress_common
sha256: "7cad12802628706655920089cfe9ee1d1098300e7f39a079eb160458bbc47652"
sha256: "7f79bc6c8a363063620b4e372fa86bc691e1cb28e58048cd38e030692fbd99ee"
url: "https://pub.dev"
source: hosted
version: "1.0.3"
version: "1.0.5"
flutter_image_compress_macos:
dependency: transitive
description:
name: flutter_image_compress_macos
sha256: fea1e3d71150d03373916b832c49b5c2f56c3e7e13da82a929274a2c6f88251e
sha256: "26df6385512e92b3789dc76b613b54b55c457a7f1532e59078b04bf189782d47"
url: "https://pub.dev"
source: hosted
version: "1.0.1"
version: "1.0.2"
flutter_image_compress_ohos:
dependency: transitive
description:
name: flutter_image_compress_ohos
sha256: "70360371698be994786e5dd2e364a6525b1c5a4f843bff8af9b8a2fbe808d8d8"
url: "https://pub.dev"
source: hosted
version: "0.0.2"
flutter_image_compress_platform_interface:
dependency: transitive
description:
name: flutter_image_compress_platform_interface
sha256: eb4f055138b29b04498ebcb6d569aaaee34b64d75fb74ea0d40f9790bf47ee9d
sha256: "579cb3947fd4309103afe6442a01ca01e1e6f93dc53bb4cbd090e8ce34a41889"
url: "https://pub.dev"
source: hosted
version: "1.0.3"
version: "1.0.5"
flutter_image_compress_web:
dependency: transitive
description:
name: flutter_image_compress_web
sha256: da41cc3859f19d11c7d10be615f6a9dcf0907e7daffde7442bf4cc2486663660
sha256: f02fe352b17f82b72f481de45add240db062a2585850bea1667e82cc4cd6c311
url: "https://pub.dev"
source: hosted
version: "0.1.3+2"
version: "0.1.4+1"
flutter_launcher_icons:
dependency: "direct dev"
description:
Expand Down Expand Up @@ -1076,10 +1084,10 @@ packages:
dependency: "direct dev"
description:
name: mockito
sha256: "7d5b53bcd556c1bc7ffbe4e4d5a19c3e112b7e925e9e172dd7c6ad0630812616"
sha256: "6841eed20a7befac0ce07df8116c8b8233ed1f4486a7647c7fc5a02ae6163917"
url: "https://pub.dev"
source: hosted
version: "5.4.2"
version: "5.4.4"
nested:
dependency: transitive
description:
Expand Down Expand Up @@ -1125,10 +1133,10 @@ packages:
dependency: "direct main"
description:
name: package_info_plus
sha256: "7e76fad405b3e4016cd39d08f455a4eb5199723cf594cd1b8916d47140d93017"
sha256: "88bc797f44a94814f2213db1c9bd5badebafdfb8290ca9f78d4b9ee2a3db4d79"
url: "https://pub.dev"
source: hosted
version: "4.2.0"
version: "5.0.1"
package_info_plus_platform_interface:
dependency: transitive
description:
Expand Down Expand Up @@ -1325,10 +1333,10 @@ packages:
dependency: "direct main"
description:
name: provider
sha256: "9a96a0a19b594dbc5bf0f1f27d2bc67d5f95957359b461cd9feb44ed6ae75096"
sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c
url: "https://pub.dev"
source: hosted
version: "6.1.1"
version: "6.1.2"
pub_semver:
dependency: transitive
description:
Expand All @@ -1353,30 +1361,22 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.0.1"
quiver:
dependency: transitive
description:
name: quiver
sha256: b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47
url: "https://pub.dev"
source: hosted
version: "3.2.1"
rive:
dependency: "direct main"
description:
name: rive
sha256: ae75a6e9cfbf146630bfb1feba97ee582d935508be6b362e4bd197b9c55a6dd3
sha256: ec44b6cf7341e21727c4b0e762f4ac82f9a45f7e52df3ebad2d1289a726fbaaf
url: "https://pub.dev"
source: hosted
version: "0.12.4"
version: "0.13.1"
rive_common:
dependency: transitive
description:
name: rive_common
sha256: f4e20d0a99c5040c85624a3eb2b0b6b19e614d93a693c3bb25cf6e7bb2d3d6d3
sha256: "0f070bc0e764c570abd8b34d744ef30d1292bd4051f2e0951bbda755875fce6a"
url: "https://pub.dev"
source: hosted
version: "0.2.8"
version: "0.3.3"
scanner_ml_kit:
dependency: "direct main"
description:
Expand Down Expand Up @@ -1418,18 +1418,18 @@ packages:
dependency: transitive
description:
name: sentry
sha256: e8040183ea1a0323999bce69786ed8429b1b89fbe5815a504d5bb7493a6464cc
sha256: a460aa48568d47140dd0557410b624d344ffb8c05555107ac65035c1097cf1ad
url: "https://pub.dev"
source: hosted
version: "7.13.1"
version: "7.18.0"
sentry_flutter:
dependency: "direct main"
description:
name: sentry_flutter
sha256: "843e317e605e5860e30ae431e9b8724c54f1a8567c9ad495e04595926bf22376"
sha256: "3d0d1d4e0e407d276ae8128d123263ccbc37e988bae906765efd6f37d544f4c6"
url: "https://pub.dev"
source: hosted
version: "7.13.1"
version: "7.18.0"
share_plus:
dependency: "direct main"
description:
Expand Down
16 changes: 8 additions & 8 deletions packages/smooth_app/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@ dependencies:
iso_countries: 2.2.0
latlong2: 0.9.0
matomo_tracker: 4.1.1
package_info_plus: 4.2.0
package_info_plus: 5.0.1
device_info_plus: 9.1.2
permission_handler: 11.3.0
photo_view: 0.14.0
uuid: 3.0.7
provider: 6.1.2
sentry_flutter: 7.13.1
sentry_flutter: 7.18.0
sqflite: 2.3.2
url_launcher: 6.1.3
visibility_detector: 0.4.0+2
assorted_layout_widgets: 9.0.0
assorted_layout_widgets: 9.0.1
app_settings: 5.1.1
diacritic: 0.1.5
app_store_shared:
Expand All @@ -51,7 +51,7 @@ dependencies:
flutter_native_splash: 2.3.10
image: 4.1.7
auto_size_text: 3.0.0
crop_image: 1.0.11
crop_image: 1.0.12
shared_preferences: 2.2.2
intl: 0.18.1
collection: 1.18.0
Expand All @@ -60,11 +60,11 @@ dependencies:
share_plus: 7.2.2
fimber: 0.7.0
shimmer: ^3.0.0
rive: 0.12.4
rive: 0.13.1
sensors_plus: 3.1.0
webview_flutter: 3.0.4
flutter_custom_tabs: 2.0.0+1
flutter_image_compress: 2.1.0
flutter_image_compress: 2.2.0
connectivity_plus: 5.0.2
dart_ping: 9.0.1
dart_ping_ios: 4.0.2
Expand All @@ -86,7 +86,7 @@ dependencies:
# We use two different scanning engines,
# mobile scanner powered by ML Kit for the Play Store and Apple App Store,
# but qr_code_scanner which uses the open source ZXing for F-Droid
camera: 0.10.5+5
camera: 0.10.5+9

scanner_shared:
path: ../scanner/shared
Expand All @@ -110,7 +110,7 @@ dev_dependencies:
flutter_launcher_icons: 0.13.1
flutter_test:
sdk: flutter
mockito: 5.4.2
mockito: 5.4.4
path_provider_platform_interface: 2.1.2
plugin_platform_interface: 2.1.8
flutter_lints: 2.0.3
Expand Down
Loading