Merge branch 'main' into TALAO

TalaoDAO · Jun 10, 2024 · 953a15c · 953a15c
2 parents 3dd6cca + 78b2218
commit 953a15c
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 32 deletions.
diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json
@@ -1,4 +1,4 @@
 {
-  "flutterSdkVersion": "3.16.8",
+  "flutterSdkVersion": "3.19.6",
   "flavors": {}
 }
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -170,7 +170,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {

diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/packages/oidc4vc/lib/src/models/openid_configuration.dart b/packages/oidc4vc/lib/src/models/openid_configuration.dart
@@ -24,6 +24,7 @@ class OpenIdConfiguration extends Equatable {
     this.credentialManifests,
     this.issuer,
     this.jwksUri,
+    required this.requirePushedAuthorizationRequests,
     this.grantTypesSupported,
   });
 

diff --git a/pubspec.lock b/pubspec.lock
@@ -37,10 +37,10 @@ packages:
     dependency: transitive
     description:
       name: archive
-      sha256: "6bd38d335f0954f5fad9c79e614604fbf03a0e5b975923dd001b6ea965ef5b4b"
+      sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d
       url: "https://pub.dev"
     source: hosted
-    version: "3.6.0"
+    version: "3.6.1"
   args:
     dependency: transitive
     description:
@@ -864,10 +864,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_chat_ui
-      sha256: "40fb37acc328dd179eadc3d67bf8bd2d950dc0da34464aa8d48e8707e0234c09"
+      sha256: "5a1fed18377d28774f8226ba247f7f2817b9d44f9c621087ab7c66ef657e4c4f"
       url: "https://pub.dev"
     source: hosted
-    version: "1.6.13"
+    version: "1.6.14"
   flutter_dotenv:
     dependency: "direct main"
     description:
@@ -1255,10 +1255,10 @@ packages:
     dependency: "direct main"
     description:
       name: image_picker
-      sha256: "33974eca2e87e8b4e3727f1b94fa3abcb25afe80b6bc2c4d449a0e150aedf720"
+      sha256: "021834d9c0c3de46bf0fe40341fa07168407f694d9b2bb18d532dc1261867f7a"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
   image_picker_android:
     dependency: transitive
     description:
@@ -1279,10 +1279,10 @@ packages:
     dependency: transitive
     description:
       name: image_picker_ios
-      sha256: "4824d8c7f6f89121ef0122ff79bb00b009607faecc8545b86bca9ab5ce1e95bf"
+      sha256: "6703696ad49f5c3c8356d576d7ace84d1faf459afb07accbb0fae780753ff447"
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.11+2"
+    version: "0.8.12"
   image_picker_linux:
     dependency: transitive
     description:
@@ -1780,10 +1780,10 @@ packages:
     dependency: transitive
     description:
       name: permission_handler_apple
-      sha256: e9ad66020b89ff1b63908f247c2c6f931c6e62699b756ef8b3c4569350cd8662
+      sha256: e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0
       url: "https://pub.dev"
     source: hosted
-    version: "9.4.4"
+    version: "9.4.5"
   permission_handler_html:
     dependency: transitive
     description:
@@ -1836,10 +1836,10 @@ packages:
     dependency: transitive
     description:
       name: platform
-      sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
+      sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.4"
+    version: "3.1.5"
   platform_device_id:
     dependency: "direct main"
     description:
@@ -2004,10 +2004,10 @@ packages:
     dependency: transitive
     description:
       name: rational
-      sha256: ba58e9e18df9abde280e8b10051e4bce85091e41e8e7e411b6cde2e738d357cf
+      sha256: cb808fb6f1a839e6fc5f7d8cb3b0a10e1db48b3be102de73938c627f0b636336
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.2"
+    version: "2.2.3"
   retry:
     dependency: transitive
     description:
@@ -2441,10 +2441,10 @@ packages:
     dependency: "direct main"
     description:
       name: url_launcher
-      sha256: "6ce1e04375be4eed30548f10a315826fd933c1e493206eab82eed01f438c8d2e"
+      sha256: "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3"
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.6"
+    version: "6.3.0"
   url_launcher_android:
     dependency: transitive
     description:

diff --git a/script.sh b/script.sh
@@ -1,17 +1,17 @@
 
 function pub {
-  flutter clean
+  fvm flutter clean
   for d in `ls packages`;
   do
     (
       cd "packages/$d"
-      flutter clean
-      flutter pub get
-      flutter pub upgrade
+      fvm flutter clean
+      fvm flutter pub get
+      fvm flutter pub upgrade
     )
   done 
-  flutter pub get
-  flutter pub upgrade
+  fvm flutter pub get
+  fvm flutter pub upgrade
 }
 
 function buildRunner {
@@ -21,10 +21,10 @@ function buildRunner {
     (
       echo "$d"
       cd "packages/$d"
-      dart pub run build_runner build --delete-conflicting-outputs
+      fvm flutter packages pub run build_runner build --delete-conflicting-outputs
     )
   done 
-  dart pub run build_runner build --delete-conflicting-outputs
+  fvm flutter packages pub run build_runner build --delete-conflicting-outputs
 }
 
 function podUpdate {
@@ -41,17 +41,17 @@ function podUpdate {
 if [[ "$*" == *-runDev* ]]; 
 then
   echo "flutter run development"
-  flutter run --flavor development --target lib/main_development.dart
+  fvm flutter run --flavor development --target lib/main_development.dart
 
 elif [[ "$*" == *-runstage* ]]; 
 then
   echo "flutter run staging"
-  flutter run --flavor staging --target lib/main_staging.dart
+  fvm flutter run --flavor staging --target lib/main_staging.dart
 
 elif [[ "$*" == *-run* ]]; 
 then
   echo "flutter run production"
-  flutter run --flavor production --target lib/main_production.dart
+  fvm flutter run --flavor production --target lib/main_production.dart
 
 elif [[ "$*" == *-pod* ]]; 
 then 
@@ -62,7 +62,7 @@ then
   buildRunner
   echo "deploy android"
   echo "Make sure you are in right branch"
-  flutter build appbundle --flavor "production" --target "lib/main_production.dart"
+  fvm flutter build appbundle --flavor "production" --target "lib/main_production.dart"
   # cd android 
   # fastlane deploy
   echo "app bundle deployed on internal testing track"
@@ -74,7 +74,7 @@ then
   podUpdate
   echo "deploy ios"
   echo "Make sure you are in right branch"
-  flutter build ios --release --flavor "production" --target "lib/main_production.dart"
+  fvm flutter build ios --release --flavor "production" --target "lib/main_production.dart"
   cd ios 
   fastlane beta
 elif [[ "$*" == *-pub* ]];