Merge pull request #1639 from matthiasn/chore/dependency_upgrades

chore: dependency upgrades

.fvm/flutter_sdk

@@ -0,0 +1 @@
+/Users/mn/fvm/versions/3.16.5

.fvm/fvm_config.json

@@ -0,0 +1,4 @@
+{
+  "flutterSdkVersion": "3.16.5",
+  "flavors": {}
+}

.gitignore

@@ -71,7 +71,6 @@ junit.xml
 test_resources/test.aac.aes
 test_resources/test.png.aes
 
-.fvm
 screenshots
 
 macos/whisper.cpp/*.zip

Makefile

@@ -1,3 +1,12 @@
+OS := $(shell uname -s)
+FLUTTER_CMD :=
+
+ifeq ($(OS), Darwin)
+	FLUTTER_CMD := fvm flutter
+else
+	FLUTTER_CMD := flutter
+endif
+
 IOS_ARCHIVE_PATH = ./build/ios/archive/Runner.xcarchive
 IOS_EXPORT_PATH = ./build/ios/export
 MACOS_ARCHIVE_PATH = ./build/macos/archive/Runner.xcarchive
@@ -7,15 +16,15 @@ LOTTI_VERSION := $(shell yq '.version' pubspec.yaml |  tr -d '"')
 
 .PHONY: test
 test:
-	flutter test --coverage
+	$(FLUTTER_CMD) test --coverage
 
 .PHONY: analyze
 analyze:
-	flutter analyze
+	$(FLUTTER_CMD) analyze
 
 .PHONY: junit_test
 junit_test:
-	flutter test --coverage --reporter json > TEST-report.jsonl
+	$(FLUTTER_CMD) test --coverage --reporter json > TEST-report.jsonl
 
 .PHONY: junit_upload
 junit_upload:
@@ -29,11 +38,11 @@ integration_test:
 
 .PHONY: clean
 clean:
-	flutter clean
+	$(FLUTTER_CMD) clean
 
 .PHONY: deps
 deps:
-	flutter pub get
+	$(FLUTTER_CMD) pub get
 
 .PHONY: enable_arb_tools
 enable_arb_tools:
@@ -45,13 +54,13 @@ sort_arb_files: enable_arb_tools
 
 .PHONY: l10n
 l10n: deps
-	flutter gen-l10n
+	$(FLUTTER_CMD) gen-l10n
 	@echo "Missing translations:"
 	@cat missing_translations.txt
 
 .PHONY: doctor
 doctor:
-	flutter doctor
+	$(FLUTTER_CMD) doctor
 
 .PHONY: coverage_report
 coverage_report:
@@ -64,10 +73,10 @@ coverage: test coverage_report
 
 .PHONY: check-null-safety
 check-null-safety:
-	flutter pub outdated --mode=null-safety
+	$(FLUTTER_CMD) pub outdated --mode=null-safety
 
 .PHONY: build_runner
-build_runner: deps l10n
+build_runner: deps
 	dart run build_runner build --delete-conflicting-outputs
 
 .PHONY: watch
@@ -76,7 +85,7 @@ watch: l10n
 
 .PHONY: activate_fluttium
 activate_fluttium:
-	flutter pub global activate fluttium_cli
+	$(FLUTTER_CMD) pub global activate fluttium_cli
 
 .PHONY: fluttium
 fluttium: get_whisper_cpp
@@ -107,13 +116,13 @@ migrate_db:
 
 .PHONY: bundle
 bundle:
-	flutter build bundle
+	$(FLUTTER_CMD) build bundle
 
 #######################################
 
 .PHONY: ios_build_ipa
 ios_build_ipa: get_whisper_cpp_ios
-	flutter build ipa
+	$(FLUTTER_CMD) build ipa
 
 .PHONY: ios_build
 ios_build: clean_test ios_build_ipa
@@ -155,7 +164,7 @@ ios: ios_build ios_fastlane_build ios_fastlane_upload
 
 .PHONY: macos_build_flutter
 macos_build_flutter: get_whisper_cpp
-	flutter build macos
+	$(FLUTTER_CMD) build macos
 
 .PHONY: macos_build
 macos_build: clean_test macos_build_flutter
@@ -236,18 +245,18 @@ macos_local: macos_build
 
 .PHONY: android_build
 android_build:
-	flutter build appbundle
+	$(FLUTTER_CMD) build appbundle
 
 .PHONY: linux_build
 linux_build:
-	flutter build linux
+	$(FLUTTER_CMD) build linux
 
 .PHONY: linux
 linux: l10n test linux_build
 
 .PHONY: windows
 windows: clean_test
-	flutter build windows
+	$(FLUTTER_CMD) build windows
 
 .PHONY: tag_push
 tag_push:
@@ -281,7 +290,7 @@ icons:
 	dart run flutter_launcher_icons:main
 
 .PHONY: clean_test
-clean_test: clean deps l10n build_runner test
+clean_test: clean deps build_runner l10n test
 
 .PHONY: clean_build_analyze
 clean_build_analyze: clean deps l10n build_runner analyze

ios/Podfile.lock

@@ -6,12 +6,12 @@ PODS:
     - ReachabilitySwift
   - device_info_plus (0.0.1):
     - Flutter
-  - ffmpeg-kit-ios-https (5.1)
-  - ffmpeg_kit_flutter (5.1.0):
-    - ffmpeg_kit_flutter/https (= 5.1.0)
+  - ffmpeg-kit-ios-https (6.0)
+  - ffmpeg_kit_flutter (6.0.3):
+    - ffmpeg_kit_flutter/https (= 6.0.3)
     - Flutter
-  - ffmpeg_kit_flutter/https (5.1.0):
-    - ffmpeg-kit-ios-https (= 5.1)
+  - ffmpeg_kit_flutter/https (6.0.3):
+    - ffmpeg-kit-ios-https (= 6.0)
     - Flutter
   - Flutter (1.0.0)
   - flutter_fgbg (0.0.1):
@@ -75,8 +75,9 @@ PODS:
     - Flutter
     - MTBBarcodeScanner
   - ReachabilitySwift (5.0.0)
-  - record (0.0.1):
+  - record_darwin (1.0.0):
     - Flutter
+    - FlutterMacOS
   - SDWebImage (5.16.0):
     - SDWebImage/Core (= 5.16.0)
   - SDWebImage/Core (5.16.0)
@@ -91,25 +92,26 @@ PODS:
   - sqflite (0.0.3):
     - Flutter
     - FMDB (>= 2.7.5)
-  - sqlite3 (3.41.2):
-    - sqlite3/common (= 3.41.2)
-  - sqlite3/common (3.41.2)
-  - sqlite3/fts5 (3.41.2):
+  - sqlite3 (3.44.0):
+    - sqlite3/common (= 3.44.0)
+  - sqlite3/common (3.44.0)
+  - sqlite3/fts5 (3.44.0):
     - sqlite3/common
-  - sqlite3/perf-threadsafe (3.41.2):
+  - sqlite3/perf-threadsafe (3.44.0):
     - sqlite3/common
-  - sqlite3/rtree (3.41.2):
+  - sqlite3/rtree (3.44.0):
     - sqlite3/common
   - sqlite3_flutter_libs (0.0.1):
     - Flutter
-    - sqlite3 (~> 3.41.2)
+    - sqlite3 (~> 3.44.0)
     - sqlite3/fts5
     - sqlite3/perf-threadsafe
     - sqlite3/rtree
   - url_launcher_ios (0.0.1):
     - Flutter
   - video_player_avfoundation (0.0.1):
     - Flutter
+    - FlutterMacOS
 
 DEPENDENCIES:
   - audiofileplayer (from `.symlinks/plugins/audiofileplayer/ios`)
@@ -136,13 +138,13 @@ DEPENDENCIES:
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
   - photo_manager (from `.symlinks/plugins/photo_manager/ios`)
   - qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`)
-  - record (from `.symlinks/plugins/record/ios`)
+  - record_darwin (from `.symlinks/plugins/record_darwin/ios`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
   - sqflite (from `.symlinks/plugins/sqflite/ios`)
   - sqlite3_flutter_libs (from `.symlinks/plugins/sqlite3_flutter_libs/ios`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
-  - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/ios`)
+  - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`)
 
 SPEC REPOS:
   trunk:
@@ -205,8 +207,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/photo_manager/ios"
   qr_code_scanner:
     :path: ".symlinks/plugins/qr_code_scanner/ios"
-  record:
-    :path: ".symlinks/plugins/record/ios"
+  record_darwin:
+    :path: ".symlinks/plugins/record_darwin/ios"
   share_plus:
     :path: ".symlinks/plugins/share_plus/ios"
   shared_preferences_foundation:
@@ -218,14 +220,14 @@ EXTERNAL SOURCES:
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
   video_player_avfoundation:
-    :path: ".symlinks/plugins/video_player_avfoundation/ios"
+    :path: ".symlinks/plugins/video_player_avfoundation/darwin"
 
 SPEC CHECKSUMS:
   audiofileplayer: 4aaff759a721ec3a850a682e0d9ec554e5f9e86f
-  connectivity_plus: 07c49e96d7fc92bc9920617b83238c4d178b446a
-  device_info_plus: 7545d84d8d1b896cb16a4ff98c19f07ec4b298ea
-  ffmpeg-kit-ios-https: 8dffbe1623a2f227be98fc314294847a97f818e4
-  ffmpeg_kit_flutter: 17e9f35a4ec996ac55051c20be05240f2a0b53e8
+  connectivity_plus: bf0076dd84a130856aa636df1c71ccaff908fa1d
+  device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
+  ffmpeg-kit-ios-https: f9c838aa5400a6c5ba12324c6b798f52197ba354
+  ffmpeg_kit_flutter: b4ca70cac3fc1d8ac14cdc660754b60870358732
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_fgbg: 31c0d1140a131daea2d342121808f6aa0dcd879d
   flutter_health_fit: af332b5d7512b9cc8a05e7282cfcee02b056d32e
@@ -244,24 +246,24 @@ SPEC CHECKSUMS:
   media_kit_libs_ios_audio: 8f39d96a9c630685dfb844c289bd1d114c486fb3
   media_kit_native_event_loop: 99111eded5acbdc9c2738021ea6550dd36ca8837
   MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
-  package_info_plus: fd030dabf36271f146f1f3beacd48f564b0f17f7
+  package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
   pasteboard: 982969ebaa7c78af3e6cc7761e8f5e77565d9ce0
   path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
   permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
   photo_manager: 4f6810b7dfc4feb03b461ac1a70dacf91fba7604
   qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e
   ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
-  record: cae05d8dd3cdb1dea3511b20e5a5811a1ae00d0d
+  record_darwin: 1f6619f2abac4d1ca91d3eeab038c980d76f1517
   SDWebImage: 2aea163b50bfcb569a2726b6a754c54a4506fcf6
   SDWebImageWebPCoder: f0f287cee4cd96a59937fbf3c77a8cfda9ba67b0
-  share_plus: 599aa54e4ea31d4b4c0e9c911bcc26c55e791028
+  share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5
   shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
   sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
-  sqlite3: fd89671d969f3e73efe503ce203e28b016b58f68
-  sqlite3_flutter_libs: 04ba0d14a04335a2fbf9a331e8664f401fbccdd5
-  url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
-  video_player_avfoundation: 81e49bb3d9fb63dccf9fa0f6d877dc3ddbeac126
+  sqlite3: 6e2d4a4879854d0ec86b476bf3c3e30870bac273
+  sqlite3_flutter_libs: eb769059df0356dc52ddda040f09cacc9391a7cf
+  url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b
+  video_player_avfoundation: e9e6f9cae7d7a6d9b43519b0aab382bca60fcfd1
 
 PODFILE CHECKSUM: 5b3398e7604abf76fbba588f5b0fc85f420e288c
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.14.3

ios/Runner.xcodeproj/project.pbxproj

@@ -541,7 +541,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 10;
-				DEVELOPMENT_TEAM = SS586VG7L7;
+				DEVELOPMENT_TEAM = 7DN35ABWYL;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
@@ -554,7 +554,7 @@
 					"-O3",
 					"-DNDEBUG",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.matthiasn.lotti.dev;
+				PRODUCT_BUNDLE_IDENTIFIER = com.matthiasnehlsen.lotti.dev;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";