diff --git a/CHANGELOG.md b/CHANGELOG.md index c698694..c6a3781 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,23 @@ All notable changes to this project will be documented in this file. - 涉及文件: - `lib/views/profile/app-info.dart` - 添加 UDID 获取和显示 +### 升级 +- 📦 **flutter_udid 库升级至 4.1.2** + - 升级本地 flutter_udid 包到最新版本 4.1.2 + - Android 平台:更新 Gradle 到 8.5.0,Kotlin 到 2.0.21,使用新的 FlutterPlugin API + - iOS 平台:替换 SAMKeychain 为 KeychainAccess,支持 iOS 13.0+ + - MacOS 平台:使用 KeychainAccess 和 IOKit 获取硬件 UUID + - HarmonyOS 平台:保持 3.0.0 版本,使用 OAID 获取设备标识 + - 解决 Gradle 依赖冲突(jcenter 废弃问题) + - 统一 JVM 目标版本为 17 + - 涉及文件: + - `packages/flutter_udid/pubspec.yaml` - 更新版本和平台配置 + - `packages/flutter_udid/android/build.gradle` - 更新 Gradle 和 Kotlin 版本 + - `packages/flutter_udid/android/src/main/kotlin/.../FlutterUdidPlugin.kt` - 更新插件 API + - `packages/flutter_udid/ios/flutter_udid.podspec` - 更新依赖和部署目标 + - `packages/flutter_udid/ios/Classes/SwiftFlutterUdidPlugin.swift` - 更新 KeychainAccess + - `packages/flutter_udid/macos/Classes/FlutterUdidPlugin.swift` - 更新实现 + ### 新增 - 👥 **QQ 交流群卡片** - 在了解我们页面的"官方网站"卡片下方添加 QQ 群卡片 diff --git a/android/build.gradle.kts b/android/build.gradle.kts index 3ee1921..0e29146 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -5,7 +5,26 @@ allprojects { } } -// 统一 JVM 版本配置 +allprojects { + buildscript { + repositories { + google() + mavenCentral() + } + } +} + +allprojects { + configurations.all { + resolutionStrategy.eachDependency { + if (requested.group == "org.ow2.asm" && requested.name == "asm-util") { + useVersion("9.6") + because("jcenter is deprecated, using mavenCentral version") + } + } + } +} + allprojects { tasks.withType { sourceCompatibility = "17" @@ -19,7 +38,6 @@ allprojects { } } -// 为 audioplayers_android 模块单独设置 Java 1.8 project(":audioplayers_android") { tasks.withType { sourceCompatibility = "1.8" diff --git a/android/build/reports/problems/problems-report.html b/android/build/reports/problems/problems-report.html index b96f1cc..98c83f2 100644 --- a/android/build/reports/problems/problems-report.html +++ b/android/build/reports/problems/problems-report.html @@ -650,7 +650,7 @@ code + .copy-button { diff --git a/lib/views/profile/app-info.dart b/lib/views/profile/app-info.dart index d888a8f..3525289 100644 --- a/lib/views/profile/app-info.dart +++ b/lib/views/profile/app-info.dart @@ -624,7 +624,12 @@ class _AppInfoPageState extends State { _buildInfoItem('设备类型', deviceType, Icons.devices), _buildInfoItem('构建模式', buildMode, Icons.build), _buildInfoItem('运行环境', runtimeEnv, Icons.code), - _buildCopyableItem(context, 'UDID', _udid, Icons.perm_identity), + _buildCopyableItem( + context, + 'Flutter UDID', + _udid, + Icons.perm_identity, + ), Padding( padding: const EdgeInsets.all(16), child: Container( diff --git a/pubspec.lock b/pubspec.lock index d365150..0845cb1 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -230,12 +230,10 @@ packages: flutter_udid: dependency: "direct main" description: - path: "." - ref: HEAD - resolved-ref: "4bd2d6988e959e11779f9a72eaadb3f75de68a2d" - url: "https://gitcode.com/openharmony-sig/fluttertpc_flutter_udid.git" - source: git - version: "2.0.1" + path: "packages/flutter_udid" + relative: true + source: path + version: "4.1.2" flutter_web_plugins: dependency: transitive description: flutter diff --git a/pubspec.yaml b/pubspec.yaml index 53c1071..414860e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -47,8 +47,7 @@ dependencies: url: https://gitcode.com/openharmony-sig/flutter_audioplayers.git path: packages/audioplayers flutter_udid: - git: - url: https://gitcode.com/openharmony-sig/fluttertpc_flutter_udid.git + path: packages/flutter_udid share_plus: