Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .fvmrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"flutter": "3.27.1"
"flutter": "3.29.2"
}
24 changes: 12 additions & 12 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ on:

jobs:
setup:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: Atsumi3/actions-setup-fvm@0.0.3
- uses: bluefireteam/melos-action@v2
- run: melos generate
Expand All @@ -22,7 +22,7 @@ jobs:
key: ${{ runner.os }}-repo-${{ github.sha }}-generated

build:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs: setup
steps:
- uses: actions/checkout@v4
Expand All @@ -35,10 +35,10 @@ jobs:
- run: melos build

analyze:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs: setup
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Restore repository cache
uses: actions/cache@v3
with:
Expand All @@ -58,10 +58,10 @@ jobs:
- run: melos analyze --fatal-infos

format:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs: setup
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Restore repository cache
uses: actions/cache@v3
with:
Expand All @@ -70,14 +70,14 @@ jobs:
restore-keys: |
${{ runner.os }}-repo-
- uses: Atsumi3/actions-setup-fvm@0.0.3
- uses: bluefireteam/melos-action@v2
- uses: bluefireteam/melos-action@v3
- run: melos format:exclude


publish:
name: Dry-run publish
needs: setup
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Restore repository cache
Expand All @@ -93,10 +93,10 @@ jobs:
- run: melos exec --no-private --ignore ubuntu_test -- flutter pub publish --dry-run

test:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs: setup
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Restore repository cache
uses: actions/cache@v3
with:
Expand All @@ -105,7 +105,7 @@ jobs:
restore-keys: |
${{ runner.os }}-repo-
- uses: Atsumi3/actions-setup-fvm@0.0.3
- uses: bluefireteam/melos-action@v2
- uses: bluefireteam/melos-action@v3
- run: sudo apt update && sudo apt install -y lcov
- run: melos coverage
- uses: codecov/codecov-action@v5
Expand Down
2 changes: 1 addition & 1 deletion melos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ scripts:
# cleanup generated files from coverage
coverage:cleanup: >
melos exec --file-exists=coverage/lcov.info -- \
lcov --remove coverage/lcov.info '**/*.g.dart' '**/*.freezed.dart' -o coverage/lcov.info
lcov --remove coverage/lcov.info '**/*.g.dart' '**/*.freezed.dart' --ignore-errors unused -o coverage/lcov.info

# format all packages
format:exclude: >
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
import FlutterMacOS
import Foundation

import screen_retriever
import screen_retriever_macos
import window_manager

func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
ScreenRetrieverPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverPlugin"))
ScreenRetrieverMacosPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverMacosPlugin"))
WindowManagerPlugin.register(with: registry.registrar(forPlugin: "WindowManagerPlugin"))
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@

#include "generated_plugin_registrant.h"

#include <screen_retriever/screen_retriever_plugin.h>
#include <screen_retriever_windows/screen_retriever_windows_plugin_c_api.h>
#include <window_manager/window_manager_plugin.h>

void RegisterPlugins(flutter::PluginRegistry* registry) {
ScreenRetrieverPluginRegisterWithRegistrar(
registry->GetRegistrarForPlugin("ScreenRetrieverPlugin"));
ScreenRetrieverWindowsPluginCApiRegisterWithRegistrar(
registry->GetRegistrarForPlugin("ScreenRetrieverWindowsPluginCApi"));
WindowManagerPluginRegisterWithRegistrar(
registry->GetRegistrarForPlugin("WindowManagerPlugin"));
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#

list(APPEND FLUTTER_PLUGIN_LIST
screen_retriever
screen_retriever_windows
window_manager
)

Expand Down
49 changes: 49 additions & 0 deletions packages/timezone_map/test/geoip_test.mocks.dart
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,16 @@ class _FakeResponse_4<T1> extends _i1.SmartFake implements _i6.Response<T1> {
);
}

class _FakeDio_5 extends _i1.SmartFake implements _i7.Dio {
_FakeDio_5(
Object parent,
Invocation parentInvocation,
) : super(
parent,
parentInvocation,
);
}

/// A class which mocks [Dio].
///
/// See the documentation for Mockito's code generation for more information.
Expand Down Expand Up @@ -600,6 +610,7 @@ class MockDio extends _i1.Mock implements _i7.Dio {
Map<String, dynamic>? queryParameters,
_i9.CancelToken? cancelToken,
bool? deleteOnError = true,
_i2.FileAccessMode? fileAccessMode = _i2.FileAccessMode.write,
String? lengthHeader = r'content-length',
Object? data,
_i2.Options? options,
Expand All @@ -616,6 +627,7 @@ class MockDio extends _i1.Mock implements _i7.Dio {
#queryParameters: queryParameters,
#cancelToken: cancelToken,
#deleteOnError: deleteOnError,
#fileAccessMode: fileAccessMode,
#lengthHeader: lengthHeader,
#data: data,
#options: options,
Expand All @@ -635,6 +647,7 @@ class MockDio extends _i1.Mock implements _i7.Dio {
#queryParameters: queryParameters,
#cancelToken: cancelToken,
#deleteOnError: deleteOnError,
#fileAccessMode: fileAccessMode,
#lengthHeader: lengthHeader,
#data: data,
#options: options,
Expand All @@ -650,6 +663,7 @@ class MockDio extends _i1.Mock implements _i7.Dio {
_i2.ProgressCallback? onReceiveProgress,
_i9.CancelToken? cancelToken,
bool? deleteOnError = true,
_i2.FileAccessMode? fileAccessMode = _i2.FileAccessMode.write,
String? lengthHeader = r'content-length',
Object? data,
_i2.Options? options,
Expand All @@ -665,6 +679,7 @@ class MockDio extends _i1.Mock implements _i7.Dio {
#onReceiveProgress: onReceiveProgress,
#cancelToken: cancelToken,
#deleteOnError: deleteOnError,
#fileAccessMode: fileAccessMode,
#lengthHeader: lengthHeader,
#data: data,
#options: options,
Expand All @@ -683,6 +698,7 @@ class MockDio extends _i1.Mock implements _i7.Dio {
#onReceiveProgress: onReceiveProgress,
#cancelToken: cancelToken,
#deleteOnError: deleteOnError,
#fileAccessMode: fileAccessMode,
#lengthHeader: lengthHeader,
#data: data,
#options: options,
Expand Down Expand Up @@ -783,4 +799,37 @@ class MockDio extends _i1.Mock implements _i7.Dio {
),
)),
) as _i8.Future<_i6.Response<T>>);

@override
_i7.Dio clone({
_i2.BaseOptions? options,
_i5.Interceptors? interceptors,
_i3.HttpClientAdapter? httpClientAdapter,
_i4.Transformer? transformer,
}) =>
(super.noSuchMethod(
Invocation.method(
#clone,
[],
{
#options: options,
#interceptors: interceptors,
#httpClientAdapter: httpClientAdapter,
#transformer: transformer,
},
),
returnValue: _FakeDio_5(
this,
Invocation.method(
#clone,
[],
{
#options: options,
#interceptors: interceptors,
#httpClientAdapter: httpClientAdapter,
#transformer: transformer,
},
),
),
) as _i7.Dio);
}
49 changes: 49 additions & 0 deletions packages/timezone_map/test/service_test.mocks.dart
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,16 @@ class _FakeResponse_4<T1> extends _i1.SmartFake implements _i6.Response<T1> {
);
}

class _FakeDio_5 extends _i1.SmartFake implements _i7.Dio {
_FakeDio_5(
Object parent,
Invocation parentInvocation,
) : super(
parent,
parentInvocation,
);
}

/// A class which mocks [Dio].
///
/// See the documentation for Mockito's code generation for more information.
Expand Down Expand Up @@ -602,6 +612,7 @@ class MockDio extends _i1.Mock implements _i7.Dio {
Map<String, dynamic>? queryParameters,
_i9.CancelToken? cancelToken,
bool? deleteOnError = true,
_i2.FileAccessMode? fileAccessMode = _i2.FileAccessMode.write,
String? lengthHeader = r'content-length',
Object? data,
_i2.Options? options,
Expand All @@ -618,6 +629,7 @@ class MockDio extends _i1.Mock implements _i7.Dio {
#queryParameters: queryParameters,
#cancelToken: cancelToken,
#deleteOnError: deleteOnError,
#fileAccessMode: fileAccessMode,
#lengthHeader: lengthHeader,
#data: data,
#options: options,
Expand All @@ -637,6 +649,7 @@ class MockDio extends _i1.Mock implements _i7.Dio {
#queryParameters: queryParameters,
#cancelToken: cancelToken,
#deleteOnError: deleteOnError,
#fileAccessMode: fileAccessMode,
#lengthHeader: lengthHeader,
#data: data,
#options: options,
Expand All @@ -652,6 +665,7 @@ class MockDio extends _i1.Mock implements _i7.Dio {
_i2.ProgressCallback? onReceiveProgress,
_i9.CancelToken? cancelToken,
bool? deleteOnError = true,
_i2.FileAccessMode? fileAccessMode = _i2.FileAccessMode.write,
String? lengthHeader = r'content-length',
Object? data,
_i2.Options? options,
Expand All @@ -667,6 +681,7 @@ class MockDio extends _i1.Mock implements _i7.Dio {
#onReceiveProgress: onReceiveProgress,
#cancelToken: cancelToken,
#deleteOnError: deleteOnError,
#fileAccessMode: fileAccessMode,
#lengthHeader: lengthHeader,
#data: data,
#options: options,
Expand All @@ -685,6 +700,7 @@ class MockDio extends _i1.Mock implements _i7.Dio {
#onReceiveProgress: onReceiveProgress,
#cancelToken: cancelToken,
#deleteOnError: deleteOnError,
#fileAccessMode: fileAccessMode,
#lengthHeader: lengthHeader,
#data: data,
#options: options,
Expand Down Expand Up @@ -785,6 +801,39 @@ class MockDio extends _i1.Mock implements _i7.Dio {
),
)),
) as _i8.Future<_i6.Response<T>>);

@override
_i7.Dio clone({
_i2.BaseOptions? options,
_i5.Interceptors? interceptors,
_i3.HttpClientAdapter? httpClientAdapter,
_i4.Transformer? transformer,
}) =>
(super.noSuchMethod(
Invocation.method(
#clone,
[],
{
#options: options,
#interceptors: interceptors,
#httpClientAdapter: httpClientAdapter,
#transformer: transformer,
},
),
returnValue: _FakeDio_5(
this,
Invocation.method(
#clone,
[],
{
#options: options,
#interceptors: interceptors,
#httpClientAdapter: httpClientAdapter,
#transformer: transformer,
},
),
),
) as _i7.Dio);
}

/// A class which mocks [GeoSource].
Expand Down