From 9ff24c1fcb12acbe4b7a4ead8fe69a7092016f63 Mon Sep 17 00:00:00 2001 From: Janez T Date: Sun, 8 Mar 2026 09:40:10 +0100 Subject: [PATCH] Fix invalid objective_c framework --- ios/fastlane/report.xml | 13 +++- lib/models/contact.dart | 2 +- macos/Flutter/GeneratedPluginRegistrant.swift | 2 + pubspec.lock | 66 ++----------------- pubspec.yaml | 6 ++ 5 files changed, 24 insertions(+), 65 deletions(-) diff --git a/ios/fastlane/report.xml b/ios/fastlane/report.xml index 451471c..36d8f0d 100644 --- a/ios/fastlane/report.xml +++ b/ios/fastlane/report.xml @@ -5,17 +5,24 @@ - + - + - + + + + + + + + diff --git a/lib/models/contact.dart b/lib/models/contact.dart index 47895a2..6da0af8 100644 --- a/lib/models/contact.dart +++ b/lib/models/contact.dart @@ -232,7 +232,7 @@ extension ContactLocalization on Contact { String get routeSummary { if (routeIsUnknown) { - return 'Unknown'; + return 'Flood/Unknown'; } if (!routeHasPath || routeHopCount == 0) { return 'Direct'; diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 2075a58..f189caf 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -15,6 +15,7 @@ import flutter_local_notifications import geolocator_apple import nsd_macos import package_info_plus +import path_provider_foundation import record_macos import share_plus import shared_preferences_foundation @@ -32,6 +33,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { GeolocatorPlugin.register(with: registry.registrar(forPlugin: "GeolocatorPlugin")) NsdMacosPlugin.register(with: registry.registrar(forPlugin: "NsdMacosPlugin")) FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) + PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) RecordMacOsPlugin.register(with: registry.registrar(forPlugin: "RecordMacOsPlugin")) SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) diff --git a/pubspec.lock b/pubspec.lock index e9a438d..06cac74 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -129,14 +129,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.2" - code_assets: - dependency: transitive - description: - name: code_assets - sha256: "83ccdaa064c980b5596c35dd64a8d3ecc68620174ab9b90b6343b753aa721687" - url: "https://pub.dev" - source: hosted - version: "1.0.0" codec2_flutter: dependency: "direct main" description: @@ -623,14 +615,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.2.5" - glob: - dependency: transitive - description: - name: glob - sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de - url: "https://pub.dev" - source: hosted - version: "2.1.3" gsettings: dependency: transitive description: @@ -639,14 +623,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.2.8" - hooks: - dependency: transitive - description: - name: hooks - sha256: e79ed1e8e1929bc6ecb6ec85f0cb519c887aa5b423705ded0d0f2d9226def388 - url: "https://pub.dev" - source: hosted - version: "1.0.2" http: dependency: "direct main" description: @@ -799,14 +775,6 @@ packages: url: "https://pub.dev" source: hosted version: "6.1.0" - logging: - dependency: transitive - description: - name: logging - sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 - url: "https://pub.dev" - source: hosted - version: "1.3.0" matcher: dependency: transitive description: @@ -856,14 +824,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.0" - native_toolchain_c: - dependency: transitive - description: - name: native_toolchain_c - sha256: "92b2ca62c8bd2b8d2f267cdfccf9bfbdb7322f778f8f91b3ce5b5cda23a3899f" - url: "https://pub.dev" - source: hosted - version: "0.17.5" nested: dependency: transitive description: @@ -920,14 +880,6 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.1" - objective_c: - dependency: transitive - description: - name: objective_c - sha256: "100a1c87616ab6ed41ec263b083c0ef3261ee6cd1dc3b0f35f8ddfa4f996fe52" - url: "https://pub.dev" - source: hosted - version: "9.3.0" package_info_plus: dependency: "direct main" description: @@ -969,13 +921,13 @@ packages: source: hosted version: "2.2.22" path_provider_foundation: - dependency: transitive + dependency: "direct overridden" description: name: path_provider_foundation - sha256: "2a376b7d6392d80cd3705782d2caa734ca4727776db0b6ec36ef3f1855197699" + sha256: "6d13aece7b3f5c5a9731eaf553ff9dcbc2eff41087fd2df587fd0fed9a3eb0c4" url: "https://pub.dev" source: hosted - version: "2.6.0" + version: "2.5.1" path_provider_linux: dependency: transitive description: @@ -1112,14 +1064,6 @@ packages: url: "https://pub.dev" source: hosted version: "6.1.5+1" - pub_semver: - dependency: transitive - description: - name: pub_semver - sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585" - url: "https://pub.dev" - source: hosted - version: "2.2.0" record: dependency: "direct main" description: @@ -1582,5 +1526,5 @@ packages: source: hosted version: "3.1.3" sdks: - dart: ">=3.10.3 <4.0.0" - flutter: ">=3.38.4" + dart: ">=3.10.0 <4.0.0" + flutter: ">=3.38.1" diff --git a/pubspec.yaml b/pubspec.yaml index 1cc0deb..c22c31b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -138,6 +138,12 @@ dev_dependencies: flutter_launcher_icons: "^0.14.4" fake_async: ^1.3.3 +dependency_overrides: + # path_provider_foundation 2.6.0 pulls in package:objective_c as a native + # asset. That framework has been ending up archived with a macOS platform + # slice and fails App Store validation for iOS uploads. + path_provider_foundation: 2.5.1 + flutter_launcher_icons: android: "launcher_icon" ios: true