modernize android folder

2026-08-17 14:36:07 -04:00 · 2026-08-17 14:36:07 -04:00 · f01fe0eb3b
commit f01fe0eb3b
parent 01b13b4764
12 changed files with 264 additions and 230 deletions
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@ -6,6 +6,12 @@ analyzer:
    - "build/**"
    - "**/*.g.dart"
    - "**/*.freezed.dart"
+    - android/**
+    - ios/**
+    - web/**
+    - windows/**
+    - macos/**
+    - linux/**
 include: package:flutter_lints/flutter.yaml
 linter:
  rules:
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@ -1,77 +0,0 @@
-plugins {
-    id "com.android.application"
-    id "kotlin-android"
-    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
-    id "dev.flutter.flutter-gradle-plugin"
-}
-
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file("local.properties")
-if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader("UTF-8") { reader ->
-        localProperties.load(reader)
-    }
-}
-
-def flutterVersionCode = localProperties.getProperty("flutter.versionCode")
-if (flutterVersionCode == null) {
-    flutterVersionCode = "1"
-}
-
-def flutterVersionName = localProperties.getProperty("flutter.versionName")
-if (flutterVersionName == null) {
-    flutterVersionName = "1.0"
-}
-
-def keystoreProperties = new Properties()
-def keystorePropertiesFile = rootProject.file('key.properties')
-if (keystorePropertiesFile.exists()) {
-	keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
-}
-
-android {
-    namespace = "nexus.federated.nexus"
-    ndkVersion = flutter.ndkVersion
-    compileSdk = 34
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-
-    kotlinOptions {
-        jvmTarget = "17"
-    }
-
-    defaultConfig {
-        applicationId = "nexus.federated.nexus"
-        minSdk = 29
-        targetSdkVersion flutter.targetSdkVersion
-        versionCode = flutterVersionCode.toInteger()
-        versionName = flutterVersionName
-    }
-
-	signingConfigs {
-		release {
-			keyAlias "key"
-			def storePath = keystoreProperties['path'] ?: System.getenv("KEYSTORE_PATH")
-			storeFile storePath ? file(storePath) : null
-			keyPassword keystoreProperties['password'] ?: System.getenv("KEYSTORE_PASSWORD")
-			storePassword keystoreProperties['password'] ?: System.getenv("KEYSTORE_PASSWORD")
-		}
-    }
-
-    buildTypes {
-        release {
-		   signingConfig signingConfigs.release
-        }
-
-		debug {
-			applicationIdSuffix = ".debug"
-	   	}
-    }
-}
-
-flutter {
-    source = "../.."
-}
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@ -0,0 +1,74 @@
+import java.util.Properties
+
+plugins {
+    id("com.android.application")
+    id("dev.flutter.flutter-gradle-plugin")
+}
+
+val keystoreProperties = Properties()
+val keystorePropertiesFile = rootProject.file("key.properties")
+
+if (keystorePropertiesFile.exists()) {
+    keystorePropertiesFile.inputStream().use {
+        keystoreProperties.load(it)
+    }
+}
+
+android {
+    namespace = "nexus.federated.nexus"
+    compileSdk = 36
+    ndkVersion = flutter.ndkVersion
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    defaultConfig {
+        applicationId = "nexus.federated.nexus"
+        minSdk = 29
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
+    }
+
+    signingConfigs {
+        create("release") {
+            keyAlias = "key"
+
+            val storePath =
+                keystoreProperties["path"]?.toString()
+                    ?: System.getenv("KEYSTORE_PATH")
+
+            storeFile = storePath?.let { file(it) }
+
+            keyPassword =
+                keystoreProperties["password"]?.toString()
+                    ?: System.getenv("KEYSTORE_PASSWORD")
+
+            storePassword =
+                keystoreProperties["password"]?.toString()
+                    ?: System.getenv("KEYSTORE_PASSWORD")
+        }
+    }
+
+    buildTypes {
+        release {
+            signingConfig = signingConfigs.getByName("release")
+        }
+
+        debug {
+            applicationIdSuffix = ".debug"
+        }
+    }
+}
+
+kotlin {
+    compilerOptions {
+        jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
+    }
+}
+
+flutter {
+    source = "../.."
+}
--- a/android/build.gradle
+++ b/android/build.gradle
@ -1,26 +0,0 @@
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-    }
-}
-
-rootProject.buildDir = "../build"
-subprojects {
-    project.buildDir = "${rootProject.buildDir}/${project.name}"
-
-	afterEvaluate {project ->
-        if (project.hasProperty("android")) {
-            android {
-                compileSdkVersion 36
-                buildToolsVersion '33.0.1'
-            }
-        }
-    }
-
-    project.evaluationDependsOn(":app")
-}
-
-tasks.register("clean", Delete) {
-    delete rootProject.buildDir
-}
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@ -0,0 +1,25 @@
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+val newBuildDir: Directory =
+    rootProject.layout.buildDirectory
+        .dir("../../build")
+        .get()
+rootProject.layout.buildDirectory.value(newBuildDir)
+
+subprojects {
+    val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name)
+    project.layout.buildDirectory.value(newSubprojectBuildDir)
+}
+
+subprojects {
+    project.evaluationDependsOn(":app")
+}
+
+tasks.register<Delete>("clean") {
+    delete(rootProject.layout.buildDirectory)
+}
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/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-8.14.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-all.zip
--- a/android/settings.gradle
+++ b/android/settings.gradle
@ -1,25 +0,0 @@
-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
-    }()
-
-    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
-
-    repositories {
-        google()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-
-plugins {
-    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.13.0" apply false
-    id "org.jetbrains.kotlin.android" version "2.2.20" apply false
-}
-
-include ":app"
--- a/android/settings.gradle.kts
+++ b/android/settings.gradle.kts
@ -0,0 +1,26 @@
+pluginManagement {
+    val flutterSdkPath =
+        run {
+            val properties = java.util.Properties()
+            file("local.properties").inputStream().use { properties.load(it) }
+            val flutterSdkPath = properties.getProperty("flutter.sdk")
+            require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
+            flutterSdkPath
+        }
+
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
+
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+plugins {
+    id("dev.flutter.flutter-plugin-loader") version "1.0.0"
+    id("com.android.application") version "9.3.1" apply false
+    id("org.jetbrains.kotlin.android") version "2.4.10" apply false
+}
+
+include(":app")
--- a/flake.lock
+++ b/flake.lock
@ -88,11 +88,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1785967620,
-        "narHash": "sha256-IItrdb7Puk05RqOBWZYFC5X6Wl1sJmCfh5MWVHw5iMM=",
+        "lastModified": 1786862985,
+        "narHash": "sha256-FBJRXmbGXiSUDvYEbfLYRkckayyZ6SK1UEqhCrIZ2Cs=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "b7c2ada94fe99c15b0dbcf4d11fd7850b957a436",
+        "rev": "e5bdc4a41d4c072fe1e3787eaa0320a384741d44",
        "type": "github"
      },
      "original": {
--- a/linux/nix/devshell.nix
+++ b/linux/nix/devshell.nix
@ -2,7 +2,7 @@
 let
  android = pkgs.androidenv.composeAndroidPackages {
    toolsVersion = "26.1.1";
-    platformToolsVersion = "36.0.1";
+    platformToolsVersion = "37.0.1";
    buildToolsVersions = [
      "35.0.0"
      "36.0.0"
@ -42,8 +42,7 @@ pkgs.mkShell {
    ANDROID_SDK_ROOT = ANDROID_HOME;
    JAVA_HOME = pkgs.jdk17;

-    TOOLS = "${ANDROID_HOME}/build-tools/${"36.0.0"}";
-    GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${TOOLS}/aapt2";
+    GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_HOME}/build-tools/36.0.0/aapt2";
  }
  // lib.optionalAttrs pkgs.stdenv.isLinux {
    CPATH = lib.makeSearchPath "include" [ pkgs.glibc.dev ];
--- a/pubspec.lock
+++ b/pubspec.lock
@ -5,26 +5,26 @@ packages:
    dependency: transitive
    description:
      name: _fe_analyzer_shared
-      sha256: a49d6cf99e8d8e7a8e93668d09ced0bbdb954d0b4fccc2f5f9241c6b87fad95c
+      sha256: "1b0e6a07425a3e460666e88bf1c949ccc7bb0116ad562ce94a1eca60fe820725"
      url: "https://pub.dev"
    source: hosted
-    version: "99.0.0"
+    version: "103.0.0"
  analysis_server_plugin:
    dependency: transitive
    description:
      name: analysis_server_plugin
-      sha256: "3960b28ee740004df39f85d5ebfc91785f7a90e51fd7c9a185e86a36b2f581b4"
+      sha256: c58b2a05b260a023eefd0848496ff6b113a318c6c95dad4215165a4bd54ae600
      url: "https://pub.dev"
    source: hosted
-    version: "0.3.14"
+    version: "0.3.18"
  analyzer:
    dependency: transitive
    description:
      name: analyzer
-      sha256: "663efa951fb8a45e06f491223a604c93820598f20e6a99c25617a1576065e8b7"
+      sha256: "61c04d0c1bfed555c681ea079519933f071a5a026578ff73c4ff0df2d3462e5e"
      url: "https://pub.dev"
    source: hosted
-    version: "12.1.0"
+    version: "13.3.0"
  analyzer_buffer:
    dependency: transitive
    description:
@ -37,10 +37,10 @@ packages:
    dependency: transitive
    description:
      name: analyzer_plugin
-      sha256: "0057a98d64d7bb872b0c87dff6e73d2c2d80c77156e7a03f127a26f8aa240649"
+      sha256: c2a75baf1657171cc7872db96a12b07e385873cf7a73f2b4f7638e9d0701ee53
      url: "https://pub.dev"
    source: hosted
-    version: "0.14.8"
+    version: "0.14.12"
  app_links:
    dependency: "direct main"
    description:
@ -89,6 +89,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.7.0"
+  asn1lib:
+    dependency: transitive
+    description:
+      name: asn1lib
+      sha256: "9a8f69025044eb466b9b60ef3bc3ac99b4dc6c158ae9c56d25eeccf5bc56d024"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.6.5"
  async:
    dependency: transitive
    description:
@ -109,10 +117,10 @@ packages:
    dependency: transitive
    description:
      name: build
-      sha256: "45d14a0fb23e018d8287c32fc98d726ce466b231928ed9b9200f29bd3ccd39ae"
+      sha256: b94f5da9ed3d081fd4ecc426c260998b5f4f4eb2f6d89b7e5472edef0b2b2a1b
      url: "https://pub.dev"
    source: hosted
-    version: "4.0.7"
+    version: "4.0.10"
  build_config:
    dependency: transitive
    description:
@ -133,10 +141,10 @@ packages:
    dependency: "direct dev"
    description:
      name: build_runner
-      sha256: "5367e521935b102bdf1e735d2aab461e36b2edca6517662d088dd04cc39f8d16"
+      sha256: "90363d438bd9f84a4d5bbb83352251f57d2d9d771bc95a44e6a33fe25fa52774"
      url: "https://pub.dev"
    source: hosted
-    version: "2.15.1"
+    version: "2.16.0"
  built_collection:
    dependency: transitive
    description:
@ -169,14 +177,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.4.1"
-  charcode:
-    dependency: transitive
-    description:
-      name: charcode
-      sha256: fb0f1107cac15a5ea6ef0a6ef71a807b9e4267c713bb93e00e92d737cc8dbd8a
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.0"
  checked_yaml:
    dependency: transitive
    description:
@ -273,14 +273,22 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.0.2"
+  cupertino_ui:
+    dependency: transitive
+    description:
+      name: cupertino_ui
+      sha256: "7ed8ce4159d342eec4c65f4ea6eec57adaf9365404378541f38efc1da20a5b3d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0"
  dart_style:
    dependency: transitive
    description:
      name: dart_style
-      sha256: a4c1ccfee44c7e75ed80484071a5c142a385345e658fd8bd7c4b5c97e7198f98
+      sha256: "3f88fc9c96c568d631356507355a2d1e983ee000c9ac008bdcb39b5bf53ce777"
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.8"
+    version: "3.1.12"
  dbus:
    dependency: transitive
    description:
@ -301,10 +309,10 @@ packages:
    dependency: "direct main"
    description:
      name: dynamic_polls
-      sha256: "72ff19cdf041ad8dcfa76adaebb216d005f40b278d955e6e0c7bcb769215fabe"
+      sha256: "58cd1fafbbaba6b485a61692aa3bd33ded6f0f61734543b6c754511c362d8ae1"
      url: "https://pub.dev"
    source: hosted
-    version: "0.0.7"
+    version: "0.0.8"
  emoji_text_field:
    dependency: "direct main"
    description:
@ -314,6 +322,14 @@ packages:
      url: "https://github.com/Henry-Hiles/emoji_text_field"
    source: git
    version: "1.0.0"
+  encrypt:
+    dependency: transitive
+    description:
+      name: encrypt
+      sha256: "62d9aa4670cc2a8798bab89b39fc71b6dfbacf615de6cf5001fb39f7e4a996a2"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.0.3"
  equatable:
    dependency: transitive
    description:
@ -512,10 +528,10 @@ packages:
    dependency: "direct main"
    description:
      name: flutter_riverpod
-      sha256: "9255e1e3ad6e38906a1b4f8287678f95f378744c5b46b1985588543f3f19046e"
+      sha256: "56e81e662e6e54e59b231da57e90ac0d06ac67d8e3f2273c129a37ae6282b40c"
      url: "https://pub.dev"
    source: hosted
-    version: "3.3.2"
+    version: "3.4.2"
  flutter_svg:
    dependency: "direct main"
    description:
@ -554,10 +570,10 @@ packages:
    dependency: "direct dev"
    description:
      name: freezed
-      sha256: "8599ba37236328ff6f97269ecce875d251a367eb2929c9bbf9b811b2ce56c74e"
+      sha256: "9ec135696554923c59339d46dd50adbaf81099be06ffda0fb9c06f410aea9137"
      url: "https://pub.dev"
    source: hosted
-    version: "3.2.6-dev.1"
+    version: "4.0.0-dev.3"
  freezed_annotation:
    dependency: "direct main"
    description:
@ -578,10 +594,10 @@ packages:
    dependency: transitive
    description:
      name: get_x_storage
-      sha256: "69e4412dd70e25a4991623c10bf72e3b12106f2cb4353a2d167353947597f3aa"
+      sha256: "597cd8f6ef8b01c747a6d95ff7b0310066f6c82ddf5565ca371f047f316fe43e"
      url: "https://pub.dev"
    source: hosted
-    version: "0.0.9"
+    version: "0.2.0"
  glob:
    dependency: transitive
    description:
@ -610,18 +626,18 @@ packages:
    dependency: "direct main"
    description:
      name: hooks
-      sha256: "9a62a50b50b769a737bc0a8ff381f333529df3ab746b2f6b02e83760231455ba"
+      sha256: "03a564c3704524ee0f7fc56fc621e8796cc2eb8c24d1f1a33b34979815b285c4"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.2"
+    version: "2.1.0"
  hooks_riverpod:
    dependency: "direct main"
    description:
      name: hooks_riverpod
-      sha256: dcaf59f0f41489ff08ce61438ada564d67f40cfa37cc7c8589da78fb600c2edc
+      sha256: fce693abc6289c8bb42348eae520b979f7edbaae0c1b77b946ef058d0693f6f6
      url: "https://pub.dev"
    source: hosted
-    version: "3.3.2"
+    version: "3.4.2"
  html:
    dependency: transitive
    description:
@ -738,10 +754,10 @@ packages:
    dependency: "direct main"
    description:
      name: intl
-      sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5"
+      sha256: "1ca20c894b1717686a2319b8548763d812bc0aabdac580420a44c5178c57a867"
      url: "https://pub.dev"
    source: hosted
-    version: "0.20.2"
+    version: "0.20.3"
  io:
    dependency: transitive
    description:
@ -750,6 +766,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.0.5"
+  js:
+    dependency: transitive
+    description:
+      name: js
+      sha256: "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.7.2"
  json_annotation:
    dependency: "direct main"
    description:
@ -807,6 +831,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "6.1.0"
+  listen:
+    dependency: transitive
+    description:
+      name: listen
+      sha256: "47501a08016a43fcad79252439d723f50f14f88fa7bfd8a177e0a417e5c9e1f2"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.1"
  logging:
    dependency: transitive
    description:
@ -819,18 +851,18 @@ packages:
    dependency: "direct main"
    description:
      name: m3e_buttons
-      sha256: "20b29df165d4d866ffd0d4808090210740690707705f44fc61c9b275bec3af36"
+      sha256: "001031f1b72ef19643a8a6a531aafcfb31a06b53456b6f60014403c125e67056"
      url: "https://pub.dev"
    source: hosted
-    version: "0.0.5"
+    version: "1.0.0"
  m3e_card_list:
    dependency: "direct main"
    description:
      name: m3e_card_list
-      sha256: d4aba0123cccda40ac80789befa8d355e1dc16aa7dcee910157690b0546d78d6
+      sha256: ed1cc150f051b8812ffd735915ae59fed23517ffeeed04c4b2b8ef6257cc18b7
      url: "https://pub.dev"
    source: hosted
-    version: "0.1.0"
+    version: "1.0.0"
  m3e_design:
    dependency: transitive
    description:
@ -843,10 +875,10 @@ packages:
    dependency: transitive
    description:
      name: matcher
-      sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861
+      sha256: "31bd099b47c10cd1aeb55146a2d46ce0277630ecef3f7dae54ad7873f36696cd"
      url: "https://pub.dev"
    source: hosted
-    version: "0.12.19"
+    version: "0.12.20"
  material_color_utilities:
    dependency: transitive
    description:
@ -855,6 +887,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "0.13.0"
+  material_ui:
+    dependency: transitive
+    description:
+      name: material_ui
+      sha256: d9b4f6c69b80bc83d0a14357c86e4c14c8076e807ae73cf2960c8560f623995f
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0"
  measure_size:
    dependency: "direct main"
    description:
@ -931,10 +971,10 @@ packages:
    dependency: transitive
    description:
      name: meta
-      sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349"
+      sha256: "307249ce4ff29d58a18e97f6345f539382eb9c9c29ecda628900f31de0443dd9"
      url: "https://pub.dev"
    source: hosted
-    version: "1.18.0"
+    version: "1.19.0"
  mime:
    dependency: transitive
    description:
@ -955,10 +995,10 @@ packages:
    dependency: transitive
    description:
      name: native_toolchain_c
-      sha256: f9c168717100ae6d9fee9ffb0be379bf1f8b26b0f6bcbd4fdddcd931993a6a72
+      sha256: a1c26117c48cebe5677b0cf0e33a980a79a7c5577effc86f52e5a0d309cdcb60
      url: "https://pub.dev"
    source: hosted
-    version: "0.19.2"
+    version: "0.19.3"
  navigation_rail_m3e:
    dependency: "direct main"
    description:
@ -1096,6 +1136,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.1.8"
+  pointycastle:
+    dependency: transitive
+    description:
+      name: pointycastle
+      sha256: "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.9.1"
  pool:
    dependency: transitive
    description:
@ -1140,34 +1188,34 @@ packages:
    dependency: transitive
    description:
      name: record_use
-      sha256: "2551bd8eecfe95d14ae75f6021ad0248be5c27f138c2ec12fcb52b500b3ba1ed"
+      sha256: "3b4ab682aff40175afca6ff090cc5aa7ce9dafe8dfbae1537a6c678e6678baee"
      url: "https://pub.dev"
    source: hosted
-    version: "0.6.0"
+    version: "1.1.0"
  riverpod:
    dependency: transitive
    description:
      name: riverpod
-      sha256: "17100416c51db7810c71a7bb2c34d1f881faa0074fd452afb0c4db6f8f126c76"
+      sha256: "84351b3472a447f7b89f961f95c73287009d58c59d8cc1267425d995f78e50f1"
      url: "https://pub.dev"
    source: hosted
-    version: "3.3.2"
+    version: "3.4.2"
  riverpod_analyzer_utils:
    dependency: transitive
    description:
      name: riverpod_analyzer_utils
-      sha256: "3e275138862ccc22ed61444a1f9a840f753094c367f28f4123f50289cd204d68"
+      sha256: "46a8dd0461080fde8f886f65f87580758dae8495e352f9ea6a09953abc3df7bd"
      url: "https://pub.dev"
    source: hosted
-    version: "1.0.0-dev.10"
+    version: "1.0.0-dev.11"
  riverpod_lint:
    dependency: "direct dev"
    description:
      name: riverpod_lint
-      sha256: "166f29492228dc471b6fe294092560ccd5545ed15c9fc155622455b58b2451a9"
+      sha256: "7d37414a82b0f52f3d8e440320830d9a8c59620663884b2bb5baaca26296c995"
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.4"
+    version: "3.1.8"
  rxdart:
    dependency: transitive
    description:
@ -1409,10 +1457,10 @@ packages:
    dependency: transitive
    description:
      name: synchronized
-      sha256: "61894a1956de6b4fc1aefd0892e109514a1a706cbece3ac59decd90ff5a7a423"
+      sha256: "3a7b5d17422dd0f8d5c6c14feaa5a1c65638b9455f871a96f08437562c046931"
      url: "https://pub.dev"
    source: hosted
-    version: "3.4.1+1"
+    version: "3.4.1+2"
  term_glyph:
    dependency: transitive
    description:
@ -1425,26 +1473,26 @@ packages:
    dependency: transitive
    description:
      name: test
-      sha256: "8d9ceddbab833f180fbefed08afa76d7c03513dfdba87ffcec2718b02bbcbf20"
+      sha256: ca578dc12bb8b2f40b67b7d3bd2fac4f31c01a6ff7130a14e2597b919934507f
      url: "https://pub.dev"
    source: hosted
-    version: "1.31.0"
+    version: "1.31.1"
  test_api:
    dependency: transitive
    description:
      name: test_api
-      sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e"
+      sha256: "2a122cbe059f8b610d3a5415f42e255b6c17b1f21eee1d960f31080237fb4f11"
      url: "https://pub.dev"
    source: hosted
-    version: "0.7.11"
+    version: "0.7.12"
  test_core:
    dependency: transitive
    description:
      name: test_core
-      sha256: "1991d4cfe85d5043241acac92962c3977c8d2f2add1ee73130c7b286417d1d34"
+      sha256: d2e98ec12998368dc59ddd47ab709f2cd55acd6b66dc7db764455a44082f4bc5
      url: "https://pub.dev"
    source: hosted
-    version: "0.6.17"
+    version: "0.6.18"
  timeago:
    dependency: "direct main"
    description:
@ -1461,22 +1509,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.4.0"
-  universal_html:
-    dependency: transitive
-    description:
-      name: universal_html
-      sha256: c0bcae5c733c60f26c7dfc88b10b0fd27cbcc45cb7492311cdaa6067e21c9cd4
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.3.0"
-  universal_io:
-    dependency: transitive
-    description:
-      name: universal_io
-      sha256: f63cbc48103236abf48e345e07a03ce5757ea86285ed313a6a032596ed9301e2
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.3.1"
  universal_platform:
    dependency: transitive
    description:
@ -1593,10 +1625,10 @@ packages:
    dependency: transitive
    description:
      name: vector_math
-      sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
+      sha256: f36f9f3be64c6198714492bb455c11056e33e2f85d9a0b676a48301e44fdcf47
      url: "https://pub.dev"
    source: hosted
-    version: "2.2.0"
+    version: "2.4.2"
  vm_service:
    dependency: transitive
    description:
@ -1710,5 +1742,5 @@ packages:
    source: hosted
    version: "2.2.4"
 sdks:
-  dart: ">=3.12.2 <4.0.0"
-  flutter: ">=3.44.0"
+  dart: ">=3.13.0 <4.0.0"
+  flutter: ">=3.47.0"
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -16,7 +16,7 @@ flutter:
    uses-material-design: true

 environment:
-    sdk: "^3.12.2"
+    sdk: "3.13.0"

 dependency_overrides:
    path_provider_android: 2.2.23 # Pinned to avoid JNI
@ -30,14 +30,14 @@ dependencies:
        sdk: flutter
    flutter_localizations:
        sdk: flutter
-    flutter_riverpod: 3.3.2
-    hooks_riverpod: 3.3.2
-    intl: 0.20.2
+    flutter_riverpod: 3.4.2
+    hooks_riverpod: 3.4.2
+    intl: 0.20.3
    fast_immutable_collections: 11.2.0
    path_provider: 2.1.6
    url_launcher: 6.3.2
    freezed_annotation: 3.1.0
-    image_picker: ^1.2.3
+    image_picker: 1.2.3
    path: 1.9.1
    dynamic_color: 1.9.0
    collection: 1.19.1
@ -48,10 +48,10 @@ dependencies:
    json_annotation: 4.12.0
    shared_preferences: 2.5.5
    fluttertagger: 2.3.2
-    dynamic_polls: 0.0.7
+    dynamic_polls: 0.0.8
    flutter_hooks: 0.21.3+1
    ffi: 2.2.0
-    hooks: 2.0.2
+    hooks: 2.1.0
    code_assets: 1.2.1
    ffigen: 21.0.0
    timeago: 3.7.1
@ -67,22 +67,22 @@ dependencies:
    media_kit_video: 2.0.1
    media_kit_libs_video: 1.0.7
    measure_size: 5.0.2
-    m3e_buttons: 0.0.5
+    m3e_buttons: 1.0.0
    navigation_rail_m3e:
        git:
            url: https://github.com/Henry-Hiles/material_3_expressive
            path: packages/navigation_rail_m3e
-    m3e_card_list: 0.1.0
+    m3e_card_list: 1.0.0
    xdg_directories: 1.1.0
    package_info_plus: 10.2.1
    app_links: 7.2.1
-    file_selector: ^1.1.0
+    file_selector: 1.1.0

 dev_dependencies:
-    build_runner: ^2.15.1
+    build_runner: 2.16.0
    flutter_lints: 6.0.0
-    freezed: 3.2.6-dev.1
-    riverpod_lint: 3.1.4
+    freezed: 4.0.0-dev.3
+    riverpod_lint: 3.1.8
    flutter_launcher_icons: 0.14.4
    json_serializable: 6.14.1