Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/upstream/main' into gustl2…
Browse files Browse the repository at this point in the history
…2/1689-release-mode

# Conflicts:
#	.github/workflows/test.yml
  • Loading branch information
Gustl22 committed Nov 17, 2024
2 parents 5ebceca + b401a23 commit 90b844e
Show file tree
Hide file tree
Showing 24 changed files with 156 additions and 45 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build-example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ jobs:
with:
flutter-version: ${{ inputs.flutter_version }}
channel: ${{ inputs.flutter_channel }}
- uses: bluefireteam/melos-action@main
- uses: bluefireteam/melos-action@v3

- name: Example app - Build Web app
working-directory: ./packages/audioplayers/example
Expand Down Expand Up @@ -153,7 +153,7 @@ jobs:
with:
flutter-version: ${{ inputs.flutter_version }}
channel: ${{ inputs.flutter_channel }}
- uses: bluefireteam/melos-action@main
- uses: bluefireteam/melos-action@v3

- name: Example App - Build Android APK
working-directory: ./packages/audioplayers/example
Expand All @@ -169,7 +169,7 @@ jobs:
with:
flutter-version: ${{ inputs.flutter_version }}
channel: ${{ inputs.flutter_channel }}
- uses: bluefireteam/melos-action@main
- uses: bluefireteam/melos-action@v3

- name: Example app - Build iOS
working-directory: ./packages/audioplayers/example
Expand All @@ -185,7 +185,7 @@ jobs:
with:
flutter-version: ${{ inputs.flutter_version }}
channel: ${{ inputs.flutter_channel }}
- uses: bluefireteam/melos-action@main
- uses: bluefireteam/melos-action@v3

- name: Example app - Build macOS
working-directory: ./packages/audioplayers/example
Expand All @@ -201,7 +201,7 @@ jobs:
with:
flutter-version: ${{ inputs.flutter_version }}
channel: ${{ inputs.flutter_channel }}
- uses: bluefireteam/melos-action@main
- uses: bluefireteam/melos-action@v3

- name: Example app - Build Windows app
working-directory: ./packages/audioplayers/example
Expand All @@ -217,7 +217,7 @@ jobs:
with:
flutter-version: ${{ inputs.flutter_version }}
channel: ${{ inputs.flutter_channel }}
- uses: bluefireteam/melos-action@main
- uses: bluefireteam/melos-action@v3

- name: Install Flutter requirements for Linux
run: |
Expand Down
34 changes: 34 additions & 0 deletions .github/workflows/release-prepare.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Prepare release
on:
workflow_dispatch:
inputs:
prerelease:
description: 'Version as prerelease'
required: false
default: false
type: boolean

jobs:
call-min-flutter-test:
uses: ./.github/workflows/test.yml
with:
flutter_version: '3.22.0'
fatal_warnings: false
prepare-release:
name: Prepare release
needs: call-min-flutter-test
permissions:
contents: write
pull-requests: write
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: subosito/flutter-action@v2
- uses: bluefireteam/melos-action@v3
with:
run-versioning: ${{ inputs.prerelease == false }}
run-versioning-prerelease: ${{ inputs.prerelease == true }}
publish-dry-run: true
create-pr: true
git-email: contact@blue-fire.xyz
git-name: Bluefireteam
19 changes: 19 additions & 0 deletions .github/workflows/release-publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Publish packages
on:
workflow_dispatch:

jobs:
publish-packages:
name: Publish packages
permissions:
contents: write
id-token: write # Required for authentication using OIDC
runs-on: [ ubuntu-latest ]
steps:
- uses: actions/checkout@v4
- uses: subosito/flutter-action@v2
- uses: bluefireteam/melos-action@v3
with:
publish: true
git-email: contact@blue-fire.xyz
git-name: Bluefireteam
18 changes: 18 additions & 0 deletions .github/workflows/release-tag.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Tag release
on:
push:
branches: [main]

jobs:
publish-packages:
name: Create tag for a release
permissions:
contents: write
runs-on: [ ubuntu-latest ]
if: contains(github.event.head_commit.message, 'chore(release)')
steps:
- uses: actions/checkout@v4
- uses: subosito/flutter-action@v2
- uses: bluefireteam/melos-action@v3
with:
tag: true
12 changes: 0 additions & 12 deletions .github/workflows/release.yml

This file was deleted.

16 changes: 8 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ jobs:
with:
flutter-version: ${{ inputs.flutter_version }}
channel: ${{ inputs.flutter_channel }}
- uses: bluefireteam/melos-action@main
- uses: bluefireteam/melos-action@v3

- run: melos format --set-exit-if-changed
- run: melos analyze ${{ inputs.fatal_warnings && '--fatal-infos' || '--no-fatal-warnings' }}
Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:
with:
flutter-version: ${{ inputs.flutter_version }}
channel: ${{ inputs.flutter_channel }}
- uses: bluefireteam/melos-action@main
- uses: bluefireteam/melos-action@v3
- uses: nanasess/setup-chromedriver@v2

- name: Run Flutter integration tests
Expand Down Expand Up @@ -198,7 +198,7 @@ jobs:
with:
flutter-version: ${{ inputs.flutter_version }}
channel: ${{ inputs.flutter_channel }}
- uses: bluefireteam/melos-action@main
- uses: bluefireteam/melos-action@v3

- name: Download Android emulator image
run: |
Expand Down Expand Up @@ -240,7 +240,7 @@ jobs:
with:
flutter-version: ${{ inputs.flutter_version }}
channel: ${{ inputs.flutter_channel }}
- uses: bluefireteam/melos-action@main
- uses: bluefireteam/melos-action@v3

- name: Run Flutter integration tests
working-directory: ./packages/audioplayers/example
Expand Down Expand Up @@ -299,7 +299,7 @@ jobs:
( cd server; dart run bin/server.dart ) &
flutter test -d macos integration_test/platform_test.dart --dart-define USE_LOCAL_SERVER=true
# flutter test -d macos integration_test/lib_test.dart --dart-define USE_LOCAL_SERVER=true
# TODO: Integration tests on macOS 13 currently time out.
# TODO: Integration tests on macOS 13 currently time out.
# flutter test -d macos integration_test/app_test.dart --dart-define USE_LOCAL_SERVER=true

macos-14:
Expand All @@ -312,7 +312,7 @@ jobs:
with:
flutter-version: ${{ inputs.flutter_version }}
channel: ${{ inputs.flutter_channel }}
- uses: bluefireteam/melos-action@main
- uses: bluefireteam/melos-action@v3

- name: Run Flutter integration tests
working-directory: ./packages/audioplayers/example
Expand All @@ -333,7 +333,7 @@ jobs:
with:
flutter-version: ${{ inputs.flutter_version }}
channel: ${{ inputs.flutter_channel }}
- uses: bluefireteam/melos-action@main
- uses: bluefireteam/melos-action@v3
- name: Start audio server
run: net start audiosrv
- name: Download virtual audio device
Expand Down Expand Up @@ -378,7 +378,7 @@ jobs:
with:
flutter-version: ${{ inputs.flutter_version }}
channel: ${{ inputs.flutter_channel }}
- uses: bluefireteam/melos-action@main
- uses: bluefireteam/melos-action@v3
- name: Install Flutter requirements for Linux
run: |
sudo apt-get update
Expand Down
34 changes: 26 additions & 8 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,32 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## 2024-08-26

### Changes

---

Packages with breaking changes:

- There are no breaking changes in this release.

Packages with other changes:

- [`audioplayers_web` - `v5.0.1`](#audioplayers_web---v501)
- [`audioplayers` - `v6.1.0`](#audioplayers---v610)

---

#### `audioplayers_web` - `v5.0.1`

- **DEPS**: Consider web:1.0.0 ([#1828](https://github.com/bluefireteam/audioplayers/pull/1828)). ([9d25e78d](https://github.com/bluefireteam/audioplayers/commit/9d25e78d24a687c90ffa76f034c418d2bbe45251))

#### `audioplayers` - `v6.1.0`

- **FEAT**: Upgrade to Flutter v3.22.x ([#1803](https://github.com/bluefireteam/audioplayers/issues/1803)). ([4d669e72](https://github.com/bluefireteam/audioplayers/commit/4d669e723dc5c2399073301ba9333f99bc623669))


## 2024-03-19

### Changes
Expand Down Expand Up @@ -85,10 +111,6 @@ Packages with other changes:
- **BREAKING** **FEAT**: FramePositionUpdater & TimerPositionUpdater ([#1664](https://github.com/bluefireteam/audioplayers/issues/1664)). ([1ea93536](https://github.com/bluefireteam/audioplayers/commit/1ea93536b448fa5d43281cbc0a7b67445fc1a9a8))
- **BREAKING** **DEPS**: Update min Flutter to v3.13.0, compatibility with v3.16.8 ([#1715](https://github.com/bluefireteam/audioplayers/issues/1715)). ([e4262f4c](https://github.com/bluefireteam/audioplayers/commit/e4262f4c0d6582c35738ace603583c81bd5a3b4b))

# Change Log

All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## 2023-11-14

Expand Down Expand Up @@ -116,10 +138,6 @@ Packages with other changes:

- **FIX**(android): Released wrong source in LOW_LATENCY mode ([#1672](https://github.com/bluefireteam/audioplayers/issues/1672)). ([d9c5f693](https://github.com/bluefireteam/audioplayers/commit/d9c5f693cafab21b67b785de6244c3c371344a53))

# Change Log

All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## 2023-10-02

Expand Down
4 changes: 4 additions & 0 deletions packages/audioplayers/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 6.1.0

- **FEAT**: Upgrade to Flutter v3.22.x ([#1803](https://github.com/bluefireteam/audioplayers/issues/1803)). ([4d669e72](https://github.com/bluefireteam/audioplayers/commit/4d669e723dc5c2399073301ba9333f99bc623669))

## 6.0.0

> Note: This release has breaking changes.
Expand Down
13 changes: 8 additions & 5 deletions packages/audioplayers/example/integration_test/lib_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,14 @@ void main() async {
expect(positions.last, Duration.zero);
}
},
// FIXME(gustl22): Android provides no position for samples shorter
// than 0.5 seconds.
skip: isAndroid &&
!td.isLiveStream &&
td.duration! < const Duration(seconds: 1),
skip:
// FIXME(gustl22): [FLAKY] macos 13 fails on live streams.
(isMacOS && td.isLiveStream) ||
// FIXME(gustl22): Android provides no position for samples
// shorter than 0.5 seconds.
(isAndroid &&
!td.isLiveStream &&
td.duration! < const Duration(seconds: 1)),
);
}

Expand Down
2 changes: 1 addition & 1 deletion packages/audioplayers/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Demonstrates how to use the audioplayers plugin.
publish_to: none

dependencies:
audioplayers: ^6.0.0
audioplayers: ^6.1.0
collection: ^1.16.0
file_picker: ^8.0.3
flutter:
Expand Down
1 change: 0 additions & 1 deletion packages/audioplayers/example/server/public/files/audio

This file was deleted.

4 changes: 2 additions & 2 deletions packages/audioplayers/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: audioplayers
description: A Flutter plugin to play multiple audio files simultaneously
version: 6.0.0
version: 6.1.0
homepage: https://github.com/bluefireteam/audioplayers
repository: https://github.com/bluefireteam/audioplayers/tree/master/packages/audioplayers

Expand All @@ -25,7 +25,7 @@ dependencies:
audioplayers_darwin: ^6.0.0
audioplayers_linux: ^4.0.0
audioplayers_platform_interface: ^7.0.0
audioplayers_web: ^5.0.0
audioplayers_web: ^5.0.1
audioplayers_windows: ^4.0.0
file: '>=6.1.0 <8.0.0'
flutter:
Expand Down
14 changes: 14 additions & 0 deletions packages/audioplayers_linux/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,17 @@ sudo pacman -S gstreamer gst-libav gst-plugins-base gst-plugins-good
```

You can install additional plugins as needed following [the Wiki](https://wiki.archlinux.org/title/GStreamer).

### Fedora/RHEL

[Flutter](https://docs.flutter.dev/get-started/install/linux#linux-setup) dependencies:

```bash
sudo dnf install clang cmake ninja-build pkg-config
```

[GStreamer](https://gstreamer.freedesktop.org/documentation/installing/on-linux.html?gi-language=c):

```bash
sudo dnf install gstreamer1-devel gstreamer1-plugins-base-devel
```
4 changes: 4 additions & 0 deletions packages/audioplayers_web/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 5.0.1

- **DEPS**: Consider web:1.0.0 ([#1828](https://github.com/bluefireteam/audioplayers/pull/1828)). ([9d25e78d](https://github.com/bluefireteam/audioplayers/commit/9d25e78d24a687c90ffa76f034c418d2bbe45251))

## 5.0.0

> Note: This release has breaking changes.
Expand Down
2 changes: 2 additions & 0 deletions packages/audioplayers_web/lib/wrapped_player.dart
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,8 @@ class WrappedPlayer {
}

void pause() {
// TODO(Gustl22): remove ignore, when web >= 1.0.0
// ignore: unnecessary_cast
_pausedAt = player?.currentTime as double?;
_isPlaying = false;
player?.pause();
Expand Down
Loading

0 comments on commit 90b844e

Please sign in to comment.