更新到上游2.1.0

.fvmrc

@@ -1,3 +1,3 @@
 {
-  "flutter": "3.41.6"
+  "flutter": "3.41.9"
 }

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.gitignore

@@ -11,6 +11,7 @@
 .svn/
 .swiftpm/
 migrate_working_dir/
+Package.resolved
 
 # IntelliJ related
 *.iml
@@ -148,7 +149,7 @@ pili_release.json
 
 dist
 
-test*.dart
+test*
 
 ohos/build-profile.json5
 

.vscode/build_env.dart

@@ -5,13 +5,15 @@ Future<void> _updatePubspecVersion(int versionCode) async {
   final pubspecPath = './pubspec.yaml';
   final file = File(pubspecPath);
   if (!await file.exists()) return;
-  
+
   final content = await file.readAsString();
   final lines = content.split('\n');
-  
+
   for (var i = 0; i < lines.length; i++) {
     if (lines[i].startsWith('version:')) {
-      final match = RegExp(r'version:\s*([\d.]+)(\+[\d]+)?').firstMatch(lines[i]);
+      final match = RegExp(
+        r'version:\s*([\d.]+)(\+[\d]+)?',
+      ).firstMatch(lines[i]);
       if (match != null) {
         final versionName = match.group(1)!;
         lines[i] = 'version: $versionName+$versionCode';
@@ -24,12 +26,12 @@ Future<void> _updatePubspecVersion(int versionCode) async {
 
 void main() async {
   // 手动指定 versionName
-  const versionName = '2.0.1-ohos-3';
+  const versionName = '2.1.0-ohos';
 
   // 通过 git 命令获取 hash 和 code
   final versionCode = await _getGitCommitCount();
   final commitHash = await _getGitCommitHash();
-  
+
   await _updatePubspecVersion(versionCode);
 
   final env = {
@@ -39,7 +41,7 @@ void main() async {
     'pili.time': DateTime.now().millisecondsSinceEpoch ~/ 1000,
     'pili.hash': commitHash,
     'pili.code': versionCode,
-    'ENABLE_FLEX_OVERFLOW': false
+    'ENABLE_FLEX_OVERFLOW': false,
   };
   File('./.vscode/env.json')
     ..createSync(recursive: true)

analysis_options.yaml

@@ -12,7 +12,6 @@ include: package:flutter_lints/flutter.yaml
 analyzer:
   exclude:
     - lib/grpc/bilibili/**
-    # - lib/grpc/google/**
     # - lib/common/widgets/flutter/**
 
 formatter:

android/app/build.gradle.kts

@@ -3,11 +3,20 @@ import org.jetbrains.kotlin.konan.properties.Properties
 
 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")
 }
 
+val agpMajorVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
+    .substringBefore('.')
+    .toInt()
+val builtInKotlinProperty = providers.gradleProperty("android.builtInKotlin").orNull
+val isBuiltInKotlinEnabled = agpMajorVersion >= 9 &&
+        (builtInKotlinProperty == null || builtInKotlinProperty.toBoolean())
+if (!isBuiltInKotlinEnabled) {
+    apply(plugin = "org.jetbrains.kotlin.android")
+}
+
 android {
     namespace = "com.example.piliplus"
     compileSdk = flutter.compileSdkVersion
@@ -18,12 +27,6 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlin {
-        compilerOptions {
-            jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
-        }
-    }
-
     defaultConfig {
         applicationId = "com.example.piliplus"
         minSdk = flutter.minSdkVersion
@@ -51,6 +54,12 @@ android {
         }
     }
 
+    buildFeatures {
+        if (project.hasProperty("dev")) {
+            resValues = true
+        }
+    }
+
     buildTypes {
         all {
             signingConfig = config ?: signingConfigs["debug"]
@@ -82,6 +91,12 @@ android {
     }
 }
 
+kotlin {
+    compilerOptions {
+        jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
+    }
+}
+
 flutter {
     source = "../.."
 }