Skip to content

Commit 2cd9c47

Browse files
committed
-update Podfile.lock and add Package.resolved for new dependencies; refactor repeater popup logic
- Fixed iOS App Store upload rejection (ITMS-90683) caused by unused permission macros being compiled into the binary. The build now only includes location and notification permissions. No user-facing behavior change. - Tapping a repeater ID chip no longer gets stuck on "Repeater data not available." Now fetches on demand with a loading indicator and tap-to-retry. Works in offline mode too, where repeater names were previously never populated
1 parent 1b22acc commit 2cd9c47

8 files changed

Lines changed: 407 additions & 190 deletions

File tree

ios/Podfile

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,27 @@ end
3939
post_install do |installer|
4040
installer.pods_project.targets.each do |target|
4141
flutter_additional_ios_build_settings(target)
42+
43+
target.build_configurations.each do |config|
44+
config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
45+
'$(inherited)',
46+
'PERMISSION_EVENTS=0',
47+
'PERMISSION_EVENTS_FULL_ACCESS=0',
48+
'PERMISSION_REMINDERS=0',
49+
'PERMISSION_CONTACTS=0',
50+
'PERMISSION_CAMERA=0',
51+
'PERMISSION_MICROPHONE=0',
52+
'PERMISSION_SPEECH_RECOGNIZER=0',
53+
'PERMISSION_PHOTOS=0',
54+
'PERMISSION_LOCATION=1',
55+
'PERMISSION_NOTIFICATIONS=1',
56+
'PERMISSION_MEDIA_LIBRARY=0',
57+
'PERMISSION_SENSORS=0',
58+
'PERMISSION_BLUETOOTH=0',
59+
'PERMISSION_APP_TRACKING_TRANSPARENCY=0',
60+
'PERMISSION_CRITICAL_ALERTS=0',
61+
'PERMISSION_ASSISTANT=0',
62+
]
63+
end
4264
end
4365
end

ios/Podfile.lock

Lines changed: 0 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -1,144 +1,33 @@
11
PODS:
2-
- audio_session (0.0.1):
3-
- Flutter
4-
- DKImagePickerController/Core (4.3.9):
5-
- DKImagePickerController/ImageDataManager
6-
- DKImagePickerController/Resource
7-
- DKImagePickerController/ImageDataManager (4.3.9)
8-
- DKImagePickerController/PhotoGallery (4.3.9):
9-
- DKImagePickerController/Core
10-
- DKPhotoGallery
11-
- DKImagePickerController/Resource (4.3.9)
12-
- DKPhotoGallery (0.0.19):
13-
- DKPhotoGallery/Core (= 0.0.19)
14-
- DKPhotoGallery/Model (= 0.0.19)
15-
- DKPhotoGallery/Preview (= 0.0.19)
16-
- DKPhotoGallery/Resource (= 0.0.19)
17-
- SDWebImage
18-
- SwiftyGif
19-
- DKPhotoGallery/Core (0.0.19):
20-
- DKPhotoGallery/Model
21-
- DKPhotoGallery/Preview
22-
- SDWebImage
23-
- SwiftyGif
24-
- DKPhotoGallery/Model (0.0.19):
25-
- SDWebImage
26-
- SwiftyGif
27-
- DKPhotoGallery/Preview (0.0.19):
28-
- DKPhotoGallery/Model
29-
- DKPhotoGallery/Resource
30-
- SDWebImage
31-
- SwiftyGif
32-
- DKPhotoGallery/Resource (0.0.19):
33-
- SDWebImage
34-
- SwiftyGif
35-
- file_picker (0.0.1):
36-
- DKImagePickerController/PhotoGallery
37-
- Flutter
382
- Flutter (1.0.0)
393
- flutter_background_service_ios (0.0.3):
404
- Flutter
41-
- flutter_blue_plus_darwin (0.0.2):
42-
- Flutter
43-
- FlutterMacOS
445
- flutter_local_notifications (0.0.1):
456
- Flutter
46-
- geolocator_apple (1.2.0):
47-
- Flutter
48-
- FlutterMacOS
49-
- just_audio (0.0.1):
50-
- Flutter
51-
- FlutterMacOS
52-
- package_info_plus (0.4.5):
53-
- Flutter
547
- permission_handler_apple (9.3.0):
558
- Flutter
56-
- SDWebImage (5.21.5):
57-
- SDWebImage/Core (= 5.21.5)
58-
- SDWebImage/Core (5.21.5)
59-
- share_plus (0.0.1):
60-
- Flutter
61-
- shared_preferences_foundation (0.0.1):
62-
- Flutter
63-
- FlutterMacOS
64-
- SwiftyGif (5.4.5)
65-
- url_launcher_ios (0.0.1):
66-
- Flutter
67-
- wakelock_plus (0.0.1):
68-
- Flutter
699

7010
DEPENDENCIES:
71-
- audio_session (from `.symlinks/plugins/audio_session/ios`)
72-
- file_picker (from `.symlinks/plugins/file_picker/ios`)
7311
- Flutter (from `Flutter`)
7412
- flutter_background_service_ios (from `.symlinks/plugins/flutter_background_service_ios/ios`)
75-
- flutter_blue_plus_darwin (from `.symlinks/plugins/flutter_blue_plus_darwin/darwin`)
7613
- flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
77-
- geolocator_apple (from `.symlinks/plugins/geolocator_apple/darwin`)
78-
- just_audio (from `.symlinks/plugins/just_audio/darwin`)
79-
- package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
8014
- permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
81-
- share_plus (from `.symlinks/plugins/share_plus/ios`)
82-
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
83-
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
84-
- wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`)
85-
86-
SPEC REPOS:
87-
trunk:
88-
- DKImagePickerController
89-
- DKPhotoGallery
90-
- SDWebImage
91-
- SwiftyGif
9215

9316
EXTERNAL SOURCES:
94-
audio_session:
95-
:path: ".symlinks/plugins/audio_session/ios"
96-
file_picker:
97-
:path: ".symlinks/plugins/file_picker/ios"
9817
Flutter:
9918
:path: Flutter
10019
flutter_background_service_ios:
10120
:path: ".symlinks/plugins/flutter_background_service_ios/ios"
102-
flutter_blue_plus_darwin:
103-
:path: ".symlinks/plugins/flutter_blue_plus_darwin/darwin"
10421
flutter_local_notifications:
10522
:path: ".symlinks/plugins/flutter_local_notifications/ios"
106-
geolocator_apple:
107-
:path: ".symlinks/plugins/geolocator_apple/darwin"
108-
just_audio:
109-
:path: ".symlinks/plugins/just_audio/darwin"
110-
package_info_plus:
111-
:path: ".symlinks/plugins/package_info_plus/ios"
11223
permission_handler_apple:
11324
:path: ".symlinks/plugins/permission_handler_apple/ios"
114-
share_plus:
115-
:path: ".symlinks/plugins/share_plus/ios"
116-
shared_preferences_foundation:
117-
:path: ".symlinks/plugins/shared_preferences_foundation/darwin"
118-
url_launcher_ios:
119-
:path: ".symlinks/plugins/url_launcher_ios/ios"
120-
wakelock_plus:
121-
:path: ".symlinks/plugins/wakelock_plus/ios"
12225

12326
SPEC CHECKSUMS:
124-
audio_session: 9bb7f6c970f21241b19f5a3658097ae459681ba0
125-
DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
126-
DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
127-
file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be
12827
Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
12928
flutter_background_service_ios: 00d31bdff7b4bfe06d32375df358abe0329cf87e
130-
flutter_blue_plus_darwin: 20a08bfeaa0f7804d524858d3d8744bcc1b6dbc3
13129
flutter_local_notifications: ad39620c743ea4c15127860f4b5641649a988100
132-
geolocator_apple: ab36aa0e8b7d7a2d7639b3b4e48308394e8cef5e
133-
just_audio: 4e391f57b79cad2b0674030a00453ca5ce817eed
134-
package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
13530
permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
136-
SDWebImage: e9c98383c7572d713c1a0d7dd2783b10599b9838
137-
share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
138-
shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
139-
SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
140-
url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b
141-
wakelock_plus: e29112ab3ef0b318e58cfa5c32326458be66b556
14231

14332
PODFILE CHECKSUM: 3c63482e143d1b91d2d2560aee9fb04ecc74ac7e
14433

ios/Runner.xcodeproj/project.pbxproj

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
1717
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
1818
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
19+
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
1920
/* End PBXBuildFile section */
2021

2122
/* Begin PBXContainerItemProxy section */
@@ -65,6 +66,7 @@
6566
C5DCC2A7546C7F71461B567A /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
6667
D478469A7D705340684EFF2B /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
6768
F799CC3DB45F3F5C30B5907D /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
69+
78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = "<group>"; };
6870
/* End PBXFileReference section */
6971

7072
/* Begin PBXFrameworksBuildPhase section */
@@ -80,6 +82,7 @@
8082
isa = PBXFrameworksBuildPhase;
8183
buildActionMask = 2147483647;
8284
files = (
85+
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */,
8386
75D889865C3C829654189002 /* Pods_Runner.framework in Frameworks */,
8487
);
8588
runOnlyForDeploymentPostprocessing = 0;
@@ -120,6 +123,7 @@
120123
9740EEB11CF90186004384FC /* Flutter */ = {
121124
isa = PBXGroup;
122125
children = (
126+
78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */,
123127
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
124128
9740EEB21CF90195004384FC /* Debug.xcconfig */,
125129
7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
@@ -187,6 +191,9 @@
187191
productType = "com.apple.product-type.bundle.unit-test";
188192
};
189193
97C146ED1CF9000F007C117D /* Runner */ = {
194+
packageProductDependencies = (
195+
78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
196+
);
190197
isa = PBXNativeTarget;
191198
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
192199
buildPhases = (
@@ -213,6 +220,9 @@
213220

214221
/* Begin PBXProject section */
215222
97C146E61CF9000F007C117D /* Project object */ = {
223+
packageReferences = (
224+
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */,
225+
);
216226
isa = PBXProject;
217227
attributes = {
218228
BuildIndependentTargetsInParallel = YES;
@@ -752,6 +762,18 @@
752762
defaultConfigurationName = Release;
753763
};
754764
/* End XCConfigurationList section */
765+
/* Begin XCLocalSwiftPackageReference section */
766+
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = {
767+
isa = XCLocalSwiftPackageReference;
768+
relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
769+
};
770+
/* End XCLocalSwiftPackageReference section */
771+
/* Begin XCSwiftPackageProductDependency section */
772+
78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
773+
isa = XCSwiftPackageProductDependency;
774+
productName = FlutterGeneratedPluginSwiftPackage;
775+
};
776+
/* End XCSwiftPackageProductDependency section */
755777
};
756778
rootObject = 97C146E61CF9000F007C117D /* Project object */;
757779
}

ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 59 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,24 @@
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
8+
<PreActions>
9+
<ExecutionAction
10+
ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
11+
<ActionContent
12+
title = "Run Prepare Flutter Framework Script"
13+
scriptText = "/bin/sh &quot;$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh&quot; prepare&#10;">
14+
<EnvironmentBuildable>
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "97C146ED1CF9000F007C117D"
18+
BuildableName = "Runner.app"
19+
BlueprintName = "Runner"
20+
ReferencedContainer = "container:Runner.xcodeproj">
21+
</BuildableReference>
22+
</EnvironmentBuildable>
23+
</ActionContent>
24+
</ExecutionAction>
25+
</PreActions>
826
<BuildActionEntries>
927
<BuildActionEntry
1028
buildForTesting = "YES"

ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 59 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)