Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps!: Update min Flutter to v3.13.0, compatibility with v3.16.8 #1715

Merged
merged 43 commits into from
Jan 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
e82fb2e
chore: Bump min Flutter version to 3.13.0
Gustl22 Nov 28, 2023
2e1d949
Upgrade packages
Gustl22 Nov 28, 2023
e0000de
Remove dartdoc from 7ca5058acbaab061dfcc18c61fbdf42b7fc5ed87 as inclu…
Gustl22 Nov 28, 2023
6311fcc
Remove dartdoc packages
Gustl22 Nov 28, 2023
2556c4e
Fix melos commands
Gustl22 Nov 28, 2023
7d7d92e
example: compatibility with installed flutter sdk
Gustl22 Nov 29, 2023
7b33d99
fix: bbc url
Gustl22 Nov 29, 2023
f31fceb
Revert "fix: bbc url"
Gustl22 Nov 29, 2023
848666d
Merge remote-tracking branch 'upstream/main' into gustl22/upgrade-flu…
Gustl22 Nov 30, 2023
78ba3f9
Remove unsupported flutter version
Gustl22 Nov 30, 2023
59eedf8
Merge branch 'main' into gustl22/upgrade-flutter
Gustl22 Nov 30, 2023
4228c5e
Fix tests on linux
Gustl22 Nov 30, 2023
11a1202
Fix tests on linux
Gustl22 Nov 30, 2023
7f379d4
Print statement let pass test
Gustl22 Nov 30, 2023
1ee1076
Merge branch 'main' into gustl22/upgrade-flutter
Gustl22 Dec 10, 2023
672d8bc
attempt to fix tests
Gustl22 Dec 10, 2023
eb4c5e7
fix awaiting
Gustl22 Dec 10, 2023
ee7f140
add await again
Gustl22 Dec 10, 2023
1833b03
Only pump, if throw error on linux
Gustl22 Dec 10, 2023
8653e60
Add missing pump
Gustl22 Dec 10, 2023
39c42da
test: remove unnecessary cast
Gustl22 Dec 14, 2023
44d7676
fix(linux): Handle failures in OnMediaError only
Gustl22 Dec 14, 2023
bb00848
test(linux): Remove pumps
Gustl22 Dec 14, 2023
ed6809b
Revert "test(linux): Remove pumps"
Gustl22 Dec 14, 2023
5b869d6
Revert "Only pump, if throw error on linux"
Gustl22 Dec 14, 2023
fad65e8
test(linux): Remove pumps from platform_test only
Gustl22 Dec 14, 2023
5b2918c
test(linux): Replace WidgetTester.pump with Future.delayed
Gustl22 Dec 15, 2023
ca975a2
fix(android): propagate synchronous errors
Gustl22 Dec 15, 2023
0c9668c
deps: test with Flutter 3.16.4
Gustl22 Dec 15, 2023
39db425
fix: Propagate Stream Errors through the same Future
Gustl22 Dec 15, 2023
22c67d7
Merge remote-tracking branch 'upstream/main' into gustl22/upgrade-flu…
Gustl22 Dec 15, 2023
f7441b2
fix: Propagate Stream Errors through the same Future
Gustl22 Dec 15, 2023
5db8900
tests: Move timeout
Gustl22 Dec 15, 2023
ba21378
tests: Move timeout
Gustl22 Dec 15, 2023
8273619
tests(android): skip a test
Gustl22 Dec 15, 2023
c8cc9b4
Merge remote-tracking branch 'upstream/gustl22/stream-error-propagati…
Gustl22 Jan 9, 2024
3de493f
Flutter channel selection
Gustl22 Jan 18, 2024
23ba338
test current stable
Gustl22 Jan 18, 2024
6387614
WIP: use master channel
Gustl22 Jan 18, 2024
4635937
Revert "WIP: use master channel"
Gustl22 Jan 18, 2024
c4c522c
Remove linux workaround
Gustl22 Jan 18, 2024
faf151c
Revert "Remove linux workaround"
Gustl22 Jan 18, 2024
c7b3f4d
Merge remote-tracking branch 'upstream/main' into gustl22/upgrade-flu…
Gustl22 Jan 19, 2024
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
33 changes: 22 additions & 11 deletions .github/workflows/build-example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,18 @@ on:
type: choice
options:
- 'any'
- '3.16.x'
- '3.13.x'
- '3.10.x'
- '3.7.x'
- '3.3.x'
- '3.0.x'
flutter_channel:
description: 'Flutter Channel'
required: false
default: 'stable'
type: choice
options:
- 'stable'
- 'beta'
- 'dev'
- 'master'
enable_android:
description: 'Build Android'
required: false
Expand Down Expand Up @@ -53,7 +60,11 @@ on:
inputs:
flutter_version:
required: false
default: '3.13.0'
default: '3.16.8'
type: string
flutter_channel:
required: false
default: 'stable'
type: string
enable_android:
required: false
Expand Down Expand Up @@ -94,7 +105,7 @@ jobs:
- uses: subosito/flutter-action@v2
with:
flutter-version: ${{ inputs.flutter_version }}
channel: 'stable'
channel: ${{ inputs.flutter_channel }}
- uses: bluefireteam/melos-action@main

- name: Example app - Build Web app
Expand All @@ -120,7 +131,7 @@ jobs:
- uses: subosito/flutter-action@v2
with:
flutter-version: ${{ inputs.flutter_version }}
channel: 'stable'
channel: ${{ inputs.flutter_channel }}
- uses: bluefireteam/melos-action@main

- name: Example App - Build Android APK
Expand All @@ -136,7 +147,7 @@ jobs:
- uses: subosito/flutter-action@v2
with:
flutter-version: ${{ inputs.flutter_version }}
channel: 'stable'
channel: ${{ inputs.flutter_channel }}
- uses: bluefireteam/melos-action@main

- name: Example app - Build iOS
Expand All @@ -152,7 +163,7 @@ jobs:
- uses: subosito/flutter-action@v2
with:
flutter-version: ${{ inputs.flutter_version }}
channel: 'stable'
channel: ${{ inputs.flutter_channel }}
- uses: bluefireteam/melos-action@main

- name: Example app - Build macOS
Expand All @@ -168,7 +179,7 @@ jobs:
- uses: subosito/flutter-action@v2
with:
flutter-version: ${{ inputs.flutter_version }}
channel: 'stable'
channel: ${{ inputs.flutter_channel }}
- uses: bluefireteam/melos-action@main

- name: Example app - Build Windows app
Expand All @@ -184,7 +195,7 @@ jobs:
- uses: subosito/flutter-action@v2
with:
flutter-version: ${{ inputs.flutter_version }}
channel: 'stable'
channel: ${{ inputs.flutter_channel }}
- uses: bluefireteam/melos-action@main

- name: Install Flutter requirements for Linux
Expand Down
34 changes: 23 additions & 11 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,18 @@ on:
type: choice
options:
- 'any'
- '3.16.x'
- '3.13.x'
- '3.10.x'
- '3.7.x'
- '3.3.x'
flutter_channel:
description: 'Flutter Channel'
required: false
default: 'stable'
type: choice
options:
- 'stable'
- 'beta'
- 'dev'
- 'master'
fatal_warnings:
description: 'Treat warnings as fatal'
required: false
Expand Down Expand Up @@ -52,7 +60,11 @@ on:
inputs:
flutter_version:
required: false
default: '3.13.0'
default: '3.16.8'
type: string
flutter_channel:
required: false
default: 'stable'
type: string
fatal_warnings:
required: false
Expand Down Expand Up @@ -96,7 +108,7 @@ jobs:
- uses: subosito/flutter-action@v2
with:
flutter-version: ${{ inputs.flutter_version }}
channel: 'stable'
channel: ${{ inputs.flutter_channel }}
- uses: bluefireteam/melos-action@main

- run: melos run format-check
Expand Down Expand Up @@ -128,7 +140,7 @@ jobs:
- uses: subosito/flutter-action@v2
with:
flutter-version: ${{ inputs.flutter_version }}
channel: 'stable'
channel: ${{ inputs.flutter_channel }}
- uses: bluefireteam/melos-action@main
- uses: nanasess/setup-chromedriver@v2

Expand Down Expand Up @@ -179,7 +191,7 @@ jobs:
- uses: subosito/flutter-action@v2
with:
flutter-version: ${{ inputs.flutter_version }}
channel: 'stable'
channel: ${{ inputs.flutter_channel }}
- uses: bluefireteam/melos-action@main

- name: Download Android emulator image
Expand Down Expand Up @@ -220,7 +232,7 @@ jobs:
- uses: subosito/flutter-action@v2
with:
flutter-version: ${{ inputs.flutter_version }}
channel: 'stable'
channel: ${{ inputs.flutter_channel }}
- uses: bluefireteam/melos-action@main

- name: List all simulators
Expand Down Expand Up @@ -249,7 +261,7 @@ jobs:
- uses: subosito/flutter-action@v2
with:
flutter-version: ${{ inputs.flutter_version }}
channel: 'stable'
channel: ${{ inputs.flutter_channel }}
- uses: bluefireteam/melos-action@main

- name: Run Flutter integration tests
Expand All @@ -270,7 +282,7 @@ jobs:
- uses: subosito/flutter-action@v2
with:
flutter-version: ${{ inputs.flutter_version }}
channel: 'stable'
channel: ${{ inputs.flutter_channel }}
- uses: bluefireteam/melos-action@main
- name: Start audio server
run: net start audiosrv
Expand Down Expand Up @@ -311,7 +323,7 @@ jobs:
- uses: subosito/flutter-action@v2
with:
flutter-version: ${{ inputs.flutter_version }}
channel: 'stable'
channel: ${{ inputs.flutter_channel }}
- uses: bluefireteam/melos-action@main
- name: Install Flutter requirements for Linux
run: |
Expand Down
8 changes: 4 additions & 4 deletions melos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ scripts:

format:
run: melos exec dart format . --fix
description: Run `flutter format` for all packages.
description: Run `dart format` for all packages.

format-check:
run: melos exec dart format . --set-exit-if-changed
description: Run `flutter format` checks for all packages.
description: Run `dart format` checks for all packages.

dartdoc:
run: melos exec flutter pub run dartdoc
description: Run dartdoc checks for all non-example packages.
run: melos exec dart doc
description: Run `dart doc` for all non-example packages.
packageFilters:
ignore: "*_example"

Expand Down
3 changes: 2 additions & 1 deletion packages/audioplayers/example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdk 33
// Allow compatibility with selected Flutter SDK
compileSdk flutter.compileSdkVersion

namespace 'xyz.luan.audioplayers.example'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,15 @@ import 'package:flutter/foundation.dart';
import 'package:flutter_test/flutter_test.dart';

extension LibWidgetTester on WidgetTester {
Future<void> pumpLinux() async {
Future<void> pumpPlatform([
Duration? duration,
EnginePhase phase = EnginePhase.sendSemanticsUpdate,
]) async {
if (!kIsWeb && defaultTargetPlatform == TargetPlatform.linux) {
// FIXME(gustl22): Linux needs additional pump (#1556)
await pump();
// FIXME(1556): Pump on Linux doesn't work with GStreamer bus callback
await Future.delayed(duration ?? Duration.zero);
} else {
await pump(duration, phase);
}
}

Expand Down
Loading