Skip to content

Commit

Permalink
Merge remote-tracking branch 'base/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	flutter_local_notifications/ios/Classes/FlutterLocalNotificationsPlugin.m
#	flutter_local_notifications/pubspec.yaml
#	flutter_local_notifications_linux/pubspec.yaml
  • Loading branch information
remcoanker committed Feb 19, 2024
2 parents 772843c + 2783939 commit d879284
Show file tree
Hide file tree
Showing 120 changed files with 5,427 additions and 2,472 deletions.
186 changes: 0 additions & 186 deletions .cirrus.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
As this repository hosts two packages, please ensure the PR title starts with the name of the package that it relates to using square brackets (e.g. [flutter_local_notifications]). The contribution guidelines can be found at https://github.com/MaikuB/flutter_local_notifications/blob/master/CONTRIBUTING.md. Please review this as it contains details on what to follow when submitting a PR.
As this repository hosts multiple packages, please ensure the PR title starts with the name of the package that it relates to using square brackets (e.g. [flutter_local_notifications]). Should the PR more than one package than please prefix the title of the PR with [various] The contribution guidelines can be found at https://github.com/MaikuB/flutter_local_notifications/blob/master/CONTRIBUTING.md. Please review this as it contains details on what to follow when submitting a PR.
10 changes: 7 additions & 3 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,23 @@ name: format

on: push

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
java_format:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2 # v2 minimum required
- uses: actions/checkout@v4
- uses: axel-op/googlejavaformat-action@v3
with:
args: '--skip-sorting-imports --replace'

objc_format:
runs-on: macos-latest
steps:
- uses: actions/checkout@v2 # v2 minimum required
- uses: actions/checkout@v4
- name: Test
run: |
which clang-format || brew install clang-format
Expand All @@ -26,7 +30,7 @@ jobs:
swift_format:
runs-on: macos-latest
steps:
- uses: actions/checkout@v2 # v2 minimum required
- uses: actions/checkout@v4
- name: Test
run: |
which swiftlint || brew install swiftlint
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/scripts/install-tools.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
dart pub global activate melos 2.9.0
melos bootstrap
Loading

0 comments on commit d879284

Please sign in to comment.