Skip to content

Commit eb3a19a

Browse files
ashuntuashuntu
authored
chore: Update Flutter to 3.29.2 (#474)
Bumps Flutter version to 3.29.2 while retaining existing `pubspec.yaml` minimum Flutter version. Also updates some CI runner versions and actions. --- UDENG-6631
1 parent 55c3a2a commit eb3a19a

File tree

8 files changed

+118
-20
lines changed

8 files changed

+118
-20
lines changed

‎.fvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"flutter": "3.27.1"
2+
"flutter": "3.29.2"
33
}

‎.github/workflows/ci.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ on:
99

1010
jobs:
1111
setup:
12-
runs-on: ubuntu-22.04
12+
runs-on: ubuntu-24.04
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
- uses: Atsumi3/actions-setup-fvm@0.0.3
1616
- uses: bluefireteam/melos-action@v2
1717
- run: melos generate
@@ -22,7 +22,7 @@ jobs:
2222
key: ${{ runner.os }}-repo-${{ github.sha }}-generated
2323

2424
build:
25-
runs-on: ubuntu-22.04
25+
runs-on: ubuntu-24.04
2626
needs: setup
2727
steps:
2828
- uses: actions/checkout@v4
@@ -35,10 +35,10 @@ jobs:
3535
- run: melos build
3636

3737
analyze:
38-
runs-on: ubuntu-22.04
38+
runs-on: ubuntu-24.04
3939
needs: setup
4040
steps:
41-
- uses: actions/checkout@v3
41+
- uses: actions/checkout@v4
4242
- name: Restore repository cache
4343
uses: actions/cache@v3
4444
with:
@@ -58,10 +58,10 @@ jobs:
5858
- run: melos analyze --fatal-infos
5959

6060
format:
61-
runs-on: ubuntu-22.04
61+
runs-on: ubuntu-24.04
6262
needs: setup
6363
steps:
64-
- uses: actions/checkout@v3
64+
- uses: actions/checkout@v4
6565
- name: Restore repository cache
6666
uses: actions/cache@v3
6767
with:
@@ -70,14 +70,14 @@ jobs:
7070
restore-keys: |
7171
${{ runner.os }}-repo-
7272
- uses: Atsumi3/actions-setup-fvm@0.0.3
73-
- uses: bluefireteam/melos-action@v2
73+
- uses: bluefireteam/melos-action@v3
7474
- run: melos format:exclude
7575

7676

7777
publish:
7878
name: Dry-run publish
7979
needs: setup
80-
runs-on: ubuntu-22.04
80+
runs-on: ubuntu-24.04
8181
steps:
8282
- uses: actions/checkout@v4
8383
- name: Restore repository cache
@@ -93,10 +93,10 @@ jobs:
9393
- run: melos exec --no-private --ignore ubuntu_test -- flutter pub publish --dry-run
9494

9595
test:
96-
runs-on: ubuntu-22.04
96+
runs-on: ubuntu-24.04
9797
needs: setup
9898
steps:
99-
- uses: actions/checkout@v3
99+
- uses: actions/checkout@v4
100100
- name: Restore repository cache
101101
uses: actions/cache@v3
102102
with:
@@ -105,7 +105,7 @@ jobs:
105105
restore-keys: |
106106
${{ runner.os }}-repo-
107107
- uses: Atsumi3/actions-setup-fvm@0.0.3
108-
- uses: bluefireteam/melos-action@v2
108+
- uses: bluefireteam/melos-action@v3
109109
- run: sudo apt update && sudo apt install -y lcov
110110
- run: melos coverage
111111
- uses: codecov/codecov-action@v5

‎melos.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ scripts:
4343
# cleanup generated files from coverage
4444
coverage:cleanup: >
4545
melos exec --file-exists=coverage/lcov.info -- \
46-
lcov --remove coverage/lcov.info '**/*.g.dart' '**/*.freezed.dart' -o coverage/lcov.info
46+
lcov --remove coverage/lcov.info '**/*.g.dart' '**/*.freezed.dart' --ignore-errors unused -o coverage/lcov.info
4747

4848
# format all packages
4949
format:exclude: >

‎packages/timezone_map/example/macos/Flutter/GeneratedPluginRegistrant.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
import FlutterMacOS
66
import Foundation
77

8-
import screen_retriever
8+
import screen_retriever_macos
99
import window_manager
1010

1111
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
12-
ScreenRetrieverPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverPlugin"))
12+
ScreenRetrieverMacosPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverMacosPlugin"))
1313
WindowManagerPlugin.register(with: registry.registrar(forPlugin: "WindowManagerPlugin"))
1414
}

‎packages/timezone_map/example/windows/flutter/generated_plugin_registrant.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
#include "generated_plugin_registrant.h"
88

9-
#include <screen_retriever/screen_retriever_plugin.h>
9+
#include <screen_retriever_windows/screen_retriever_windows_plugin_c_api.h>
1010
#include <window_manager/window_manager_plugin.h>
1111

1212
void RegisterPlugins(flutter::PluginRegistry* registry) {
13-
ScreenRetrieverPluginRegisterWithRegistrar(
14-
registry->GetRegistrarForPlugin("ScreenRetrieverPlugin"));
13+
ScreenRetrieverWindowsPluginCApiRegisterWithRegistrar(
14+
registry->GetRegistrarForPlugin("ScreenRetrieverWindowsPluginCApi"));
1515
WindowManagerPluginRegisterWithRegistrar(
1616
registry->GetRegistrarForPlugin("WindowManagerPlugin"));
1717
}

‎packages/timezone_map/example/windows/flutter/generated_plugins.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44

55
list(APPEND FLUTTER_PLUGIN_LIST
6-
screen_retriever
6+
screen_retriever_windows
77
window_manager
88
)
99

‎packages/timezone_map/test/geoip_test.mocks.dart‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,16 @@ class _FakeResponse_4<T1> extends _i1.SmartFake implements _i6.Response<T1> {
7878
);
7979
}
8080

81+
class _FakeDio_5 extends _i1.SmartFake implements _i7.Dio {
82+
_FakeDio_5(
83+
Object parent,
84+
Invocation parentInvocation,
85+
) : super(
86+
parent,
87+
parentInvocation,
88+
);
89+
}
90+
8191
/// A class which mocks [Dio].
8292
///
8393
/// See the documentation for Mockito's code generation for more information.
@@ -600,6 +610,7 @@ class MockDio extends _i1.Mock implements _i7.Dio {
600610
Map<String, dynamic>? queryParameters,
601611
_i9.CancelToken? cancelToken,
602612
bool? deleteOnError = true,
613+
_i2.FileAccessMode? fileAccessMode = _i2.FileAccessMode.write,
603614
String? lengthHeader = r'content-length',
604615
Object? data,
605616
_i2.Options? options,
@@ -616,6 +627,7 @@ class MockDio extends _i1.Mock implements _i7.Dio {
616627
#queryParameters: queryParameters,
617628
#cancelToken: cancelToken,
618629
#deleteOnError: deleteOnError,
630+
#fileAccessMode: fileAccessMode,
619631
#lengthHeader: lengthHeader,
620632
#data: data,
621633
#options: options,
@@ -635,6 +647,7 @@ class MockDio extends _i1.Mock implements _i7.Dio {
635647
#queryParameters: queryParameters,
636648
#cancelToken: cancelToken,
637649
#deleteOnError: deleteOnError,
650+
#fileAccessMode: fileAccessMode,
638651
#lengthHeader: lengthHeader,
639652
#data: data,
640653
#options: options,
@@ -650,6 +663,7 @@ class MockDio extends _i1.Mock implements _i7.Dio {
650663
_i2.ProgressCallback? onReceiveProgress,
651664
_i9.CancelToken? cancelToken,
652665
bool? deleteOnError = true,
666+
_i2.FileAccessMode? fileAccessMode = _i2.FileAccessMode.write,
653667
String? lengthHeader = r'content-length',
654668
Object? data,
655669
_i2.Options? options,
@@ -665,6 +679,7 @@ class MockDio extends _i1.Mock implements _i7.Dio {
665679
#onReceiveProgress: onReceiveProgress,
666680
#cancelToken: cancelToken,
667681
#deleteOnError: deleteOnError,
682+
#fileAccessMode: fileAccessMode,
668683
#lengthHeader: lengthHeader,
669684
#data: data,
670685
#options: options,
@@ -683,6 +698,7 @@ class MockDio extends _i1.Mock implements _i7.Dio {
683698
#onReceiveProgress: onReceiveProgress,
684699
#cancelToken: cancelToken,
685700
#deleteOnError: deleteOnError,
701+
#fileAccessMode: fileAccessMode,
686702
#lengthHeader: lengthHeader,
687703
#data: data,
688704
#options: options,
@@ -783,4 +799,37 @@ class MockDio extends _i1.Mock implements _i7.Dio {
783799
),
784800
)),
785801
) as _i8.Future<_i6.Response<T>>);
802+
803+
@override
804+
_i7.Dio clone({
805+
_i2.BaseOptions? options,
806+
_i5.Interceptors? interceptors,
807+
_i3.HttpClientAdapter? httpClientAdapter,
808+
_i4.Transformer? transformer,
809+
}) =>
810+
(super.noSuchMethod(
811+
Invocation.method(
812+
#clone,
813+
[],
814+
{
815+
#options: options,
816+
#interceptors: interceptors,
817+
#httpClientAdapter: httpClientAdapter,
818+
#transformer: transformer,
819+
},
820+
),
821+
returnValue: _FakeDio_5(
822+
this,
823+
Invocation.method(
824+
#clone,
825+
[],
826+
{
827+
#options: options,
828+
#interceptors: interceptors,
829+
#httpClientAdapter: httpClientAdapter,
830+
#transformer: transformer,
831+
},
832+
),
833+
),
834+
) as _i7.Dio);
786835
}

‎packages/timezone_map/test/service_test.mocks.dart‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,16 @@ class _FakeResponse_4<T1> extends _i1.SmartFake implements _i6.Response<T1> {
8080
);
8181
}
8282

83+
class _FakeDio_5 extends _i1.SmartFake implements _i7.Dio {
84+
_FakeDio_5(
85+
Object parent,
86+
Invocation parentInvocation,
87+
) : super(
88+
parent,
89+
parentInvocation,
90+
);
91+
}
92+
8393
/// A class which mocks [Dio].
8494
///
8595
/// See the documentation for Mockito's code generation for more information.
@@ -602,6 +612,7 @@ class MockDio extends _i1.Mock implements _i7.Dio {
602612
Map<String, dynamic>? queryParameters,
603613
_i9.CancelToken? cancelToken,
604614
bool? deleteOnError = true,
615+
_i2.FileAccessMode? fileAccessMode = _i2.FileAccessMode.write,
605616
String? lengthHeader = r'content-length',
606617
Object? data,
607618
_i2.Options? options,
@@ -618,6 +629,7 @@ class MockDio extends _i1.Mock implements _i7.Dio {
618629
#queryParameters: queryParameters,
619630
#cancelToken: cancelToken,
620631
#deleteOnError: deleteOnError,
632+
#fileAccessMode: fileAccessMode,
621633
#lengthHeader: lengthHeader,
622634
#data: data,
623635
#options: options,
@@ -637,6 +649,7 @@ class MockDio extends _i1.Mock implements _i7.Dio {
637649
#queryParameters: queryParameters,
638650
#cancelToken: cancelToken,
639651
#deleteOnError: deleteOnError,
652+
#fileAccessMode: fileAccessMode,
640653
#lengthHeader: lengthHeader,
641654
#data: data,
642655
#options: options,
@@ -652,6 +665,7 @@ class MockDio extends _i1.Mock implements _i7.Dio {
652665
_i2.ProgressCallback? onReceiveProgress,
653666
_i9.CancelToken? cancelToken,
654667
bool? deleteOnError = true,
668+
_i2.FileAccessMode? fileAccessMode = _i2.FileAccessMode.write,
655669
String? lengthHeader = r'content-length',
656670
Object? data,
657671
_i2.Options? options,
@@ -667,6 +681,7 @@ class MockDio extends _i1.Mock implements _i7.Dio {
667681
#onReceiveProgress: onReceiveProgress,
668682
#cancelToken: cancelToken,
669683
#deleteOnError: deleteOnError,
684+
#fileAccessMode: fileAccessMode,
670685
#lengthHeader: lengthHeader,
671686
#data: data,
672687
#options: options,
@@ -685,6 +700,7 @@ class MockDio extends _i1.Mock implements _i7.Dio {
685700
#onReceiveProgress: onReceiveProgress,
686701
#cancelToken: cancelToken,
687702
#deleteOnError: deleteOnError,
703+
#fileAccessMode: fileAccessMode,
688704
#lengthHeader: lengthHeader,
689705
#data: data,
690706
#options: options,
@@ -785,6 +801,39 @@ class MockDio extends _i1.Mock implements _i7.Dio {
785801
),
786802
)),
787803
) as _i8.Future<_i6.Response<T>>);
804+
805+
@override
806+
_i7.Dio clone({
807+
_i2.BaseOptions? options,
808+
_i5.Interceptors? interceptors,
809+
_i3.HttpClientAdapter? httpClientAdapter,
810+
_i4.Transformer? transformer,
811+
}) =>
812+
(super.noSuchMethod(
813+
Invocation.method(
814+
#clone,
815+
[],
816+
{
817+
#options: options,
818+
#interceptors: interceptors,
819+
#httpClientAdapter: httpClientAdapter,
820+
#transformer: transformer,
821+
},
822+
),
823+
returnValue: _FakeDio_5(
824+
this,
825+
Invocation.method(
826+
#clone,
827+
[],
828+
{
829+
#options: options,
830+
#interceptors: interceptors,
831+
#httpClientAdapter: httpClientAdapter,
832+
#transformer: transformer,
833+
},
834+
),
835+
),
836+
) as _i7.Dio);
788837
}
789838

790839
/// A class which mocks [GeoSource].

0 commit comments

Comments
 (0)