diff --git a/.vscode/launch.json b/.vscode/launch.json index 3b1860d6..f8773aa6 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -29,7 +29,7 @@ "name": "krow-staff-application (STAGING Android)", "request": "launch", "type": "dart", - "program": "lmobile-apps/staff-app/lib/main_dev.dart", + "program": "mobile-apps/staff-app/lib/main_dev.dart", "flutterMode": "debug", "toolArgs": ["--flavor", "staging"] }, @@ -45,7 +45,7 @@ "name": "krow-client-application (DEV Android)", "request": "launch", "type": "dart", - "program": "lmobile-apps/client-app/lib/main_dev.dart", + "program": "mobile-apps/client-app/lib/main_dev.dart", "flutterMode": "debug", "toolArgs": ["--flavor", "dev"] }, diff --git a/Makefile b/Makefile index 4ea516d2..0b9cf927 100644 --- a/Makefile +++ b/Makefile @@ -384,7 +384,6 @@ mobile-client-build: $(FLUTTER) build ipa --flavor $(FLAVOR); \ fi - mobile-staff-install: @echo "--> Installing Flutter dependencies for staff app..." @cd mobile-apps/staff-app && $(FLUTTER) pub get diff --git a/codemagic.yaml b/codemagic.yaml index fcbce8cd..46b6aab7 100644 --- a/codemagic.yaml +++ b/codemagic.yaml @@ -85,6 +85,9 @@ workflows: <<: *client-app-base name: 🚛🤖 Client App Dev (Android App Distribution) environment: + flutter: stable + xcode: latest + cocoapods: default groups: - client_app_dev_credentials vars: @@ -97,6 +100,9 @@ workflows: <<: *client-app-base name: 🚛🤖 Client App Staging (Android App Distribution) environment: + flutter: stable + xcode: latest + cocoapods: default groups: - client_app_staging_credentials vars: diff --git a/mobile-apps/client-app/android/app/src/dev/google-services.json b/mobile-apps/client-app/android/app/src/dev/google-services.json index a11bbd27..1e592d44 100644 --- a/mobile-apps/client-app/android/app/src/dev/google-services.json +++ b/mobile-apps/client-app/android/app/src/dev/google-services.json @@ -31,10 +31,10 @@ "client_type": 3 }, { - "client_id": "933560802882-qgbq6m04moicvkff2b3i6p9agu7i4gou.apps.googleusercontent.com", + "client_id": "933560802882-dppsapp5i3lsfrlm1mhob2s21peofg1t.apps.googleusercontent.com", "client_type": 2, "ios_info": { - "bundle_id": "com.krow.app.dev" + "bundle_id": "com.krow.app.staff.dev" } } ] @@ -43,9 +43,9 @@ }, { "client_info": { - "mobilesdk_app_id": "1:933560802882:android:f4587798877cbb917757db", + "mobilesdk_app_id": "1:933560802882:android:d49b8c0f4d19e95e7757db", "android_client_info": { - "package_name": "com.krow.app.dev" + "package_name": "com.krow.app.staff.dev" } }, "oauth_client": [ @@ -67,10 +67,10 @@ "client_type": 3 }, { - "client_id": "933560802882-qgbq6m04moicvkff2b3i6p9agu7i4gou.apps.googleusercontent.com", + "client_id": "933560802882-dppsapp5i3lsfrlm1mhob2s21peofg1t.apps.googleusercontent.com", "client_type": 2, "ios_info": { - "bundle_id": "com.krow.app.dev" + "bundle_id": "com.krow.app.staff.dev" } } ] diff --git a/mobile-apps/client-app/android/app/src/staging/google-services.json b/mobile-apps/client-app/android/app/src/staging/google-services.json index fce47d44..e8a70f5f 100644 --- a/mobile-apps/client-app/android/app/src/staging/google-services.json +++ b/mobile-apps/client-app/android/app/src/staging/google-services.json @@ -26,9 +26,9 @@ }, { "client_info": { - "mobilesdk_app_id": "1:1032971403708:android:87edb39679f806ab356bb9", + "mobilesdk_app_id": "1:1032971403708:android:6e5031c203f01cc2356bb9", "android_client_info": { - "package_name": "com.krow.app.staging" + "package_name": "com.krow.app.staff.staging" } }, "oauth_client": [], diff --git a/mobile-apps/client-app/firebase.json b/mobile-apps/client-app/firebase.json index 483a5629..2b43948c 100644 --- a/mobile-apps/client-app/firebase.json +++ b/mobile-apps/client-app/firebase.json @@ -3,9 +3,9 @@ "platforms": { "android": { "default": { - "projectId": "krow-staging", - "appId": "1:14482748607:android:85b147490ff76b6924820a", - "fileOutput": "android/app/google-services.json" + "projectId": "krow-workforce-dev", + "appId": "1:933560802882:android:edcddb83ea4bbb517757db", + "fileOutput": "android/app/src/dev/google-services.json" }, "buildConfigurations": { "src/dev": { @@ -22,13 +22,43 @@ }, "ios": { "default": { - "projectId": "krow-staging", - "appId": "1:14482748607:ios:229a7ce2d64cb09f24820a", + "projectId": "krow-workforce-dev", + "appId": "1:933560802882:ios:7f0632ecbeff8f027757db", "uploadDebugSymbols": false, - "fileOutput": "ios/Runner/GoogleService-Info.plist" + "fileOutput": "ios/flavors/dev/GoogleService-Info.plist" }, - "targets": { - "Runner": { + "buildConfigurations": { + "Debug-dev": { + "projectId": "krow-workforce-dev", + "appId": "1:933560802882:ios:7f0632ecbeff8f027757db", + "uploadDebugSymbols": false, + "fileOutput": "ios/flavors/dev/GoogleService-Info.plist" + }, + "Profile-dev": { + "projectId": "krow-workforce-dev", + "appId": "1:933560802882:ios:7f0632ecbeff8f027757db", + "uploadDebugSymbols": false, + "fileOutput": "ios/flavors/dev/GoogleService-Info.plist" + }, + "Release-dev": { + "projectId": "krow-workforce-dev", + "appId": "1:933560802882:ios:7f0632ecbeff8f027757db", + "uploadDebugSymbols": false, + "fileOutput": "ios/flavors/dev/GoogleService-Info.plist" + }, + "Debug-staging": { + "projectId": "krow-workforce-staging", + "appId": "1:1032971403708:ios:b1a21a7337a268b3356bb9", + "uploadDebugSymbols": false, + "fileOutput": "ios/flavors/staging/GoogleService-Info.plist" + }, + "Profile-staging": { + "projectId": "krow-workforce-staging", + "appId": "1:1032971403708:ios:b1a21a7337a268b3356bb9", + "uploadDebugSymbols": false, + "fileOutput": "ios/flavors/staging/GoogleService-Info.plist" + }, + "Release-staging": { "projectId": "krow-workforce-staging", "appId": "1:1032971403708:ios:b1a21a7337a268b3356bb9", "uploadDebugSymbols": false, diff --git a/mobile-apps/client-app/ios/Flutter/AppFrameworkInfo.plist b/mobile-apps/client-app/ios/Flutter/AppFrameworkInfo.plist index 7c569640..1dc6cf76 100644 --- a/mobile-apps/client-app/ios/Flutter/AppFrameworkInfo.plist +++ b/mobile-apps/client-app/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 12.0 + 13.0 diff --git a/mobile-apps/client-app/ios/Podfile.lock b/mobile-apps/client-app/ios/Podfile.lock index 5927aaf4..8b02bbad 100644 --- a/mobile-apps/client-app/ios/Podfile.lock +++ b/mobile-apps/client-app/ios/Podfile.lock @@ -1,89 +1,90 @@ PODS: - connectivity_plus (0.0.1): - Flutter - - Firebase/Auth (11.10.0): + - Firebase/Auth (11.15.0): - Firebase/CoreOnly - - FirebaseAuth (~> 11.10.0) - - Firebase/CoreOnly (11.10.0): - - FirebaseCore (~> 11.10.0) - - Firebase/RemoteConfig (11.10.0): + - FirebaseAuth (~> 11.15.0) + - Firebase/CoreOnly (11.15.0): + - FirebaseCore (~> 11.15.0) + - Firebase/RemoteConfig (11.15.0): - Firebase/CoreOnly - - FirebaseRemoteConfig (~> 11.10.0) - - firebase_auth (5.5.1): - - Firebase/Auth (= 11.10.0) + - FirebaseRemoteConfig (~> 11.15.0) + - firebase_auth (5.7.0): + - Firebase/Auth (= 11.15.0) - firebase_core - Flutter - - firebase_core (3.13.0): - - Firebase/CoreOnly (= 11.10.0) + - firebase_core (3.15.2): + - Firebase/CoreOnly (= 11.15.0) - Flutter - - firebase_remote_config (5.4.3): - - Firebase/RemoteConfig (= 11.10.0) + - firebase_remote_config (5.5.0): + - Firebase/RemoteConfig (= 11.15.0) - firebase_core - Flutter - - FirebaseABTesting (11.10.0): - - FirebaseCore (~> 11.10.0) - - FirebaseAppCheckInterop (11.12.0) - - FirebaseAuth (11.10.0): + - FirebaseABTesting (11.15.0): + - FirebaseCore (~> 11.15.0) + - FirebaseAppCheckInterop (11.15.0) + - FirebaseAuth (11.15.0): - FirebaseAppCheckInterop (~> 11.0) - FirebaseAuthInterop (~> 11.0) - - FirebaseCore (~> 11.10.0) - - FirebaseCoreExtension (~> 11.10.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.0) - - GoogleUtilities/Environment (~> 8.0) + - FirebaseCore (~> 11.15.0) + - FirebaseCoreExtension (~> 11.15.0) + - GoogleUtilities/AppDelegateSwizzler (~> 8.1) + - GoogleUtilities/Environment (~> 8.1) - GTMSessionFetcher/Core (< 5.0, >= 3.4) - RecaptchaInterop (~> 101.0) - - FirebaseAuthInterop (11.12.0) - - FirebaseCore (11.10.0): - - FirebaseCoreInternal (~> 11.10.0) - - GoogleUtilities/Environment (~> 8.0) - - GoogleUtilities/Logger (~> 8.0) - - FirebaseCoreExtension (11.10.0): - - FirebaseCore (~> 11.10.0) - - FirebaseCoreInternal (11.10.0): - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - FirebaseInstallations (11.10.0): - - FirebaseCore (~> 11.10.0) - - GoogleUtilities/Environment (~> 8.0) - - GoogleUtilities/UserDefaults (~> 8.0) + - FirebaseAuthInterop (11.15.0) + - FirebaseCore (11.15.0): + - FirebaseCoreInternal (~> 11.15.0) + - GoogleUtilities/Environment (~> 8.1) + - GoogleUtilities/Logger (~> 8.1) + - FirebaseCoreExtension (11.15.0): + - FirebaseCore (~> 11.15.0) + - FirebaseCoreInternal (11.15.0): + - "GoogleUtilities/NSData+zlib (~> 8.1)" + - FirebaseInstallations (11.15.0): + - FirebaseCore (~> 11.15.0) + - GoogleUtilities/Environment (~> 8.1) + - GoogleUtilities/UserDefaults (~> 8.1) - PromisesObjC (~> 2.4) - - FirebaseRemoteConfig (11.10.0): + - FirebaseRemoteConfig (11.15.0): - FirebaseABTesting (~> 11.0) - - FirebaseCore (~> 11.10.0) + - FirebaseCore (~> 11.15.0) - FirebaseInstallations (~> 11.0) - FirebaseRemoteConfigInterop (~> 11.0) - FirebaseSharedSwift (~> 11.0) - - GoogleUtilities/Environment (~> 8.0) - - "GoogleUtilities/NSData+zlib (~> 8.0)" - - FirebaseRemoteConfigInterop (11.12.0) - - FirebaseSharedSwift (11.12.0) + - GoogleUtilities/Environment (~> 8.1) + - "GoogleUtilities/NSData+zlib (~> 8.1)" + - FirebaseRemoteConfigInterop (11.15.0) + - FirebaseSharedSwift (11.15.0) - Flutter (1.0.0) - geolocator_apple (1.2.0): - Flutter - - GoogleUtilities/AppDelegateSwizzler (8.0.2): + - FlutterMacOS + - GoogleUtilities/AppDelegateSwizzler (8.1.0): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - GoogleUtilities/Privacy - - GoogleUtilities/Environment (8.0.2): + - GoogleUtilities/Environment (8.1.0): - GoogleUtilities/Privacy - - GoogleUtilities/Logger (8.0.2): + - GoogleUtilities/Logger (8.1.0): - GoogleUtilities/Environment - GoogleUtilities/Privacy - - GoogleUtilities/Network (8.0.2): + - GoogleUtilities/Network (8.1.0): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Privacy - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (8.0.2)": + - "GoogleUtilities/NSData+zlib (8.1.0)": - GoogleUtilities/Privacy - - GoogleUtilities/Privacy (8.0.2) - - GoogleUtilities/Reachability (8.0.2): + - GoogleUtilities/Privacy (8.1.0) + - GoogleUtilities/Reachability (8.1.0): - GoogleUtilities/Logger - GoogleUtilities/Privacy - - GoogleUtilities/UserDefaults (8.0.2): + - GoogleUtilities/UserDefaults (8.1.0): - GoogleUtilities/Logger - GoogleUtilities/Privacy - - GTMSessionFetcher/Core (4.4.0) + - GTMSessionFetcher/Core (4.5.0) - image_picker_ios (0.0.1): - Flutter - package_info_plus (0.4.5): @@ -110,7 +111,7 @@ DEPENDENCIES: - firebase_core (from `.symlinks/plugins/firebase_core/ios`) - firebase_remote_config (from `.symlinks/plugins/firebase_remote_config/ios`) - Flutter (from `Flutter`) - - geolocator_apple (from `.symlinks/plugins/geolocator_apple/ios`) + - geolocator_apple (from `.symlinks/plugins/geolocator_apple/darwin`) - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`) - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) @@ -150,7 +151,7 @@ EXTERNAL SOURCES: Flutter: :path: Flutter geolocator_apple: - :path: ".symlinks/plugins/geolocator_apple/ios" + :path: ".symlinks/plugins/geolocator_apple/darwin" image_picker_ios: :path: ".symlinks/plugins/image_picker_ios/ios" package_info_plus: @@ -168,34 +169,34 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd - Firebase: 1fe1c0a7d9aaea32efe01fbea5f0ebd8d70e53a2 - firebase_auth: d1c3360eacfba7c85b60a720b2555b762ecfabea - firebase_core: 2d4534e7b489907dcede540c835b48981d890943 - firebase_remote_config: c20b15c34b138104c1a971d83ea36bc3dd626ab8 - FirebaseABTesting: dfc10eb6cc08fe3b391ac9e5aa40396d43ea6675 - FirebaseAppCheckInterop: 73b173e5ec45192e2d522ad43f526a82ad10b852 - FirebaseAuth: c4146bdfdc87329f9962babd24dae89373f49a32 - FirebaseAuthInterop: b583210c039a60ed3f1e48865e1f3da44a796595 - FirebaseCore: 8344daef5e2661eb004b177488d6f9f0f24251b7 - FirebaseCoreExtension: 6f357679327f3614e995dc7cf3f2d600bdc774ac - FirebaseCoreInternal: ef4505d2afb1d0ebbc33162cb3795382904b5679 - FirebaseInstallations: 9980995bdd06ec8081dfb6ab364162bdd64245c3 - FirebaseRemoteConfig: 10695bc0ce3b103e3706a5578c43f2a9f69d5aaa - FirebaseRemoteConfigInterop: 82b81fd06ee550cbeff40004e2c106daedf73e38 - FirebaseSharedSwift: d2475748a2d2a36242ed13baa34b2acda846c925 - Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 - geolocator_apple: 1560c3c875af2a412242c7a923e15d0d401966ff - GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d - GTMSessionFetcher: 75b671f9e551e4c49153d4c4f8659ef4f559b970 - image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a + Firebase: d99ac19b909cd2c548339c2241ecd0d1599ab02e + firebase_auth: 50af8366c87bb88c80ebeae62eb60189c7246b9b + firebase_core: 995454a784ff288be5689b796deb9e9fa3601818 + firebase_remote_config: 4dd0f9d900105e8d81a31a26ac1ed949c6d3c74a + FirebaseABTesting: 5e9d432834aebf27ab72100d37af44dfbe8d82f7 + FirebaseAppCheckInterop: 06fe5a3799278ae4667e6c432edd86b1030fa3df + FirebaseAuth: a6575e5fbf46b046c58dc211a28a5fbdd8d4c83b + FirebaseAuthInterop: 7087d7a4ee4bc4de019b2d0c240974ed5d89e2fd + FirebaseCore: efb3893e5b94f32b86e331e3bd6dadf18b66568e + FirebaseCoreExtension: edbd30474b5ccf04e5f001470bdf6ea616af2435 + FirebaseCoreInternal: 9afa45b1159304c963da48addb78275ef701c6b4 + FirebaseInstallations: 317270fec08a5d418fdbc8429282238cab3ac843 + FirebaseRemoteConfig: b496646b82855e174a7f1e354c65e0e913085168 + FirebaseRemoteConfigInterop: 1c6135e8a094cc6368949f5faeeca7ee8948b8aa + FirebaseSharedSwift: e17c654ef1f1a616b0b33054e663ad1035c8fd40 + Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467 + geolocator_apple: ab36aa0e8b7d7a2d7639b3b4e48308394e8cef5e + GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 + GTMSessionFetcher: fc75fc972958dceedee61cb662ae1da7a83a91cf + image_picker_ios: e0ece4aa2a75771a7de3fa735d26d90817041326 package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499 - path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564 + path_provider_foundation: bb55f6dbba17d0dccd6737fe6f7f34fbd0376880 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 RecaptchaInterop: 11e0b637842dfb48308d242afc3f448062325aba share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a - shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7 + shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0 - url_launcher_ios: 694010445543906933d732453a59da0a173ae33d + url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b PODFILE CHECKSUM: 1959d098c91d8a792531a723c4a9d7e9f6a01e38 diff --git a/mobile-apps/client-app/ios/Runner.xcodeproj/project.pbxproj b/mobile-apps/client-app/ios/Runner.xcodeproj/project.pbxproj index 167d0898..c6b3d289 100644 --- a/mobile-apps/client-app/ios/Runner.xcodeproj/project.pbxproj +++ b/mobile-apps/client-app/ios/Runner.xcodeproj/project.pbxproj @@ -45,6 +45,7 @@ /* Begin PBXFileReference section */ 019936F5E5071DEB07C51262 /* 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 = ""; }; + 0BD79811492364B207649E91 /* Pods-RunnerTests.debug-staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug-staging.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug-staging.xcconfig"; 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 = ""; }; 1A35D95C39A234CDD8A30EBA /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -70,12 +71,14 @@ 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; 7E61F543F47D7A473A838524 /* Pods-Runner.profile-dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile-dev.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile-dev.xcconfig"; sourceTree = ""; }; 80A828942D8E071B3D5B9AE2 /* Pods-RunnerTests.release-dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release-dev.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release-dev.xcconfig"; sourceTree = ""; }; + 8B1BF3A4022DC92FE8374944 /* Pods-RunnerTests.profile-staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile-staging.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile-staging.xcconfig"; sourceTree = ""; }; 8BA9DB622D77867F00292546 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; 8BA9DB642D7786E000292546 /* RunnerDebug-prod.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "RunnerDebug-prod.entitlements"; sourceTree = ""; }; 8BBA6BE02D3FC8B500FDA749 /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; 8BBA6BE92D3FCC3000FDA749 /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; 8BBA6BEB2D3FCC5000FDA749 /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; 9037CFB4787ADCC2DCCD4954 /* Pods-RunnerTests.profile-prod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile-prod.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile-prod.xcconfig"; sourceTree = ""; }; + 90552E34C1CD8E7EA7D43B4B /* Pods-RunnerTests.release-staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release-staging.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release-staging.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -85,10 +88,13 @@ 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; A6FE6D7F169B2770774E2C97 /* 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 = ""; }; A94BB3488A3BD82FAF50589E /* 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 = ""; }; + AAD4A6DBF2EA21253512E90B /* Pods-Runner.profile-staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile-staging.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile-staging.xcconfig"; sourceTree = ""; }; AF641B21EDE66D2176CD9528 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; B64E4BE3B75D5115AEA7BB6E /* Pods-RunnerTests.profile-dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile-dev.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile-dev.xcconfig"; sourceTree = ""; }; C55E95D7095124BDD8B73E09 /* 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 = ""; }; C7A55C19D5B55EB6B317ED24 /* Pods-Runner.release-prod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release-prod.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release-prod.xcconfig"; sourceTree = ""; }; + D41C1EC176817CAD195E8E2B /* Pods-Runner.debug-staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug-staging.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug-staging.xcconfig"; sourceTree = ""; }; + DB8FE608218B985972C2AC9D /* Pods-Runner.release-staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release-staging.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release-staging.xcconfig"; sourceTree = ""; }; DCC7808F8209E128F0D6B4AD /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; E34090814D405F121E9A6759 /* Pods-Runner.debug-prod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug-prod.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug-prod.xcconfig"; sourceTree = ""; }; E69AAA5C667B54983322C7AC /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -166,6 +172,12 @@ 80A828942D8E071B3D5B9AE2 /* Pods-RunnerTests.release-dev.xcconfig */, 9037CFB4787ADCC2DCCD4954 /* Pods-RunnerTests.profile-prod.xcconfig */, B64E4BE3B75D5115AEA7BB6E /* Pods-RunnerTests.profile-dev.xcconfig */, + D41C1EC176817CAD195E8E2B /* Pods-Runner.debug-staging.xcconfig */, + DB8FE608218B985972C2AC9D /* Pods-Runner.release-staging.xcconfig */, + AAD4A6DBF2EA21253512E90B /* Pods-Runner.profile-staging.xcconfig */, + 0BD79811492364B207649E91 /* Pods-RunnerTests.debug-staging.xcconfig */, + 90552E34C1CD8E7EA7D43B4B /* Pods-RunnerTests.release-staging.xcconfig */, + 8B1BF3A4022DC92FE8374944 /* Pods-RunnerTests.profile-staging.xcconfig */, ); path = Pods; sourceTree = ""; @@ -293,6 +305,7 @@ 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, E648481602389E2D8F8AC745 /* [CP] Embed Pods Frameworks */, + 813D81FA3CE3C2588A3A04E8 /* FlutterFire: "flutterfire bundle-service-file" */, ); buildRules = ( ); @@ -404,6 +417,24 @@ 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; }; + 813D81FA3CE3C2588A3A04E8 /* FlutterFire: "flutterfire bundle-service-file" */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "FlutterFire: \"flutterfire bundle-service-file\""; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\n#!/bin/bash\nPATH=\"${PATH}:$FLUTTER_ROOT/bin:${PUB_CACHE}/bin:$HOME/.pub-cache/bin\"\nflutterfire bundle-service-file --plist-destination=\"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app\" --build-configuration=${CONFIGURATION} --platform=ios --apple-project-path=\"${SRCROOT}\"\n"; + }; 8BBA6BE72D3FC8D400FDA749 /* copy googleservices */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -467,14 +498,10 @@ inputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - ); name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); - outputPaths = ( - ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; @@ -1229,7 +1256,7 @@ }; BC747CCB2ECC2EAF00D4AE69 /* Debug-staging */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 6052F75B3733BCF63265D19A /* Pods-RunnerTests.debug-dev.xcconfig */; + baseConfigurationReference = 0BD79811492364B207649E91 /* Pods-RunnerTests.debug-staging.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -1329,7 +1356,7 @@ }; BC747CCE2ECC2EB900D4AE69 /* Profile-staging */ = { isa = XCBuildConfiguration; - baseConfigurationReference = B64E4BE3B75D5115AEA7BB6E /* Pods-RunnerTests.profile-dev.xcconfig */; + baseConfigurationReference = 8B1BF3A4022DC92FE8374944 /* Pods-RunnerTests.profile-staging.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -1429,7 +1456,7 @@ }; BC747CD12ECC2EC000D4AE69 /* Release-staging */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 80A828942D8E071B3D5B9AE2 /* Pods-RunnerTests.release-dev.xcconfig */; + baseConfigurationReference = 90552E34C1CD8E7EA7D43B4B /* Pods-RunnerTests.release-staging.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; diff --git a/mobile-apps/client-app/ios/Runner.xcodeproj/xcshareddata/xcschemes/dev.xcscheme b/mobile-apps/client-app/ios/Runner.xcodeproj/xcshareddata/xcschemes/dev.xcscheme index b2261c59..eed3f671 100644 --- a/mobile-apps/client-app/ios/Runner.xcodeproj/xcshareddata/xcschemes/dev.xcscheme +++ b/mobile-apps/client-app/ios/Runner.xcodeproj/xcshareddata/xcschemes/dev.xcscheme @@ -27,6 +27,7 @@ buildConfiguration = "Debug-dev" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit" shouldUseLaunchSchemeArgsEnv = "YES" shouldAutocreateTestPlan = "YES"> @@ -34,6 +35,7 @@ buildConfiguration = "Debug-dev" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/mobile-apps/client-app/lib/firebase_options_dev.dart b/mobile-apps/client-app/lib/firebase_options_dev.dart index 5a991808..0aaff462 100644 --- a/mobile-apps/client-app/lib/firebase_options_dev.dart +++ b/mobile-apps/client-app/lib/firebase_options_dev.dart @@ -66,4 +66,5 @@ class DefaultFirebaseOptions { iosClientId: '933560802882-ml2526jqnnsteent4i9li50c00hisoge.apps.googleusercontent.com', iosBundleId: 'com.krow.app.business.dev', ); -} + +} \ No newline at end of file diff --git a/mobile-apps/client-app/lib/firebase_options_staging.dart b/mobile-apps/client-app/lib/firebase_options_staging.dart index b95107f7..d913e995 100644 --- a/mobile-apps/client-app/lib/firebase_options_staging.dart +++ b/mobile-apps/client-app/lib/firebase_options_staging.dart @@ -65,4 +65,5 @@ class DefaultFirebaseOptions { storageBucket: 'krow-workforce-staging.firebasestorage.app', iosBundleId: 'com.krow.app.business.staging', ); -} + +} \ No newline at end of file diff --git a/mobile-apps/client-app/pubspec.yaml b/mobile-apps/client-app/pubspec.yaml index 8171d08e..e871a142 100644 --- a/mobile-apps/client-app/pubspec.yaml +++ b/mobile-apps/client-app/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: 'none' version: 1.0.36+116 environment: - sdk: ^3.5.4 + sdk: ^3.8.0 dependencies: flutter: diff --git a/mobile-apps/staff-app/Makefile b/mobile-apps/staff-app/Makefile deleted file mode 100644 index 458f808a..00000000 --- a/mobile-apps/staff-app/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -DEFAULT := $code_gen - -code_gen: - @echo "Running dart build_runner" - dart run build_runner build --delete-conflicting-outputs diff --git a/mobile-apps/staff-app/pubspec.lock b/mobile-apps/staff-app/pubspec.lock index ff815acd..9ab72b8b 100644 --- a/mobile-apps/staff-app/pubspec.lock +++ b/mobile-apps/staff-app/pubspec.lock @@ -1932,5 +1932,5 @@ packages: source: hosted version: "3.1.3" sdks: - dart: ">=3.8.0-0 <4.0.0" + dart: ">=3.8.0 <4.0.0" flutter: ">=3.27.0" diff --git a/mobile-apps/staff-app/pubspec.yaml b/mobile-apps/staff-app/pubspec.yaml index 1e04f871..fb104998 100644 --- a/mobile-apps/staff-app/pubspec.yaml +++ b/mobile-apps/staff-app/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: 'none' version: 1.0.28+111 environment: - sdk: ^3.5.4 + sdk: ^3.8.0 dependencies: flutter: