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:"
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 @@