Skip to content

Commit aacadba

Browse files
committed
Merge remote-tracking branch 'origin/next' into fix/legacy
2 parents a458a5b + 2b48b5d commit aacadba

File tree

20 files changed

+400
-64
lines changed

20 files changed

+400
-64
lines changed

.github/workflows/backward_compatibility.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
env:
3535
GOLDEN_SKIP: "yes"
3636
steps:
37-
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
37+
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
3838
- name: Update pubspec.yaml
3939
run: |
4040
set -e
@@ -76,7 +76,7 @@ jobs:
7676
cat pubspec.yaml
7777
7878
- name: Setup Flutter
79-
uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa # v2.10.0
79+
uses: subosito/flutter-action@cc97e1648fff6ca5cc647fa67f47e70f7895510b # v2.11.0
8080
with:
8181
flutter-version: ${{ env.FLUTTER_VERSION }}
8282
- run: flutter test
@@ -99,7 +99,7 @@ jobs:
9999
env:
100100
GOLDEN_SKIP: "yes"
101101
steps:
102-
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
102+
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
103103
- name: Update pubspec.yaml
104104
run: |
105105
set -e
@@ -112,7 +112,7 @@ jobs:
112112
# output for debugging
113113
cat pubspec.yaml
114114
- name: Setup Flutter
115-
uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa # v2.10.0
115+
uses: subosito/flutter-action@cc97e1648fff6ca5cc647fa67f47e70f7895510b # v2.11.0
116116
with:
117117
channel: ${{ matrix.channel }}
118118
- run: flutter test

.github/workflows/demo_app.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ jobs:
1111
name: vercel
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
14+
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
1515
- name: Setup Flutter
16-
uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa # v2.10.0
16+
uses: subosito/flutter-action@cc97e1648fff6ca5cc647fa67f47e70f7895510b # v2.11.0
1717
with:
1818
cache: true
1919
- name: Gradle cache
20-
uses: gradle/gradle-build-action@ef76a971e2fa3f867b617efd72f2fbd72cf6f8bc # v2.8.0
20+
uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2.9.0
2121

2222
- name: Run flutter build apk --debug
2323
run: |

.github/workflows/flutter.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ jobs:
1616
name: Unit test
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
19+
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
2020
- uses: actions/dependency-review-action@6c5ccdad469c9f8a2996bfecaec55a631a347034 # v3.1.0
2121
if: github.base_ref
2222
- name: Setup Flutter
23-
uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa # v2.10.0
23+
uses: subosito/flutter-action@cc97e1648fff6ca5cc647fa67f47e70f7895510b # v2.11.0
2424
with:
2525
cache: true
2626
- run: dart format --set-exit-if-changed --output none .
@@ -43,13 +43,13 @@ jobs:
4343
name: Integration test (Android)
4444
runs-on: macos-latest
4545
steps:
46-
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
46+
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
4747
- name: Setup Flutter
48-
uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa # v2.10.0
48+
uses: subosito/flutter-action@cc97e1648fff6ca5cc647fa67f47e70f7895510b # v2.11.0
4949
with:
5050
cache: true
5151
- name: Gradle cache
52-
uses: gradle/gradle-build-action@ef76a971e2fa3f867b617efd72f2fbd72cf6f8bc # v2.8.0
52+
uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2.9.0
5353
with:
5454
# only update gradle cache from demo_app.yml jobs
5555
cache-read-only: false
@@ -90,9 +90,9 @@ jobs:
9090
name: Integration test (iOS)
9191
runs-on: macos-latest
9292
steps:
93-
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
93+
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
9494
- name: Setup Flutter
95-
uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa # v2.10.0
95+
uses: subosito/flutter-action@cc97e1648fff6ca5cc647fa67f47e70f7895510b # v2.11.0
9696
with:
9797
cache: true
9898

.github/workflows/flutter_beta.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ jobs:
1717
env:
1818
GOLDEN_SKIP: "yes"
1919
steps:
20-
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
20+
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
2121
- name: Setup Flutter
22-
uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa # v2.10.0
22+
uses: subosito/flutter-action@cc97e1648fff6ca5cc647fa67f47e70f7895510b # v2.11.0
2323
with:
2424
channel: beta
2525
- run: ./tool/test.sh --coverage

.github/workflows/flutter_master.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ jobs:
1717
env:
1818
GOLDEN_SKIP: "yes"
1919
steps:
20-
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
20+
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
2121
- name: Setup Flutter
22-
uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa # v2.10.0
22+
uses: subosito/flutter-action@cc97e1648fff6ca5cc647fa67f47e70f7895510b # v2.11.0
2323
with:
2424
channel: master
2525
- run: ./tool/test.sh

.github/workflows/scorecard.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ jobs:
1616
id-token: write
1717
security-events: write
1818
steps:
19-
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
20-
- uses: ossf/scorecard-action@08b4669551908b1024bb425080c797723083c031 # v2.2.0
19+
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
20+
- uses: ossf/scorecard-action@483ef80eb98fb506c348f7d62e28055e49fe2398 # v2.3.0
2121
with:
2222
results_file: results.sarif
2323
results_format: sarif
2424
publish_results: true
2525
- uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
2626
with:
2727
path: results.sarif
28-
- uses: github/codeql-action/upload-sarif@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # v2.21.5
28+
- uses: github/codeql-action/upload-sarif@d90b8d79de6dc1f58e83a1499aa58d6c93dc28de # v2.22.2
2929
with:
3030
sarif_file: results.sarif

demo_app/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
}
77

88
dependencies {
9-
classpath 'com.android.tools.build:gradle:8.1.1'
9+
classpath 'com.android.tools.build:gradle:8.1.2'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111
}
1212
}

demo_app/test/table/row_color.png

11.6 KB
Loading

packages/core/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@ Major breaking changes if you have custom rendering:
6363
- Removed: BuildMetadata, RebuildTriggers
6464
- Changed: BuildBit, WidgetPlaceholder
6565

66+
## 0.10.6
67+
68+
- Fix border 0 is still being rendered (#1045)
69+
6670
## 0.10.5
6771

6872
- Replace the deprecated `DecoderCallback` in tests (#1014)

packages/core/lib/src/core_data.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ part 'data/build_bits.dart';
1010
part 'data/css.dart';
1111
part 'data/html_style.dart';
1212
part 'data/image.dart';
13+
part 'data/lockable_list.dart';
1314
part 'data/normal_line_height.dart';
1415

1516
/// A collection of style's key and value pairs.

0 commit comments

Comments
 (0)