From 59150dc697fa025a5b3f693386fa1f290a73b54a Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Thu, 10 Aug 2023 07:33:24 +0300 Subject: [PATCH 1/4] build changes ios --- ios/Podfile | 3 + ios/Podfile.lock | 216 ------------------ ios/Runner.xcodeproj/project.pbxproj | 104 ++++----- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- 4 files changed, 47 insertions(+), 278 deletions(-) delete mode 100644 ios/Podfile.lock diff --git a/ios/Podfile b/ios/Podfile index 2c068c40..0646ebd4 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -37,5 +37,8 @@ end post_install do |installer| installer.pods_project.targets.each do |target| flutter_additional_ios_build_settings(target) + target.build_configurations.each do |config| + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0' + end end end diff --git a/ios/Podfile.lock b/ios/Podfile.lock deleted file mode 100644 index cbf76fea..00000000 --- a/ios/Podfile.lock +++ /dev/null @@ -1,216 +0,0 @@ -PODS: - - audioplayers_darwin (0.0.1): - - Flutter - - Firebase/CoreOnly (10.3.0): - - FirebaseCore (= 10.3.0) - - Firebase/Messaging (10.3.0): - - Firebase/CoreOnly - - FirebaseMessaging (~> 10.3.0) - - firebase_core (2.4.1): - - Firebase/CoreOnly (= 10.3.0) - - Flutter - - firebase_messaging (14.2.1): - - Firebase/Messaging (= 10.3.0) - - firebase_core - - Flutter - - FirebaseCore (10.3.0): - - FirebaseCoreInternal (~> 10.0) - - GoogleUtilities/Environment (~> 7.8) - - GoogleUtilities/Logger (~> 7.8) - - FirebaseCoreInternal (10.3.0): - - "GoogleUtilities/NSData+zlib (~> 7.8)" - - FirebaseInstallations (10.3.0): - - FirebaseCore (~> 10.0) - - GoogleUtilities/Environment (~> 7.8) - - GoogleUtilities/UserDefaults (~> 7.8) - - PromisesObjC (~> 2.1) - - FirebaseMessaging (10.3.0): - - FirebaseCore (~> 10.0) - - FirebaseInstallations (~> 10.0) - - GoogleDataTransport (~> 9.2) - - GoogleUtilities/AppDelegateSwizzler (~> 7.8) - - GoogleUtilities/Environment (~> 7.8) - - GoogleUtilities/Reachability (~> 7.8) - - GoogleUtilities/UserDefaults (~> 7.8) - - nanopb (< 2.30910.0, >= 2.30908.0) - - Flutter (1.0.0) - - flutter_keyboard_visibility (0.0.1): - - Flutter - - flutter_local_notifications (0.0.1): - - Flutter - - flutter_sound (9.2.13): - - Flutter - - flutter_sound_core (= 9.2.13) - - flutter_sound_core (9.2.13) - - fluttertoast (0.0.2): - - Flutter - - Toast - - FMDB (2.7.5): - - FMDB/standard (= 2.7.5) - - FMDB/standard (2.7.5) - - GoogleDataTransport (9.2.0): - - GoogleUtilities/Environment (~> 7.7) - - nanopb (< 2.30910.0, >= 2.30908.0) - - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/AppDelegateSwizzler (7.10.0): - - GoogleUtilities/Environment - - GoogleUtilities/Logger - - GoogleUtilities/Network - - GoogleUtilities/Environment (7.10.0): - - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.10.0): - - GoogleUtilities/Environment - - GoogleUtilities/Network (7.10.0): - - GoogleUtilities/Logger - - "GoogleUtilities/NSData+zlib" - - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.10.0)" - - GoogleUtilities/Reachability (7.10.0): - - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (7.10.0): - - GoogleUtilities/Logger - - image_picker_ios (0.0.1): - - Flutter - - MTBBarcodeScanner (5.0.11) - - nanopb (2.30909.0): - - nanopb/decode (= 2.30909.0) - - nanopb/encode (= 2.30909.0) - - nanopb/decode (2.30909.0) - - nanopb/encode (2.30909.0) - - package_info (0.0.1): - - Flutter - - path_provider_ios (0.0.1): - - Flutter - - permission_handler_apple (9.0.4): - - Flutter - - PromisesObjC (2.1.1) - - qr_code_scanner (0.2.0): - - Flutter - - MTBBarcodeScanner - - share (0.0.1): - - Flutter - - shared_preferences_ios (0.0.1): - - Flutter - - speech_to_text (0.0.1): - - Flutter - - Try - - sqflite (0.0.2): - - Flutter - - FMDB (>= 2.7.5) - - Toast (4.0.0) - - Try (2.1.1) - - url_launcher_ios (0.0.1): - - Flutter - -DEPENDENCIES: - - audioplayers_darwin (from `.symlinks/plugins/audioplayers_darwin/ios`) - - firebase_core (from `.symlinks/plugins/firebase_core/ios`) - - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`) - - Flutter (from `Flutter`) - - flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`) - - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`) - - flutter_sound (from `.symlinks/plugins/flutter_sound/ios`) - - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`) - - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`) - - package_info (from `.symlinks/plugins/package_info/ios`) - - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`) - - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) - - qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`) - - share (from `.symlinks/plugins/share/ios`) - - shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`) - - speech_to_text (from `.symlinks/plugins/speech_to_text/ios`) - - sqflite (from `.symlinks/plugins/sqflite/ios`) - - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - -SPEC REPOS: - trunk: - - Firebase - - FirebaseCore - - FirebaseCoreInternal - - FirebaseInstallations - - FirebaseMessaging - - flutter_sound_core - - FMDB - - GoogleDataTransport - - GoogleUtilities - - MTBBarcodeScanner - - nanopb - - PromisesObjC - - Toast - - Try - -EXTERNAL SOURCES: - audioplayers_darwin: - :path: ".symlinks/plugins/audioplayers_darwin/ios" - firebase_core: - :path: ".symlinks/plugins/firebase_core/ios" - firebase_messaging: - :path: ".symlinks/plugins/firebase_messaging/ios" - Flutter: - :path: Flutter - flutter_keyboard_visibility: - :path: ".symlinks/plugins/flutter_keyboard_visibility/ios" - flutter_local_notifications: - :path: ".symlinks/plugins/flutter_local_notifications/ios" - flutter_sound: - :path: ".symlinks/plugins/flutter_sound/ios" - fluttertoast: - :path: ".symlinks/plugins/fluttertoast/ios" - image_picker_ios: - :path: ".symlinks/plugins/image_picker_ios/ios" - package_info: - :path: ".symlinks/plugins/package_info/ios" - path_provider_ios: - :path: ".symlinks/plugins/path_provider_ios/ios" - permission_handler_apple: - :path: ".symlinks/plugins/permission_handler_apple/ios" - qr_code_scanner: - :path: ".symlinks/plugins/qr_code_scanner/ios" - share: - :path: ".symlinks/plugins/share/ios" - shared_preferences_ios: - :path: ".symlinks/plugins/shared_preferences_ios/ios" - speech_to_text: - :path: ".symlinks/plugins/speech_to_text/ios" - sqflite: - :path: ".symlinks/plugins/sqflite/ios" - url_launcher_ios: - :path: ".symlinks/plugins/url_launcher_ios/ios" - -SPEC CHECKSUMS: - audioplayers_darwin: 877d9a4d06331c5c374595e46e16453ac7eafa40 - Firebase: f92fc551ead69c94168d36c2b26188263860acd9 - firebase_core: bf59c32d2e53814f558efa20840c1902fa2fe461 - firebase_messaging: ee597229fc260f8fa491fa8f2d4a32dfbfa406fa - FirebaseCore: 988754646ab3bd4bdcb740f1bfe26b9f6c0d5f2a - FirebaseCoreInternal: 29b76f784d607df8b2a1259d73c3f04f1210137b - FirebaseInstallations: e2f26126089dcf41e215f7b8925af8d953c7d602 - FirebaseMessaging: e345b219fd15d325f0cf2fef28cb8ce00d851b3f - Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 - flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069 - flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743 - flutter_sound: c60effa2a350fb977885f0db2fbc4c1ad5160900 - flutter_sound_core: 26c10e5832e76aaacfae252d8925232281c486ae - fluttertoast: eb263d302cc92e04176c053d2385237e9f43fad0 - FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a - GoogleDataTransport: 1c8145da7117bd68bbbed00cf304edb6a24de00f - GoogleUtilities: bad72cb363809015b1f7f19beb1f1cd23c589f95 - image_picker_ios: b786a5dcf033a8336a657191401bfdf12017dabb - MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb - nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431 - package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62 - path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02 - permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce - PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb - qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e - share: 0b2c3e82132f5888bccca3351c504d0003b3b410 - shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad - speech_to_text: b43a7d99aef037bd758ed8e45d79bbac035d2dfe - sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904 - Toast: 91b396c56ee72a5790816f40d3a94dd357abc196 - Try: 5ef669ae832617b3cee58cb2c6f99fb767a4ff96 - url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de - -PODFILE CHECKSUM: 4e8f8b2be68aeea4c0d5beb6ff1e79fface1d048 - -COCOAPODS: 1.11.3 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 5116f0d6..5fcc36b0 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -10,11 +10,11 @@ 00C3AFCE29769C38002E7B47 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 00C3AFCD29769C37002E7B47 /* GoogleService-Info.plist */; }; 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 4141329F7EE1C2C4921406EF /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CCEA5D6B9129CB26397DBEBA /* Pods_Runner.framework */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; - F2A2A0FF9835A41EAE85C46C /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4EFA2032ACFCE75A326C4021 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -35,9 +35,8 @@ 00C3AFCD29769C37002E7B47 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; - 21218448C05A6EE259A8A273 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 19F80F744566086934C1EFAB /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 4EFA2032ACFCE75A326C4021 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; @@ -48,8 +47,9 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 9CABA487766DBA12CD9795AB /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - C495935E3B272204B901FA13 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + B31016378DCE198B9537F302 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + B42BA5D3E47EC815EC803E18 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + CCEA5D6B9129CB26397DBEBA /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -57,7 +57,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - F2A2A0FF9835A41EAE85C46C /* Pods_Runner.framework in Frameworks */, + 4141329F7EE1C2C4921406EF /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -67,13 +67,21 @@ 577ED37A491ADCF557B4F6D9 /* Pods */ = { isa = PBXGroup; children = ( - 21218448C05A6EE259A8A273 /* Pods-Runner.debug.xcconfig */, - C495935E3B272204B901FA13 /* Pods-Runner.release.xcconfig */, - 9CABA487766DBA12CD9795AB /* Pods-Runner.profile.xcconfig */, + B42BA5D3E47EC815EC803E18 /* Pods-Runner.debug.xcconfig */, + B31016378DCE198B9537F302 /* Pods-Runner.release.xcconfig */, + 19F80F744566086934C1EFAB /* Pods-Runner.profile.xcconfig */, ); path = Pods; sourceTree = ""; }; + 87D8490E375D7CE60C246AAF /* Frameworks */ = { + isa = PBXGroup; + children = ( + CCEA5D6B9129CB26397DBEBA /* Pods_Runner.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( @@ -92,7 +100,7 @@ 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, 577ED37A491ADCF557B4F6D9 /* Pods */, - CF00C18CA99370AC196B5B50 /* Frameworks */, + 87D8490E375D7CE60C246AAF /* Frameworks */, ); sourceTree = ""; }; @@ -121,14 +129,6 @@ path = Runner; sourceTree = ""; }; - CF00C18CA99370AC196B5B50 /* Frameworks */ = { - isa = PBXGroup; - children = ( - 4EFA2032ACFCE75A326C4021 /* Pods_Runner.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -136,14 +136,14 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 1EBE8111D78021B782F0E9D3 /* [CP] Check Pods Manifest.lock */, + 9F565295956C4424C1A65C21 /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - 82ACB2D948A573383205B7AC /* [CP] Embed Pods Frameworks */, + 55FB1946A3AB2CD5DD528CC0 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -203,28 +203,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 1EBE8111D78021B782F0E9D3 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -240,7 +218,7 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 82ACB2D948A573383205B7AC /* [CP] Embed Pods Frameworks */ = { + 55FB1946A3AB2CD5DD528CC0 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -272,6 +250,28 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; + 9F565295956C4424C1A65C21 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -441,16 +441,10 @@ "-framework", "\"package_info\"", "-framework", - "\"path_provider_ios\"", - "-framework", - "\"permission_handler_apple\"", - "-framework", "\"qr_code_scanner\"", "-framework", "\"share\"", "-framework", - "\"shared_preferences_ios\"", - "-framework", "\"speech_to_text\"", "-framework", "\"sqflite\"", @@ -662,16 +656,10 @@ "-framework", "\"package_info\"", "-framework", - "\"path_provider_ios\"", - "-framework", - "\"permission_handler_apple\"", - "-framework", "\"qr_code_scanner\"", "-framework", "\"share\"", "-framework", - "\"shared_preferences_ios\"", - "-framework", "\"speech_to_text\"", "-framework", "\"sqflite\"", @@ -773,16 +761,10 @@ "-framework", "\"package_info\"", "-framework", - "\"path_provider_ios\"", - "-framework", - "\"permission_handler_apple\"", - "-framework", "\"qr_code_scanner\"", "-framework", "\"share\"", "-framework", - "\"shared_preferences_ios\"", - "-framework", "\"speech_to_text\"", "-framework", "\"sqflite\"", diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index c87d15a3..f3d88ace 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -40,7 +40,7 @@ Date: Tue, 17 Oct 2023 14:50:47 +0300 Subject: [PATCH 2/4] android 1.0.4 released. --- android/app/build.gradle | 4 ++-- lib/controllers/api_routes/urls.dart | 4 ++-- pubspec.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index d8e93da8..11d962c1 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -49,8 +49,8 @@ android { // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration. minSdkVersion 21 targetSdkVersion 33 - versionCode 3 - versionName '1.0.3' + versionCode 4 + versionName '1.0.4' } signingConfigs { diff --git a/lib/controllers/api_routes/urls.dart b/lib/controllers/api_routes/urls.dart index 64815ebc..18076255 100644 --- a/lib/controllers/api_routes/urls.dart +++ b/lib/controllers/api_routes/urls.dart @@ -4,9 +4,9 @@ class URLs { static const host2 = "http://194.163.164.213/atoms/api"; // todo @sikander will remove after confirmation //static const host1 = "https://atomsuat.hmg.com"; // old uat url - //static const host1 = "https://atomsm.hmg.com"; // production url + static const host1 = "https://atomsm.hmg.com"; // production url - static const host1 = "https://atomsmdev.hmg.com"; // local UAT url + /// static const host1 = "https://atomsmdev.hmg.com"; // local UAT url // static const host1 = "http://109.123.243.118:9000"; diff --git a/pubspec.yaml b/pubspec.yaml index 031a8b0d..fbc5da65 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.0.4+3 +version: 1.0.5+4 environment: sdk: ">=2.7.0 <3.0.0" From c9f903fac8cbb6f0df8e214e81afb46d9896237e Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Wed, 1 Nov 2023 10:04:31 +0300 Subject: [PATCH 3/4] urgent improvements. --- android/app/build.gradle | 4 ++-- lib/controllers/api_routes/urls.dart | 5 +++-- .../service_report_assistants_employee_provider.dart | 10 ++++++++-- .../pages/sub_workorder/create_sub_workorder_page.dart | 5 ++++- .../sub_workorder/work_order_details_bottom_sheet.dart | 5 ++++- .../widgets/pentry/pentry_ppm_check_list_form.dart | 2 +- .../report/service_report_assistant_employee_menu.dart | 8 ++++++-- pubspec.yaml | 2 +- 8 files changed, 29 insertions(+), 12 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 11d962c1..5529b7b7 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -49,8 +49,8 @@ android { // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration. minSdkVersion 21 targetSdkVersion 33 - versionCode 4 - versionName '1.0.4' + versionCode 5 + versionName '1.0.5' } signingConfigs { diff --git a/lib/controllers/api_routes/urls.dart b/lib/controllers/api_routes/urls.dart index 18076255..92ca681d 100644 --- a/lib/controllers/api_routes/urls.dart +++ b/lib/controllers/api_routes/urls.dart @@ -6,7 +6,7 @@ class URLs { //static const host1 = "https://atomsuat.hmg.com"; // old uat url static const host1 = "https://atomsm.hmg.com"; // production url - /// static const host1 = "https://atomsmdev.hmg.com"; // local UAT url + // static const host1 = "https://atomsmdev.hmg.com"; // local UAT url // static const host1 = "http://109.123.243.118:9000"; @@ -21,7 +21,8 @@ class URLs { // static String getFileUrl(String file) => (file == null || file.isEmpty) ? null :1 (file.contains("/") ? file : "$_host/attachment/$file"); // API Routes - static get login => "$_baseUrl/MobileAuth/LoginIntegration"; // post + // static get login => "$_baseUrl/MobileAuth/Login"; // web login + static get login => "$_baseUrl/MobileAuth/LoginIntegration"; // mobile login static get register => "$_baseUrl/handle/create/user"; // post static get updateProfile => "$_baseUrl/update/user/profile"; // post static get getHospitals => "$_baseUrl/Customer/GetCustomers"; // get diff --git a/lib/controllers/providers/api/status_drop_down/report/service_report_assistants_employee_provider.dart b/lib/controllers/providers/api/status_drop_down/report/service_report_assistants_employee_provider.dart index 922242a9..47d56f0f 100644 --- a/lib/controllers/providers/api/status_drop_down/report/service_report_assistants_employee_provider.dart +++ b/lib/controllers/providers/api/status_drop_down/report/service_report_assistants_employee_provider.dart @@ -19,18 +19,24 @@ class ServiceReportAssistantsEmployeeProvider extends ChangeNotifier { // like 400 customer request failed // 500 service not available int _stateCode; + int get stateCode => _stateCode; + set setStateCode(int statusCode) => _stateCode = statusCode; + // contain user data // when user not login or register _user = null List _assistantEmployees; + List get assistantEmployees => _assistantEmployees; // when categories in-process _loading = true // done _loading = true // failed _loading = false bool _loading; + bool get isLoading => _loading; + set isLoading(bool isLoading) { _loading = isLoading; notifyListeners(); @@ -41,14 +47,14 @@ class ServiceReportAssistantsEmployeeProvider extends ChangeNotifier { /// return state code if request complete may be 200, 404 or 403 /// for more details check http state manager /// lib\controllers\http_status_manger\http_status_manger.dart - Future getAssistantEmployees() async { + Future getAssistantEmployees(num assetId) async { if (_loading == true) return -2; _loading = true; notifyListeners(); Response response; try { response = await ApiManager.instance.get( - "${URLs.getEngineers}", + "${URLs.getEngineers}&assetId=$assetId", ); // response = await get( // Uri.parse( diff --git a/lib/views/pages/sub_workorder/create_sub_workorder_page.dart b/lib/views/pages/sub_workorder/create_sub_workorder_page.dart index 6e4df099..2c0af9b4 100644 --- a/lib/views/pages/sub_workorder/create_sub_workorder_page.dart +++ b/lib/views/pages/sub_workorder/create_sub_workorder_page.dart @@ -258,7 +258,10 @@ class _CreateSubWorkOrderPageState extends State { useSafeArea: true, isScrollControlled: true, backgroundColor: Colors.transparent, - builder: (context) => WorkOrderDetailsBottomSheet(subWorkOrder: _subWorkOrders), + builder: (context) => WorkOrderDetailsBottomSheet( + subWorkOrder: _subWorkOrders, + assetId: widget.workOrder?.callRequest?.asset?.id, + ), ); //log(_subWorkOrders?.toJson()?.toString()); }, diff --git a/lib/views/pages/sub_workorder/work_order_details_bottom_sheet.dart b/lib/views/pages/sub_workorder/work_order_details_bottom_sheet.dart index 5ed1e253..ac993824 100644 --- a/lib/views/pages/sub_workorder/work_order_details_bottom_sheet.dart +++ b/lib/views/pages/sub_workorder/work_order_details_bottom_sheet.dart @@ -19,7 +19,9 @@ import 'auto_generated_vendor_name.dart'; class WorkOrderDetailsBottomSheet extends StatefulWidget { final SearchWorkOrder subWorkOrder; - const WorkOrderDetailsBottomSheet({this.subWorkOrder, Key key}) : super(key: key); + final num assetId; + + const WorkOrderDetailsBottomSheet({this.subWorkOrder, this.assetId, Key key}) : super(key: key); @override State createState() => _WorkOrderDetailsBottomSheetState(); @@ -91,6 +93,7 @@ class _WorkOrderDetailsBottomSheetState extends State { height: 4, ), ATextFormField( - initialValue: (model.title ?? "").toString(), + initialValue: (model.title?.trim() ?? "").toString(), textAlign: TextAlign.center, style: Theme.of(context).textTheme.subtitle1, textInputType: TextInputType.text, diff --git a/lib/views/widgets/status/report/service_report_assistant_employee_menu.dart b/lib/views/widgets/status/report/service_report_assistant_employee_menu.dart index 1bf2c491..7e178c6f 100644 --- a/lib/views/widgets/status/report/service_report_assistant_employee_menu.dart +++ b/lib/views/widgets/status/report/service_report_assistant_employee_menu.dart @@ -9,7 +9,10 @@ import '../../../../controllers/providers/api/status_drop_down/report/service_re class ServiceReportAssistantEmployeeMenu extends StatelessWidget { final Function(AssistantEmployees) onSelect; final AssistantEmployees initialValue; - const ServiceReportAssistantEmployeeMenu({Key key, @required this.onSelect, this.initialValue}) : super(key: key); + final num assetId; + + const ServiceReportAssistantEmployeeMenu({Key key, @required this.onSelect, this.initialValue, this.assetId}) : super(key: key); + @override Widget build(BuildContext context) { ServiceReportAssistantsEmployeeProvider menuProvider = Provider.of(context); @@ -18,7 +21,8 @@ class ServiceReportAssistantEmployeeMenu extends StatelessWidget { isFailedLoading: menuProvider.assistantEmployees == null, stateCode: menuProvider.stateCode, onRefresh: () async { - await menuProvider.getAssistantEmployees(); + await menuProvider.getAssistantEmployees(assetId); + // menuProvider.setStateCode = null; }, child: AssistantEmployeeMenu( initialStatus: initialValue, diff --git a/pubspec.yaml b/pubspec.yaml index fbc5da65..e47dba3f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.0.5+4 +version: 1.0.6+5 environment: sdk: ">=2.7.0 <3.0.0" From 98c68bfbf06d5272b761957365320ff286e3195b Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Wed, 1 Nov 2023 11:13:36 +0300 Subject: [PATCH 4/4] search work order by assigned employee fixed. --- lib/controllers/api_routes/urls.dart | 2 -- .../report/service_report_users_provider.dart | 8 +++++--- .../pages/sub_workorder/create_sub_workorder_page.dart | 4 ++++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/controllers/api_routes/urls.dart b/lib/controllers/api_routes/urls.dart index 92ca681d..129a43a9 100644 --- a/lib/controllers/api_routes/urls.dart +++ b/lib/controllers/api_routes/urls.dart @@ -48,8 +48,6 @@ class URLs { static get getMaintenanceSituation => "$_baseUrl/Lookups/GetLookup?lookupEnum=502"; - static get getAllUsers => "http://109.123.243.118:5000/api/Account/GetAllUsers"; - static get getPreventiveMaintenanceVisits => "$_baseUrl/return/user/calibrations"; // get static get updatePreventiveMaintenanceVisits => "$_baseUrl/Visit/UpdateVisits"; // get diff --git a/lib/controllers/providers/api/status_drop_down/report/service_report_users_provider.dart b/lib/controllers/providers/api/status_drop_down/report/service_report_users_provider.dart index 6fcd5f80..c05295fa 100644 --- a/lib/controllers/providers/api/status_drop_down/report/service_report_users_provider.dart +++ b/lib/controllers/providers/api/status_drop_down/report/service_report_users_provider.dart @@ -19,18 +19,22 @@ class ServiceReportUsersProvider extends ChangeNotifier { // like 400 customer request failed // 500 service not available int _stateCode; + int get stateCode => _stateCode; // contain user data // when user not login or register _user = null List _engineers; + List get engineers => _engineers; // when categories in-process _loading = true // done _loading = true // failed _loading = false bool _loading; + bool get isLoading => _loading; + set isLoading(bool isLoading) { _loading = isLoading; notifyListeners(); @@ -47,9 +51,7 @@ class ServiceReportUsersProvider extends ChangeNotifier { notifyListeners(); Response response; try { - response = await ApiManager.instance.get( - "${URLs.getAllUsers}", - ); + response = await ApiManager.instance.get("${URLs.getEngineers}"); // response = await get( // Uri.parse( // URLs.getServiceReportLastCalls diff --git a/lib/views/pages/sub_workorder/create_sub_workorder_page.dart b/lib/views/pages/sub_workorder/create_sub_workorder_page.dart index 2c0af9b4..227d7af7 100644 --- a/lib/views/pages/sub_workorder/create_sub_workorder_page.dart +++ b/lib/views/pages/sub_workorder/create_sub_workorder_page.dart @@ -6,6 +6,7 @@ import 'package:flutter/material.dart'; import 'package:fluttertoast/fluttertoast.dart'; import 'package:provider/provider.dart'; import 'package:test_sa/controllers/providers/api/service_requests_provider.dart'; +import 'package:test_sa/controllers/providers/api/status_drop_down/report/service_report_assistants_employee_provider.dart'; import 'package:test_sa/controllers/providers/api/status_drop_down/report/service_types_provider.dart'; import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/models/call_request_for_work_order_model.dart'; @@ -63,6 +64,9 @@ class _CreateSubWorkOrderPageState extends State { _serviceReport = ServiceReport(id: widget.workOrder.id, type: widget.workOrder.assetType, equipmentStatus: widget.workOrder.equipmentStatus); _isLoading = true; super.initState(); + if (context.mounted) { + Provider.of(context, listen: false).reset(); + } } var assetTypesProvider;