Merge branch 'main' into content_sizing

pull/2787/head
Eric Windmill 2 months ago committed by GitHub
commit 01fbd8448a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -26,8 +26,8 @@ jobs:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
steps:
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654
with:
distribution: 'zulu'
java-version: '17'
@ -42,8 +42,8 @@ jobs:
runs-on: ubuntu-latest
if: github.repository == 'flutter/samples'
steps:
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654
with:
distribution: 'zulu'
java-version: '17'
@ -58,8 +58,8 @@ jobs:
# runs-on: macos-latest
# if: github.repository == 'flutter/samples'
# steps:
# - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
# - uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e
# - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
# - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654
# with:
# distribution: 'zulu'
# java-version: '17'

@ -19,8 +19,8 @@ jobs:
runs-on: ubuntu-latest
if: github.repository == 'flutter/samples'
steps:
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654
with:
distribution: 'zulu'
java-version: '17'

@ -22,8 +22,8 @@ jobs:
strategy:
fail-fast: false
steps:
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654
with:
distribution: 'zulu'
java-version: '17'

@ -144,7 +144,7 @@ jobs:
- name: 'Checkout PR branch'
if: |-
${{ steps.get_context.outputs.is_pr == 'true' }}
uses: 'actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8' # ratchet:actions/checkout@v4
uses: 'actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd' # ratchet:actions/checkout@v4
with:
token: '${{ steps.generate_token.outputs.token || secrets.GITHUB_TOKEN }}'
repository: '${{ github.repository }}'
@ -154,7 +154,7 @@ jobs:
- name: 'Checkout main branch'
if: |-
${{ steps.get_context.outputs.is_pr == 'false' }}
uses: 'actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8' # ratchet:actions/checkout@v4
uses: 'actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd' # ratchet:actions/checkout@v4
with:
token: '${{ steps.generate_token.outputs.token || secrets.GITHUB_TOKEN }}'
repository: '${{ github.repository }}'

@ -44,7 +44,7 @@ jobs:
steps:
- name: 'Checkout repository'
uses: 'actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8' # ratchet:actions/checkout@v4
uses: 'actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd' # ratchet:actions/checkout@v4
- name: 'Generate GitHub App Token'
id: 'generate_token'

@ -26,7 +26,7 @@ jobs:
steps:
- name: 'Checkout repository'
uses: 'actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8' # ratchet:actions/checkout@v4
uses: 'actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd' # ratchet:actions/checkout@v4
- name: 'Generate GitHub App Token'
id: 'generate_token'

@ -66,7 +66,7 @@ jobs:
steps:
- name: 'Checkout PR code'
uses: 'actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8' # ratchet:actions/checkout@v4
uses: 'actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd' # ratchet:actions/checkout@v4
- name: 'Generate GitHub App Token'
id: 'generate_token'

@ -27,8 +27,8 @@ jobs:
flutter_version: [stable, beta]
os: [ubuntu-latest, macos-latest]
steps:
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654
with:
distribution: 'zulu'
java-version: '17'

@ -38,7 +38,7 @@ page.
* If the `schema.dart` is modified, the generated classes can be updated with
```bash
flutter pub run pigeon --input pigeon/schema.dart \
dart run pigeon --input pigeon/schema.dart \
--dart_out lib/api.dart \
--objc_header_out ../ios_books/IosBooks/api.h \
--objc_source_out ../ios_books/IosBooks/api.m \

@ -16,7 +16,7 @@ in `pigeon/schema.dart` is updated, the generated classes can also be re-
generated using:
```shell
flutter pub run pigeon --input pigeon/schema.dart \
dart run pigeon --input pigeon/schema.dart \
--dart_out lib/api.dart \
--objc_header_out ../ios_books/IosBooks/api.h \
--objc_source_out ../ios_books/IosBooks/api.m \

@ -1,5 +1,5 @@
#!/bin/sh
flutter pub run pigeon --input pigeon/schema.dart \
dart run pigeon --input pigeon/schema.dart \
--dart_out lib/api.dart \
--objc_header_out ../ios_books/IosBooks/api.h \
--objc_source_out ../ios_books/IosBooks/api.m \

@ -9,7 +9,7 @@ part 'booking_summary.g.dart';
/// BookingSummary contains the necessary data to display a booking
/// in the user home screen, but lacks the rest of the booking data
/// like activitities or destination.
/// like activities or destination.
///
/// Use the [BookingRepository] to obtain a full [Booking]
/// using the [BookingSummary.id].

@ -32,7 +32,7 @@ Future<void> generateJsonBindings() async => _logProcessOutput(
@Task()
Future<void> watch() async => _logProcessOutput(
Process.start('flutter', ['pub', 'run', 'build_runner', 'watch']),
Process.start('dart', ['run', 'build_runner', 'watch']),
);
@Task()

@ -32,7 +32,7 @@ Future<void> generateJsonBindings() async => _logProcessOutput(
@Task()
Future<void> watch() async => _logProcessOutput(
Process.start('flutter', ['pub', 'run', 'build_runner', 'watch']),
Process.start('dart', ['run', 'build_runner', 'watch']),
);
@Task()

@ -69,7 +69,7 @@ lib
The state management approach is intentionally low-level. That way, it's easy to
take this project and run with it, without having to learn new paradigms, or having
to remember to run `flutter pub run build_runner watch`. You are,
to remember to run `dart run build_runner watch`. You are,
of course, encouraged to use whatever paradigm, helper package or code generation
scheme that you prefer.
@ -522,7 +522,7 @@ To update the launcher icon, first change the files
Then, run the following:
```bash
flutter pub run flutter_launcher_icons:main
dart run flutter_launcher_icons:main
```
You can [configure](https://github.com/fluttercommunity/flutter_launcher_icons#book-guide)

@ -1,4 +1,4 @@
# Run with `flutter pub run ffigen --config ffigen.yaml`.
# Run with `dart run ffigen --config ffigen.yaml`.
name: PedometerBindings
description: "Bindings for CM pedometers"
language: objc

@ -11,26 +11,26 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^20.0.3",
"@angular/animations": "^21.1.1",
"@angular/cdk": "^20.1.0",
"@angular/common": "^20.1.4",
"@angular/compiler": "^20.0.6",
"@angular/common": "^21.1.1",
"@angular/compiler": "^21.1.0",
"@angular/core": "^20.0.3",
"@angular/forms": "^20.1.2",
"@angular/material": "^20.1.0",
"@angular/forms": "^21.1.0",
"@angular/material": "^21.1.1",
"@angular/platform-browser": "^20.0.3",
"@angular/platform-browser-dynamic": "^20.1.0",
"@angular/router": "^20.0.3",
"@angular/router": "^21.1.0",
"rxjs": "~7.8.1",
"tslib": "^2.6.2",
"zone.js": "~0.15.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "^20.0.2",
"@angular/cli": "~20.1.0",
"@angular/cli": "~21.1.1",
"@angular/compiler-cli": "^20.0.3",
"@types/jasmine": "~5.1.0",
"jasmine-core": "~5.5.0",
"@types/jasmine": "~6.0.0",
"jasmine-core": "~6.0.0",
"karma": "~6.4.2",
"karma-chrome-launcher": "~3.2.0",
"karma-coverage": "~2.2.0",

Loading…
Cancel
Save