Merge branch 'develop' into feat/5568

monsieurtanuki · Sep 19, 2024 · 6e96427 · 6e96427
2 parents 316477d + 44d3d38
commit 6e96427
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/android-release-to-org-openfoodfacts-scanner.yml b/.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/setup-java@v4.2.2
+        uses: actions/setup-java@v4.3.0
         with:
           distribution: 'zulu'
           java-version: ${{ env.JAVA_VERSION }}

diff --git a/.github/workflows/ios-release-to-org-openfoodfacts-scanner.yml b/.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/setup-java@v4.2.2
+        uses: actions/setup-java@v4.3.0
         with:
           distribution: 'zulu'
           java-version: ${{ env.JAVA_VERSION }}

diff --git a/.github/workflows/postsubmit.yml b/.github/workflows/postsubmit.yml
@@ -16,7 +16,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Java JDK
-        uses: actions/setup-java@v4.2.2
+        uses: actions/setup-java@v4.3.0
         with:
           distribution: 'zulu'
           java-version: 17

diff --git a/.github/workflows/waldo_sessions.yml b/.github/workflows/waldo_sessions.yml
@@ -27,7 +27,7 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Java JDK
-        uses: actions/setup-java@v4.2.2
+        uses: actions/setup-java@v4.3.0
         with:
           distribution: 'zulu'
           java-version: 17

diff --git a/packages/smooth_app/lib/pages/scan/carousel/scan_carousel_manager.dart b/packages/smooth_app/lib/pages/scan/carousel/scan_carousel_manager.dart
@@ -1,4 +1,4 @@
-import 'package:carousel_slider/carousel_controller.dart';
+import 'package:carousel_slider/carousel_slider.dart';
 import 'package:flutter/material.dart';
 import 'package:smooth_app/helpers/haptic_feedback_helper.dart';
 
@@ -34,7 +34,7 @@ class ExternalScanCarouselManager extends StatefulWidget {
 
 class ExternalScanCarouselManagerState
     extends State<ExternalScanCarouselManager> {
-  final CarouselController _controller = CarouselController();
+  final CarouselSliderController _controller = CarouselSliderController();
 
   /// A hidden attribute to force to return to the Scanner tab
   /// This value should only be accessed via [forceShowScannerTab], as it will
@@ -75,7 +75,7 @@ class ExternalScanCarouselManagerState
   // Without an animation
   void moveToSearchCard() => _controller.jumpToPage(0);
 
-  CarouselController get controller => _controller;
+  CarouselSliderController get controller => _controller;
 
   bool updateShouldNotify(ExternalScanCarouselManagerState oldState) {
     return oldState.currentBarcode != currentBarcode || _forceShowScannerTab;

diff --git a/packages/smooth_app/pubspec.lock b/packages/smooth_app/pubspec.lock
@@ -89,10 +89,10 @@ packages:
     dependency: "direct main"
     description:
       name: audioplayers
-      sha256: "752039d6aa752597c98ec212e9759519061759e402e7da59a511f39d43aa07d2"
+      sha256: c346ba5a39dc208f1bab55fc239855f573d69b0e832402114bf0b793622adc4d
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.0"
+    version: "6.1.0"
   audioplayers_android:
     dependency: transitive
     description:
@@ -129,10 +129,10 @@ packages:
     dependency: transitive
     description:
       name: audioplayers_web
-      sha256: db8fc420dadf80da18e2286c18e746fb4c3b2c5adbf0c963299dde046828886d
+      sha256: "3609bdf0e05e66a3d9750ee40b1e37f2a622c4edb796cc600b53a90a30a2ace4"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.0"
+    version: "5.0.1"
   audioplayers_windows:
     dependency: transitive
     description:
@@ -241,10 +241,10 @@ packages:
     dependency: "direct main"
     description:
       name: carousel_slider
-      sha256: "9c695cc963bf1d04a47bd6021f68befce8970bcd61d24938e1fb0918cf5d9c42"
+      sha256: "7b006ec356205054af5beaef62e2221160ea36b90fb70a35e4deacd49d0349ae"
       url: "https://pub.dev"
     source: hosted
-    version: "4.2.1"
+    version: "5.0.0"
   characters:
     dependency: transitive
     description:
@@ -1695,10 +1695,10 @@ packages:
     dependency: "direct main"
     description:
       name: uuid
-      sha256: "83d37c7ad7aaf9aa8e275490669535c8080377cfa7a7004c24dfac53afffaa90"
+      sha256: f33d6bb662f0e4f79dcd7ada2e6170f3b3a2530c28fc41f49a411ddedd576a77
       url: "https://pub.dev"
     source: hosted
-    version: "4.4.2"
+    version: "4.5.0"
   vector_graphics:
     dependency: transitive
     description:

diff --git a/packages/smooth_app/pubspec.yaml b/packages/smooth_app/pubspec.yaml
@@ -15,7 +15,7 @@ dependencies:
   async: 2.11.0
   go_router: 14.2.7
   barcode_widget: 2.0.4
-  carousel_slider: 4.2.1
+  carousel_slider: 5.0.0
   cupertino_icons: 1.0.8
   flutter_svg: 2.0.10+1
   flutter_map: 7.0.2
@@ -35,7 +35,7 @@ dependencies:
   device_info_plus: 10.1.2
   permission_handler: 11.3.1
   photo_view: 0.15.0
-  uuid: 4.4.2
+  uuid: 4.5.0
   provider: 6.1.2
   sentry_flutter: 8.7.0
   sqflite: 2.3.3+1
@@ -46,7 +46,7 @@ dependencies:
   diacritic: 0.1.5
   app_store_shared:
     path: ../app_store/shared
-  audioplayers: 6.0.0
+  audioplayers: 6.1.0
   flutter_email_sender: 6.0.3
   flutter_native_splash: 2.4.1
   image: 4.2.0