Skip to content

Commit 2781962

Browse files
Nirajn2311Nirajn2311
authored
feat: flutter 3.41 (#1738)
* chore: update ci/cd pipelines to use flutter 3.41 * feat(ios): UIScene migration * chore: update flutter to v3.41.3 in codemagic ci/cd * chore: update flutter to v3.41.6 in codemagic ci/cd * fix: handle unauthenticated users response * chore: revert tab style change
1 parent e7fefe5 commit 2781962

File tree

10 files changed

+83
-19
lines changed

10 files changed

+83
-19
lines changed

‎.github/workflows/flutter-ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,13 @@ jobs:
7575
disable-animations: false
7676
script: echo "Generated AVD snapshot for caching."
7777

78-
- name: Setup Flutter 3.38.x
78+
- name: Setup Flutter 3.41.x
7979
uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046 # v2
8080
with:
81-
flutter-version: "3.38.x"
81+
flutter-version: "3.41.x"
8282
channel: "stable"
8383
cache: true
84-
cache-key: flutter-3.38.x
84+
cache-key: flutter-3.41.x
8585
cache-path: ${{ runner.tool_cache }}/flutter
8686

8787
- name: Create .env file

‎.github/workflows/flutter-deploy.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,13 @@ jobs:
6969
disable-animations: false
7070
script: echo "Generated AVD snapshot for caching."
7171

72-
- name: Setup Flutter 3.38.x
72+
- name: Setup Flutter 3.41.x
7373
uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046 # v2
7474
with:
75-
flutter-version: "3.38.x"
75+
flutter-version: "3.41.x"
7676
channel: "stable"
7777
cache: true
78-
cache-key: flutter-3.38.x
78+
cache-key: flutter-3.41.x
7979
cache-path: ${{ runner.tool_cache }}/flutter
8080

8181
- name: Create .env file

‎.github/workflows/flutter-unit-tests.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ jobs:
2020
- name: Checkout files
2121
uses: actions/checkout@v4
2222

23-
- name: Setup Flutter 3.38.x
23+
- name: Setup Flutter 3.41.x
2424
uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046 # v2
2525
with:
26-
flutter-version: "3.38.x"
26+
flutter-version: "3.41.x"
2727
channel: "stable"
2828
cache: true
29-
cache-key: flutter-3.38.x
29+
cache-key: flutter-3.41.x
3030
cache-path: ${{ runner.tool_cache }}/flutter
3131

3232
- name: Create .env file

‎.github/workflows/mobile-curriculum-e2e.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
android-api-level: [35]
2828
node-version: [24]
2929
pnpm-version: [10]
30-
flutter-version: ["3.38.x"]
30+
flutter-version: ["3.41.x"]
3131

3232
steps:
3333
- name: Remove unused software

‎codemagic.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ workflows:
1515
cancel_previous_builds: true
1616

1717
environment:
18-
flutter: 3.38.5
18+
flutter: 3.41.6
1919
xcode: latest
2020
cocoapods: default
2121
groups:
@@ -87,7 +87,7 @@ workflows:
8787
cancel_previous_builds: true
8888

8989
environment:
90-
flutter: 3.38.5
90+
flutter: 3.41.6
9191
xcode: latest
9292
cocoapods: default
9393
ios_signing:

‎mobile-app/ios/Runner/AppDelegate.swift‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
import UIKit
22
import Flutter
3+
import flutter_local_notifications
34

45
@main
5-
@objc class AppDelegate: FlutterAppDelegate {
6+
@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate {
67
override func application(
78
_ application: UIApplication,
89
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
910
) -> Bool {
10-
if #available(iOS 10.0, *) {
11-
UNUserNotificationCenter.current().delegate = self as? UNUserNotificationCenterDelegate
12-
}
13-
14-
GeneratedPluginRegistrant.register(with: self)
11+
UNUserNotificationCenter.current().delegate = self as UNUserNotificationCenterDelegate
1512
return super.application(application, didFinishLaunchingWithOptions: launchOptions)
1613
}
14+
15+
func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) {
16+
GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry)
17+
}
1718
}

‎mobile-app/ios/Runner/Info-Debug.plist‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,5 +71,26 @@
7171
<false/>
7272
<key>UIStatusBarHidden</key>
7373
<false/>
74+
<key>UIApplicationSceneManifest</key>
75+
<dict>
76+
<key>UIApplicationSupportsMultipleScenes</key>
77+
<false/>
78+
<key>UISceneConfigurations</key>
79+
<dict>
80+
<key>UIWindowSceneSessionRoleApplication</key>
81+
<array>
82+
<dict>
83+
<key>UISceneClassName</key>
84+
<string>UIWindowScene</string>
85+
<key>UISceneDelegateClassName</key>
86+
<string>FlutterSceneDelegate</string>
87+
<key>UISceneConfigurationName</key>
88+
<string>flutter</string>
89+
<key>UISceneStoryboardFile</key>
90+
<string>Main</string>
91+
</dict>
92+
</array>
93+
</dict>
94+
</dict>
7495
</dict>
7596
</plist>

‎mobile-app/ios/Runner/Info-Profile.plist‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,5 +73,26 @@
7373
<false/>
7474
<key>UIStatusBarHidden</key>
7575
<false/>
76+
<key>UIApplicationSceneManifest</key>
77+
<dict>
78+
<key>UIApplicationSupportsMultipleScenes</key>
79+
<false/>
80+
<key>UISceneConfigurations</key>
81+
<dict>
82+
<key>UIWindowSceneSessionRoleApplication</key>
83+
<array>
84+
<dict>
85+
<key>UISceneClassName</key>
86+
<string>UIWindowScene</string>
87+
<key>UISceneDelegateClassName</key>
88+
<string>FlutterSceneDelegate</string>
89+
<key>UISceneConfigurationName</key>
90+
<string>flutter</string>
91+
<key>UISceneStoryboardFile</key>
92+
<string>Main</string>
93+
</dict>
94+
</array>
95+
</dict>
96+
</dict>
7697
</dict>
7798
</plist>

‎mobile-app/ios/Runner/Info-Release.plist‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,5 +69,26 @@
6969
<false/>
7070
<key>UIStatusBarHidden</key>
7171
<false/>
72+
<key>UIApplicationSceneManifest</key>
73+
<dict>
74+
<key>UIApplicationSupportsMultipleScenes</key>
75+
<false/>
76+
<key>UISceneConfigurations</key>
77+
<dict>
78+
<key>UIWindowSceneSessionRoleApplication</key>
79+
<array>
80+
<dict>
81+
<key>UISceneClassName</key>
82+
<string>UIWindowScene</string>
83+
<key>UISceneDelegateClassName</key>
84+
<string>FlutterSceneDelegate</string>
85+
<key>UISceneConfigurationName</key>
86+
<string>flutter</string>
87+
<key>UISceneStoryboardFile</key>
88+
<string>Main</string>
89+
</dict>
90+
</array>
91+
</dict>
92+
</dict>
7293
</dict>
7394
</plist>

‎mobile-app/lib/service/authentication/authentication_service.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ class AuthenticationService {
351351
),
352352
);
353353

354-
if (res.statusCode == 200) {
354+
if (res.statusCode == 200 && res.data['result'] != '') {
355355
userModel = parseUserModel(res.data['user'][res.data['result']]);
356356
staticIsloggedIn = true;
357357
isLoggedInStream.sink.add(true);

0 commit comments

Comments
 (0)