From c409299497f941c690c926fe3e1dc49d275222cf Mon Sep 17 00:00:00 2001 From: Amir Panahandeh Date: Tue, 18 Nov 2025 00:36:14 +0330 Subject: [PATCH 1/2] Upgrade to Flutter 3.38 --- .github/workflows/fleather.yml | 4 ++-- .../example/android/gradle/wrapper/gradle-wrapper.properties | 2 +- packages/fleather/example/android/settings.gradle | 4 ++-- packages/fleather/l10n.yaml | 1 - 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/fleather.yml b/.github/workflows/fleather.yml index 0fa807f2..28b3e5ca 100644 --- a/.github/workflows/fleather.yml +++ b/.github/workflows/fleather.yml @@ -10,10 +10,10 @@ jobs: - uses: actions/checkout@v3 - uses: subosito/flutter-action@v2 with: - flutter-version: "3.35.1" + flutter-version: "3.38.0" cache: true # Manually Update this `key` - cache-key: "3.35.1" + cache-key: "3.38.0" - run: dart pub global activate coverage # diff --git a/packages/fleather/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/fleather/example/android/gradle/wrapper/gradle-wrapper.properties index 7aeeb11c..9162f100 100644 --- a/packages/fleather/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/fleather/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip diff --git a/packages/fleather/example/android/settings.gradle b/packages/fleather/example/android/settings.gradle index 70736a92..f6948003 100644 --- a/packages/fleather/example/android/settings.gradle +++ b/packages/fleather/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 '8.5.0' apply false - id "org.jetbrains.kotlin.android" version "1.9.21" apply false + id "com.android.application" version '8.10.0' apply false + id "org.jetbrains.kotlin.android" version "2.1.0" apply false } include ":app" \ No newline at end of file diff --git a/packages/fleather/l10n.yaml b/packages/fleather/l10n.yaml index 65ca2532..f589d7b0 100644 --- a/packages/fleather/l10n.yaml +++ b/packages/fleather/l10n.yaml @@ -1,6 +1,5 @@ format: true use-escaping: true -synthetic-package: false arb-dir: lib/l10n/translations template-arb-file: en.arb From ca5c575f349b15d3a35b72f760155a5a6ffd7eee Mon Sep 17 00:00:00 2001 From: Amir Panahandeh Date: Tue, 18 Nov 2025 15:14:04 +0330 Subject: [PATCH 2/2] Upgrade dependencies --- packages/fleather/example/ios/Podfile.lock | 2 +- packages/fleather/example/pubspec.yaml | 8 ++++---- packages/fleather/pubspec.yaml | 2 +- packages/parchment/pubspec.yaml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/fleather/example/ios/Podfile.lock b/packages/fleather/example/ios/Podfile.lock index 2ea5ad2d..80721714 100644 --- a/packages/fleather/example/ios/Podfile.lock +++ b/packages/fleather/example/ios/Podfile.lock @@ -25,7 +25,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467 - image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a + image_picker_ios: e0ece4aa2a75771a7de3fa735d26d90817041326 integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e url_launcher_ios: 694010445543906933d732453a59da0a173ae33d diff --git a/packages/fleather/example/pubspec.yaml b/packages/fleather/example/pubspec.yaml index 1547536e..0efdd1b4 100644 --- a/packages/fleather/example/pubspec.yaml +++ b/packages/fleather/example/pubspec.yaml @@ -13,8 +13,8 @@ dependencies: sdk: flutter flutter_localizations: sdk: flutter - url_launcher: ^6.3.1 - image_picker: ^1.1.2 + url_launcher: ^6.3.2 + image_picker: ^1.2.1 fleather: path: ../ parchment: @@ -31,8 +31,8 @@ dev_dependencies: sdk: flutter flutter_driver: sdk: flutter - flutter_lints: ^5.0.0 - flutter_test_robots: ^0.0.24 + flutter_lints: ^6.0.0 + flutter_test_robots: ^1.0.0 flutter: uses-material-design: true diff --git a/packages/fleather/pubspec.yaml b/packages/fleather/pubspec.yaml index e5510b19..41571a7f 100644 --- a/packages/fleather/pubspec.yaml +++ b/packages/fleather/pubspec.yaml @@ -39,7 +39,7 @@ dev_dependencies: flutter_lints: ^6.0.0 fake_async: ^1.3.3 mocktail: ^1.0.4 - meta: ^1.16.0 + meta: ^1.17.0 flutter: generate: true diff --git a/packages/parchment/pubspec.yaml b/packages/parchment/pubspec.yaml index bf801a1c..52c80d58 100644 --- a/packages/parchment/pubspec.yaml +++ b/packages/parchment/pubspec.yaml @@ -12,8 +12,8 @@ dependencies: collection: ^1.19.1 parchment_delta: ^1.0.0 html: ^0.15.6 - meta: ^1.16.0 + meta: ^1.17.0 dev_dependencies: - test: ^1.26.1 + test: ^1.27.0 lints: ^6.0.0