chore: update Flutter to 3.32.7

.fvmrc

@@ -1,3 +1,4 @@
 {
-  "flutter": "3.22.1"
+  "flutter": "3.32.7",
+  "flavors": {}
 }

.github/workflows/actions/flutter-setup/action.yml

@@ -1,4 +1,4 @@
-# IMPORTANT: FVM_VERSION, ANDROID_APP_FOLDER and IOS_APP_FOLDER have to be set on github variables
+# IMPORTANT: FVM_VERSION, JAVA_VERSION, ANDROID_APP_FOLDER and IOS_APP_FOLDER have to be set on github variables
 
 name: Setup flutter
 description: "Setup infra"
@@ -16,7 +16,7 @@ runs:
     - uses: actions/setup-java@v3
       with:
         distribution: "zulu"
-        java-version: "17"
+        java-version: ${{ vars.JAVA_VERSION }}
     - uses: dart-lang/setup-dart@v1.4
     - name: Cache FVM & Flutter
       uses: actions/cache@v3

.github/workflows/flutter-ci.yml

@@ -1,3 +1,5 @@
+## IMPORTANT: JAVA_VERSION has to be set on github variables
+
 name: Flutter CI
 on:
   pull_request:
@@ -13,7 +15,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: ${{ vars.JAVA_VERSION }}
       - uses: dart-lang/setup-dart@v1.4
       - uses: subosito/flutter-action@v2
         with:

android/app/build.gradle

@@ -1,4 +1,8 @@
-apply from: rootProject.file('read_properties.gradle')
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+}
 
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
@@ -8,11 +12,6 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
     flutterVersionCode = '1'
@@ -23,11 +22,10 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
+apply from: rootProject.file('read_properties.gradle')
 
 android {
+    namespace "com.xmartlabs.flutter_template"
 
     // ----- BEGIN flavorDimensions (autogenerated by flutter_flavorizr) -----
     flavorDimensions "flavor-type"
@@ -52,7 +50,7 @@ android {
 
     // ----- END flavorDimensions (autogenerated by flutter_flavorizr) -----
 
-   compileSdkVersion 33
+    compileSdk 36
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -70,7 +68,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.xmartlabs.flutter_template"
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 36
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
@@ -97,7 +95,3 @@ android {
 flutter {
     source '../..'
 }
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-}

android/build.gradle

@@ -1,16 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.6.10'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath "com.android.tools.build:gradle:7.1.3"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()

android/gradle.properties

@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx4g
 android.useAndroidX=true
 android.enableJetifier=true

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-7.4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip

android/settings.gradle

@@ -1,11 +1,25 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }()
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
 
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "8.9.2" apply false
+    id "org.jetbrains.kotlin.android" version "1.8.21" apply false
+}
+
+include ":app"

design_system/design_system_gallery/lib/main.dart

@@ -24,7 +24,7 @@ class MyApp extends StatelessWidget {
 class _GalleryAppContentScreen extends StatelessWidget {
   final GalleryRouter _router;
 
-  const _GalleryAppContentScreen(this._router, {super.key});
+  const _GalleryAppContentScreen(this._router);
 
   @override
   Widget build(BuildContext context) => MaterialApp.router(