From 429f1e6f968017796d268d2b1ed7c97c47e59c69 Mon Sep 17 00:00:00 2001 From: Marianum Date: Fri, 17 Jul 2026 15:19:10 +0200 Subject: [PATCH] fix build against updated dependencies: re-add DioExceptionType.transformTimeout case (restored in dio 5.10.0) and rename SwiftReceiveSharingIntentPlugin to ReceiveSharingIntentPlugin (renamed in receive_sharing_intent 1.9.0); refresh Podfile.lock and SPM Package.resolved --- ios/Podfile.lock | 12 ------------ .../xcshareddata/swiftpm/Package.resolved | 12 ++++++------ ios/Runner/SceneDelegate.swift | 4 ++-- ios/Share Extension/ShareViewController.swift | 2 +- lib/api/errors/error_mapper.dart | 1 + .../errors/marianumconnect_error.dart | 1 + 6 files changed, 11 insertions(+), 21 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 07bbcac..b1cfbb6 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -4,8 +4,6 @@ PODS: - Flutter (1.0.0) - flutter_app_badge (2.0.0): - Flutter - - home_widget (0.0.1): - - Flutter - open_filex (0.0.2): - Flutter - PhoneNumberKit (3.7.11): @@ -14,8 +12,6 @@ PODS: - PhoneNumberKit/PhoneNumberKitCore (3.7.11) - PhoneNumberKit/UIKit (3.7.11): - PhoneNumberKit/PhoneNumberKitCore - - receive_sharing_intent (1.8.1): - - Flutter - workmanager_apple (0.0.1): - Flutter @@ -23,10 +19,8 @@ DEPENDENCIES: - eraser (from `.symlinks/plugins/eraser/ios`) - Flutter (from `Flutter`) - flutter_app_badge (from `.symlinks/plugins/flutter_app_badge/ios`) - - home_widget (from `.symlinks/plugins/home_widget/ios`) - open_filex (from `.symlinks/plugins/open_filex/ios`) - PhoneNumberKit (~> 3.7.6) - - receive_sharing_intent (from `.symlinks/plugins/receive_sharing_intent/ios`) - workmanager_apple (from `.symlinks/plugins/workmanager_apple/ios`) SPEC REPOS: @@ -40,12 +34,8 @@ EXTERNAL SOURCES: :path: Flutter flutter_app_badge: :path: ".symlinks/plugins/flutter_app_badge/ios" - home_widget: - :path: ".symlinks/plugins/home_widget/ios" open_filex: :path: ".symlinks/plugins/open_filex/ios" - receive_sharing_intent: - :path: ".symlinks/plugins/receive_sharing_intent/ios" workmanager_apple: :path: ".symlinks/plugins/workmanager_apple/ios" @@ -53,10 +43,8 @@ SPEC CHECKSUMS: eraser: 83a4b06985f3702aa3d8dec816f9693266012937 Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467 flutter_app_badge: ca742dd659a157c1090ef7cd881cb78f48f3bcdf - home_widget: f169fc41fd807b4d46ab6615dc44d62adbf9f64f open_filex: 432f3cd11432da3e39f47fcc0df2b1603854eff1 PhoneNumberKit: 9ff0c5ae9fe4770193b68a3d3e6c938fe976788c - receive_sharing_intent: 222384f00ffe7e952bbfabaa9e3967cb87e5fe00 workmanager_apple: 904529ae31e97fc5be632cf628507652294a0778 PODFILE CHECKSUM: 087d168982f24fb137e2d46f893b771b4b9955c6 diff --git a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index d506520..1f2e4ed 100644 --- a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -14,8 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/google/app-check.git", "state" : { - "revision" : "bb4002485ff867768dec13bf904a2ddb050bd1b1", - "version" : "11.3.0" + "revision" : "3e33dd27dd4c69bd81c7c81fe61d8ccf58846902", + "version" : "11.3.1" } }, { @@ -59,8 +59,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/googleads/google-ads-on-device-conversion-ios-sdk", "state" : { - "revision" : "9bfcc6cf435b2e7c5562c1900b8680c594fa9a64", - "version" : "3.6.0" + "revision" : "dc39082d8881109d35b94b1c122164c0e8d08a55", + "version" : "3.6.1" } }, { @@ -86,8 +86,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/google/GoogleUtilities.git", "state" : { - "revision" : "c46e5f8b7c23265f17c24ca7f9fa1b13ded7a822", - "version" : "8.1.1" + "revision" : "9f183ae842be978784f2963a343682e0c46d8fb3", + "version" : "8.1.2" } }, { diff --git a/ios/Runner/SceneDelegate.swift b/ios/Runner/SceneDelegate.swift index aeefe17..eb61b78 100644 --- a/ios/Runner/SceneDelegate.swift +++ b/ios/Runner/SceneDelegate.swift @@ -14,7 +14,7 @@ class SceneDelegate: FlutterSceneDelegate { ) { super.scene(scene, willConnectTo: session, options: connectionOptions) for context in connectionOptions.urlContexts { - _ = SwiftReceiveSharingIntentPlugin.instance.application( + _ = ReceiveSharingIntentPlugin.instance.application( UIApplication.shared, didFinishLaunchingWithOptions: [UIApplication.LaunchOptionsKey.url: context.url] ) @@ -23,7 +23,7 @@ class SceneDelegate: FlutterSceneDelegate { override func scene(_ scene: UIScene, openURLContexts URLContexts: Set) { for context in URLContexts { - _ = SwiftReceiveSharingIntentPlugin.instance.application( + _ = ReceiveSharingIntentPlugin.instance.application( UIApplication.shared, open: context.url, options: [:] diff --git a/ios/Share Extension/ShareViewController.swift b/ios/Share Extension/ShareViewController.swift index 9c80aaf..881b42f 100644 --- a/ios/Share Extension/ShareViewController.swift +++ b/ios/Share Extension/ShareViewController.swift @@ -3,7 +3,7 @@ import UniformTypeIdentifiers import AVFoundation // Datenmodell muss byte-für-byte zu dem passen, was -// SwiftReceiveSharingIntentPlugin auf der Host-App-Seite decodiert. +// ReceiveSharingIntentPlugin auf der Host-App-Seite decodiert. private enum SharedMediaType: String, Codable { case image, video, text, file, url } diff --git a/lib/api/errors/error_mapper.dart b/lib/api/errors/error_mapper.dart index a100623..9cafa3a 100644 --- a/lib/api/errors/error_mapper.dart +++ b/lib/api/errors/error_mapper.dart @@ -27,6 +27,7 @@ AppException? _dioToAppException(DioException error) { case DioExceptionType.connectionTimeout: case DioExceptionType.sendTimeout: case DioExceptionType.receiveTimeout: + case DioExceptionType.transformTimeout: return NetworkException.timeout(technicalDetails: error.message); case DioExceptionType.connectionError: return NetworkException(technicalDetails: error.message); diff --git a/lib/api/marianumconnect/errors/marianumconnect_error.dart b/lib/api/marianumconnect/errors/marianumconnect_error.dart index 4160cc4..18fa4b7 100644 --- a/lib/api/marianumconnect/errors/marianumconnect_error.dart +++ b/lib/api/marianumconnect/errors/marianumconnect_error.dart @@ -14,6 +14,7 @@ AppException mapMarianumConnectError(DioException error) { case DioExceptionType.connectionTimeout: case DioExceptionType.sendTimeout: case DioExceptionType.receiveTimeout: + case DioExceptionType.transformTimeout: return NetworkException.timeout(technicalDetails: error.message); case DioExceptionType.connectionError: return NetworkException(technicalDetails: error.message);