From 81c436900244e6565f753d41b756b436bfe8edfe Mon Sep 17 00:00:00 2001 From: Stefan Schaller Date: Fri, 5 Jul 2024 08:41:50 +0200 Subject: [PATCH 1/4] add runner for bin --- bin/android_integration.dart | 5 +++++ bin/ios_integration.dart | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 bin/android_integration.dart create mode 100644 bin/ios_integration.dart diff --git a/bin/android_integration.dart b/bin/android_integration.dart new file mode 100644 index 0000000..af29756 --- /dev/null +++ b/bin/android_integration.dart @@ -0,0 +1,5 @@ +import 'package:tapped_test_toolkit/tapped_test_toolkit.dart'; + +void main(List arguments) { + runAndroidIntegrationTest(arguments); +} diff --git a/bin/ios_integration.dart b/bin/ios_integration.dart new file mode 100644 index 0000000..b0216bb --- /dev/null +++ b/bin/ios_integration.dart @@ -0,0 +1,5 @@ +import 'package:tapped_test_toolkit/tapped_test_toolkit.dart'; + +void main(List arguments) { + runIosIntegrationTest(arguments); +} From f8c7201f320ffc72d52b2f98975430e0e9fdd996 Mon Sep 17 00:00:00 2001 From: Stefan Schaller Date: Fri, 5 Jul 2024 08:46:13 +0200 Subject: [PATCH 2/4] fix flutter versions --- .fvm/fvm_config.json | 4 ---- .fvmrc | 3 +++ .../integration_test_android_option.freezed.dart | 5 ++--- .../integration_test_ios_option.freezed.dart | 5 ++--- pubspec.yaml | 16 ++++++++-------- 5 files changed, 15 insertions(+), 18 deletions(-) delete mode 100644 .fvm/fvm_config.json create mode 100644 .fvmrc diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json deleted file mode 100644 index 2f5541f..0000000 --- a/.fvm/fvm_config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "flutterSdkVersion": "3.16.9", - "flavors": {} -} diff --git a/.fvmrc b/.fvmrc new file mode 100644 index 0000000..8f59eb5 --- /dev/null +++ b/.fvmrc @@ -0,0 +1,3 @@ +{ + "flutter": "3.22.2" +} \ No newline at end of file diff --git a/lib/src/integration_test/option/integration_test_android_option.freezed.dart b/lib/src/integration_test/option/integration_test_android_option.freezed.dart index ce49511..3cdae7f 100644 --- a/lib/src/integration_test/option/integration_test_android_option.freezed.dart +++ b/lib/src/integration_test/option/integration_test_android_option.freezed.dart @@ -183,7 +183,7 @@ class _$IntegrationTestAndroidOptionImpl extends _IntegrationTestAndroidOption { required this.browserstackAccessKey, required this.apk, required this.testSuite, - final List devices = const ["Samsung Galaxy S22-12.0"], + required final List devices, this.networkLogs = true, this.deviceLogs = true}) : _devices = devices, @@ -199,7 +199,6 @@ class _$IntegrationTestAndroidOptionImpl extends _IntegrationTestAndroidOption { final File testSuite; final List _devices; @override - @JsonKey() List get devices { if (_devices is EqualUnmodifiableListView) return _devices; // ignore: implicit_dynamic_type @@ -264,7 +263,7 @@ abstract class _IntegrationTestAndroidOption required final String browserstackAccessKey, required final File apk, required final File testSuite, - final List devices, + required final List devices, final bool networkLogs, final bool deviceLogs}) = _$IntegrationTestAndroidOptionImpl; const _IntegrationTestAndroidOption._() : super._(); diff --git a/lib/src/integration_test/option/integration_test_ios_option.freezed.dart b/lib/src/integration_test/option/integration_test_ios_option.freezed.dart index 02c897c..d753dfa 100644 --- a/lib/src/integration_test/option/integration_test_ios_option.freezed.dart +++ b/lib/src/integration_test/option/integration_test_ios_option.freezed.dart @@ -167,7 +167,7 @@ class _$IntegrationTestIosOptionImpl extends _IntegrationTestIosOption { {required this.browserstackUsername, required this.browserstackAccessKey, required this.testPackage, - final List devices = const ["Samsung Galaxy S22-12.0"], + required final List devices, this.networkLogs = true, this.deviceLogs = true}) : _devices = devices, @@ -181,7 +181,6 @@ class _$IntegrationTestIosOptionImpl extends _IntegrationTestIosOption { final File testPackage; final List _devices; @override - @JsonKey() List get devices { if (_devices is EqualUnmodifiableListView) return _devices; // ignore: implicit_dynamic_type @@ -241,7 +240,7 @@ abstract class _IntegrationTestIosOption extends IntegrationTestIosOption { {required final String browserstackUsername, required final String browserstackAccessKey, required final File testPackage, - final List devices, + required final List devices, final bool networkLogs, final bool deviceLogs}) = _$IntegrationTestIosOptionImpl; const _IntegrationTestIosOption._() : super._(); diff --git a/pubspec.yaml b/pubspec.yaml index 08bc019..12d2088 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -8,18 +8,18 @@ environment: flutter: ">=3.16.0" dependencies: - args: ^2.4.2 - http: ^1.1.2 - freezed_annotation: ^2.4.1 - json_annotation: ^4.8.1 + args: ^2.5.0 + http: ^1.2.1 + freezed_annotation: ^2.4.2 + json_annotation: ^4.9.0 path: ^1.9.0 # formatting the time of some jobs - intl: ^0.18.1 + intl: ^0.19.0 dev_dependencies: - build_runner: ^2.4.8 - flutter_lints: ^3.0.1 - freezed: ^2.4.7 + build_runner: ^2.4.11 + flutter_lints: ^4.0.0 + freezed: ^2.5.4 tapped_lints: git: url: https://github.com/tappeddev/tapped_lints.git From b37629d0267dbb8e49094093e7357e272fbd9235 Mon Sep 17 00:00:00 2001 From: Stefan Schaller Date: Fri, 5 Jul 2024 08:51:15 +0200 Subject: [PATCH 3/4] fix flutter versions --- pubspec.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index 12d2088..e0f396d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -10,7 +10,7 @@ environment: dependencies: args: ^2.5.0 http: ^1.2.1 - freezed_annotation: ^2.4.2 + freezed_annotation: ^2.4.1 json_annotation: ^4.9.0 path: ^1.9.0 # formatting the time of some jobs @@ -19,7 +19,7 @@ dependencies: dev_dependencies: build_runner: ^2.4.11 flutter_lints: ^4.0.0 - freezed: ^2.5.4 + freezed: ^2.5.2 tapped_lints: git: url: https://github.com/tappeddev/tapped_lints.git From 14d3c391cd2c27938b5337859c5319f3f16c7694 Mon Sep 17 00:00:00 2001 From: Stefan Schaller Date: Fri, 5 Jul 2024 08:56:40 +0200 Subject: [PATCH 4/4] fix ci --- .github/workflows/check.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 3010749..2af3ae0 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -13,9 +13,8 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 - - uses: kuhnroyal/flutter-fvm-config-action@v1 - with: - path: '.fvm/fvm_config.json' + - uses: kuhnroyal/flutter-fvm-config-action@v2 + id: fvm-config-action - uses: subosito/flutter-action@v2 with: flutter-version: ${{ env.FLUTTER_VERSION }} @@ -30,9 +29,8 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 - - uses: kuhnroyal/flutter-fvm-config-action@v1 - with: - path: '.fvm/fvm_config.json' + - uses: kuhnroyal/flutter-fvm-config-action@v2 + id: fvm-config-action - uses: subosito/flutter-action@v2 with: flutter-version: ${{ env.FLUTTER_VERSION }}