Merge pull request #1756 from matthiasn/chore/flutter_3.22.1

chore: upgrade to Flutter 3.22.1 & WhisperKit v0.7.1
matthiasn · May 26, 2024 · 59f777c · 59f777c
2 parents b9712b4 + cecd626
commit 59f777c
Show file tree

Hide file tree

Showing 15 changed files with 59 additions and 51 deletions.
diff --git a/.fvm/flutter_sdk b/.fvm/flutter_sdk
@@ -1 +1 @@
-/Users/mn/fvm/versions/3.22.0
+/Users/mn/fvm/versions/3.22.1
diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json
@@ -1,3 +1,3 @@
 {
-  "flutterSdkVersion": "3.22.0"
+  "flutterSdkVersion": "3.22.1"
 }
diff --git a/.fvmrc b/.fvmrc
@@ -1,3 +1,3 @@
 {
-  "flutter": "3.22.0"
+  "flutter": "3.22.1"
 }
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -94,18 +94,18 @@ PODS:
   - sqflite (0.0.3):
     - Flutter
     - FlutterMacOS
-  - "sqlite3 (3.45.3+1)":
-    - "sqlite3/common (= 3.45.3+1)"
-  - "sqlite3/common (3.45.3+1)"
-  - "sqlite3/fts5 (3.45.3+1)":
+  - sqlite3 (3.46.0):
+    - sqlite3/common (= 3.46.0)
+  - sqlite3/common (3.46.0)
+  - sqlite3/fts5 (3.46.0):
     - sqlite3/common
-  - "sqlite3/perf-threadsafe (3.45.3+1)":
+  - sqlite3/perf-threadsafe (3.46.0):
     - sqlite3/common
-  - "sqlite3/rtree (3.45.3+1)":
+  - sqlite3/rtree (3.46.0):
     - sqlite3/common
   - sqlite3_flutter_libs (0.0.1):
     - Flutter
-    - "sqlite3 (~> 3.45.3+1)"
+    - sqlite3 (~> 3.46.0)
     - sqlite3/fts5
     - sqlite3/perf-threadsafe
     - sqlite3/rtree
@@ -268,8 +268,8 @@ SPEC CHECKSUMS:
   share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
   shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
   sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
-  sqlite3: 02d1f07eaaa01f80a1c16b4b31dfcbb3345ee01a
-  sqlite3_flutter_libs: 9bfe005308998aeca155330bbc2ea6dddf834a3b
+  sqlite3: 154b084339ede06960a5b3c8160066adc9176b7d
+  sqlite3_flutter_libs: 0d611efdf6d1c9297d5ab03dab21b75aeebdae31
   super_native_extensions: 4916b3c627a9c7fffdc48a23a9eca0b1ac228fa7
   url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
   video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3

diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -631,7 +631,7 @@
 			repositoryURL = "https://github.com/argmaxinc/whisperkit";
 			requirement = {
 				kind = exactVersion;
-				version = 0.6.1;
+				version = 0.7.1;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

diff --git a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -24,8 +24,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/argmaxinc/whisperkit",
       "state" : {
-        "revision" : "c20943d3f5d6f64981e9eaed8a3a9c3a62124fc5",
-        "version" : "0.6.1"
+        "revision" : "3aa94e8c3950afdeaf916cb1da71e44f62bd2864",
+        "version" : "0.7.1"
       }
     }
   ],

diff --git a/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -24,8 +24,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/argmaxinc/whisperkit",
       "state" : {
-        "revision" : "c20943d3f5d6f64981e9eaed8a3a9c3a62124fc5",
-        "version" : "0.6.1"
+        "revision" : "3aa94e8c3950afdeaf916cb1da71e44f62bd2864",
+        "version" : "0.7.1"
       }
     }
   ],

diff --git a/ios/Runner/WhisperKitRunner.swift b/ios/Runner/WhisperKitRunner.swift
@@ -52,8 +52,8 @@ public class WhisperKitRunner: NSObject, FlutterStreamHandler {
                         callback: self.sendTranscriptionProgressEvent
                     )
 
-                    let text = transcription?.text
-                    let language = transcription?.language
+                    let text : String? = transcription?.first?.text
+                    let language = transcription?.first?.language
 
                     let data = [language, self.model, text]
                     result(data)

diff --git a/macos/Podfile.lock b/macos/Podfile.lock
@@ -55,18 +55,18 @@ PODS:
   - sqflite (0.0.3):
     - Flutter
     - FlutterMacOS
-  - "sqlite3 (3.45.3+1)":
-    - "sqlite3/common (= 3.45.3+1)"
-  - "sqlite3/common (3.45.3+1)"
-  - "sqlite3/fts5 (3.45.3+1)":
+  - sqlite3 (3.46.0):
+    - sqlite3/common (= 3.46.0)
+  - sqlite3/common (3.46.0)
+  - sqlite3/fts5 (3.46.0):
     - sqlite3/common
-  - "sqlite3/perf-threadsafe (3.45.3+1)":
+  - sqlite3/perf-threadsafe (3.46.0):
     - sqlite3/common
-  - "sqlite3/rtree (3.45.3+1)":
+  - sqlite3/rtree (3.46.0):
     - sqlite3/common
   - sqlite3_flutter_libs (0.0.1):
     - FlutterMacOS
-    - "sqlite3 (~> 3.45.3+1)"
+    - sqlite3 (~> 3.46.0)
     - sqlite3/fts5
     - sqlite3/perf-threadsafe
     - sqlite3/rtree
@@ -199,8 +199,8 @@ SPEC CHECKSUMS:
   share_plus: 36537c04ce0c3e3f5bd297ce4318b6d5ee5fd6cf
   shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
   sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
-  sqlite3: 02d1f07eaaa01f80a1c16b4b31dfcbb3345ee01a
-  sqlite3_flutter_libs: 8d204ef443cf0d5c1c8b058044eab53f3943a9c5
+  sqlite3: 154b084339ede06960a5b3c8160066adc9176b7d
+  sqlite3_flutter_libs: 1be4459672f8168ded2d8667599b8e3ca5e72b83
   super_native_extensions: 85efee3a7495b46b04befcfc86ed12069264ebf3
   url_launcher_macos: 5f437abeda8c85500ceb03f5c1938a8c5a705399
   video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3

diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj
@@ -708,7 +708,7 @@
 			repositoryURL = "https://github.com/argmaxinc/whisperkit";
 			requirement = {
 				kind = exactVersion;
-				version = 0.6.1;
+				version = 0.7.1;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

diff --git a/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -24,8 +24,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/argmaxinc/whisperkit",
       "state" : {
-        "revision" : "c20943d3f5d6f64981e9eaed8a3a9c3a62124fc5",
-        "version" : "0.6.1"
+        "revision" : "3aa94e8c3950afdeaf916cb1da71e44f62bd2864",
+        "version" : "0.7.1"
       }
     }
   ],

diff --git a/macos/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved b/macos/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -24,8 +24,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/argmaxinc/whisperkit",
       "state" : {
-        "revision" : "c20943d3f5d6f64981e9eaed8a3a9c3a62124fc5",
-        "version" : "0.6.1"
+        "revision" : "3aa94e8c3950afdeaf916cb1da71e44f62bd2864",
+        "version" : "0.7.1"
       }
     }
   ],

diff --git a/macos/Runner/WhisperKitRunner.swift b/macos/Runner/WhisperKitRunner.swift
@@ -52,9 +52,9 @@ public class WhisperKitRunner: NSObject, FlutterStreamHandler {
                         ),
                         callback: self.sendTranscriptionProgressEvent
                     )
-                    
-                    let text = transcription?.text
-                    let language = transcription?.language
+
+                    let text : String? = transcription?.first?.text
+                    let language = transcription?.first?.language
 
                     let data = [language, self.model, text]
                     result(data)

diff --git a/pubspec.lock b/pubspec.lock
@@ -433,6 +433,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.1.1"
+  dart_earcut:
+    dependency: transitive
+    description:
+      name: dart_earcut
+      sha256: "41b493147e30a051efb2da1e3acb7f38fe0db60afba24ac1ea5684cee272721e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
   dart_geohash:
     dependency: "direct main"
     description:
@@ -622,18 +630,18 @@ packages:
     dependency: transitive
     description:
       name: fetch_api
-      sha256: c0a76bfd84d4bc5a0733ab8b9fcee268d5069228790a6dd71fc2a6d1049223cc
+      sha256: "97f46c25b480aad74f7cc2ad7ccba2c5c6f08d008e68f95c1077286ce243d0e6"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.2.0"
   fetch_client:
     dependency: transitive
     description:
       name: fetch_client
-      sha256: "0b935eff9dfa84fb56bddadaf020c9aa61f02cbd6fa8dad914d6d343a838936d"
+      sha256: "9666ee14536778474072245ed5cba07db81ae8eb5de3b7bf4a2d1e2c49696092"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
   ffi:
     dependency: transitive
     description:
@@ -768,10 +776,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_form_builder
-      sha256: "560eb5e367d81170c6ade1e7ae63ecc5167936ae2cdfaae8a345e91bce19d2f2"
+      sha256: "447f8808f68070f7df968e8063aada3c9d2e90e789b5b70f3b44e4b315212656"
       url: "https://pub.dev"
     source: hosted
-    version: "9.2.1"
+    version: "9.3.0"
   flutter_health_fit:
     dependency: "direct main"
     description:
@@ -934,10 +942,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_map
-      sha256: cda8d72135b697f519287258b5294a57ce2f2a5ebf234f0e406aad4dc14c9399
+      sha256: ead3532d99548140346684cf737a4c0a6f59f02f62ee4e406597f8364afbf1a2
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.0"
+    version: "7.0.0"
   flutter_markdown:
     dependency: "direct main"
     description:
@@ -2171,10 +2179,10 @@ packages:
     dependency: transitive
     description:
       name: record_web
-      sha256: "0ef370d1e6553ad33c39dd03103b374e7861f3518b0533e64c94d73f988a5ffa"
+      sha256: "703adb626d31e2dd86a8f6b34e306e03cd323e0c5e16e11bbc0385b07a8df97e"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   record_windows:
     dependency: transitive
     description:
@@ -2512,10 +2520,10 @@ packages:
     dependency: "direct main"
     description:
       name: sqlite3_flutter_libs
-      sha256: fb2a106a2ea6042fe57de2c47074cc31539a941819c91e105b864744605da3f5
+      sha256: "1e62698dc1ab396152ccaf3b3990d826244e9f3c8c39b51805f209adcd6dbea3"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.21"
+    version: "0.5.22"
   sqlparser:
     dependency: transitive
     description:
@@ -3046,4 +3054,4 @@ packages:
     version: "3.1.2"
 sdks:
   dart: ">=3.4.0 <4.0.0"
-  flutter: ">=3.19.2"
+  flutter: ">=3.22.0"
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: lotti
 description: Achieve your goals and keep your data private with Lotti.
 publish_to: 'none'
-version: 0.9.467+2533
+version: 0.9.468+2535
 
 msix_config:
   display_name: LottiApp
@@ -69,7 +69,7 @@ dependencies:
   flutter_localizations:
     sdk: flutter
 
-  flutter_map: ^6.1.0
+  flutter_map: ^7.0.0
   flutter_markdown: ^0.7.1
   flutter_native_timezone: ^2.0.0
   flutter_olm: ^1.4.1