Skip to content

Commit 02fd565

Browse files
lamonflylamonfly
authored
Merge pull request #70 from nventive/dev/febr/update-flutter-3.35
feat: update flutter to 3.35.6 and use navbar m3
2 parents eb3dc53 + 9539009 commit 02fd565

File tree

16 files changed

+393
-385
lines changed

16 files changed

+393
-385
lines changed

‎build/variables.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
ProjectName: FlutterApplicationTemplate
6363

6464
# Flutter version.
65-
FlutterVersion: '3.27.3'
65+
FlutterVersion: '3.35.6'
6666

6767
# Docker container to run MobSF.
6868
DockerVersion: '25.0.5'

‎src/app/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
*.swp
66
.DS_Store
77
.atom/
8+
.build/
89
.buildlog/
910
.history
1011
.svn/
12+
.swiftpm/
1113
migrate_working_dir/
1214

1315
# IntelliJ related

‎src/app/android/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ if (keystorePropertiesFile.exists()) {
3434
android {
3535
namespace "com.nventive.internal.flutterapptemplate"
3636
compileSdk flutter.compileSdkVersion
37-
ndkVersion "27.0.12077973"
37+
ndkVersion flutter.ndkVersion
3838

3939
compileOptions {
4040
sourceCompatibility JavaVersion.VERSION_1_8
@@ -79,5 +79,5 @@ flutter {
7979
}
8080

8181
dependencies {
82-
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.2'
82+
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
8383
}

‎src/app/ios/Podfile.lock‎

Lines changed: 97 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,94 @@
11
PODS:
2-
- Bugsee (5.5.5)
3-
- bugsee_flutter (8.5.0):
4-
- Bugsee (= 5.5.5)
2+
- Bugsee (5.5.8)
3+
- bugsee_flutter (8.6.8):
4+
- Bugsee (= 5.5.8)
55
- Flutter
6-
- Firebase/Analytics (11.0.0):
7-
- Firebase/Core
8-
- Firebase/Core (11.0.0):
6+
- Firebase/CoreOnly (12.4.0):
7+
- FirebaseCore (~> 12.4.0)
8+
- Firebase/RemoteConfig (12.4.0):
99
- Firebase/CoreOnly
10-
- FirebaseAnalytics (~> 11.0.0)
11-
- Firebase/CoreOnly (11.0.0):
12-
- FirebaseCore (= 11.0.0)
13-
- Firebase/RemoteConfig (11.0.0):
14-
- Firebase/CoreOnly
15-
- FirebaseRemoteConfig (~> 11.0.0)
16-
- firebase_analytics (11.3.0):
17-
- Firebase/Analytics (= 11.0.0)
10+
- FirebaseRemoteConfig (~> 12.4.0)
11+
- firebase_analytics (12.0.4):
1812
- firebase_core
13+
- FirebaseAnalytics (= 12.4.0)
1914
- Flutter
20-
- firebase_core (3.4.0):
21-
- Firebase/CoreOnly (= 11.0.0)
15+
- firebase_core (4.2.1):
16+
- Firebase/CoreOnly (= 12.4.0)
2217
- Flutter
23-
- firebase_remote_config (5.1.0):
24-
- Firebase/RemoteConfig (= 11.0.0)
18+
- firebase_remote_config (6.1.1):
19+
- Firebase/RemoteConfig (= 12.4.0)
2520
- firebase_core
2621
- Flutter
27-
- FirebaseABTesting (11.4.0):
28-
- FirebaseCore (~> 11.0)
29-
- FirebaseAnalytics (11.0.0):
30-
- FirebaseAnalytics/AdIdSupport (= 11.0.0)
31-
- FirebaseCore (~> 11.0)
32-
- FirebaseInstallations (~> 11.0)
33-
- GoogleUtilities/AppDelegateSwizzler (~> 8.0)
34-
- GoogleUtilities/MethodSwizzler (~> 8.0)
35-
- GoogleUtilities/Network (~> 8.0)
36-
- "GoogleUtilities/NSData+zlib (~> 8.0)"
22+
- FirebaseABTesting (12.4.0):
23+
- FirebaseCore (~> 12.4.0)
24+
- FirebaseAnalytics (12.4.0):
25+
- FirebaseAnalytics/Default (= 12.4.0)
26+
- FirebaseCore (~> 12.4.0)
27+
- FirebaseInstallations (~> 12.4.0)
28+
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
29+
- GoogleUtilities/MethodSwizzler (~> 8.1)
30+
- GoogleUtilities/Network (~> 8.1)
31+
- "GoogleUtilities/NSData+zlib (~> 8.1)"
3732
- nanopb (~> 3.30910.0)
38-
- FirebaseAnalytics/AdIdSupport (11.0.0):
39-
- FirebaseCore (~> 11.0)
40-
- FirebaseInstallations (~> 11.0)
41-
- GoogleAppMeasurement (= 11.0.0)
42-
- GoogleUtilities/AppDelegateSwizzler (~> 8.0)
43-
- GoogleUtilities/MethodSwizzler (~> 8.0)
44-
- GoogleUtilities/Network (~> 8.0)
45-
- "GoogleUtilities/NSData+zlib (~> 8.0)"
33+
- FirebaseAnalytics/Default (12.4.0):
34+
- FirebaseCore (~> 12.4.0)
35+
- FirebaseInstallations (~> 12.4.0)
36+
- GoogleAppMeasurement/Default (= 12.4.0)
37+
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
38+
- GoogleUtilities/MethodSwizzler (~> 8.1)
39+
- GoogleUtilities/Network (~> 8.1)
40+
- "GoogleUtilities/NSData+zlib (~> 8.1)"
4641
- nanopb (~> 3.30910.0)
47-
- FirebaseCore (11.0.0):
48-
- FirebaseCoreInternal (~> 11.0)
49-
- GoogleUtilities/Environment (~> 8.0)
50-
- GoogleUtilities/Logger (~> 8.0)
51-
- FirebaseCoreInternal (11.15.0):
42+
- FirebaseCore (12.4.0):
43+
- FirebaseCoreInternal (~> 12.4.0)
44+
- GoogleUtilities/Environment (~> 8.1)
45+
- GoogleUtilities/Logger (~> 8.1)
46+
- FirebaseCoreInternal (12.4.0):
5247
- "GoogleUtilities/NSData+zlib (~> 8.1)"
53-
- FirebaseInstallations (11.4.0):
54-
- FirebaseCore (~> 11.0)
55-
- GoogleUtilities/Environment (~> 8.0)
56-
- GoogleUtilities/UserDefaults (~> 8.0)
48+
- FirebaseInstallations (12.4.0):
49+
- FirebaseCore (~> 12.4.0)
50+
- GoogleUtilities/Environment (~> 8.1)
51+
- GoogleUtilities/UserDefaults (~> 8.1)
5752
- PromisesObjC (~> 2.4)
58-
- FirebaseRemoteConfig (11.0.0):
59-
- FirebaseABTesting (~> 11.0)
60-
- FirebaseCore (~> 11.0)
61-
- FirebaseInstallations (~> 11.0)
62-
- FirebaseRemoteConfigInterop (~> 11.0)
63-
- FirebaseSharedSwift (~> 11.0)
64-
- GoogleUtilities/Environment (~> 8.0)
65-
- "GoogleUtilities/NSData+zlib (~> 8.0)"
66-
- FirebaseRemoteConfigInterop (11.15.0)
67-
- FirebaseSharedSwift (11.15.0)
53+
- FirebaseRemoteConfig (12.4.0):
54+
- FirebaseABTesting (~> 12.4.0)
55+
- FirebaseCore (~> 12.4.0)
56+
- FirebaseInstallations (~> 12.4.0)
57+
- FirebaseRemoteConfigInterop (~> 12.4.0)
58+
- FirebaseSharedSwift (~> 12.4.0)
59+
- GoogleUtilities/Environment (~> 8.1)
60+
- "GoogleUtilities/NSData+zlib (~> 8.1)"
61+
- FirebaseRemoteConfigInterop (12.4.0)
62+
- FirebaseSharedSwift (12.4.0)
6863
- Flutter (1.0.0)
6964
- flutter_local_notifications (0.0.1):
7065
- Flutter
71-
- GoogleAppMeasurement (11.0.0):
72-
- GoogleAppMeasurement/AdIdSupport (= 11.0.0)
73-
- GoogleUtilities/AppDelegateSwizzler (~> 8.0)
74-
- GoogleUtilities/MethodSwizzler (~> 8.0)
75-
- GoogleUtilities/Network (~> 8.0)
76-
- "GoogleUtilities/NSData+zlib (~> 8.0)"
66+
- GoogleAdsOnDeviceConversion (3.1.0):
67+
- GoogleUtilities/Environment (~> 8.1)
68+
- GoogleUtilities/Logger (~> 8.1)
69+
- GoogleUtilities/Network (~> 8.1)
7770
- nanopb (~> 3.30910.0)
78-
- GoogleAppMeasurement/AdIdSupport (11.0.0):
79-
- GoogleAppMeasurement/WithoutAdIdSupport (= 11.0.0)
80-
- GoogleUtilities/AppDelegateSwizzler (~> 8.0)
81-
- GoogleUtilities/MethodSwizzler (~> 8.0)
82-
- GoogleUtilities/Network (~> 8.0)
83-
- "GoogleUtilities/NSData+zlib (~> 8.0)"
71+
- GoogleAppMeasurement/Core (12.4.0):
72+
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
73+
- GoogleUtilities/MethodSwizzler (~> 8.1)
74+
- GoogleUtilities/Network (~> 8.1)
75+
- "GoogleUtilities/NSData+zlib (~> 8.1)"
76+
- nanopb (~> 3.30910.0)
77+
- GoogleAppMeasurement/Default (12.4.0):
78+
- GoogleAdsOnDeviceConversion (~> 3.1.0)
79+
- GoogleAppMeasurement/Core (= 12.4.0)
80+
- GoogleAppMeasurement/IdentitySupport (= 12.4.0)
81+
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
82+
- GoogleUtilities/MethodSwizzler (~> 8.1)
83+
- GoogleUtilities/Network (~> 8.1)
84+
- "GoogleUtilities/NSData+zlib (~> 8.1)"
8485
- nanopb (~> 3.30910.0)
85-
- GoogleAppMeasurement/WithoutAdIdSupport (11.0.0):
86-
- GoogleUtilities/AppDelegateSwizzler (~> 8.0)
87-
- GoogleUtilities/MethodSwizzler (~> 8.0)
88-
- GoogleUtilities/Network (~> 8.0)
89-
- "GoogleUtilities/NSData+zlib (~> 8.0)"
86+
- GoogleAppMeasurement/IdentitySupport (12.4.0):
87+
- GoogleAppMeasurement/Core (= 12.4.0)
88+
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
89+
- GoogleUtilities/MethodSwizzler (~> 8.1)
90+
- GoogleUtilities/Network (~> 8.1)
91+
- "GoogleUtilities/NSData+zlib (~> 8.1)"
9092
- nanopb (~> 3.30910.0)
9193
- GoogleUtilities/AppDelegateSwizzler (8.1.0):
9294
- GoogleUtilities/Environment
@@ -171,6 +173,7 @@ SPEC REPOS:
171173
- FirebaseRemoteConfig
172174
- FirebaseRemoteConfigInterop
173175
- FirebaseSharedSwift
176+
- GoogleAdsOnDeviceConversion
174177
- GoogleAppMeasurement
175178
- GoogleUtilities
176179
- nanopb
@@ -209,35 +212,36 @@ EXTERNAL SOURCES:
209212
:path: ".symlinks/plugins/url_launcher_ios/ios"
210213

211214
SPEC CHECKSUMS:
212-
Bugsee: fe3441494bd6bd8f3f555105ebbba0593e9f1e1c
213-
bugsee_flutter: a2f080e69679201a7d9bbe361dc2c23e3fae7d19
214-
Firebase: 9f574c08c2396885b5e7e100ed4293d956218af9
215-
firebase_analytics: 2090f32a7f5364b03cdf11aa7e904f4610309563
216-
firebase_core: 53cecb83c72fea329b267bb0accb06a33e9f036a
217-
firebase_remote_config: 27bccd8aeb0773cbeb226404f9d5521e4514675c
218-
FirebaseABTesting: aef1719704fade00b200827e7973f352efc4caee
219-
FirebaseAnalytics: 27eb78b97880ea4a004839b9bac0b58880f5a92a
220-
FirebaseCore: 3cf438f431f18c12cdf2aaf64434648b63f7e383
221-
FirebaseCoreInternal: 9afa45b1159304c963da48addb78275ef701c6b4
222-
FirebaseInstallations: 6ef4a1c7eb2a61ee1f74727d7f6ce2e72acf1414
223-
FirebaseRemoteConfig: fe8b7e6d6770fefbde27b0cac3f3deffba6e7326
224-
FirebaseRemoteConfigInterop: 1c6135e8a094cc6368949f5faeeca7ee8948b8aa
225-
FirebaseSharedSwift: e17c654ef1f1a616b0b33054e663ad1035c8fd40
226-
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
227-
flutter_local_notifications: ad39620c743ea4c15127860f4b5641649a988100
228-
GoogleAppMeasurement: 6e49ffac7d3f2c3ded9cc663f912a13b67bbd0de
215+
Bugsee: f01ff17cd219184da8f7a9188de6d3323edc42a7
216+
bugsee_flutter: fe52bde90508c589024f70150d8a8881e83b02d4
217+
Firebase: f07b15ae5a6ec0f93713e30b923d9970d144af3e
218+
firebase_analytics: 67fbdd9f3c04e55048024f3da21cfc36f05e56cf
219+
firebase_core: f1aafb21c14f497e5498f7ffc4dc63cbb52b2594
220+
firebase_remote_config: a984c9b1b0ada895a3f03a46f1bbb4c998663aa5
221+
FirebaseABTesting: c05b5ec9f1d9f21a65909525de301d375032d9a4
222+
FirebaseAnalytics: 0fc2b20091f0ddd21bf73397cf8f0eb5346dc24f
223+
FirebaseCore: bb595f3114953664e3c1dc032f008a244147cfd3
224+
FirebaseCoreInternal: d7f5a043c2cd01a08103ab586587c1468047bca6
225+
FirebaseInstallations: ae9f4902cb5bf1d0c5eaa31ec1f4e5495a0714e2
226+
FirebaseRemoteConfig: 28e071a214ec66cdb113ed9ff4ce63e9abe018db
227+
FirebaseRemoteConfigInterop: 1e31ec72b89c9924367c59bfb5ec9ab60d1d6766
228+
FirebaseSharedSwift: 93426a1de92f19e1199fac5295a4f8df16458daa
229+
Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
230+
flutter_local_notifications: a5a732f069baa862e728d839dd2ebb904737effb
231+
GoogleAdsOnDeviceConversion: e03a386840803ea7eef3fd22a061930142c039c1
232+
GoogleAppMeasurement: 1e718274b7e015cefd846ac1fcf7820c70dc017d
229233
GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
230234
integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
231235
nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
232236
open_filex: 432f3cd11432da3e39f47fcc0df2b1603854eff1
233237
package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
234-
path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
238+
path_provider_foundation: bb55f6dbba17d0dccd6737fe6f7f34fbd0376880
235239
permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
236240
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
237241
sensors_plus: 6a11ed0c2e1d0bd0b20b4029d3bad27d96e0c65b
238-
share_plus: 011d6fb4f9d2576b83179a3a5c5e323202cdabcf
239-
shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
240-
url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
242+
share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
243+
shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
244+
url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b
241245

242246
PODFILE CHECKSUM: 5e773f411663c695e26c43c3e3c6ff68e3f631da
243247

‎src/app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<MacroExpansion>
3132
<BuildableReference
@@ -54,11 +55,13 @@
5455
buildConfiguration = "Debug"
5556
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5657
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
58+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
5759
launchStyle = "0"
5860
useCustomWorkingDirectory = "NO"
5961
ignoresPersistentStateOnLaunch = "NO"
6062
debugDocumentVersioning = "YES"
6163
debugServiceExtension = "internal"
64+
enableGPUValidationMode = "1"
6265
allowLocationSimulation = "YES">
6366
<BuildableProductRunnable
6467
runnableDebuggingMode = "0">

‎src/app/ios/Runner/AppDelegate.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import UIKit
22
import Flutter
33

4-
@UIApplicationMain
4+
@main
55
@objc class AppDelegate: FlutterAppDelegate {
66
override func application(
77
_ application: UIApplication,

‎src/app/l10n.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
arb-dir: lib/l10n/arb
22
template-arb-file: app_en.arb
3-
synthetic-package: false
43
output-dir: lib/l10n/gen_l10n
54
output-localization-file: app_localizations.dart
65
nullable-getter: false

‎src/app/lib/app_shell.dart‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@ final class AppShell extends StatelessWidget {
1212
Widget build(BuildContext context) {
1313
return Scaffold(
1414
body: navigationShell,
15-
bottomNavigationBar: BottomNavigationBar(
16-
items: <BottomNavigationBarItem>[
17-
BottomNavigationBarItem(
15+
bottomNavigationBar: NavigationBar(
16+
destinations: <NavigationDestination>[
17+
NavigationDestination(
1818
icon: const Icon(Icons.theater_comedy),
1919
label: context.local.dadJokesPageLabel,
2020
),
21-
BottomNavigationBarItem(
21+
NavigationDestination(
2222
icon: const Icon(Icons.favorite),
2323
label: context.local.favoriteDadJokesPageLabel,
2424
),
2525
],
26-
currentIndex: navigationShell.currentIndex,
27-
onTap: navigationShell.goBranch,
26+
selectedIndex: navigationShell.currentIndex,
27+
onDestinationSelected: navigationShell.goBranch,
2828
),
2929
);
3030
}

0 commit comments

Comments
 (0)