Skip to content

Commit

Permalink
Merge branch 'main' into allow-custom-id
Browse files Browse the repository at this point in the history
  • Loading branch information
JulianBissekkou committed Jul 11, 2024
2 parents 931d243 + ee96db7 commit 165c3a7
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 17 deletions.
4 changes: 0 additions & 4 deletions .fvm/fvm_config.json

This file was deleted.

3 changes: 3 additions & 0 deletions .fvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"flutter": "3.22.2"
}
10 changes: 4 additions & 6 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down
5 changes: 5 additions & 0 deletions bin/android_integration.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import 'package:tapped_test_toolkit/tapped_test_toolkit.dart';

void main(List<String> arguments) {
runAndroidIntegrationTest(arguments);
}
5 changes: 5 additions & 0 deletions bin/ios_integration.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import 'package:tapped_test_toolkit/tapped_test_toolkit.dart';

void main(List<String> arguments) {
runIosIntegrationTest(arguments);
}
14 changes: 7 additions & 7 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ environment:
flutter: ">=3.16.0"

dependencies:
args: ^2.4.2
http: ^1.1.2
args: ^2.5.0
http: ^1.2.1
freezed_annotation: ^2.4.1
json_annotation: ^4.8.1
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.2
tapped_lints:
git:
url: https://github.com/tappeddev/tapped_lints.git
Expand Down

0 comments on commit 165c3a7

Please sign in to comment.