Skip to content
This repository has been archived by the owner on Feb 23, 2024. It is now read-only.

Commit

Permalink
Merge branch 'main' into fix/flaky-integrated-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
wolfenrain authored Jul 18, 2023
2 parents f40a5ad + 20e4778 commit 64453e5
Show file tree
Hide file tree
Showing 86 changed files with 153 additions and 142 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/generate_template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
git config user.email vgvbot@users.noreply.github.com
- name: Create Pull Request
uses: peter-evans/create-pull-request@v4.2.3
uses: peter-evans/create-pull-request@v5.0.2
with:
base: main
branch: chore/generate-template
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/my_plugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ jobs:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
with:
flutter_channel: stable
flutter_version: 3.7.1
flutter_version: 3.10.0
working_directory: src/my_plugin/my_plugin

android:
runs-on: macos-latest
if: false # TODO: Integration tests are flaky since Flutter 3.7.1
if: false # TODO: Integration tests are flaky, see https://github.com/VeryGoodOpenSource/very_good_flutter_plugin/issues/79

defaults:
run:
Expand Down Expand Up @@ -106,7 +106,7 @@ jobs:

linux:
runs-on: ubuntu-18.04
if: false # TODO: Integration tests are flaky since Flutter 3.7.1
if: false # TODO: Integration tests are flaky, see https://github.com/VeryGoodOpenSource/very_good_flutter_plugin/issues/79

defaults:
run:
Expand Down Expand Up @@ -195,7 +195,7 @@ jobs:
run: flutter config --enable-windows-desktop

- name: Flutter Doctor
run: flutter doctor -v
run: flutter doctor -v

- name: Integration Tests
run: flutter test integration_test -d windows
2 changes: 1 addition & 1 deletion .github/workflows/my_plugin_android.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ jobs:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
with:
flutter_channel: stable
flutter_version: 3.7.1
flutter_version: 3.10.0
working_directory: src/my_plugin/my_plugin_android
2 changes: 1 addition & 1 deletion .github/workflows/my_plugin_ios.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ jobs:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
with:
flutter_channel: stable
flutter_version: 3.7.1
flutter_version: 3.10.0
working_directory: src/my_plugin/my_plugin_ios
2 changes: 1 addition & 1 deletion .github/workflows/my_plugin_linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ jobs:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
with:
flutter_channel: stable
flutter_version: 3.7.1
flutter_version: 3.10.0
working_directory: src/my_plugin/my_plugin_linux
2 changes: 1 addition & 1 deletion .github/workflows/my_plugin_macos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ jobs:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
with:
flutter_channel: stable
flutter_version: 3.7.1
flutter_version: 3.10.0
working_directory: src/my_plugin/my_plugin_macos
2 changes: 1 addition & 1 deletion .github/workflows/my_plugin_platform_interface.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ jobs:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
with:
flutter_channel: stable
flutter_version: 3.7.1
flutter_version: 3.10.0
working_directory: src/my_plugin/my_plugin_platform_interface
2 changes: 1 addition & 1 deletion .github/workflows/my_plugin_web.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ jobs:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
with:
flutter_channel: stable
flutter_version: 3.7.1
flutter_version: 3.10.0
working_directory: src/my_plugin/my_plugin_web
2 changes: 1 addition & 1 deletion .github/workflows/my_plugin_windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ jobs:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
with:
flutter_channel: stable
flutter_version: 3.7.1
flutter_version: 3.10.0
working_directory: src/my_plugin/my_plugin_windows
14 changes: 14 additions & 0 deletions brick/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# 0.5.0

- feat!: bump min Dart SDK to 3.0.0

# 0.4.0

- feat!: bump min Dart SDK to 2.19.0

# 0.3.3

- chore: fix generator run
- fix: updated regex matching
- chore: support dart sdk 2.18.0

# 0.3.2

- feat: update workflows, dependabot generation, add spellcheck
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ jobs:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
with:
flutter_channel: stable
flutter_version: 3.7.1
flutter_version: 3.10.0
working_directory: {{project_name.snakeCase()}}_android
{{#publishable}}
pana:
uses: VeryGoodOpenSource/very_good_workflows/brick/__brick__/{{project_name.snakeCase()}}/.github/workflows/pana.yml@v1
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/pana.yml@v1
{{/publishable}}
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ jobs:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
with:
flutter_channel: stable
flutter_version: 3.7.1
flutter_version: 3.10.0
working_directory: {{project_name.snakeCase()}}_ios
{{#publishable}}
pana:
uses: VeryGoodOpenSource/very_good_workflows/brick/__brick__/{{project_name.snakeCase()}}/.github/workflows/pana.yml@v1
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/pana.yml@v1
{{/publishable}}
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ jobs:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
with:
flutter_channel: stable
flutter_version: 3.7.1
flutter_version: 3.10.0
working_directory: {{project_name.snakeCase()}}_linux
{{#publishable}}
pana:
uses: VeryGoodOpenSource/very_good_workflows/brick/__brick__/{{project_name.snakeCase()}}/.github/workflows/pana.yml@v1
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/pana.yml@v1
{{/publishable}}
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ jobs:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
with:
flutter_channel: stable
flutter_version: 3.7.1
flutter_version: 3.10.0
working_directory: {{project_name.snakeCase()}}_macos
{{#publishable}}
pana:
uses: VeryGoodOpenSource/very_good_workflows/brick/__brick__/{{project_name.snakeCase()}}/.github/workflows/pana.yml@v1
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/pana.yml@v1
{{/publishable}}
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ jobs:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
with:
flutter_channel: stable
flutter_version: 3.7.1
flutter_version: 3.10.0
working_directory: {{project_name.snakeCase()}}_web
{{#publishable}}
pana:
uses: VeryGoodOpenSource/very_good_workflows/brick/__brick__/{{project_name.snakeCase()}}/.github/workflows/pana.yml@v1
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/pana.yml@v1
{{/publishable}}
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ jobs:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
with:
flutter_channel: stable
flutter_version: 3.7.1
flutter_version: 3.10.0
working_directory: {{project_name.snakeCase()}}_windows
{{#publishable}}
pana:
uses: VeryGoodOpenSource/very_good_workflows/brick/__brick__/{{project_name.snakeCase()}}/.github/workflows/pana.yml@v1
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/pana.yml@v1
{{/publishable}}
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,16 @@ jobs:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
with:
flutter_channel: stable
flutter_version: 3.7.1
flutter_version: 3.10.0
working_directory: {{project_name.snakeCase()}}
{{#publishable}}
pana:
uses: VeryGoodOpenSource/very_good_workflows/brick/__brick__/{{project_name.snakeCase()}}/.github/workflows/pana.yml@v1
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/pana.yml@v1
{{/publishable}}

android:
runs-on: macos-latest
if: false # TODO: Integration tests are flaky since Flutter 3.7.1
if: false # TODO: Integration tests are flaky, see https://github.com/VeryGoodOpenSource/very_good_flutter_plugin/issues/79

defaults:
run:
Expand Down Expand Up @@ -110,7 +110,7 @@ jobs:

linux:
runs-on: ubuntu-18.04
if: false # TODO: Integration tests are flaky since Flutter 3.7.1
if: false # TODO: Integration tests are flaky, see https://github.com/VeryGoodOpenSource/very_good_flutter_plugin/issues/79

defaults:
run:
Expand All @@ -137,7 +137,7 @@ jobs:

macos:
runs-on: macos-latest
if: false # TODO: Macos tests are flaky since Flutter 3.7.1
if: false # TODO: Macos tests are flaky, see https://github.com/VeryGoodOpenSource/very_good_flutter_plugin/issues/79

defaults:
run:
Expand Down Expand Up @@ -199,7 +199,7 @@ jobs:
run: flutter config --enable-windows-desktop

- name: Flutter Doctor
run: flutter doctor -v
run: flutter doctor -v

- name: Integration Tests
run: flutter test integration_test -d windows
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ jobs:
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
with:
flutter_channel: stable
flutter_version: 3.7.1
flutter_version: 3.10.0
working_directory: {{project_name.snakeCase()}}_platform_interface
{{#publishable}}
pana:
uses: VeryGoodOpenSource/very_good_workflows/brick/__brick__/{{project_name.snakeCase()}}/.github/workflows/pana.yml@v1
uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/pana.yml@v1
{{/publishable}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include: package:very_good_analysis/analysis_options.4.0.0.yaml
include: package:very_good_analysis/analysis_options.5.0.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ version: 0.1.0+1
{{^publishable}}publish_to: none{{/publishable}}

environment:
sdk: ">=2.19.0 <3.0.0"
flutter: ">=3.7.1"
sdk: ">=3.0.0 <4.0.0"

flutter:
plugin:
Expand All @@ -26,4 +25,4 @@ dev_dependencies:
flutter_test:
sdk: flutter
plugin_platform_interface: ^2.0.0
very_good_analysis: ^4.0.0
very_good_analysis: ^5.0.0
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ void main() {
{{project_name.camelCase()}} = {{project_name.pascalCase()}}Android();

log = <MethodCall>[];
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
.setMockMethodCallHandler({{project_name.camelCase()}}.methodChannel, (methodCall) async {
log.add(methodCall);
switch (methodCall.method) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include: package:very_good_analysis/analysis_options.4.0.0.yaml
include: package:very_good_analysis/analysis_options.5.0.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ version: 0.1.0+1
{{^publishable}}publish_to: none{{/publishable}}

environment:
sdk: ">=2.19.0 <3.0.0"
flutter: ">=3.7.1"
sdk: ">=3.0.0 <4.0.0"

flutter:
plugin:
Expand All @@ -25,4 +24,4 @@ dev_dependencies:
flutter_test:
sdk: flutter
plugin_platform_interface: ^2.0.0
very_good_analysis: ^4.0.0
very_good_analysis: ^5.0.0
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ void main() {
{{project_name.camelCase()}} = {{project_name.pascalCase()}}IOS();

log = <MethodCall>[];
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
.setMockMethodCallHandler({{project_name.camelCase()}}.methodChannel, (methodCall) async {
log.add(methodCall);
switch (methodCall.method) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include: package:very_good_analysis/analysis_options.4.0.0.yaml
include: package:very_good_analysis/analysis_options.5.0.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ version: 0.1.0+1
{{^publishable}}publish_to: none{{/publishable}}

environment:
sdk: ">=2.19.0 <3.0.0"
flutter: ">=3.7.1"
sdk: ">=3.0.0 <4.0.0"

flutter:
plugin:
Expand All @@ -24,4 +23,4 @@ dependencies:
dev_dependencies:
flutter_test:
sdk: flutter
very_good_analysis: ^4.0.0
very_good_analysis: ^5.0.0
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ void main() {
{{project_name.camelCase()}} = {{project_name.pascalCase()}}Linux();

log = <MethodCall>[];
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
.setMockMethodCallHandler({{project_name.camelCase()}}.methodChannel, (methodCall) async {
log.add(methodCall);
switch (methodCall.method) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include: package:very_good_analysis/analysis_options.4.0.0.yaml
include: package:very_good_analysis/analysis_options.5.0.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ version: 0.1.0+1
{{^publishable}}publish_to: none{{/publishable}}

environment:
sdk: ">=2.19.0 <3.0.0"
flutter: ">=3.7.1"
sdk: ">=3.0.0 <4.0.0"

flutter:
plugin:
Expand All @@ -24,4 +23,4 @@ dependencies:
dev_dependencies:
flutter_test:
sdk: flutter
very_good_analysis: ^4.0.0
very_good_analysis: ^5.0.0
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ void main() {
{{project_name.camelCase()}} = {{project_name.pascalCase()}}MacOS();

log = <MethodCall>[];
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
.setMockMethodCallHandler({{project_name.camelCase()}}.methodChannel, (methodCall) async {
log.add(methodCall);
switch (methodCall.method) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include: package:very_good_analysis/analysis_options.4.0.0.yaml
include: package:very_good_analysis/analysis_options.5.0.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ version: 0.1.0+1
{{^publishable}}publish_to: none{{/publishable}}

environment:
sdk: ">=2.19.0 <3.0.0"
flutter: ">=3.7.1"
sdk: ">=3.0.0 <4.0.0"

flutter:
plugin:
Expand All @@ -26,4 +25,4 @@ dependencies:
dev_dependencies:
flutter_test:
sdk: flutter
very_good_analysis: ^4.0.0
very_good_analysis: ^5.0.0
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include: package:very_good_analysis/analysis_options.4.0.0.yaml
include: package:very_good_analysis/analysis_options.5.0.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ version: 0.1.0+1
{{^publishable}}publish_to: none{{/publishable}}

environment:
sdk: ">=2.19.0 <3.0.0"
flutter: ">=3.7.1"
sdk: ">=3.0.0 <4.0.0"

flutter:
plugin:
Expand All @@ -24,4 +23,4 @@ dependencies:
dev_dependencies:
flutter_test:
sdk: flutter
very_good_analysis: ^4.0.0
very_good_analysis: ^5.0.0
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ void main() {
{{project_name.camelCase()}} = {{project_name.pascalCase()}}Windows();

log = <MethodCall>[];
TestDefaultBinaryMessengerBinding.instance!.defaultBinaryMessenger
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
.setMockMethodCallHandler({{project_name.camelCase()}}.methodChannel, (methodCall) async {
log.add(methodCall);
switch (methodCall.method) {
Expand Down
Loading

0 comments on commit 64453e5

Please sign in to comment.