Merge pull request #88 from flutter-form-builder-ecosystem/upgrade-fl…

…utter-3.27 Upgrade-flutter-3.27
flutter-form-builder-ecosystem · Dec 21, 2024 · 4590329 · 4590329
2 parents 4b85c34 + 8d0243c
commit 4590329
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 67 deletions.
diff --git a/.github/workflows/base.yaml b/.github/workflows/base.yaml
@@ -11,63 +11,16 @@ on:
 
   workflow_dispatch:
 
+# This ensures that previous jobs for the PR are canceled when PR is updated
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
-    runs-on: macos-latest
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 1 # Use shallow clone for faster checkout
-
-      - name: Check broken links
-        uses: JustinBeckwith/linkinator-action@v1
-        with:
-          paths: "**/*.md"
-
-      - name: Setup Java
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version: '11'
-
-      - name: Get Flutter version by FVM
-        uses: kuhnroyal/flutter-fvm-config-action@v2
-        id: fvm-config-action
-        with:
-          path: ".fvmrc"
-
-      - name: Flutter action
-        uses: subosito/flutter-action@v2
-        with:
-          flutter-version: ${{ steps.fvm-config-action.outputs.FLUTTER_VERSION }}
-          channel: ${{ steps.fvm-config-action.outputs.FLUTTER_CHANNEL }}
-          architecture: x64
-          cache: true
-
-      - name: Install dependencies
-        run: flutter pub get
-      - name: Format code
-        run: dart format --set-exit-if-changed .
-      - name: Analyze static code
-        run: flutter analyze
-      # - name: Run tests
-      #   run: flutter test
-      - name: Check publish warnings
-        run: dart pub publish --dry-run
-      - name: Build example
-        run: |
-          cd example
-          flutter build appbundle --debug
-          flutter build ios --debug --no-codesign
-          flutter build web
-
-      # - name: Upload coverage to Codecov
-      #   uses: codecov/codecov-action@v3
-      #   with:
-      #     files: coverage/lcov.info
-      #     flags: unittests
-      #     name: form_builder_file_picker
+    uses: flutter-form-builder-ecosystem/.github/.github/workflows/minimal-quality.yaml@main
+  example:
+    uses: flutter-form-builder-ecosystem/.github/.github/workflows/build-examples.yaml@main
 
   deployment:
     permissions:

diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
diff --git a/example/android/settings.gradle b/example/android/settings.gradle
@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.7.10" apply false
+    id "com.android.application" version "8.2.1" apply false
+    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
 }
 
 include ":app"
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -4,13 +4,13 @@ version: 1.0.0+1
 publish_to: 'none'
 
 environment:
-  sdk: '>=3.4.0 <4.0.0'
-  flutter: '>=3.22.0'
+  sdk: '>=3.6.0 <4.0.0'
+  flutter: '>=3.27.0'
 
 dependencies:
   flutter:
     sdk: flutter
-  flutter_form_builder: ^9.3.0
+  flutter_form_builder: ^9.6.0
   form_builder_file_picker:
       path: ../
 

diff --git a/lib/src/form_builder_file_picker.dart b/lib/src/form_builder_file_picker.dart
@@ -263,7 +263,7 @@ class _FormBuilderFilePickerState extends FormBuilderFieldDecorationState<
                     Container(
                       padding: const EdgeInsets.symmetric(horizontal: 2),
                       width: double.infinity,
-                      color: Colors.white.withOpacity(.8),
+                      color: Colors.white.withValues(alpha: .8),
                       child: Text(
                         files[index].name,
                         style: theme.textTheme.bodySmall,
@@ -283,7 +283,7 @@ class _FormBuilderFilePickerState extends FormBuilderFieldDecorationState<
                           child: Container(
                             margin: const EdgeInsets.all(3),
                             decoration: BoxDecoration(
-                              color: Colors.grey.withOpacity(.7),
+                              color: Colors.grey.withValues(alpha: .7),
                               shape: BoxShape.circle,
                             ),
                             alignment: Alignment.center,

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -11,15 +11,15 @@ funding:
   - https://opencollective.com/flutter-form-builder-ecosystem
 
 environment:
-  sdk: '>=3.4.0 <4.0.0'
-  flutter: '>=3.22.0'
+  sdk: '>=3.6.0 <4.0.0'
+  flutter: '>=3.27.0'
 
 dependencies:
   community_material_icon: ^5.9.55
-  file_picker: ^8.0.7
+  file_picker: ^8.1.6
   flutter:
     sdk: flutter
-  flutter_form_builder: ^9.3.0
+  flutter_form_builder: ^9.6.0
 
 platforms:
   android: