Skip to content

Commit 4590329

Browse files
Merge pull request #88 from flutter-form-builder-ecosystem/upgrade-flutter-3.27
Upgrade-flutter-3.27
2 parents 4b85c34 + 8d0243c commit 4590329

File tree

6 files changed

+20
-67
lines changed

6 files changed

+20
-67
lines changed

.github/workflows/base.yaml

Lines changed: 8 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -11,63 +11,16 @@ on:
1111

1212
workflow_dispatch:
1313

14+
# This ensures that previous jobs for the PR are canceled when PR is updated
15+
concurrency:
16+
group: ${{ github.workflow }}-${{ github.ref }}
17+
cancel-in-progress: true
18+
1419
jobs:
1520
build:
16-
runs-on: macos-latest
17-
18-
steps:
19-
- uses: actions/checkout@v4
20-
with:
21-
fetch-depth: 1 # Use shallow clone for faster checkout
22-
23-
- name: Check broken links
24-
uses: JustinBeckwith/linkinator-action@v1
25-
with:
26-
paths: "**/*.md"
27-
28-
- name: Setup Java
29-
uses: actions/setup-java@v4
30-
with:
31-
distribution: 'zulu'
32-
java-version: '11'
33-
34-
- name: Get Flutter version by FVM
35-
uses: kuhnroyal/flutter-fvm-config-action@v2
36-
id: fvm-config-action
37-
with:
38-
path: ".fvmrc"
39-
40-
- name: Flutter action
41-
uses: subosito/flutter-action@v2
42-
with:
43-
flutter-version: ${{ steps.fvm-config-action.outputs.FLUTTER_VERSION }}
44-
channel: ${{ steps.fvm-config-action.outputs.FLUTTER_CHANNEL }}
45-
architecture: x64
46-
cache: true
47-
48-
- name: Install dependencies
49-
run: flutter pub get
50-
- name: Format code
51-
run: dart format --set-exit-if-changed .
52-
- name: Analyze static code
53-
run: flutter analyze
54-
# - name: Run tests
55-
# run: flutter test
56-
- name: Check publish warnings
57-
run: dart pub publish --dry-run
58-
- name: Build example
59-
run: |
60-
cd example
61-
flutter build appbundle --debug
62-
flutter build ios --debug --no-codesign
63-
flutter build web
64-
65-
# - name: Upload coverage to Codecov
66-
# uses: codecov/codecov-action@v3
67-
# with:
68-
# files: coverage/lcov.info
69-
# flags: unittests
70-
# name: form_builder_file_picker
21+
uses: flutter-form-builder-ecosystem/.github/.github/workflows/minimal-quality.yaml@main
22+
example:
23+
uses: flutter-form-builder-ecosystem/.github/.github/workflows/build-examples.yaml@main
7124

7225
deployment:
7326
permissions:

example/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip

example/android/settings.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ pluginManagement {
1818

1919
plugins {
2020
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21-
id "com.android.application" version "7.3.0" apply false
22-
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
21+
id "com.android.application" version "8.2.1" apply false
22+
id "org.jetbrains.kotlin.android" version "1.8.22" apply false
2323
}
2424

2525
include ":app"

example/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ version: 1.0.0+1
44
publish_to: 'none'
55

66
environment:
7-
sdk: '>=3.4.0 <4.0.0'
8-
flutter: '>=3.22.0'
7+
sdk: '>=3.6.0 <4.0.0'
8+
flutter: '>=3.27.0'
99

1010
dependencies:
1111
flutter:
1212
sdk: flutter
13-
flutter_form_builder: ^9.3.0
13+
flutter_form_builder: ^9.6.0
1414
form_builder_file_picker:
1515
path: ../
1616

lib/src/form_builder_file_picker.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ class _FormBuilderFilePickerState extends FormBuilderFieldDecorationState<
263263
Container(
264264
padding: const EdgeInsets.symmetric(horizontal: 2),
265265
width: double.infinity,
266-
color: Colors.white.withOpacity(.8),
266+
color: Colors.white.withValues(alpha: .8),
267267
child: Text(
268268
files[index].name,
269269
style: theme.textTheme.bodySmall,
@@ -283,7 +283,7 @@ class _FormBuilderFilePickerState extends FormBuilderFieldDecorationState<
283283
child: Container(
284284
margin: const EdgeInsets.all(3),
285285
decoration: BoxDecoration(
286-
color: Colors.grey.withOpacity(.7),
286+
color: Colors.grey.withValues(alpha: .7),
287287
shape: BoxShape.circle,
288288
),
289289
alignment: Alignment.center,

pubspec.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ funding:
1111
- https://opencollective.com/flutter-form-builder-ecosystem
1212

1313
environment:
14-
sdk: '>=3.4.0 <4.0.0'
15-
flutter: '>=3.22.0'
14+
sdk: '>=3.6.0 <4.0.0'
15+
flutter: '>=3.27.0'
1616

1717
dependencies:
1818
community_material_icon: ^5.9.55
19-
file_picker: ^8.0.7
19+
file_picker: ^8.1.6
2020
flutter:
2121
sdk: flutter
22-
flutter_form_builder: ^9.3.0
22+
flutter_form_builder: ^9.6.0
2323

2424
platforms:
2525
android:

0 commit comments

Comments
 (0)