Skip to content

Commit c30d798

Browse files
committed
Update to latest packages, fix analysis errors
1 parent 5c89af1 commit c30d798

File tree

9 files changed

+231
-240
lines changed

9 files changed

+231
-240
lines changed

ios/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelpe
2828
flutter_ios_podfile_setup
2929

3030
target 'Runner' do
31-
pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :tag => '10.9.0'
31+
pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :tag => '10.15.0'
3232
use_frameworks!
3333
use_modular_headers!
3434

ios/Podfile.lock

Lines changed: 54 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,81 @@
11
PODS:
2-
- cloud_firestore (4.7.1):
3-
- Firebase/Firestore (= 10.9.0)
2+
- cloud_firestore (4.9.2):
3+
- Firebase/Firestore (= 10.15.0)
44
- firebase_core
55
- Flutter
66
- nanopb (< 2.30910.0, >= 2.30908.0)
77
- desktop_webview_auth (0.0.1):
88
- Flutter
9-
- Firebase/Auth (10.9.0):
9+
- Firebase/Auth (10.15.0):
1010
- Firebase/CoreOnly
11-
- FirebaseAuth (~> 10.9.0)
12-
- Firebase/CoreOnly (10.9.0):
13-
- FirebaseCore (= 10.9.0)
14-
- Firebase/DynamicLinks (10.9.0):
11+
- FirebaseAuth (~> 10.15.0)
12+
- Firebase/CoreOnly (10.15.0):
13+
- FirebaseCore (= 10.15.0)
14+
- Firebase/DynamicLinks (10.15.0):
1515
- Firebase/CoreOnly
16-
- FirebaseDynamicLinks (~> 10.9.0)
17-
- Firebase/Firestore (10.9.0):
16+
- FirebaseDynamicLinks (~> 10.15.0)
17+
- Firebase/Firestore (10.15.0):
1818
- Firebase/CoreOnly
19-
- FirebaseFirestore (~> 10.9.0)
20-
- firebase_auth (4.6.1):
21-
- Firebase/Auth (= 10.9.0)
19+
- FirebaseFirestore (~> 10.15.0)
20+
- firebase_auth (4.10.0):
21+
- Firebase/Auth (= 10.15.0)
2222
- firebase_core
2323
- Flutter
24-
- firebase_core (2.13.0):
25-
- Firebase/CoreOnly (= 10.9.0)
24+
- firebase_core (2.16.0):
25+
- Firebase/CoreOnly (= 10.15.0)
2626
- Flutter
27-
- firebase_dynamic_links (5.3.0):
28-
- Firebase/DynamicLinks (= 10.9.0)
27+
- firebase_dynamic_links (5.3.6):
28+
- Firebase/DynamicLinks (= 10.15.0)
2929
- firebase_core
3030
- Flutter
31-
- FirebaseAppCheckInterop (10.10.0)
32-
- FirebaseAuth (10.9.0):
31+
- FirebaseAppCheckInterop (10.15.0)
32+
- FirebaseAuth (10.15.0):
3333
- FirebaseAppCheckInterop (~> 10.0)
3434
- FirebaseCore (~> 10.0)
3535
- GoogleUtilities/AppDelegateSwizzler (~> 7.8)
3636
- GoogleUtilities/Environment (~> 7.8)
3737
- GTMSessionFetcher/Core (< 4.0, >= 2.1)
38-
- FirebaseCore (10.9.0):
38+
- RecaptchaInterop (~> 100.0)
39+
- FirebaseCore (10.15.0):
3940
- FirebaseCoreInternal (~> 10.0)
4041
- GoogleUtilities/Environment (~> 7.8)
4142
- GoogleUtilities/Logger (~> 7.8)
42-
- FirebaseCoreInternal (10.10.0):
43+
- FirebaseCoreInternal (10.15.0):
4344
- "GoogleUtilities/NSData+zlib (~> 7.8)"
44-
- FirebaseDynamicLinks (10.9.0):
45+
- FirebaseDynamicLinks (10.15.0):
4546
- FirebaseCore (~> 10.0)
46-
- FirebaseFirestore (10.9.0):
47-
- FirebaseFirestore/AutodetectLeveldb (= 10.9.0)
48-
- FirebaseFirestore/AutodetectLeveldb (10.9.0):
47+
- FirebaseFirestore (10.15.0):
48+
- FirebaseFirestore/AutodetectLeveldb (= 10.15.0)
49+
- FirebaseFirestore/AutodetectLeveldb (10.15.0):
4950
- FirebaseFirestore/Base
5051
- FirebaseFirestore/WithLeveldb
51-
- FirebaseFirestore/Base (10.9.0)
52-
- FirebaseFirestore/WithLeveldb (10.9.0):
52+
- FirebaseFirestore/Base (10.15.0)
53+
- FirebaseFirestore/WithLeveldb (10.15.0):
5354
- FirebaseFirestore/Base
5455
- Flutter (1.0.0)
55-
- GoogleUtilities/AppDelegateSwizzler (7.11.1):
56+
- GoogleUtilities/AppDelegateSwizzler (7.11.5):
5657
- GoogleUtilities/Environment
5758
- GoogleUtilities/Logger
5859
- GoogleUtilities/Network
59-
- GoogleUtilities/Environment (7.11.1):
60+
- GoogleUtilities/Environment (7.11.5):
6061
- PromisesObjC (< 3.0, >= 1.2)
61-
- GoogleUtilities/Logger (7.11.1):
62+
- GoogleUtilities/Logger (7.11.5):
6263
- GoogleUtilities/Environment
63-
- GoogleUtilities/Network (7.11.1):
64+
- GoogleUtilities/Network (7.11.5):
6465
- GoogleUtilities/Logger
6566
- "GoogleUtilities/NSData+zlib"
6667
- GoogleUtilities/Reachability
67-
- "GoogleUtilities/NSData+zlib (7.11.1)"
68-
- GoogleUtilities/Reachability (7.11.1):
68+
- "GoogleUtilities/NSData+zlib (7.11.5)"
69+
- GoogleUtilities/Reachability (7.11.5):
6970
- GoogleUtilities/Logger
7071
- GTMSessionFetcher/Core (3.1.1)
7172
- nanopb (2.30909.0):
7273
- nanopb/decode (= 2.30909.0)
7374
- nanopb/encode (= 2.30909.0)
7475
- nanopb/decode (2.30909.0)
7576
- nanopb/encode (2.30909.0)
76-
- PromisesObjC (2.2.0)
77+
- PromisesObjC (2.3.1)
78+
- RecaptchaInterop (100.0.0)
7779
- shared_preferences_foundation (0.0.1):
7880
- Flutter
7981
- FlutterMacOS
@@ -84,7 +86,7 @@ DEPENDENCIES:
8486
- firebase_auth (from `.symlinks/plugins/firebase_auth/ios`)
8587
- firebase_core (from `.symlinks/plugins/firebase_core/ios`)
8688
- firebase_dynamic_links (from `.symlinks/plugins/firebase_dynamic_links/ios`)
87-
- FirebaseFirestore (from `https://github.com/invertase/firestore-ios-sdk-frameworks.git`, tag `10.9.0`)
89+
- FirebaseFirestore (from `https://github.com/invertase/firestore-ios-sdk-frameworks.git`, tag `10.15.0`)
8890
- Flutter (from `Flutter`)
8991
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
9092

@@ -100,6 +102,7 @@ SPEC REPOS:
100102
- GTMSessionFetcher
101103
- nanopb
102104
- PromisesObjC
105+
- RecaptchaInterop
103106

104107
EXTERNAL SOURCES:
105108
cloud_firestore:
@@ -114,7 +117,7 @@ EXTERNAL SOURCES:
114117
:path: ".symlinks/plugins/firebase_dynamic_links/ios"
115118
FirebaseFirestore:
116119
:git: https://github.com/invertase/firestore-ios-sdk-frameworks.git
117-
:tag: 10.9.0
120+
:tag: 10.15.0
118121
Flutter:
119122
:path: Flutter
120123
shared_preferences_foundation:
@@ -123,28 +126,29 @@ EXTERNAL SOURCES:
123126
CHECKOUT OPTIONS:
124127
FirebaseFirestore:
125128
:git: https://github.com/invertase/firestore-ios-sdk-frameworks.git
126-
:tag: 10.9.0
129+
:tag: 10.15.0
127130

128131
SPEC CHECKSUMS:
129-
cloud_firestore: f9951b7475ab483af80514228921edbef7109fff
132+
cloud_firestore: ac000d8c5a79d57dc69238ea06bb422880fb825e
130133
desktop_webview_auth: d645139460ef203d50bd0cdb33356785dd939cce
131-
Firebase: bd152f0f3d278c4060c5c71359db08ebcfd5a3e2
132-
firebase_auth: 202fb0b14e267d2a91d83b75d0ce064ef2063383
133-
firebase_core: fc68c0f9eec4e800b9418deff14a7e0a504016f3
134-
firebase_dynamic_links: cc52d37f59a53c3d9f00557fb082aae96d286859
135-
FirebaseAppCheckInterop: 7d3521f56872cf74a01792c0a095a30e054ff6ae
136-
FirebaseAuth: 21d5e902fcea44d0d961540fc4742966ae6118cc
137-
FirebaseCore: b68d3616526ec02e4d155166bbafb8eca64af557
138-
FirebaseCoreInternal: 971029061d326000d65bfdc21f5502c75c8b0893
139-
FirebaseDynamicLinks: 8cb66c4f403aa6ddf86ff3bc3c383a652f344ce9
140-
FirebaseFirestore: 8418f3a8d5892bf386b05d5f988b6e7e253a2ea6
134+
Firebase: 66043bd4579e5b73811f96829c694c7af8d67435
135+
firebase_auth: ca31bca59224dc727ea0df7f066f30158a8acc3b
136+
firebase_core: 77172d0a9d8d19d07606e24406e4c2fc14d3265b
137+
firebase_dynamic_links: 27625ac999a9353d6e323c07db85c3b55c5c6839
138+
FirebaseAppCheckInterop: a8c555b1c2db1d9445e6c3a08a848167ddb7eb51
139+
FirebaseAuth: a55ec5f7f8a5b1c2dd750235c1bb419bfb642445
140+
FirebaseCore: 2cec518b43635f96afe7ac3a9c513e47558abd2e
141+
FirebaseCoreInternal: 2f4bee5ed00301b5e56da0849268797a2dd31fb4
142+
FirebaseDynamicLinks: 206d4ed3efd2b722822598017f3980d9fda89815
143+
FirebaseFirestore: 58d92e3cc19fd1c93e279d466aaf148ce6dbf635
141144
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
142-
GoogleUtilities: 9aa0ad5a7bc171f8bae016300bfcfa3fb8425749
145+
GoogleUtilities: 13e2c67ede716b8741c7989e26893d151b2b2084
143146
GTMSessionFetcher: e8647203b65cee28c5f73d0f473d096653945e72
144147
nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431
145-
PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef
148+
PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4
149+
RecaptchaInterop: 7d1a4a01a6b2cb1610a47ef3f85f0c411434cb21
146150
shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c
147151

148-
PODFILE CHECKSUM: d917d8949c4799edb1ff5b2ec63705a1ec2d325f
152+
PODFILE CHECKSUM: d097549f564d280cd329fcd2f0263416d4c467f8
149153

150154
COCOAPODS: 1.12.1

lib/main.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
//import 'package:auth_widget_builder/auth_widget_builder.dart';
21
import 'package:firebase_core/firebase_core.dart';
32
import 'package:flutter/foundation.dart';
43
import 'package:flutter/material.dart';

lib/src/routing/app_router.dart

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,22 +49,23 @@ GoRouter goRouter(GoRouterRef ref) {
4949
debugLogDiagnostics: true,
5050
redirect: (context, state) {
5151
final didCompleteOnboarding = onboardingRepository.isOnboardingComplete();
52+
final path = state.uri.path;
5253
if (!didCompleteOnboarding) {
5354
// Always check state.subloc before returning a non-null route
5455
// https://github.com/flutter/packages/blob/main/packages/go_router/example/lib/redirection.dart#L78
55-
if (state.location != '/onboarding') {
56+
if (path != '/onboarding') {
5657
return '/onboarding';
5758
}
5859
}
5960
final isLoggedIn = authRepository.currentUser != null;
6061
if (isLoggedIn) {
61-
if (state.location.startsWith('/signIn')) {
62+
if (path.startsWith('/signIn')) {
6263
return '/jobs';
6364
}
6465
} else {
65-
if (state.location.startsWith('/jobs') ||
66-
state.location.startsWith('/entries') ||
67-
state.location.startsWith('/account')) {
66+
if (path.startsWith('/jobs') ||
67+
path.startsWith('/entries') ||
68+
path.startsWith('/account')) {
6869
return '/signIn';
6970
}
7071
}

macos/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelpe
2727
flutter_macos_podfile_setup
2828

2929
target 'Runner' do
30-
pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :tag => '10.9.0'
30+
pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :tag => '10.15.0'
3131
use_frameworks!
3232
use_modular_headers!
3333

macos/Podfile.lock

Lines changed: 46 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,73 @@
11
PODS:
2-
- cloud_firestore (4.7.1):
3-
- Firebase/CoreOnly (~> 10.9.0)
4-
- Firebase/Firestore (~> 10.9.0)
2+
- cloud_firestore (4.9.2):
3+
- Firebase/CoreOnly (~> 10.15.0)
4+
- Firebase/Firestore (~> 10.15.0)
55
- firebase_core
66
- FlutterMacOS
77
- nanopb (< 2.30910.0, >= 2.30908.0)
88
- desktop_webview_auth (0.0.1):
99
- FlutterMacOS
10-
- Firebase/Auth (10.9.0):
10+
- Firebase/Auth (10.15.0):
1111
- Firebase/CoreOnly
12-
- FirebaseAuth (~> 10.9.0)
13-
- Firebase/CoreOnly (10.9.0):
14-
- FirebaseCore (= 10.9.0)
15-
- Firebase/Firestore (10.9.0):
12+
- FirebaseAuth (~> 10.15.0)
13+
- Firebase/CoreOnly (10.15.0):
14+
- FirebaseCore (= 10.15.0)
15+
- Firebase/Firestore (10.15.0):
1616
- Firebase/CoreOnly
17-
- FirebaseFirestore (~> 10.9.0)
18-
- firebase_auth (4.6.1):
19-
- Firebase/Auth (~> 10.9.0)
20-
- Firebase/CoreOnly (~> 10.9.0)
17+
- FirebaseFirestore (~> 10.15.0)
18+
- firebase_auth (4.10.0):
19+
- Firebase/Auth (~> 10.15.0)
20+
- Firebase/CoreOnly (~> 10.15.0)
2121
- firebase_core
2222
- FlutterMacOS
23-
- firebase_core (2.13.0):
24-
- Firebase/CoreOnly (~> 10.9.0)
23+
- firebase_core (2.16.0):
24+
- Firebase/CoreOnly (~> 10.15.0)
2525
- FlutterMacOS
26-
- FirebaseAppCheckInterop (10.10.0)
27-
- FirebaseAuth (10.9.0):
26+
- FirebaseAppCheckInterop (10.15.0)
27+
- FirebaseAuth (10.15.0):
2828
- FirebaseAppCheckInterop (~> 10.0)
2929
- FirebaseCore (~> 10.0)
3030
- GoogleUtilities/AppDelegateSwizzler (~> 7.8)
3131
- GoogleUtilities/Environment (~> 7.8)
3232
- GTMSessionFetcher/Core (< 4.0, >= 2.1)
33-
- FirebaseCore (10.9.0):
33+
- RecaptchaInterop (~> 100.0)
34+
- FirebaseCore (10.15.0):
3435
- FirebaseCoreInternal (~> 10.0)
3536
- GoogleUtilities/Environment (~> 7.8)
3637
- GoogleUtilities/Logger (~> 7.8)
37-
- FirebaseCoreInternal (10.10.0):
38+
- FirebaseCoreInternal (10.15.0):
3839
- "GoogleUtilities/NSData+zlib (~> 7.8)"
39-
- FirebaseFirestore (10.9.0):
40-
- FirebaseFirestore/AutodetectLeveldb (= 10.9.0)
41-
- FirebaseFirestore/AutodetectLeveldb (10.9.0):
40+
- FirebaseFirestore (10.15.0):
41+
- FirebaseFirestore/AutodetectLeveldb (= 10.15.0)
42+
- FirebaseFirestore/AutodetectLeveldb (10.15.0):
4243
- FirebaseFirestore/Base
4344
- FirebaseFirestore/WithLeveldb
44-
- FirebaseFirestore/Base (10.9.0)
45-
- FirebaseFirestore/WithLeveldb (10.9.0):
45+
- FirebaseFirestore/Base (10.15.0)
46+
- FirebaseFirestore/WithLeveldb (10.15.0):
4647
- FirebaseFirestore/Base
4748
- FlutterMacOS (1.0.0)
48-
- GoogleUtilities/AppDelegateSwizzler (7.11.1):
49+
- GoogleUtilities/AppDelegateSwizzler (7.11.5):
4950
- GoogleUtilities/Environment
5051
- GoogleUtilities/Logger
5152
- GoogleUtilities/Network
52-
- GoogleUtilities/Environment (7.11.1):
53+
- GoogleUtilities/Environment (7.11.5):
5354
- PromisesObjC (< 3.0, >= 1.2)
54-
- GoogleUtilities/Logger (7.11.1):
55+
- GoogleUtilities/Logger (7.11.5):
5556
- GoogleUtilities/Environment
56-
- GoogleUtilities/Network (7.11.1):
57+
- GoogleUtilities/Network (7.11.5):
5758
- GoogleUtilities/Logger
5859
- "GoogleUtilities/NSData+zlib"
5960
- GoogleUtilities/Reachability
60-
- "GoogleUtilities/NSData+zlib (7.11.1)"
61-
- GoogleUtilities/Reachability (7.11.1):
61+
- "GoogleUtilities/NSData+zlib (7.11.5)"
62+
- GoogleUtilities/Reachability (7.11.5):
6263
- GoogleUtilities/Logger
6364
- GTMSessionFetcher/Core (3.1.1)
6465
- nanopb (2.30909.0):
6566
- nanopb/decode (= 2.30909.0)
6667
- nanopb/encode (= 2.30909.0)
6768
- nanopb/decode (2.30909.0)
6869
- nanopb/encode (2.30909.0)
69-
- PromisesObjC (2.2.0)
70+
- PromisesObjC (2.3.1)
7071
- shared_preferences_foundation (0.0.1):
7172
- Flutter
7273
- FlutterMacOS
@@ -76,7 +77,7 @@ DEPENDENCIES:
7677
- desktop_webview_auth (from `Flutter/ephemeral/.symlinks/plugins/desktop_webview_auth/macos`)
7778
- firebase_auth (from `Flutter/ephemeral/.symlinks/plugins/firebase_auth/macos`)
7879
- firebase_core (from `Flutter/ephemeral/.symlinks/plugins/firebase_core/macos`)
79-
- FirebaseFirestore (from `https://github.com/invertase/firestore-ios-sdk-frameworks.git`, tag `10.9.0`)
80+
- FirebaseFirestore (from `https://github.com/invertase/firestore-ios-sdk-frameworks.git`, tag `10.15.0`)
8081
- FlutterMacOS (from `Flutter/ephemeral`)
8182
- shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`)
8283

@@ -103,7 +104,7 @@ EXTERNAL SOURCES:
103104
:path: Flutter/ephemeral/.symlinks/plugins/firebase_core/macos
104105
FirebaseFirestore:
105106
:git: https://github.com/invertase/firestore-ios-sdk-frameworks.git
106-
:tag: 10.9.0
107+
:tag: 10.15.0
107108
FlutterMacOS:
108109
:path: Flutter/ephemeral
109110
shared_preferences_foundation:
@@ -112,26 +113,26 @@ EXTERNAL SOURCES:
112113
CHECKOUT OPTIONS:
113114
FirebaseFirestore:
114115
:git: https://github.com/invertase/firestore-ios-sdk-frameworks.git
115-
:tag: 10.9.0
116+
:tag: 10.15.0
116117

117118
SPEC CHECKSUMS:
118-
cloud_firestore: b0993cb852e4da90c4297bcedac4b931e72847f5
119+
cloud_firestore: 3739580377753fa1860eee217ca8e5c816ddf365
119120
desktop_webview_auth: 9bba53a29c9bc6a4ff621fd0ebfbb18856c4dada
120-
Firebase: bd152f0f3d278c4060c5c71359db08ebcfd5a3e2
121-
firebase_auth: 6fc0967d98c2ff489d3e2977c9e9f52a5b69eb22
122-
firebase_core: feb9ea6e23cfb6d4961cd2abeec1b79b47790b8d
123-
FirebaseAppCheckInterop: 7d3521f56872cf74a01792c0a095a30e054ff6ae
124-
FirebaseAuth: 21d5e902fcea44d0d961540fc4742966ae6118cc
125-
FirebaseCore: b68d3616526ec02e4d155166bbafb8eca64af557
126-
FirebaseCoreInternal: 971029061d326000d65bfdc21f5502c75c8b0893
127-
FirebaseFirestore: 8418f3a8d5892bf386b05d5f988b6e7e253a2ea6
121+
Firebase: 66043bd4579e5b73811f96829c694c7af8d67435
122+
firebase_auth: 3aa31e1997141eadf1d3518e67162bbfa498300c
123+
firebase_core: 4d49ac49b029aa297ba35d8137947478528550c2
124+
FirebaseAppCheckInterop: a8c555b1c2db1d9445e6c3a08a848167ddb7eb51
125+
FirebaseAuth: a55ec5f7f8a5b1c2dd750235c1bb419bfb642445
126+
FirebaseCore: 2cec518b43635f96afe7ac3a9c513e47558abd2e
127+
FirebaseCoreInternal: 2f4bee5ed00301b5e56da0849268797a2dd31fb4
128+
FirebaseFirestore: 58d92e3cc19fd1c93e279d466aaf148ce6dbf635
128129
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
129-
GoogleUtilities: 9aa0ad5a7bc171f8bae016300bfcfa3fb8425749
130+
GoogleUtilities: 13e2c67ede716b8741c7989e26893d151b2b2084
130131
GTMSessionFetcher: e8647203b65cee28c5f73d0f473d096653945e72
131132
nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431
132-
PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef
133+
PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4
133134
shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c
134135

135-
PODFILE CHECKSUM: 5ee51d19d6f83e130d7f1f4d8ecbfe714408529a
136+
PODFILE CHECKSUM: b477cd12d8daead150cac140e50a54338c0e6dac
136137

137138
COCOAPODS: 1.12.1

0 commit comments

Comments
 (0)