From a5ac904e0f0d9060a15a6e0de67778cddbca73a0 Mon Sep 17 00:00:00 2001 From: Varun Kushwah Date: Sun, 15 Feb 2026 02:31:52 +0530 Subject: [PATCH 1/2] feat: upgrade to Flutter 3.41.0, fix SVG assets, and optimize gradle --- android/app/build.gradle | 4 +- android/gradle.properties | 4 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- android/settings.gradle | 4 +- assets/svg/ic_brush.svg | 2 +- assets/svg/ic_clipping.svg | 2 +- assets/svg/ic_eraser.svg | 2 +- assets/svg/ic_fill.svg | 2 +- assets/svg/ic_hand.svg | 4 +- assets/svg/ic_import.svg | 2 +- assets/svg/ic_layers.svg | 6 +- assets/svg/ic_line.svg | 2 +- assets/svg/ic_pipette.svg | 2 +- assets/svg/ic_shapes.svg | 2 +- assets/svg/ic_smudge.svg | 2 +- assets/svg/ic_stamp.svg | 2 +- assets/svg/ic_text.svg | 2 +- assets/svg/ic_tools.svg | 8 +- assets/svg/ic_transform.svg | 2 +- assets/svg/ic_watercolor.svg | 16 +- lib/core/providers/object/image_service.dart | 4 +- pubspec.lock | 533 ++++++++++-------- pubspec.yaml | 22 +- 23 files changed, 337 insertions(+), 294 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 45d34dd6..54dcfc1a 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -14,7 +14,7 @@ if (localPropertiesFile.exists()) { android { namespace = "org.catrobat.paintroid" - compileSdkVersion 35 + compileSdkVersion 36 ndkVersion flutter.ndkVersion compileOptions { @@ -33,7 +33,7 @@ android { defaultConfig { applicationId "org.catrobat.paintroidflutter" minSdkVersion 24 - targetSdkVersion 35 + targetSdkVersion 36 versionCode 1 versionName "1.0.0" } diff --git a/android/gradle.properties b/android/gradle.properties index 94adc3a3..a73a0b2c 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,3 +1,3 @@ -org.gradle.jvmargs=-Xmx1536M +org.gradle.jvmargs=-Xmx1536M -XX:MaxMetaspaceSize=512m android.useAndroidX=true -android.enableJetifier=true +android.enableJetifier=false diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 89e56bdb..4cc8c0b0 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/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.0-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip diff --git a/android/settings.gradle b/android/settings.gradle index 92934e4e..e14c0beb 100644 --- a/android/settings.gradle +++ b/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.1.0" apply false - id "org.jetbrains.kotlin.android" version "1.8.21" apply false + id "com.android.application" version "8.11.1" apply false + id "org.jetbrains.kotlin.android" version "2.2.20" apply false } include ":app" \ No newline at end of file diff --git a/assets/svg/ic_brush.svg b/assets/svg/ic_brush.svg index a3ca108b..b53ced24 100644 --- a/assets/svg/ic_brush.svg +++ b/assets/svg/ic_brush.svg @@ -1,4 +1,4 @@ - diff --git a/assets/svg/ic_clipping.svg b/assets/svg/ic_clipping.svg index 619ad346..a8d27147 100644 --- a/assets/svg/ic_clipping.svg +++ b/assets/svg/ic_clipping.svg @@ -1,3 +1,3 @@ - + diff --git a/assets/svg/ic_eraser.svg b/assets/svg/ic_eraser.svg index 66d09534..42c11e8c 100644 --- a/assets/svg/ic_eraser.svg +++ b/assets/svg/ic_eraser.svg @@ -1,4 +1,4 @@ - diff --git a/assets/svg/ic_fill.svg b/assets/svg/ic_fill.svg index 913a4cd1..11065378 100644 --- a/assets/svg/ic_fill.svg +++ b/assets/svg/ic_fill.svg @@ -1,4 +1,4 @@ - diff --git a/assets/svg/ic_hand.svg b/assets/svg/ic_hand.svg index 8295a83e..f23566ac 100644 --- a/assets/svg/ic_hand.svg +++ b/assets/svg/ic_hand.svg @@ -1,7 +1,7 @@ - - diff --git a/assets/svg/ic_import.svg b/assets/svg/ic_import.svg index 9a7a5d5a..fb8deddf 100644 --- a/assets/svg/ic_import.svg +++ b/assets/svg/ic_import.svg @@ -1,4 +1,4 @@ - diff --git a/assets/svg/ic_layers.svg b/assets/svg/ic_layers.svg index 204b56ea..d89644d5 100644 --- a/assets/svg/ic_layers.svg +++ b/assets/svg/ic_layers.svg @@ -1,8 +1,8 @@ - - - diff --git a/assets/svg/ic_line.svg b/assets/svg/ic_line.svg index 49b029f4..df32e3c3 100644 --- a/assets/svg/ic_line.svg +++ b/assets/svg/ic_line.svg @@ -1,4 +1,4 @@ - diff --git a/assets/svg/ic_pipette.svg b/assets/svg/ic_pipette.svg index bf5c10cb..1ec2166b 100644 --- a/assets/svg/ic_pipette.svg +++ b/assets/svg/ic_pipette.svg @@ -1,3 +1,3 @@ - + diff --git a/assets/svg/ic_shapes.svg b/assets/svg/ic_shapes.svg index ec194076..9b359d5b 100644 --- a/assets/svg/ic_shapes.svg +++ b/assets/svg/ic_shapes.svg @@ -1,5 +1,5 @@ - - diff --git a/assets/svg/ic_stamp.svg b/assets/svg/ic_stamp.svg index 8241abde..3cc7087b 100644 --- a/assets/svg/ic_stamp.svg +++ b/assets/svg/ic_stamp.svg @@ -1,4 +1,4 @@ - diff --git a/assets/svg/ic_text.svg b/assets/svg/ic_text.svg index 847f6213..ed463677 100644 --- a/assets/svg/ic_text.svg +++ b/assets/svg/ic_text.svg @@ -1,3 +1,3 @@ - + diff --git a/assets/svg/ic_tools.svg b/assets/svg/ic_tools.svg index 7ccc3edd..bd2d5eda 100644 --- a/assets/svg/ic_tools.svg +++ b/assets/svg/ic_tools.svg @@ -1,8 +1,8 @@ - - - - + + \ No newline at end of file diff --git a/assets/svg/ic_transform.svg b/assets/svg/ic_transform.svg index 10f2619b..a0d65cba 100644 --- a/assets/svg/ic_transform.svg +++ b/assets/svg/ic_transform.svg @@ -1,4 +1,4 @@ - diff --git a/assets/svg/ic_watercolor.svg b/assets/svg/ic_watercolor.svg index cab156e1..156e9fa5 100644 --- a/assets/svg/ic_watercolor.svg +++ b/assets/svg/ic_watercolor.svg @@ -1,19 +1,19 @@ - - - - - - - - =3.7.0 <4.0.0" - flutter: ">=3.27.0" + dart: ">=3.10.3 <4.0.0" + flutter: ">=3.38.4" diff --git a/pubspec.yaml b/pubspec.yaml index 05ad32db..5294dee4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: sdk: flutter flutter_localization: ^0.3.2 - intl: ^0.19.0 + intl: ^0.20.2 logging: ^1.0.2 flutter_riverpod: ^2.3.6 riverpod_annotation: ^2.1.1 @@ -26,17 +26,17 @@ dependencies: collection: ^1.17.1 url_launcher: ^6.1.6 toast: ^0.3.0 - oxidized: ^5.2.0 - flutter_svg: ^1.1.0 - package_info_plus: ^8.3.0 + oxidized: ^6.2.0 + flutter_svg: ^2.2.3 + package_info_plus: ^9.0.0 filesize: ^2.0.1 - smooth_page_indicator: ^1.0.0+2 - image: ^3.2.0 - permission_handler: ^11.4.0 - device_info_plus: ^9.1.2 + smooth_page_indicator: ^2.0.1 + image: ^4.7.2 + permission_handler: ^12.0.1 + device_info_plus: ^12.3.0 image_picker: ^1.1.2 path_provider: ^2.0.11 - file_picker: ^8.3.5 + file_picker: ^10.3.10 floor: ^1.2.0 sqflite: ^2.3.0 path_drawing: ^1.0.1 @@ -50,8 +50,8 @@ dev_dependencies: sdk: flutter mockito: ^5.2.0 - flutter_launcher_icons: ^0.9.3 - flutter_lints: ^5.0.0 + flutter_launcher_icons: ^0.14.4 + flutter_lints: ^6.0.0 floor_generator: ^1.4.2 riverpod_generator: ^2.2.4 riverpod_lint: ^2.0.0 From 842719f505e15e6610d2b50d25377e1069595c5a Mon Sep 17 00:00:00 2001 From: Varun Kushwah Date: Tue, 17 Feb 2026 00:43:46 +0530 Subject: [PATCH 2/2] ci: update Flutter SDK version to 3.41.0 in workflow and fvmrc --- .fvmrc | 2 +- .github/workflows/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.fvmrc b/.fvmrc index 4cac08f7..06bcdee9 100644 --- a/.fvmrc +++ b/.fvmrc @@ -1,3 +1,3 @@ { - "flutter": "3.29.2" + "flutter": "3.41.0" } \ No newline at end of file diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ec4dda57..c4c3f01c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v4.1.4 - uses: subosito/flutter-action@v2.10.0 with: - flutter-version: "3.29.2" + flutter-version: "3.41.0" channel: "stable" cache-key: "flutter-:os:-:channel:-:version:-:arch:-:hash:" cache-path: "${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:"