Upgrade dependencies

.github/workflows/android.yaml

@@ -28,11 +28,21 @@ jobs:
           channel: beta
       - name: Build
         run: |
+          FLUTTER_BUILD_NUMBER=$(git rev-list --count HEAD)
+          GIT_DESC=$(git describe --tags)
+          if [[ $GIT_DESC =~ v([0-9]+)\.([0-9]+)\.([0-9]+)-([0-9]+)-g[a-f0-9]+ ]]; then
+              FLUTTER_BUILD_NAME="${BASH_REMATCH[1]}.$((BASH_REMATCH[2]+1)).${BASH_REMATCH[3]}"
+          else
+              FLUTTER_BUILD_NAME="0.0.1"
+          fi
+
           echo $CONFIG_ENV | base64 -d > .env
           echo $ANDROID_RELEASE_SIGN_KEY | base64 -d > ./android/app/x.jks
+
           flutter build apk \
             --release \
-            --target-platform=android-arm64 \
+            --build-name=$FLUTTER_BUILD_NAME \
+            --build-number=$FLUTTER_BUILD_NUMBER \
             --dart-define-from-file=.env
         env:
           CONFIG_ENV: ${{ secrets.CONFIG_ENV }}

.github/workflows/macos.yaml

@@ -36,7 +36,8 @@ jobs:
           flutter build macos \
             --release \
             --build-name=$FLUTTER_BUILD_NAME \
-            --build-number=$FLUTTER_BUILD_NUMBER
+            --build-number=$FLUTTER_BUILD_NUMBER \
+            --dart-define-from-file=.env
         env:
           CONFIG_ENV: ${{ secrets.CONFIG_ENV }}
       - uses: actions/upload-artifact@v4

.github/workflows/web.yaml

@@ -26,7 +26,7 @@ jobs:
           FLUTTER_BUILD_NUMBER=$(git rev-list --count HEAD)
           GIT_DESC=$(git describe --tags)
           if [[ $GIT_DESC =~ v([0-9]+)\.([0-9]+)\.([0-9]+)-([0-9]+)-g[a-f0-9]+ ]]; then
-              FLUTTER_BUILD_NAME="${BASH_REMATCH[1]}.${BASH_REMATCH[2]}.${BASH_REMATCH[3]}"
+              FLUTTER_BUILD_NAME="${BASH_REMATCH[1]}.$((BASH_REMATCH[2]+1)).${BASH_REMATCH[3]}"
           else
               FLUTTER_BUILD_NAME="0.0.1"
           fi
@@ -37,8 +37,8 @@ jobs:
             --release \
             --build-name=$FLUTTER_BUILD_NAME \
             --build-number=$FLUTTER_BUILD_NUMBER \
-            --source-maps \
-            --dart-define-from-file=.env
+            --dart-define-from-file=.env \
+            --source-maps
         env:
           CONFIG_ENV: ${{ secrets.CONFIG_ENV }}
       - uses: actions/upload-artifact@v4

.metadata

@@ -4,32 +4,32 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: 2e449f06f0a3be076e336ad6b30b0e9ec99dbdfe
-  channel: alpha
+  revision: "2e2c358c9b14765c90343af9df11e12c5dfc3e6c"
+  channel: "beta"
 
 project_type: app
 
 # Tracks metadata for the flutter migrate command
 migration:
   platforms:
     - platform: root
-      create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
-      base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
+      create_revision: 2e2c358c9b14765c90343af9df11e12c5dfc3e6c
+      base_revision: 2e2c358c9b14765c90343af9df11e12c5dfc3e6c
     - platform: android
-      create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
-      base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
+      create_revision: 2e2c358c9b14765c90343af9df11e12c5dfc3e6c
+      base_revision: 2e2c358c9b14765c90343af9df11e12c5dfc3e6c
     - platform: ios
-      create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
-      base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
+      create_revision: 2e2c358c9b14765c90343af9df11e12c5dfc3e6c
+      base_revision: 2e2c358c9b14765c90343af9df11e12c5dfc3e6c
     - platform: macos
-      create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
-      base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
+      create_revision: 2e2c358c9b14765c90343af9df11e12c5dfc3e6c
+      base_revision: 2e2c358c9b14765c90343af9df11e12c5dfc3e6c
     - platform: web
-      create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
-      base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
+      create_revision: 2e2c358c9b14765c90343af9df11e12c5dfc3e6c
+      base_revision: 2e2c358c9b14765c90343af9df11e12c5dfc3e6c
     - platform: windows
-      create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
-      base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
+      create_revision: 2e2c358c9b14765c90343af9df11e12c5dfc3e6c
+      base_revision: 2e2c358c9b14765c90343af9df11e12c5dfc3e6c
 
   # User provided section
 

.vscode/launch.json

@@ -1,7 +1,4 @@
 {
-    // 使用 IntelliSense 了解相关属性。
-    // 悬停以查看现有属性的描述。
-    // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
         {

analysis_options.yaml

@@ -26,7 +26,6 @@ linter:
   # `// ignore_for_file: name_of_lint` syntax on the line or in the file
   # producing the lint.
   rules:
-    avoid_print: false
     prefer_single_quotes: true
     prefer_relative_imports: true
 # Additional information about this file can be found at

android/.gitignore

@@ -7,9 +7,7 @@ gradle-wrapper.jar
 GeneratedPluginRegistrant.java
 
 # Remember to never publicly share your keystore.
-# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
+# See https://flutter.dev/to/reference-keystore
 key.properties
 **/*.keystore
 **/*.jks
-
-app/google-services.json

android/app/build.gradle

@@ -1,71 +1,48 @@
 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 = "git rev-list HEAD --count".execute().text.trim()
-}
-
-def flutterVersionName = localProperties.getProperty("flutter.versionName")
-if (flutterVersionName == null) {
-    flutterVersionName = "git describe --tags".execute().text.trim().substring(1)
-}
-
 android {
-    namespace "io.xdea.xmux"
-    compileSdk flutter.compileSdkVersion
-    ndkVersion flutter.ndkVersion
+    namespace = "io.xdea.xmux"
+    compileSdk = flutter.compileSdkVersion
+    ndkVersion = flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
-    }
-
-    sourceSets {
-        main.java.srcDirs += "src/main/kotlin"
+        jvmTarget = JavaVersion.VERSION_1_8
     }
 
     defaultConfig {
-        applicationId "org.ctbeta.xmux.xmux"
-        minSdk 23
-        targetSdk flutter.targetSdkVersion
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
+        applicationId = "org.ctbeta.xmux.xmux"
+        minSdk = 23
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
     }
 
     signingConfigs {
         release {
-            storeFile System.getenv('KEYSTORE_FILE') ? file(System.getenv('KEYSTORE_FILE')) : null
-            storePassword System.getenv('KEYSTORE_PASSWORD')
-            keyAlias System.getenv('KEY_ALIAS')
-            keyPassword System.getenv('KEY_PASSWORD')
+            storeFile = System.getenv('KEYSTORE_FILE') ? file(System.getenv('KEYSTORE_FILE')) : null
+            storePassword = System.getenv('KEYSTORE_PASSWORD')
+            keyAlias = System.getenv('KEY_ALIAS')
+            keyPassword = System.getenv('KEY_PASSWORD')
         }
     }
 
     buildTypes {
         release {
-            signingConfig signingConfigs.release
+            signingConfig = signingConfigs.release
         }
     }
 }
 
 flutter {
-    source "../.."
+    source = "../.."
 }
-
-dependencies {}

android/app/src/main/AndroidManifest.xml

@@ -13,6 +13,7 @@
             android:name="io.xdea.xmux.MainActivity"
             android:exported="true"
             android:launchMode="singleTop"
+            android:taskAffinity=""
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
@@ -36,7 +37,7 @@
             android:value="2" />
     </application>
     <!-- Required to query activities that can process text, see:
-         https://developer.android.com/training/package-visibility?hl=en and
+         https://developer.android.com/training/package-visibility and
          https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
 
          In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->

android/build.gradle

@@ -8,6 +8,8 @@ allprojects {
 rootProject.buildDir = "../build"
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
+}
+subprojects {
     project.evaluationDependsOn(":app")
 }
 

android/gradle.properties

@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx4G
+org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true

ios/.gitignore

@@ -32,5 +32,3 @@ Runner/GeneratedPluginRegistrant.*
 !default.mode2v3
 !default.pbxuser
 !default.perspectivev3
-
-GoogleService-Info.plist

packages/.gitignore

@@ -0,0 +1,7 @@
+# https://dart.dev/guides/libraries/private-files
+# Created by `dart pub`
+/*/.dart_tool/
+
+# Avoid committing pubspec.lock for library packages; see
+# https://dart.dev/guides/libraries/private-files#pubspeclock.
+/*/pubspec.lock

packages/aaos/pubspec.yaml

@@ -16,5 +16,5 @@ dependencies:
 dev_dependencies:
   build_runner: ^2.0.0
   json_serializable: ^6.0.0
-  lints: ^2.0.0
+  lints: ^5.0.0
   test: ^1.16.0

packages/barracuda_campus/lib/barracuda_campus.dart

@@ -7,7 +7,7 @@ import 'package:html/parser.dart';
 import 'package:intl/intl.dart';
 
 class _CookieManager extends CookieManager {
-  _CookieManager(CookieJar cookieJar) : super(cookieJar);
+  _CookieManager(super.cookieJar);
 
   @override
   void onRequest(RequestOptions options, RequestInterceptorHandler handler) {
@@ -60,7 +60,7 @@ class BCStudent {
           'submit': 'Login',
         },
       );
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       if (e.response?.statusCode != 302) rethrow;
       final location = e.response?.headers['Location'];
       if (location?.first.contains('/student/login') ?? false) {

packages/barracuda_campus/pubspec.yaml

@@ -14,4 +14,4 @@ dependencies:
   intl: ^0.19.0
 
 dev_dependencies:
-  lints: ^2.0.0
+  lints: ^5.0.0

packages/emgs/lib/emgs.dart

@@ -1,5 +1,3 @@
-library emgs;
-
 import 'dart:convert';
 
 import 'package:http/http.dart' as http;

packages/emgs/pubspec.yaml

@@ -14,4 +14,4 @@ dependencies:
 dev_dependencies:
   build_runner: ^2.0.0
   json_serializable: ^6.0.0
-  lints: ^2.0.0
+  lints: ^5.0.0

packages/maintenance/lib/src/cookie_manager.dart

@@ -41,17 +41,16 @@ class CookieManager extends Interceptor {
   }
 
   @override
-  void onError(DioError err, ErrorInterceptorHandler handler) {
+  void onError(DioException err, ErrorInterceptorHandler handler) {
     if (err.response != null) {
       _saveCookies(err.response!)
           .then((_) => handler.next(err))
           .catchError((e, stackTrace) {
-        var _err = DioException(
+        handler.next(DioException(
           requestOptions: err.response!.requestOptions,
           error: e,
           stackTrace: stackTrace,
-        );
-        handler.next(_err);
+        ));
       });
     } else {
       handler.next(err);

packages/maintenance/lib/src/maintenance.dart

@@ -47,7 +47,7 @@ class Maintenance {
           followRedirects: true,
         ),
       );
-    } on DioError catch (e) {
+    } on DioException catch (e) {
       final resp = e.response;
       if (resp == null || resp.statusCode != 302) rethrow;
       if (resp.statusCode == 302) return;

packages/maintenance/pubspec.yaml

@@ -10,10 +10,11 @@ dependencies:
   cookie_jar: ^4.0.0
   dio: ^5.0.0
   html: ^0.15.0
+  http_parser: ^4.0.0
   intl: ^0.19.0
   mobx: ^2.0.0
 
 dev_dependencies:
   build_runner: ^2.0.0
-  lints: ^2.0.0
+  lints: ^5.0.0
   mobx_codegen: ^2.0.0