Merge branch 'develop' into fix/5570

monsieurtanuki · Sep 26, 2024 · ab4c7de · ab4c7de
2 parents 54cf7f7 + a656986
commit ab4c7de
Show file tree

Hide file tree

Showing 91 changed files with 754 additions and 376 deletions.
diff --git a/README.md b/README.md
@@ -90,7 +90,7 @@ Full list of features on the wiki: https://wiki.openfoodfacts.org/Mobile_App/Fea
 
 - Make sure you have installed flutter and all the requirements
   - [Official flutter installation guide](https://docs.flutter.dev/get-started/install)
-- Currently, the app uses the following version of Flutter (3.22.x).
+- Currently, the app uses the following version of Flutter (3.24.x).
 
 
 We have predefined run configurations for Android Studio and Visual Studio Code

diff --git a/flutter-version.txt b/flutter-version.txt
@@ -1 +1 @@
-3.22.2
+3.24.3
diff --git a/packages/app_store/apple_app_store/pubspec.yaml b/packages/app_store/apple_app_store/pubspec.yaml
@@ -4,7 +4,7 @@ version: 0.0.1
 publish_to: "none"
 
 environment:
-  sdk: '>=3.4.0 <4.0.0'
+  sdk: ^3.5.3
 
 dependencies:
   flutter:
@@ -18,6 +18,6 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: 2.0.3
+  flutter_lints: 4.0.0
   openfoodfacts_flutter_lints:
     git: https://github.com/openfoodfacts/openfoodfacts_flutter_lints.git
diff --git a/packages/app_store/google_play/pubspec.yaml b/packages/app_store/google_play/pubspec.yaml
@@ -4,7 +4,7 @@ version: 0.0.1
 publish_to: "none"
 
 environment:
-  sdk: '>=3.4.0 <4.0.0'
+  sdk: ^3.5.3
 
 dependencies:
   flutter:
@@ -18,7 +18,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: 2.0.3
+  flutter_lints: 4.0.0
   openfoodfacts_flutter_lints:
     git: https://github.com/openfoodfacts/openfoodfacts_flutter_lints.git
 

diff --git a/packages/app_store/shared/pubspec.yaml b/packages/app_store/shared/pubspec.yaml
@@ -4,7 +4,7 @@ version: 1.0.0
 publish_to: "none"
 
 environment:
-  sdk: '>=3.4.0 <4.0.0'
+  sdk: ^3.5.3
 
 dependencies:
   flutter:
@@ -13,7 +13,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: 2.0.3
+  flutter_lints: 4.0.0
   openfoodfacts_flutter_lints:
     git: https://github.com/openfoodfacts/openfoodfacts_flutter_lints.git
 

diff --git a/packages/app_store/uri_store/pubspec.yaml b/packages/app_store/uri_store/pubspec.yaml
@@ -4,7 +4,7 @@ version: 0.0.1
 publish_to: "none"
 
 environment:
-  sdk: '>=3.4.0 <4.0.0'
+  sdk: ^3.5.3
 
 dependencies:
   flutter:
@@ -18,6 +18,6 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: 2.0.3
+  flutter_lints: 4.0.0
   openfoodfacts_flutter_lints:
     git: https://github.com/openfoodfacts/openfoodfacts_flutter_lints.git
diff --git a/packages/scanner/ml_kit/pubspec.yaml b/packages/scanner/ml_kit/pubspec.yaml
@@ -4,7 +4,7 @@ version: 1.0.0
 publish_to: "none"
 
 environment:
-  sdk: '>=3.4.0 <4.0.0'
+  sdk: ^3.5.3
 
 dependencies:
   flutter:
@@ -20,6 +20,6 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: 2.0.2
+  flutter_lints: 4.0.0
   openfoodfacts_flutter_lints:
     git: https://github.com/openfoodfacts/openfoodfacts_flutter_lints.git
diff --git a/packages/scanner/shared/pubspec.yaml b/packages/scanner/shared/pubspec.yaml
@@ -4,7 +4,7 @@ version: 1.0.0
 publish_to: "none"
 
 environment:
-  sdk: '>=3.4.0 <4.0.0'
+  sdk: ^3.5.3
 
 dependencies:
   flutter:
@@ -16,7 +16,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: 2.0.3
+  flutter_lints: 4.0.0
   openfoodfacts_flutter_lints:
     git: https://github.com/openfoodfacts/openfoodfacts_flutter_lints.git
 

diff --git a/packages/scanner/zxing/pubspec.yaml b/packages/scanner/zxing/pubspec.yaml
@@ -4,7 +4,7 @@ version: 1.0.0
 publish_to: "none"
 
 environment:
-  sdk: '>=3.4.0 <4.0.0'
+  sdk: ^3.5.3
 
 dependencies:
   flutter:
@@ -18,6 +18,6 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: 2.0.3
+  flutter_lints: 4.0.0
   openfoodfacts_flutter_lints:
     git: https://github.com/openfoodfacts/openfoodfacts_flutter_lints.git
diff --git a/packages/smooth_app/ios/Podfile b/packages/smooth_app/ios/Podfile
@@ -32,20 +32,13 @@ target 'Runner' do
   use_modular_headers!
 
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
+#  target 'RunnerTests' do
+#    inherit! :search_paths
+#  end
 end
 
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     flutter_additional_ios_build_settings(target)
-
-    target.build_configurations.each do |config|
-       config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0'
-
-       config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
-                   '$(inherited)',
-                   'PERMISSION_CAMERA=1',
-                   'PERMISSION_PHOTOS=1',
-                 ]
-    end
   end
 end