diff --git a/app/android/app/build_local b/app/android/app/build_local index f06e5ef72..841ab2c08 100644 --- a/app/android/app/build_local +++ b/app/android/app/build_local @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,10 +12,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { @@ -21,13 +23,10 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { compileSdkVersion flutter.compileSdkVersion ndkVersion flutter.ndkVersion + namespace "org.jimber.threebotlogin" sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -95,12 +94,11 @@ flutter { def lifecycle_version = "2.5.1" dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'androidx.multidex:multidex:2.0.1' - implementation 'com.hbb20:ccp:2.4.0' + implementation 'com.hbb20:ccp:2.7.3' implementation 'com.google.code.gson:gson:2.8.6' implementation "androidx.preference:preference-ktx:1.1.1" implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" - + implementation "androidx.activity:activity:1.9.3" } diff --git a/app/android/app/build_production b/app/android/app/build_production index 61d842a26..304d7e0f6 100644 --- a/app/android/app/build_production +++ b/app/android/app/build_production @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,10 +12,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { @@ -21,13 +23,10 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { compileSdkVersion flutter.compileSdkVersion ndkVersion flutter.ndkVersion + namespace "org.jimber.threebotlogin" sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -95,12 +94,11 @@ flutter { def lifecycle_version = "2.5.1" dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'androidx.multidex:multidex:2.0.1' - implementation 'com.hbb20:ccp:2.4.0' + implementation 'com.hbb20:ccp:2.7.3' implementation 'com.google.code.gson:gson:2.8.6' implementation "androidx.preference:preference-ktx:1.1.1" implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" - + implementation "androidx.activity:activity:1.9.3" } diff --git a/app/android/app/build_staging b/app/android/app/build_staging index f06e5ef72..841ab2c08 100644 --- a/app/android/app/build_staging +++ b/app/android/app/build_staging @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,10 +12,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { @@ -21,13 +23,10 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { compileSdkVersion flutter.compileSdkVersion ndkVersion flutter.ndkVersion + namespace "org.jimber.threebotlogin" sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -95,12 +94,11 @@ flutter { def lifecycle_version = "2.5.1" dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'androidx.multidex:multidex:2.0.1' - implementation 'com.hbb20:ccp:2.4.0' + implementation 'com.hbb20:ccp:2.7.3' implementation 'com.google.code.gson:gson:2.8.6' implementation "androidx.preference:preference-ktx:1.1.1" implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" - + implementation "androidx.activity:activity:1.9.3" } diff --git a/app/android/app/build_testing b/app/android/app/build_testing index 61d842a26..304d7e0f6 100644 --- a/app/android/app/build_testing +++ b/app/android/app/build_testing @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,10 +12,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { @@ -21,13 +23,10 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { compileSdkVersion flutter.compileSdkVersion ndkVersion flutter.ndkVersion + namespace "org.jimber.threebotlogin" sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -95,12 +94,11 @@ flutter { def lifecycle_version = "2.5.1" dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'androidx.multidex:multidex:2.0.1' - implementation 'com.hbb20:ccp:2.4.0' + implementation 'com.hbb20:ccp:2.7.3' implementation 'com.google.code.gson:gson:2.8.6' implementation "androidx.preference:preference-ktx:1.1.1" implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" - + implementation "androidx.activity:activity:1.9.3" } diff --git a/app/android/app/src/main/AndroidManifest_local b/app/android/app/src/main/AndroidManifest_local index ce9dba7a7..3f0180a79 100644 --- a/app/android/app/src/main/AndroidManifest_local +++ b/app/android/app/src/main/AndroidManifest_local @@ -1,5 +1,5 @@ - - + + diff --git a/app/android/app/src/main/AndroidManifest_production b/app/android/app/src/main/AndroidManifest_production index 5ddec4700..578607cbe 100644 --- a/app/android/app/src/main/AndroidManifest_production +++ b/app/android/app/src/main/AndroidManifest_production @@ -1,5 +1,5 @@ - - + + diff --git a/app/android/app/src/main/AndroidManifest_staging b/app/android/app/src/main/AndroidManifest_staging index 47c590d8b..e0b354202 100644 --- a/app/android/app/src/main/AndroidManifest_staging +++ b/app/android/app/src/main/AndroidManifest_staging @@ -1,5 +1,5 @@ - - + + diff --git a/app/android/app/src/main/AndroidManifest_testing b/app/android/app/src/main/AndroidManifest_testing index 5baaf0b4f..2c829c582 100644 --- a/app/android/app/src/main/AndroidManifest_testing +++ b/app/android/app/src/main/AndroidManifest_testing @@ -1,5 +1,5 @@ - - + + diff --git a/app/android/build.gradle b/app/android/build.gradle index 48e5c828a..0cf2fae20 100644 --- a/app/android/build.gradle +++ b/app/android/build.gradle @@ -1,22 +1,3 @@ -buildscript { - ext.kotlin_version = '2.0.20' - repositories { - google() - jcenter() - mavenCentral() - maven { url 'https://jitpack.io' } // add this line - maven { url 'https://maven.google.com' } - - } - - dependencies { - // classpath 'com.android.tools.build:gradle:4.2.0' - classpath 'com.android.tools.build:gradle:7.3.0' - classpath 'com.google.gms:google-services:4.3.3' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - allprojects { repositories { google() @@ -31,6 +12,31 @@ rootProject.buildDir = '../build' subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" } + +subprojects { + afterEvaluate { project -> + if (project.hasProperty('android')) { + project.android { + if (namespace == null) { + namespace project.group + } + } + } + } +} + +subprojects { + afterEvaluate { project -> + if (project.plugins.hasPlugin("com.android.application") || + project.plugins.hasPlugin("com.android.library")) { + project.android { + compileSdkVersion 34 + buildToolsVersion "34.0.0" + } + } + } +} + subprojects { project.evaluationDependsOn(':app') } diff --git a/app/android/gradle.properties b/app/android/gradle.properties index 88a3fab58..a8ac4d340 100644 --- a/app/android/gradle.properties +++ b/app/android/gradle.properties @@ -12,3 +12,4 @@ org.gradle.jvmargs=-Xmx4096M \ --add-opens=java.base/java.lang.reflect=ALL-UNNAMED \ --add-opens=java.base/java.io=ALL-UNNAMED \ --add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED +dev.steenbakker.mobile_scanner.useUnbundled=true diff --git a/app/android/gradle/wrapper/gradle-wrapper.properties b/app/android/gradle/wrapper/gradle-wrapper.properties index cfe88f690..db18181ac 100644 --- a/app/android/gradle/wrapper/gradle-wrapper.properties +++ b/app/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip diff --git a/app/android/settings.gradle b/app/android/settings.gradle index 01dbec3d4..72e8d42af 100644 --- a/app/android/settings.gradle +++ b/app/android/settings.gradle @@ -1,25 +1,25 @@ -include ':app' +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + }() -def flutterProjectRoot = rootProject.projectDir.parentFile.toPath() + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") -def plugins = new Properties() -def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins') -if (pluginsFile.exists()) { - pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) } + repositories { + google() + mavenCentral() + gradlePluginPortal() + } } -plugins.each { name, path -> - def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile() - include ":$name" - project(":$name").projectDir = pluginDirectory +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version "8.7.2" apply false + id "org.jetbrains.kotlin.android" version "2.1.0" apply false } -def localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() - -assert localPropertiesFile.exists() -localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } - -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" +include ":app" diff --git a/app/ios/Podfile.lock b/app/ios/Podfile.lock index afdcec547..90f352467 100644 --- a/app/ios/Podfile.lock +++ b/app/ios/Podfile.lock @@ -1,52 +1,108 @@ PODS: - audio_session (0.0.1): - Flutter + - Crisp (2.8.2): + - Crisp/Crisp (= 2.8.2) + - Crisp/Crisp (2.8.2) + - crisp_chat (2.2.3): + - Crisp (~> 2.8.1) + - Flutter - device_info_plus (0.0.1): - Flutter - Flutter (1.0.0) - - flutter_inappwebview (0.0.1): + - flutter_inappwebview_ios (0.0.1): + - Flutter + - flutter_inappwebview_ios/Core (= 0.0.1) + - OrderedSet (~> 6.0.3) + - flutter_inappwebview_ios/Core (0.0.1): - Flutter - - flutter_inappwebview/Core (= 0.0.1) - - OrderedSet (~> 5.0) - - flutter_inappwebview/Core (0.0.1): + - OrderedSet (~> 6.0.3) + - flutter_keyboard_visibility (0.0.1): - Flutter - - OrderedSet (~> 5.0) - flutter_pkid (0.0.1): - Flutter - - idenfy_sdk_flutter (2.5.3): + - GoogleDataTransport (9.4.1): + - GoogleUtilities/Environment (~> 7.7) + - nanopb (< 2.30911.0, >= 2.30908.0) + - PromisesObjC (< 3.0, >= 1.2) + - GoogleMLKit/BarcodeScanning (6.0.0): + - GoogleMLKit/MLKitCore + - MLKitBarcodeScanning (~> 5.0.0) + - GoogleMLKit/MLKitCore (6.0.0): + - MLKitCommon (~> 11.0.0) + - GoogleToolboxForMac/Defines (4.2.1) + - GoogleToolboxForMac/Logger (4.2.1): + - GoogleToolboxForMac/Defines (= 4.2.1) + - "GoogleToolboxForMac/NSData+zlib (4.2.1)": + - GoogleToolboxForMac/Defines (= 4.2.1) + - GoogleUtilities/Environment (7.13.3): + - GoogleUtilities/Privacy + - PromisesObjC (< 3.0, >= 1.2) + - GoogleUtilities/Logger (7.13.3): + - GoogleUtilities/Environment + - GoogleUtilities/Privacy + - GoogleUtilities/Privacy (7.13.3) + - GoogleUtilities/UserDefaults (7.13.3): + - GoogleUtilities/Logger + - GoogleUtilities/Privacy + - GoogleUtilitiesComponents (1.1.0): + - GoogleUtilities/Logger + - GTMSessionFetcher/Core (3.5.0) + - idenfy_sdk_flutter (2.5.6): - Flutter - - iDenfySDK/iDenfyLiveness (= 8.4.5) - - iDenfySDK/iDenfyLiveness (8.4.5): + - iDenfySDK/iDenfyLiveness (= 8.5.3) + - iDenfySDK/iDenfyLiveness (8.5.3): - lottie-ios (= 4.4.3) - just_audio (0.0.1): - Flutter - local_auth (0.0.1): - Flutter - lottie-ios (4.4.3) - - MTBBarcodeScanner (5.0.11) + - MLImage (1.0.0-beta5) + - MLKitBarcodeScanning (5.0.0): + - MLKitCommon (~> 11.0) + - MLKitVision (~> 7.0) + - MLKitCommon (11.0.0): + - GoogleDataTransport (< 10.0, >= 9.4.1) + - GoogleToolboxForMac/Logger (< 5.0, >= 4.2.1) + - "GoogleToolboxForMac/NSData+zlib (< 5.0, >= 4.2.1)" + - GoogleUtilities/UserDefaults (< 8.0, >= 7.13.0) + - GoogleUtilitiesComponents (~> 1.0) + - GTMSessionFetcher/Core (< 4.0, >= 3.3.2) + - MLKitVision (7.0.0): + - GoogleToolboxForMac/Logger (< 5.0, >= 4.2.1) + - "GoogleToolboxForMac/NSData+zlib (< 5.0, >= 4.2.1)" + - GTMSessionFetcher/Core (< 4.0, >= 3.3.2) + - MLImage (= 1.0.0-beta5) + - MLKitCommon (~> 11.0) + - mobile_scanner (5.2.3): + - Flutter + - GoogleMLKit/BarcodeScanning (~> 6.0.0) + - nanopb (2.30910.0): + - nanopb/decode (= 2.30910.0) + - nanopb/encode (= 2.30910.0) + - nanopb/decode (2.30910.0) + - nanopb/encode (2.30910.0) - open_filex (0.0.2): - Flutter - - OrderedSet (5.0.0) + - OrderedSet (6.0.3) - package_info_plus (0.4.5): - Flutter - path_provider_foundation (0.0.1): - Flutter - FlutterMacOS - - permission_handler_apple (9.1.1): - - Flutter - - qr_code_scanner (0.2.0): + - permission_handler_apple (9.3.0): - Flutter - - MTBBarcodeScanner + - PromisesObjC (2.4.0) - screen_brightness_ios (0.1.0): - Flutter - shared_preferences_foundation (0.0.1): - Flutter - FlutterMacOS - - smart_auth (0.0.1): + - "sodium_libs (3.4.3+1)": - Flutter - - sodium_libs (2.2.1): - - Flutter - - sqflite (0.0.3): + - FlutterMacOS + - sqflite_darwin (0.0.4): - Flutter - FlutterMacOS - uni_links (0.0.1): @@ -60,48 +116,66 @@ PODS: - Flutter - webview_flutter_wkwebview (0.0.1): - Flutter + - FlutterMacOS DEPENDENCIES: - audio_session (from `.symlinks/plugins/audio_session/ios`) + - crisp_chat (from `.symlinks/plugins/crisp_chat/ios`) - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`) - Flutter (from `Flutter`) - - flutter_inappwebview (from `.symlinks/plugins/flutter_inappwebview/ios`) + - flutter_inappwebview_ios (from `.symlinks/plugins/flutter_inappwebview_ios/ios`) + - flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`) - flutter_pkid (from `.symlinks/plugins/flutter_pkid/ios`) - idenfy_sdk_flutter (from `.symlinks/plugins/idenfy_sdk_flutter/ios`) - just_audio (from `.symlinks/plugins/just_audio/ios`) - local_auth (from `.symlinks/plugins/local_auth/ios`) + - mobile_scanner (from `.symlinks/plugins/mobile_scanner/ios`) - open_filex (from `.symlinks/plugins/open_filex/ios`) - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) - - qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`) - screen_brightness_ios (from `.symlinks/plugins/screen_brightness_ios/ios`) - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - - smart_auth (from `.symlinks/plugins/smart_auth/ios`) - - sodium_libs (from `.symlinks/plugins/sodium_libs/ios`) - - sqflite (from `.symlinks/plugins/sqflite/darwin`) + - sodium_libs (from `.symlinks/plugins/sodium_libs/darwin`) + - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`) - uni_links (from `.symlinks/plugins/uni_links/ios`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`) - wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`) - - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`) + - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/darwin`) SPEC REPOS: trunk: + - Crisp + - GoogleDataTransport + - GoogleMLKit + - GoogleToolboxForMac + - GoogleUtilities + - GoogleUtilitiesComponents + - GTMSessionFetcher - iDenfySDK - lottie-ios - - MTBBarcodeScanner + - MLImage + - MLKitBarcodeScanning + - MLKitCommon + - MLKitVision + - nanopb - OrderedSet + - PromisesObjC EXTERNAL SOURCES: audio_session: :path: ".symlinks/plugins/audio_session/ios" + crisp_chat: + :path: ".symlinks/plugins/crisp_chat/ios" device_info_plus: :path: ".symlinks/plugins/device_info_plus/ios" Flutter: :path: Flutter - flutter_inappwebview: - :path: ".symlinks/plugins/flutter_inappwebview/ios" + flutter_inappwebview_ios: + :path: ".symlinks/plugins/flutter_inappwebview_ios/ios" + flutter_keyboard_visibility: + :path: ".symlinks/plugins/flutter_keyboard_visibility/ios" flutter_pkid: :path: ".symlinks/plugins/flutter_pkid/ios" idenfy_sdk_flutter: @@ -110,6 +184,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/just_audio/ios" local_auth: :path: ".symlinks/plugins/local_auth/ios" + mobile_scanner: + :path: ".symlinks/plugins/mobile_scanner/ios" open_filex: :path: ".symlinks/plugins/open_filex/ios" package_info_plus: @@ -118,18 +194,14 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/path_provider_foundation/darwin" permission_handler_apple: :path: ".symlinks/plugins/permission_handler_apple/ios" - qr_code_scanner: - :path: ".symlinks/plugins/qr_code_scanner/ios" screen_brightness_ios: :path: ".symlinks/plugins/screen_brightness_ios/ios" shared_preferences_foundation: :path: ".symlinks/plugins/shared_preferences_foundation/darwin" - smart_auth: - :path: ".symlinks/plugins/smart_auth/ios" sodium_libs: - :path: ".symlinks/plugins/sodium_libs/ios" - sqflite: - :path: ".symlinks/plugins/sqflite/darwin" + :path: ".symlinks/plugins/sodium_libs/darwin" + sqflite_darwin: + :path: ".symlinks/plugins/sqflite_darwin/darwin" uni_links: :path: ".symlinks/plugins/uni_links/ios" url_launcher_ios: @@ -139,37 +211,50 @@ EXTERNAL SOURCES: wakelock_plus: :path: ".symlinks/plugins/wakelock_plus/ios" webview_flutter_wkwebview: - :path: ".symlinks/plugins/webview_flutter_wkwebview/ios" + :path: ".symlinks/plugins/webview_flutter_wkwebview/darwin" SPEC CHECKSUMS: - audio_session: 088d2483ebd1dc43f51d253d4a1c517d9a2e7207 - device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6 + audio_session: f08db0697111ac84ba46191b55488c0563bb29c6 + Crisp: 6747c96b2b2c2a81babf1eaecd1688a65d98edd4 + crisp_chat: 3bdffe847beeaf0277d5d6d1473962d758af5685 + device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 - flutter_inappwebview: 3d32228f1304635e7c028b0d4252937730bbc6cf - flutter_pkid: 7808bd0baee7580afc1cebebf2a6f3b290e190c5 - idenfy_sdk_flutter: 3f53cc19cd757e9bb9f01d83386a6db84192dae9 - iDenfySDK: 4bba551e7e824daf7db2b3bac166a9fe339c4269 - just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa - local_auth: 1740f55d7af0a2e2a8684ce225fe79d8931e808c + flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99 + flutter_keyboard_visibility: 4625131e43015dbbe759d9b20daaf77e0e3f6619 + flutter_pkid: 816b9b6b9e0db3bd65fb88a23a6e70e6a3e9473e + GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a + GoogleMLKit: 97ac7af399057e99182ee8edfa8249e3226a4065 + GoogleToolboxForMac: d1a2cbf009c453f4d6ded37c105e2f67a32206d8 + GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15 + GoogleUtilitiesComponents: 679b2c881db3b615a2777504623df6122dd20afe + GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6 + idenfy_sdk_flutter: 3f17044441bdb67c5512092516b3119b0fbc888c + iDenfySDK: 92f176f19108688d86fb3ed8859356a645c35536 + just_audio: 6c031bb61297cf218b4462be616638e81c058e97 + local_auth: 9797b7f53f113470a9ae99c3ff005c9f19e5fb4c lottie-ios: fcb5e73e17ba4c983140b7d21095c834b3087418 - MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb - open_filex: 6e26e659846ec990262224a12ef1c528bb4edbe4 - OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c - package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85 - path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 - permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6 - qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e - screen_brightness_ios: 7437207a2a9bc56553aa10f782afecf830b4c4e2 - shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78 - smart_auth: 4bedbc118723912d0e45a07e8ab34039c19e04f2 - sodium_libs: 1faae17af662384acbd13e41867a0008cd2e2318 - sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec - uni_links: d97da20c7701486ba192624d99bffaaffcfc298a - url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe - video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3 - wakelock_plus: 8b09852c8876491e4b6d179e17dfe2a0b5f60d47 - webview_flutter_wkwebview: 2a23822e9039b7b1bc52e5add778e5d89ad488d1 + MLImage: 1824212150da33ef225fbd3dc49f184cf611046c + MLKitBarcodeScanning: 10ca0845a6d15f2f6e911f682a1998b68b973e8b + MLKitCommon: afec63980417d29ffbb4790529a1b0a2291699e1 + MLKitVision: e858c5f125ecc288e4a31127928301eaba9ae0c1 + mobile_scanner: 92e8812bf22a8f84131e2a7f9d0f44dad1a4742b + nanopb: 438bc412db1928dac798aa6fd75726007be04262 + open_filex: 432f3cd11432da3e39f47fcc0df2b1603854eff1 + OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94 + package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499 + path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564 + permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d + PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 + screen_brightness_ios: 28c5fbdb40634de44f86025d84470158ad4df48c + shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7 + sodium_libs: d5a8c0ec38806fe1cff3caf98c8319378da0bc1d + sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0 + uni_links: ed8c961e47ed9ce42b6d91e1de8049e38a4b3152 + url_launcher_ios: 694010445543906933d732453a59da0a173ae33d + video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b + wakelock_plus: 04623e3f525556020ebd4034310f20fe7fda8b49 + webview_flutter_wkwebview: 44d4dee7d7056d5ad185d25b38404436d56c547c -PODFILE CHECKSUM: f8ab9e5577c96127975d4ff88c95faaa16cd71bb +PODFILE CHECKSUM: 050ff199c8e97450c391a88d64db90da96da9995 -COCOAPODS: 1.14.3 \ No newline at end of file +COCOAPODS: 1.16.2 diff --git a/app/ios/Runner.xcodeproj/project.pbxproj b/app/ios/Runner.xcodeproj/project.pbxproj index e553da226..3ff246be8 100644 --- a/app/ios/Runner.xcodeproj/project.pbxproj +++ b/app/ios/Runner.xcodeproj/project.pbxproj @@ -152,6 +152,7 @@ 3B06AD1E1E4923F5004D2608 /* Thin Binary */, 7E75E6CA262DCE56000C2EBB /* Embed App Extensions */, 1577792F4C138F0A6A12C487 /* [CP] Embed Pods Frameworks */, + 0AA71E2D6715C5B29C833181 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -211,6 +212,23 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 0AA71E2D6715C5B29C833181 /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; 1577792F4C138F0A6A12C487 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; diff --git a/app/lib/apps/chatbot/chatbot_widget.dart b/app/lib/apps/chatbot/chatbot_widget.dart index 64f8ea047..0fb6861d6 100644 --- a/app/lib/apps/chatbot/chatbot_widget.dart +++ b/app/lib/apps/chatbot/chatbot_widget.dart @@ -26,8 +26,8 @@ class _ChatbotState extends State _ChatbotState({required this.email}) { iaWebview = InAppWebView( initialUrlRequest: URLRequest( - url: Uri.parse( - '${config.url()}$email&cache_buster=${DateTime.now().millisecondsSinceEpoch}')), + url: WebUri.uri(Uri.parse( + '${config.url()}$email&cache_buster=${DateTime.now().millisecondsSinceEpoch}'))), initialOptions: InAppWebViewGroupOptions( crossPlatform: InAppWebViewOptions(useShouldOverrideUrlLoading: true), android: AndroidInAppWebViewOptions( diff --git a/app/lib/apps/farmers/farmers_widget.dart b/app/lib/apps/farmers/farmers_widget.dart index b0b8efc41..b422741df 100644 --- a/app/lib/apps/farmers/farmers_widget.dart +++ b/app/lib/apps/farmers/farmers_widget.dart @@ -51,8 +51,8 @@ class _FarmersState extends State iaWebView = InAppWebView( initialUrlRequest: URLRequest( - url: Uri.parse( - '$farmersUri?cache_buster=${DateTime.now().millisecondsSinceEpoch}')), + url: WebUri.uri(Uri.parse( + '$farmersUri?cache_buster=${DateTime.now().millisecondsSinceEpoch}'))), initialOptions: InAppWebViewGroupOptions( crossPlatform: InAppWebViewOptions( cacheEnabled: Globals().isCacheClearedFarmer, diff --git a/app/lib/apps/news/news_widget.dart b/app/lib/apps/news/news_widget.dart index bede24873..54a6b19cc 100644 --- a/app/lib/apps/news/news_widget.dart +++ b/app/lib/apps/news/news_widget.dart @@ -41,8 +41,8 @@ class _NewsState extends State with AutomaticKeepAliveClientMixin { initialEndsWith = DateTime.now().millisecondsSinceEpoch.toString(); iaWebView = InAppWebView( initialUrlRequest: URLRequest( - url: Uri.parse( - 'https://news.threefold.me?cache_buster=$initialEndsWith')), + url: WebUri.uri(Uri.parse( + 'https://news.threefold.me?cache_buster=$initialEndsWith'))), initialOptions: InAppWebViewGroupOptions( crossPlatform: InAppWebViewOptions(), android: AndroidInAppWebViewOptions( diff --git a/app/lib/apps/wallet/wallet_widget.dart b/app/lib/apps/wallet/wallet_widget.dart index 1c05b6a9e..12244a231 100644 --- a/app/lib/apps/wallet/wallet_widget.dart +++ b/app/lib/apps/wallet/wallet_widget.dart @@ -3,7 +3,7 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_inappwebview/flutter_inappwebview.dart'; -import 'package:qr_code_scanner/qr_code_scanner.dart'; +import 'package:mobile_scanner/mobile_scanner.dart'; import 'package:threebotlogin/apps/wallet/wallet_config.dart'; import 'package:threebotlogin/apps/wallet/wallet_events.dart'; import 'package:threebotlogin/apps/wallet/wallet_user_data.dart'; @@ -53,8 +53,8 @@ class _WalletState extends State iaWebView = InAppWebView( initialUrlRequest: URLRequest( - url: Uri.parse( - '$walletUri?cache_buster=${DateTime.now().millisecondsSinceEpoch}')), + url: WebUri.uri(Uri.parse( + '$walletUri?cache_buster=${DateTime.now().millisecondsSinceEpoch}'))), initialOptions: InAppWebViewGroupOptions( crossPlatform: InAppWebViewOptions( cacheEnabled: Globals().isCacheClearedWallet, @@ -137,7 +137,7 @@ class _WalletState extends State result = await Navigator.push( context, MaterialPageRoute(builder: (context) => const ScanScreen())); } - return result.code; + return result.rawValue; } addHandler() { diff --git a/app/lib/browser.dart b/app/lib/browser.dart index 1438c0236..9945cb982 100644 --- a/app/lib/browser.dart +++ b/app/lib/browser.dart @@ -4,13 +4,13 @@ import 'package:threebotlogin/helpers/logger.dart'; class MyInAppBrowser extends InAppBrowser { @override void onLoadStart(Uri? url) { - super.onLoadStart(url); + super.onLoadStart(WebUri.uri(url!)); logger.i('\n\nStarted $url\n\n'); } @override void onLoadStop(Uri? url) { - super.onLoadStop(url); + super.onLoadStop(WebUri.uri(url!)); logger.i('\n\nStopped $url\n\n'); } diff --git a/app/lib/screens/scan_screen.dart b/app/lib/screens/scan_screen.dart index 9d46f99f7..c6d9c7e79 100644 --- a/app/lib/screens/scan_screen.dart +++ b/app/lib/screens/scan_screen.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:qr_code_scanner/qr_code_scanner.dart'; +import 'package:mobile_scanner/mobile_scanner.dart'; class ScanScreen extends StatefulWidget { const ScanScreen({super.key}); @@ -14,19 +14,14 @@ class _ScanScreenState extends State { final GlobalKey qrKey = GlobalKey(debugLabel: 'QR'); - @override - void initState() { - super.initState(); - } - @override Widget build(BuildContext context) { return Scaffold( body: Stack( children: [ - QRView( - key: qrKey, - onQRViewCreated: _onQRViewCreated, + MobileScanner( + onDetect: _handleBarcode, + fit: BoxFit.contain, ), Align(alignment: Alignment.bottomCenter, child: content()), ], @@ -34,13 +29,11 @@ class _ScanScreenState extends State { ); } - void _onQRViewCreated(QRViewController controller) { - controller.scannedDataStream.listen((scanData) { - if (!popped) { - popped = true; - Navigator.pop(context, scanData); - } - }); + void _handleBarcode(BarcodeCapture barcodes) { + if (!popped) { + popped = true; + Navigator.pop(context, barcodes.barcodes.firstOrNull); + } } Widget content() { diff --git a/app/lib/screens/wallets/send.dart b/app/lib/screens/wallets/send.dart index b56e46577..0e88607af 100644 --- a/app/lib/screens/wallets/send.dart +++ b/app/lib/screens/wallets/send.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:qr_code_scanner/qr_code_scanner.dart'; +import 'package:mobile_scanner/mobile_scanner.dart'; import 'package:threebotlogin/helpers/globals.dart'; import 'package:threebotlogin/helpers/transaction_helpers.dart'; import 'package:threebotlogin/models/wallet.dart'; @@ -381,8 +381,8 @@ class _WalletSendScreenState extends ConsumerState { MaterialPageRoute(builder: (context) => const ScanScreen())); } } - if (result.code != null) { - final code = Uri.parse(result.code!); + if (result.rawValue != null) { + final code = Uri.parse(result.rawValue!); toController.text = code.path; if (code.queryParameters.containsKey('amount')) { amountController.text = code.queryParameters['amount']!; @@ -394,7 +394,7 @@ class _WalletSendScreenState extends ConsumerState { setState(() {}); } - return result.code; + return result.rawValue!; } calculateAmount(int percentage) { diff --git a/app/lib/services/socket_service.dart b/app/lib/services/socket_service.dart index 902c322bd..fa17c2b4d 100644 --- a/app/lib/services/socket_service.dart +++ b/app/lib/services/socket_service.dart @@ -36,12 +36,16 @@ class BackendConnection { logger.i( 'Creating socket connection with $threeBotSocketUrl for $doubleName'); - socket = IO.io(threeBotSocketUrl, { - 'transports': ['websocket'], - 'forceNew': true + socket = IO.io( + threeBotSocketUrl, + IO.OptionBuilder() + .setTransports(['websocket']) + .enableForceNew() + .build()); + socket.onError((e) { + logger.e('Failed to start websocket connection: $e'); }); - - socket.on('connect', (res) { + socket.onConnect((_) { logger.i('[connect]'); socket.emit('join', {'room': doubleName.toLowerCase(), 'app': true}); @@ -75,7 +79,7 @@ class BackendConnection { Events().emit(NewSignEvent(signData: signData)); }); - socket.on('disconnect', (_) { + socket.onDisconnect((_) { logger.i('disconnect'); }); diff --git a/app/lib/widgets/phone_widget.dart b/app/lib/widgets/phone_widget.dart index 16878621f..f8696019b 100644 --- a/app/lib/widgets/phone_widget.dart +++ b/app/lib/widgets/phone_widget.dart @@ -3,8 +3,8 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter_pkid/flutter_pkid.dart'; import 'package:http/http.dart'; -import 'package:intl_phone_field/countries.dart'; -import 'package:intl_phone_field/intl_phone_field.dart'; +import 'package:intl_mobile_field/countries.dart'; +import 'package:intl_mobile_field/intl_mobile_field.dart'; import 'package:threebotlogin/helpers/globals.dart'; import 'package:threebotlogin/services/open_kyc_service.dart'; import 'package:threebotlogin/services/phone_service.dart'; @@ -105,7 +105,7 @@ class PhoneAlertDialogState extends State { ), Padding( padding: const EdgeInsets.symmetric(horizontal: 16), - child: IntlPhoneField( + child: IntlMobileField( initialCountryCode: widget.defaultCountryCode, decoration: const InputDecoration( labelText: 'Phone Number', diff --git a/app/pubspec.lock b/app/pubspec.lock index c7563e953..395cdcf9a 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -5,10 +5,15 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7" + sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab" url: "https://pub.dev" source: hosted - version: "67.0.0" + version: "76.0.0" + _macros: + dependency: transitive + description: dart + source: sdk + version: "0.3.3" adaptive_number: dependency: transitive description: @@ -21,26 +26,26 @@ packages: dependency: transitive description: name: analyzer - sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d" + sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e" url: "https://pub.dev" source: hosted - version: "6.4.1" + version: "6.11.0" archive: dependency: transitive description: name: archive - sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d + sha256: "6199c74e3db4fbfbd04f66d739e72fe11c8a8957d5f219f1f4482dbde6420b5a" url: "https://pub.dev" source: hosted - version: "3.6.1" + version: "4.0.2" args: dependency: transitive description: name: args - sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a" + sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6 url: "https://pub.dev" source: hosted - version: "2.5.0" + version: "2.6.0" asn1lib: dependency: transitive description: @@ -85,10 +90,10 @@ packages: dependency: transitive description: name: bip39_mnemonic - sha256: "24855a62fb9dd930f697063a274e084b0a574e1cc55ec270ca4756f579ab512c" + sha256: "3ae6ed74b97a0b820e71d01b75ac4bc5b036a8bb427d5ee5827427d2872eefb0" url: "https://pub.dev" source: hosted - version: "3.0.6" + version: "3.0.7" boolean_selector: dependency: transitive description: @@ -133,10 +138,10 @@ packages: dependency: "direct main" description: name: build_runner - sha256: "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7" + sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d" url: "https://pub.dev" source: hosted - version: "2.4.11" + version: "2.4.13" build_runner_core: dependency: transitive description: @@ -237,42 +242,42 @@ packages: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.0" convert: dependency: "direct main" description: name: convert - sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68 url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.2" country_picker: dependency: "direct main" description: name: country_picker - sha256: "327f5e15a76352089a6b5057abb761ee5202e7516c9440d8d6a7524139f9b14e" + sha256: "9b14c04f9a35e99f6de6bcbc453a556bb98345aecb481c7a0e843c94c2bee1f8" url: "https://pub.dev" source: hosted - version: "2.0.26" + version: "2.0.27" crisp_chat: dependency: "direct main" description: name: crisp_chat - sha256: "7ef5ee1ab811d7797e1aa723d20f69a976e10114a58bf21c3f80936c5787827e" + sha256: febd2412b87df213718d6d0308d72edc0a8638e07f6b89e3895e83785ffd092b url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "2.2.3" crypto: dependency: "direct main" description: name: crypto - sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27 + sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.6" cryptography: dependency: transitive description: @@ -285,10 +290,10 @@ packages: dependency: transitive description: name: csslib - sha256: "831883fb353c8bdc1d71979e5b342c7d88acfbc643113c14ae51e2442ea0f20f" + sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e" url: "https://pub.dev" source: hosted - version: "0.17.3" + version: "1.0.2" cupertino_icons: dependency: "direct main" description: @@ -317,26 +322,26 @@ packages: dependency: "direct main" description: name: decimal - sha256: da8f65df568345f2738cc8b0de74971c86d2d93ce5fc8c4ec094f6b7c5d48eb5 + sha256: "28239b8b929c1bd8618702e6dbc96e2618cf99770bbe9cb040d6cf56a11e4ec3" url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.2.1" device_info_plus: dependency: "direct main" description: name: device_info_plus - sha256: "77f757b789ff68e4eaf9c56d1752309bd9f7ad557cb105b938a7f8eb89e59110" + sha256: b37d37c2f912ad4e8ec694187de87d05de2a3cb82b465ff1f65f65a2d05de544 url: "https://pub.dev" source: hosted - version: "9.1.2" + version: "11.2.1" device_info_plus_platform_interface: dependency: transitive description: name: device_info_plus_platform_interface - sha256: "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba" + sha256: "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2" url: "https://pub.dev" source: hosted - version: "7.0.1" + version: "7.0.2" dio: dependency: "direct main" description: @@ -421,18 +426,10 @@ packages: dependency: "direct main" description: name: flagsmith - sha256: "70a166ac4bd8d565bd1005400baa238fe8463763366a5605a87df36cf4c03cae" + sha256: "9c0723c002e8cc2782c382df2f93dcb3a19bde8dd318a5bf568013ee368cb7df" url: "https://pub.dev" source: hosted - version: "3.1.0" - flagsmith_flutter_core: - dependency: transitive - description: - name: flagsmith_flutter_core - sha256: c7fe448040165f9c2448c24d1b2c89745983d71183210131f52d831f3aabf3c9 - url: "https://pub.dev" - source: hosted - version: "2.3.1" + version: "6.0.0" flutter: dependency: "direct main" description: flutter @@ -442,10 +439,18 @@ packages: dependency: transitive description: name: flutter_cache_manager - sha256: "8207f27539deb83732fdda03e259349046a39a4c767269285f449ade355d54ba" + sha256: "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386" url: "https://pub.dev" source: hosted - version: "3.3.1" + version: "3.4.1" + flutter_client_sse: + dependency: transitive + description: + name: flutter_client_sse + sha256: "4ce0297206473dfc064b255fe086713240002e149f52519bd48c21423e4aa5d2" + url: "https://pub.dev" + source: hosted + version: "2.0.3" flutter_curve25519: dependency: transitive description: @@ -458,10 +463,66 @@ packages: dependency: "direct main" description: name: flutter_inappwebview - sha256: d198297060d116b94048301ee6749cd2e7d03c1f2689783f52d210a6b7aba350 + sha256: "80092d13d3e29b6227e25b67973c67c7210bd5e35c4b747ca908e31eb71a46d5" + url: "https://pub.dev" + source: hosted + version: "6.1.5" + flutter_inappwebview_android: + dependency: transitive + description: + name: flutter_inappwebview_android + sha256: "62557c15a5c2db5d195cb3892aab74fcaec266d7b86d59a6f0027abd672cddba" + url: "https://pub.dev" + source: hosted + version: "1.1.3" + flutter_inappwebview_internal_annotations: + dependency: transitive + description: + name: flutter_inappwebview_internal_annotations + sha256: "787171d43f8af67864740b6f04166c13190aa74a1468a1f1f1e9ee5b90c359cd" + url: "https://pub.dev" + source: hosted + version: "1.2.0" + flutter_inappwebview_ios: + dependency: transitive + description: + name: flutter_inappwebview_ios + sha256: "5818cf9b26cf0cbb0f62ff50772217d41ea8d3d9cc00279c45f8aabaa1b4025d" + url: "https://pub.dev" + source: hosted + version: "1.1.2" + flutter_inappwebview_macos: + dependency: transitive + description: + name: flutter_inappwebview_macos + sha256: c1fbb86af1a3738e3541364d7d1866315ffb0468a1a77e34198c9be571287da1 + url: "https://pub.dev" + source: hosted + version: "1.1.2" + flutter_inappwebview_platform_interface: + dependency: transitive + description: + name: flutter_inappwebview_platform_interface + sha256: cf5323e194096b6ede7a1ca808c3e0a078e4b33cc3f6338977d75b4024ba2500 + url: "https://pub.dev" + source: hosted + version: "1.3.0+1" + flutter_inappwebview_web: + dependency: transitive + description: + name: flutter_inappwebview_web + sha256: "55f89c83b0a0d3b7893306b3bb545ba4770a4df018204917148ebb42dc14a598" + url: "https://pub.dev" + source: hosted + version: "1.1.2" + flutter_inappwebview_windows: + dependency: transitive + description: + name: flutter_inappwebview_windows + sha256: "8b4d3a46078a2cdc636c4a3d10d10f2a16882f6be607962dbfff8874d1642055" url: "https://pub.dev" source: hosted - version: "5.8.0" + version: "0.6.0" flutter_json_viewer: dependency: "direct main" description: @@ -522,24 +583,24 @@ packages: dependency: "direct main" description: name: flutter_launcher_icons - sha256: "619817c4b65b322b5104b6bb6dfe6cda62d9729bd7ad4303ecc8b4e690a67a77" + sha256: bfa04787c85d80ecb3f8777bde5fc10c3de809240c48fa061a2c2bf15ea5211c url: "https://pub.dev" source: hosted - version: "0.14.1" + version: "0.14.3" flutter_lints: dependency: "direct dev" description: name: flutter_lints - sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04 + sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1" url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "5.0.0" flutter_pkid: dependency: "direct main" description: path: "." ref: master - resolved-ref: "56cc03e8386a9f0530c3489d8bbbeedecb6f47f9" + resolved-ref: ab13fa12bfe14b0fc6d482d3a23ac24d416d8167 url: "https://github.com/threefoldtech/threefold_connect_flutter_pkid_client" source: git version: "0.0.1" @@ -555,10 +616,10 @@ packages: dependency: "direct main" description: name: flutter_riverpod - sha256: "0f1974eff5bbe774bf1d870e406fc6f29e3d6f1c46bd9c58e7172ff68a785d7d" + sha256: "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1" url: "https://pub.dev" source: hosted - version: "2.5.1" + version: "2.6.1" flutter_staggered_grid_view: dependency: transitive description: @@ -571,10 +632,10 @@ packages: dependency: "direct main" description: name: flutter_svg - sha256: "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2" + sha256: c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b url: "https://pub.dev" source: hosted - version: "2.0.10+1" + version: "2.0.17" flutter_test: dependency: "direct dev" description: flutter @@ -589,10 +650,10 @@ packages: dependency: "direct main" description: name: flutter_widget_from_html - sha256: "9e2a6201c4d2eb910b6b3ebb2a9f5c490fc61c9a1aa35eafdde38f0fc659cf4c" + sha256: f3967a5b42896662efdd420b5adaf8a7d3692b0f44462a07c80e3b4c173b1a02 url: "https://pub.dev" source: hosted - version: "0.15.2" + version: "0.15.3" flutter_widget_from_html_core: dependency: transitive description: @@ -661,10 +722,10 @@ packages: dependency: transitive description: name: fwfh_webview - sha256: f67890bc0d6278da98bd197469ae9511c859f7db327e92299fe0ea0cf46c4057 + sha256: c0a8b664b642f40f4c252a0ab4e72c22dcd97c7fb3a7e50a6b4bdb6f63afca19 url: "https://pub.dev" source: hosted - version: "0.15.2" + version: "0.15.3" glob: dependency: transitive description: @@ -677,10 +738,10 @@ packages: dependency: "direct main" description: name: google_fonts - sha256: e20ff62b158b96f392bfc8afe29dee1503c94fbea2cbe8186fd59b756b8ae982 + sha256: b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82 url: "https://pub.dev" source: hosted - version: "5.1.0" + version: "6.2.1" graphs: dependency: transitive description: @@ -693,8 +754,8 @@ packages: dependency: "direct main" description: path: "packages/gridproxy_client" - ref: main - resolved-ref: "68d4fda0ded7fbc3d6e9a594ebbf0ea7ff3b48b6" + ref: development + resolved-ref: "77f8f563f35d13016aada278feb6431fcfc6731d" url: "https://github.com/threefoldtech/tfgrid-sdk-dart" source: git version: "1.0.0" @@ -702,10 +763,10 @@ packages: dependency: "direct main" description: name: hashlib - sha256: f572f2abce09fc7aee53f15927052b9732ea1053e540af8cae211111ee0b99b1 + sha256: e13e8237d93fb275cd1c55fc339bb90638994d1a4f140c7ee270173b51f3d169 url: "https://pub.dev" source: hosted - version: "1.21.0" + version: "1.21.1" hashlib_codecs: dependency: transitive description: @@ -726,18 +787,18 @@ packages: dependency: transitive description: name: html - sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a" + sha256: "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec" url: "https://pub.dev" source: hosted - version: "0.15.4" + version: "0.15.5" http: dependency: "direct main" description: name: http - sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938" + sha256: fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.3.0" http_multi_server: dependency: transitive description: @@ -758,18 +819,18 @@ packages: dependency: "direct main" description: name: idenfy_sdk_flutter - sha256: "26d72aa9a0d5dc3c315a9e77abc7c8bea6f2ca53d72bcb2a34303cf169ca2187" + sha256: "89eebaca7b6fb0c955d51416546b81f3c76a944dfbfa4354c3a044d0cdd10010" url: "https://pub.dev" source: hosted - version: "2.5.3" + version: "2.5.6" image: dependency: transitive description: name: image - sha256: f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d + sha256: "8346ad4b5173924b5ddddab782fc7d8a6300178c8b1dc427775405a01701c4a6" url: "https://pub.dev" source: hosted - version: "4.3.0" + version: "4.5.2" infinite_scroll_pagination: dependency: "direct main" description: @@ -786,14 +847,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.19.0" - intl_phone_field: + intl_mobile_field: dependency: "direct main" description: - name: intl_phone_field - sha256: "73819d3dfcb68d2c85663606f6842597c3ddf6688ac777f051b17814fe767bbf" + name: intl_mobile_field + sha256: f1a004c1e05d88da01d199812b94249e3dfbaa39ee017037a4ec8886b264854a url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "1.1.1" io: dependency: transitive description: @@ -818,14 +879,14 @@ packages: url: "https://pub.dev" source: hosted version: "4.9.0" - json_schema2: + json_schema: dependency: transitive description: - name: json_schema2 - sha256: "094e60d3605333c0816eeb2e5310b4f71ffaea2c0abc026b27418c1ac41a5db3" + name: json_schema + sha256: b183ba828374365a89b81246c06a9a636935897d509cd846998bbc0d9bd0a2cf url: "https://pub.dev" source: hosted - version: "2.0.4+9" + version: "5.2.0" just_audio: dependency: transitive description: @@ -846,26 +907,26 @@ packages: dependency: transitive description: name: just_audio_web - sha256: "0edb481ad4aa1ff38f8c40f1a3576013c3420bf6669b686fe661627d49bc606c" + sha256: "9a98035b8b24b40749507687520ec5ab404e291d2b0937823ff45d92cb18d448" url: "https://pub.dev" source: hosted - version: "0.4.11" + version: "0.4.13" leak_tracker: dependency: transitive description: name: leak_tracker - sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06" url: "https://pub.dev" source: hosted - version: "10.0.4" + version: "10.0.7" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.8" leak_tracker_testing: dependency: transitive description: @@ -878,10 +939,10 @@ packages: dependency: transitive description: name: lints - sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" + sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "5.1.1" local_auth: dependency: "direct main" description: @@ -894,10 +955,10 @@ packages: dependency: "direct main" description: name: logger - sha256: "697d067c60c20999686a0add96cf6aba723b3aa1f83ecf806a8097231529ec32" + sha256: be4b23575aac7ebf01f225a241eb7f6b5641eeaf43c6a8613510fc2f8cf187d1 url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.5.0" logging: dependency: transitive description: @@ -910,10 +971,18 @@ packages: dependency: "direct main" description: name: lottie - sha256: "6a24ade5d3d918c306bb1c21a6b9a04aab0489d51a2582522eea820b4093b62b" + sha256: c5fa04a80a620066c15cf19cc44773e19e9b38e989ff23ea32e5903ef1015950 url: "https://pub.dev" source: hosted - version: "3.1.2" + version: "3.3.1" + macros: + dependency: transitive + description: + name: macros + sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656" + url: "https://pub.dev" + source: hosted + version: "0.1.3-main.0" matcher: dependency: transitive description: @@ -926,10 +995,10 @@ packages: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.8.0" + version: "0.11.1" merlin: dependency: transitive description: @@ -942,10 +1011,10 @@ packages: dependency: transitive description: name: meta - sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.15.0" mime: dependency: transitive description: @@ -954,14 +1023,22 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.6" + mobile_scanner: + dependency: "direct main" + description: + name: mobile_scanner + sha256: d234581c090526676fd8fab4ada92f35c6746e3fb4f05a399665d75a399fb760 + url: "https://pub.dev" + source: hosted + version: "5.2.3" moment_dart: dependency: transitive description: name: moment_dart - sha256: "721f008251341578a818140afe402be827bc29951846575598426f4039a0799b" + sha256: "35b99c62689613e84880dac9d0e81d1a624e4edbdf79897cdb3d444e964bf25b" url: "https://pub.dev" source: hosted - version: "2.2.1+beta.0" + version: "3.2.1" mutex: dependency: "direct main" description: @@ -990,10 +1067,10 @@ packages: dependency: "direct main" description: name: open_filex - sha256: ba425ea49affd0a98a234aa9344b9ea5d4c4f7625a1377961eae9fe194c3d523 + sha256: dcb7bd3d32db8db5260253a62f1564c02c2c8df64bc0187cd213f65f827519bd url: "https://pub.dev" source: hosted - version: "4.5.0" + version: "4.6.0" package_config: dependency: transitive description: @@ -1006,18 +1083,18 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: "7e76fad405b3e4016cd39d08f455a4eb5199723cf594cd1b8916d47140d93017" + sha256: "739e0a5c3c4055152520fa321d0645ee98e932718b4c8efeeb51451968fe0790" url: "https://pub.dev" source: hosted - version: "4.2.0" + version: "8.1.3" package_info_plus_platform_interface: dependency: transitive description: name: package_info_plus_platform_interface - sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6" + sha256: a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.2" path: dependency: transitive description: @@ -1038,10 +1115,10 @@ packages: dependency: "direct main" description: name: path_provider - sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378 + sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd" url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.1.5" path_provider_android: dependency: transitive description: @@ -1094,42 +1171,50 @@ packages: dependency: "direct main" description: name: permission_handler - sha256: bc56bfe9d3f44c3c612d8d393bd9b174eb796d706759f9b495ac254e4294baa5 + sha256: "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb" url: "https://pub.dev" source: hosted - version: "10.4.5" + version: "11.3.1" permission_handler_android: dependency: transitive description: name: permission_handler_android - sha256: "59c6322171c29df93a22d150ad95f3aa19ed86542eaec409ab2691b8f35f9a47" + sha256: "71bbecfee799e65aff7c744761a57e817e73b738fedf62ab7afd5593da21f9f1" url: "https://pub.dev" source: hosted - version: "10.3.6" + version: "12.0.13" permission_handler_apple: dependency: transitive description: name: permission_handler_apple - sha256: "99e220bce3f8877c78e4ace901082fb29fa1b4ebde529ad0932d8d664b34f3f5" + sha256: e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0 + url: "https://pub.dev" + source: hosted + version: "9.4.5" + permission_handler_html: + dependency: transitive + description: + name: permission_handler_html + sha256: "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24" url: "https://pub.dev" source: hosted - version: "9.1.4" + version: "0.1.3+5" permission_handler_platform_interface: dependency: transitive description: name: permission_handler_platform_interface - sha256: "6760eb5ef34589224771010805bea6054ad28453906936f843a8cc4d3a55c4a4" + sha256: e9c8eadee926c4532d0305dff94b85bf961f16759c3af791486613152af4b4f9 url: "https://pub.dev" source: hosted - version: "3.12.0" + version: "4.2.3" permission_handler_windows: dependency: transitive description: name: permission_handler_windows - sha256: cc074aace208760f1eee6aa4fae766b45d947df85bc831cde77009cdb4720098 + sha256: "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e" url: "https://pub.dev" source: hosted - version: "0.1.3" + version: "0.2.1" petitparser: dependency: transitive description: @@ -1150,10 +1235,10 @@ packages: dependency: "direct main" description: name: pinput - sha256: a92b55ecf9c25d1b9e100af45905385d5bc34fc9b6b04177a9e82cb88fe4d805 + sha256: "8a73be426a91fefec90a7f130763ca39772d547e92f19a827cf4aa02e323d35a" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "5.0.1" platform: dependency: transitive description: @@ -1182,34 +1267,34 @@ packages: dependency: transitive description: name: polkadart - sha256: "55b40e205ea4227c97fdfc8dce1783d862ddcce0b097bae6327e3835017ce9bd" + sha256: "46604b1c6fb4f35b564194e51c53a9a77a15291671db6cfbed9fb188831b8560" url: "https://pub.dev" source: hosted - version: "0.4.7" + version: "0.5.0" polkadart_cli: dependency: transitive description: name: polkadart_cli - sha256: a332ccdda670e634e266d4e38b4aba7c52cbc37a32ed037af40b37b3e6dd3c8d + sha256: ea16dc9eef662fed6c330f357b38402bc1fd2b862b4e47bf1f9d84c48fa3135b url: "https://pub.dev" source: hosted - version: "0.4.3" + version: "0.5.0" polkadart_keyring: dependency: transitive description: name: polkadart_keyring - sha256: "482260a119110ef21f8d66e69ae8c2716afab974247391535d1b02dee613f9e9" + sha256: bed5af744e801e88bf7d067ea477fc7eb0a5955801491a8b3e57b578d9de8bea url: "https://pub.dev" source: hosted - version: "0.4.4" + version: "0.5.0" polkadart_scale_codec: dependency: transitive description: name: polkadart_scale_codec - sha256: "0bc6700e93af2dd054db413837433b8383aae095348282d7837583da3e621978" + sha256: a9b295ddbd8ace501066800ab521575095464f324cb4185be386bd78ee9316d0 url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.3.0" pool: dependency: transitive description: @@ -1218,6 +1303,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.5.1" + posix: + dependency: transitive + description: + name: posix + sha256: a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a + url: "https://pub.dev" + source: hosted + version: "6.0.1" provider: dependency: transitive description: @@ -1250,14 +1343,6 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.2" - qr_code_scanner: - dependency: "direct main" - description: - name: qr_code_scanner - sha256: f23b68d893505a424f0bd2e324ebea71ed88465d572d26bb8d2e78a4749591fd - url: "https://pub.dev" - source: hosted - version: "1.0.1" qr_flutter: dependency: "direct main" description: @@ -1294,18 +1379,18 @@ packages: dependency: transitive description: name: reflectable - sha256: cdc1a278a2e9769abafaf9ba54ce1fd3432b2a38360e14b87ea6344f715340de + sha256: "35ee17c3b759fa935cc7e9247445903384520fd174e0d6c142d8288e5439fd5b" url: "https://pub.dev" source: hosted - version: "4.0.6" - rest_client: + version: "4.0.12" + rfc_6901: dependency: transitive description: - name: rest_client - sha256: "90473416250779b85f8d620e9dc277f38ea67acf84d3c6299e005ce08caedd69" + name: rfc_6901 + sha256: df1bbfa3d023009598f19636d6114c6ac1e0b7bb7bf6a260f0e6e6ce91416820 url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "0.2.0" ristretto255: dependency: transitive description: @@ -1318,90 +1403,90 @@ packages: dependency: transitive description: name: riverpod - sha256: f21b32ffd26a36555e501b04f4a5dca43ed59e16343f1a30c13632b2351dfa4d + sha256: "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959" url: "https://pub.dev" source: hosted - version: "2.5.1" + version: "2.6.1" rxdart: dependency: transitive description: name: rxdart - sha256: "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb" + sha256: "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962" url: "https://pub.dev" source: hosted - version: "0.27.7" + version: "0.28.0" screen_brightness: dependency: "direct main" description: name: screen_brightness - sha256: "7d4ac84ae26b37c01d6f5db7123a72db7933e1f2a2a8c369a51e08f81b3178d8" + sha256: "99b898dae860ebe55fc872d8e300c6eafff3ee4ccb09301b90adb3f241f29874" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "2.1.1" screen_brightness_android: dependency: transitive description: name: screen_brightness_android - sha256: "8c69d3ac475e4d625e7fa682a3a51a69ff59abe5b4a9e57f6ec7d830a6c69bd6" + sha256: ff9141bed547db02233e7dd88f990ab01973a0c8a8c04ddb855c7b072f33409a url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "2.1.0" screen_brightness_ios: dependency: transitive description: name: screen_brightness_ios - sha256: f08f70ca1ac3e30719764b5cfb8b3fe1e28163065018a41b3e6f243ab146c2f1 + sha256: bfd9bfd0ac852e7aa170e7e356cc27195b2a75037b72c8c6336cf6fb2115cffb url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "2.1.1" screen_brightness_macos: dependency: transitive description: name: screen_brightness_macos - sha256: "70c2efa4534e22b927e82693488f127dd4a0f008469fccf4f0eefe9061bbdd6a" + sha256: "4edf330ad21078686d8bfaf89413325fbaf571dcebe1e89254d675a3f288b5b9" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "2.1.1" screen_brightness_platform_interface: dependency: transitive description: name: screen_brightness_platform_interface - sha256: "9f3ebf7f22d5487e7676fe9ddaf3fc55b6ff8057707cf6dc0121c7dfda346a16" + sha256: "737bd47b57746bc4291cab1b8a5843ee881af499514881b0247ec77447ee769c" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "2.1.0" screen_brightness_windows: dependency: transitive description: name: screen_brightness_windows - sha256: c8e12a91cf6dd912a48bd41fcf749282a51afa17f536c3460d8d05702fb89ffa + sha256: d3518bf0f5d7a884cee2c14449ae0b36803802866de09f7ef74077874b6b2448 url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "2.1.0" secp256k1_ecdsa: dependency: transitive description: name: secp256k1_ecdsa - sha256: "7e731f4039f44d8e416a193db449f80c67a69ab6933a4970eb6ac7a91e1ca7b2" + sha256: "8d516e3f9ad716e721a4e961b890bb03bf3c68ba51bca256a617a055e3c7ef89" url: "https://pub.dev" source: hosted - version: "0.4.1" + version: "0.5.0" shared_preferences: dependency: "direct main" description: name: shared_preferences - sha256: d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180 + sha256: a752ce92ea7540fc35a0d19722816e04d0e72828a4200e83a98cf1a1eb524c9a url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.3.5" shared_preferences_android: - dependency: "direct overridden" + dependency: transitive description: name: shared_preferences_android - sha256: "853801ce6ba7429ec4e923e37317f32a57c903de50b8c33ffcfbdb7e6f0dd39c" + sha256: "138b7bbbc7f59c56236e426c37afb8f78cbc57b094ac64c440e0bb90e380a4f5" url: "https://pub.dev" source: hosted - version: "2.0.12" + version: "2.4.2" shared_preferences_foundation: dependency: transitive description: @@ -1462,8 +1547,8 @@ packages: dependency: transitive description: path: "packages/signer" - ref: main - resolved-ref: "68d4fda0ded7fbc3d6e9a594ebbf0ea7ff3b48b6" + ref: development + resolved-ref: "77f8f563f35d13016aada278feb6431fcfc6731d" url: "https://github.com/threefoldtech/tfgrid-sdk-dart.git" source: git version: "0.1.0" @@ -1471,7 +1556,7 @@ packages: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" sliver_tools: dependency: transitive description: @@ -1480,14 +1565,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.2.12" - smart_auth: - dependency: transitive - description: - name: smart_auth - sha256: a25229b38c02f733d0a4e98d941b42bed91a976cb589e934895e60ccfa674cf6 - url: "https://pub.dev" - source: hosted - version: "1.1.1" smooth_page_indicator: dependency: "direct main" description: @@ -1516,18 +1593,18 @@ packages: dependency: transitive description: name: sodium - sha256: d9830a388e37c82891888e64cfd4c6764fa3ac716bed80ac6eab89ee42c3cd76 + sha256: "93d7c8d9af1f57cbd1ddeeb815902d3e0c1e1c8579a78cf229bcd97e1714f061" url: "https://pub.dev" source: hosted - version: "2.3.1+1" + version: "3.4.4" sodium_libs: dependency: "direct main" description: name: sodium_libs - sha256: aa764acd6ccc6113e119c2d99471aeeb4637a9a501639549b297d3a143ff49b3 + sha256: "4e5d96a7805369dd51b24975a9072c51433466ae5716a33cff70316a14d97af9" url: "https://pub.dev" source: hosted - version: "2.2.1+6" + version: "3.4.3+1" source_span: dependency: transitive description: @@ -1548,42 +1625,66 @@ packages: dependency: transitive description: name: sqflite - sha256: a9016f495c927cb90557c909ff26a6d92d9bd54fc42ba92e19d4e79d61e798c6 + sha256: "2d7299468485dca85efeeadf5d38986909c5eb0cd71fd3db2c2f000e6c9454bb" url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.1" + sqflite_android: + dependency: transitive + description: + name: sqflite_android + sha256: "78f489aab276260cdd26676d2169446c7ecd3484bbd5fead4ca14f3ed4dd9ee3" + url: "https://pub.dev" + source: hosted + version: "2.4.0" sqflite_common: dependency: transitive description: name: sqflite_common - sha256: "28d8c66baee4968519fb8bd6cdbedad982d6e53359091f0b74544a9f32ec72d5" + sha256: "761b9740ecbd4d3e66b8916d784e581861fd3c3553eda85e167bc49fdb68f709" url: "https://pub.dev" source: hosted - version: "2.5.3" + version: "2.5.4+6" + sqflite_darwin: + dependency: transitive + description: + name: sqflite_darwin + sha256: "22adfd9a2c7d634041e96d6241e6e1c8138ca6817018afc5d443fef91dcefa9c" + url: "https://pub.dev" + source: hosted + version: "2.4.1+1" + sqflite_platform_interface: + dependency: transitive + description: + name: sqflite_platform_interface + sha256: "8dd4515c7bdcae0a785b0062859336de775e8c65db81ae33dd5445f35be61920" + url: "https://pub.dev" + source: hosted + version: "2.4.0" sr25519: dependency: transitive description: name: sr25519 - sha256: "351a42deaf7656690fb3e09568701a13c1813229cee15a21a5ca1b322246c24d" + sha256: d10247ff98330efb658042357c8c7fc46074c3c160ea16d3dcdfedf8a9a87b60 url: "https://pub.dev" source: hosted - version: "0.4.1" + version: "0.5.0" ss58: dependency: transitive description: name: ss58 - sha256: "5c2f4be38fb657a4e1aa03a712871c3a8aeea734ebdd77f6a67e4a39cf36647a" + sha256: "74dce6fbfbac9dba5f87b8f104ed2b7253c6aeac39d508f088044cf4827d9cd7" url: "https://pub.dev" source: hosted - version: "1.1.3" + version: "1.2.0" stack_trace: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.0" state_notifier: dependency: transitive description: @@ -1597,7 +1698,7 @@ packages: description: path: "packages/stellar_client" ref: development - resolved-ref: "2f7f0a8e729c87dc0ab9a973e1eac42b7686bc1c" + resolved-ref: "77f8f563f35d13016aada278feb6431fcfc6731d" url: "https://github.com/threefoldtech/tfgrid-sdk-dart" source: git version: "0.1.0" @@ -1605,10 +1706,10 @@ packages: dependency: "direct main" description: name: stellar_flutter_sdk - sha256: a25506529d40a040227cd565de6e1b4cc0a9ffc756472cf3c43420512e8a269b + sha256: dac5c9d4874ec8bb93541328718870a683dfb74d5f31c411f39b85e14cd70e79 url: "https://pub.dev" source: hosted - version: "1.8.9" + version: "1.9.2" stream_channel: dependency: transitive description: @@ -1629,10 +1730,10 @@ packages: dependency: transitive description: name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.0" strobe: dependency: transitive description: @@ -1645,26 +1746,26 @@ packages: dependency: transitive description: name: substrate_bip39 - sha256: fa950b80b92b7fc96f13683033fe974cdfd3ee0d30d989f6b8f3fcbfe6021ac2 + sha256: "6680dc10eb4f165659374eec5c5aa75920e720b3c00b65490e1dfe3d5ea5a52d" url: "https://pub.dev" source: hosted - version: "0.4.1" + version: "0.5.0" substrate_metadata: dependency: transitive description: name: substrate_metadata - sha256: ed6511dcca9dae3b10d525a6b8c1688e4eda0ab27bed0bbdfc31bc31bf34b441 + sha256: "878bf0e818eed4543f0c9af303b8ffe201cb69bf56c32d717f1bdef88e691836" url: "https://pub.dev" source: hosted - version: "1.2.2" + version: "1.3.0" synchronized: dependency: transitive description: name: synchronized - sha256: "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558" + sha256: "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225" url: "https://pub.dev" source: hosted - version: "3.1.0+1" + version: "3.3.0+3" term_glyph: dependency: transitive description: @@ -1677,16 +1778,16 @@ packages: dependency: transitive description: name: test_api - sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" + sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" url: "https://pub.dev" source: hosted - version: "0.7.0" + version: "0.7.3" tfchain_client: dependency: "direct main" description: path: "packages/tfchain_client" ref: development - resolved-ref: a66b92b9947cbc6ce7adf289f4321153ac42b936 + resolved-ref: "77f8f563f35d13016aada278feb6431fcfc6731d" url: "https://github.com/threefoldtech/tfgrid-sdk-dart" source: git version: "0.1.0" @@ -1763,7 +1864,7 @@ packages: source: hosted version: "1.1.0" unorm_dart: - dependency: "direct overridden" + dependency: transitive description: name: unorm_dart sha256: "23d8bf65605401a6a32cff99435fed66ef3dab3ddcad3454059165df46496a3b" @@ -1870,10 +1971,10 @@ packages: dependency: transitive description: name: vector_graphics - sha256: "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3" + sha256: "27d5fefe86fb9aace4a9f8375b56b3c292b64d8c04510df230f849850d912cb7" url: "https://pub.dev" source: hosted - version: "1.1.11+1" + version: "1.1.15" vector_graphics_codec: dependency: transitive description: @@ -1886,10 +1987,10 @@ packages: dependency: transitive description: name: vector_graphics_compiler - sha256: "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81" + sha256: "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad" url: "https://pub.dev" source: hosted - version: "1.1.11+1" + version: "1.1.16" vector_math: dependency: transitive description: @@ -1942,26 +2043,26 @@ packages: dependency: transitive description: name: vm_service - sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b url: "https://pub.dev" source: hosted - version: "14.2.1" + version: "14.3.0" wakelock_plus: dependency: transitive description: name: wakelock_plus - sha256: f268ca2116db22e57577fb99d52515a24bdc1d570f12ac18bb762361d43b043d + sha256: "36c88af0b930121941345306d259ec4cc4ecca3b151c02e3a9e71aede83c615e" url: "https://pub.dev" source: hosted - version: "1.1.4" + version: "1.2.10" wakelock_plus_platform_interface: dependency: transitive description: name: wakelock_plus_platform_interface - sha256: "422d1cdbb448079a8a62a5a770b69baa489f8f7ca21aef47800c726d404f9d16" + sha256: "70e780bc99796e1db82fe764b1e7dcb89a86f1e5b3afb1db354de50f2e41eb7a" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" watcher: dependency: transitive description: @@ -1974,34 +2075,34 @@ packages: dependency: transitive description: name: web - sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27" + sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "1.1.0" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42" + sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b url: "https://pub.dev" source: hosted - version: "2.4.5" + version: "2.4.0" webview_flutter: dependency: "direct main" description: name: webview_flutter - sha256: "6869c8786d179f929144b4a1f86e09ac0eddfe475984951ea6c634774c16b522" + sha256: "889a0a678e7c793c308c68739996227c9661590605e70b1f6cf6b9a6634f7aec" url: "https://pub.dev" source: hosted - version: "4.8.0" + version: "4.10.0" webview_flutter_android: dependency: transitive description: name: webview_flutter_android - sha256: ed021f27ae621bc97a6019fb601ab16331a3db4bf8afa305e9f6689bdb3edced + sha256: "5568f17a9c25c0fdd0737900fa1c2d1fee2d780bc212d9aec10c2d1f48ef0f59" url: "https://pub.dev" source: hosted - version: "3.16.8" + version: "4.3.1" webview_flutter_platform_interface: dependency: transitive description: @@ -2014,10 +2115,10 @@ packages: dependency: transitive description: name: webview_flutter_wkwebview - sha256: "9c62cc46fa4f2d41e10ab81014c1de470a6c6f26051a2de32111b2ee55287feb" + sha256: "4adc14ea9a770cc9e2c8f1ac734536bd40e82615bd0fa6b94be10982de656cc7" url: "https://pub.dev" source: hosted - version: "3.14.0" + version: "3.17.0" win32: dependency: transitive description: @@ -2054,10 +2155,10 @@ packages: dependency: "direct main" description: name: xml2json - sha256: "52b7c8d350fdce09545b058982c26689ee89f1eb188cc9910d585665bfe27bc0" + sha256: "9ff65c144a48f7f73d2bd6d919700c7697beced3b51216b982f78c68bc0da142" url: "https://pub.dev" source: hosted - version: "6.2.3" + version: "6.2.6" yaml: dependency: transitive description: @@ -2066,14 +2167,6 @@ packages: url: "https://pub.dev" source: hosted version: "3.1.2" - yaon: - dependency: transitive - description: - name: yaon - sha256: "7ffb8284eb13e448fdabf340209c306336cfeabdca97294c27b5a11237eaa3c4" - url: "https://pub.dev" - source: hosted - version: "1.1.4+10" sdks: - dart: ">=3.4.0 <4.0.0" - flutter: ">=3.22.0" + dart: ">=3.6.0 <4.0.0" + flutter: ">=3.27.0" diff --git a/app/pubspec.yaml b/app/pubspec.yaml index 40142eaea..3020b6b70 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -29,67 +29,67 @@ dependencies: gridproxy_client: git: url: https://github.com/threefoldtech/tfgrid-sdk-dart - ref: main + ref: development path: packages/gridproxy_client - flutter_svg: ^2.0.6 + flutter_svg: ^2.0.17 bip39: ^1.0.6 - socket_io_client: ^1.0.2 + socket_io_client: 1.0.2 local_auth: 1.1.7 - url_launcher: ^6.0.10 - shared_preferences: ^2.0.7 - http: ^1.0.0 - package_info_plus: ^4.0.2 - cupertino_icons: ^1.0.4 - google_fonts: ^5.0.0 - intl_phone_field: ^3.1.0 - flagsmith: ^3.1.0 - flutter_inappwebview: ^5.3.2 - sodium_libs: ^2.1.0+1 + url_launcher: ^6.3.1 + shared_preferences: ^2.3.5 + http: ^1.3.0 + package_info_plus: ^8.1.3 + cupertino_icons: ^1.0.8 + google_fonts: ^6.2.1 + # intl_phone_field: ^3.2.0 + flagsmith: ^6.0.0 + flutter_inappwebview: ^6.1.5 + sodium_libs: ^3.4.3+1 uni_links: ^0.5.1 pbkdf2ns: ^0.0.2 - qr_code_scanner: ^1.0.1 + # qr_code_scanner: ^1.0.1 flutter_json_viewer: ^1.0.1 - device_info_plus: ^9.0.2 - permission_handler: ^10.2.0 - path_provider: ^2.0.2 - dio: ^5.0.0 - open_filex: ^4.3.2 - country_picker: ^2.0.20 + device_info_plus: ^11.2.1 + permission_handler: ^11.3.1 + path_provider: ^2.1.5 + dio: ^5.7.0 + open_filex: ^4.6.0 + country_picker: ^2.0.27 pinenacl: ^0.6.0 - pinput: 3.0.1 - build_runner: ^2.4.9 + pinput: ^5.0.1 + build_runner: ^2.4.13 smooth_page_indicator: ^1.2.0+3 - webview_flutter: ^4.8.0 + webview_flutter: ^4.10.0 qr_flutter: ^4.1.0 - screen_brightness: ^1.0.1 + screen_brightness: ^2.1.1 validators: ^3.0.0 - lottie: ^3.1.2 - crisp_chat: 2.0.3 - xml2json: ^6.2.3 + lottie: ^3.3.1 + crisp_chat: ^2.2.3 + xml2json: ^6.2.6 timeago: ^3.7.0 - flutter_widget_from_html: ^0.15.2 - idenfy_sdk_flutter: 2.5.3 - flutter_riverpod: 2.5.1 + flutter_widget_from_html: ^0.15.3 + idenfy_sdk_flutter: 2.5.6 + flutter_riverpod: ^2.6.1 - convert: any - crypto: any - hashlib: any - stellar_flutter_sdk: ^1.8.9 - flutter_launcher_icons: ^0.14.1 - logger: ^2.4.0 + convert: ^3.1.2 + crypto: ^3.0.6 + hashlib: ^1.21.1 + stellar_flutter_sdk: ^1.9.2 + flutter_launcher_icons: ^0.14.3 + logger: ^2.5.0 flutter_keyboard_visibility: ^6.0.0 mutex: ^3.1.0 - decimal: ^3.1.0 + decimal: ^3.2.1 infinite_scroll_pagination: ^4.1.0 + intl_mobile_field: ^1.1.1 + mobile_scanner: 5.2.3 dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^2.0.0 + flutter_lints: ^5.0.0 dependency_overrides: intl: ^0.19.0 - unorm_dart: 0.3.0 - shared_preferences_android: 2.0.12 flutter: uses-material-design: true