From ae1ec191a8934451593bfaca5f6489f83d78116b Mon Sep 17 00:00:00 2001 From: Max Date: Sat, 6 Sep 2025 17:23:14 +0800 Subject: [PATCH] Fix build issues: remove duplicate gradle files, increase heap size, fix plugin configuration --- .dart_tool/package_config_subset | 4 +- .dart_tool/package_graph.json | 146 +++++++++++++-------------- example/android/app/build.gradle.kts | 44 -------- example/android/build.gradle.kts | 21 ---- example/android/gradle.properties | 2 +- example/android/settings.gradle.kts | 25 ----- pubspec.yaml | 9 +- 7 files changed, 83 insertions(+), 168 deletions(-) delete mode 100644 example/android/app/build.gradle.kts delete mode 100644 example/android/build.gradle.kts delete mode 100644 example/android/settings.gradle.kts diff --git a/.dart_tool/package_config_subset b/.dart_tool/package_config_subset index b48c18d..6ed44d6 100644 --- a/.dart_tool/package_config_subset +++ b/.dart_tool/package_config_subset @@ -252,8 +252,8 @@ file:///Users/max/.pub-cache/hosted/pub.flutter-io.cn/xdg_directories-1.1.0/ file:///Users/max/.pub-cache/hosted/pub.flutter-io.cn/xdg_directories-1.1.0/lib/ yx_asr 3.0 -file:///Users/max/SourceCode/yuanxuan/yx_asr/ -file:///Users/max/SourceCode/yuanxuan/yx_asr/lib/ +file:///Users/max/SourceCode/yuanxuan/yx_speech_to_text_flutter/ +file:///Users/max/SourceCode/yuanxuan/yx_speech_to_text_flutter/lib/ sky_engine 3.7 file:///Users/max/fvm/versions/3.32.0/bin/cache/pkg/sky_engine/ diff --git a/.dart_tool/package_graph.json b/.dart_tool/package_graph.json index 392bf8d..653e49a 100644 --- a/.dart_tool/package_graph.json +++ b/.dart_tool/package_graph.json @@ -88,6 +88,18 @@ "vm_service" ] }, + { + "name": "path_provider", + "version": "2.1.5", + "dependencies": [ + "flutter", + "path_provider_android", + "path_provider_foundation", + "path_provider_linux", + "path_provider_platform_interface", + "path_provider_windows" + ] + }, { "name": "record", "version": "6.1.1", @@ -361,6 +373,52 @@ "webdriver" ] }, + { + "name": "path_provider_windows", + "version": "2.3.0", + "dependencies": [ + "ffi", + "flutter", + "path", + "path_provider_platform_interface" + ] + }, + { + "name": "path_provider_platform_interface", + "version": "2.1.2", + "dependencies": [ + "flutter", + "platform", + "plugin_platform_interface" + ] + }, + { + "name": "path_provider_linux", + "version": "2.2.1", + "dependencies": [ + "ffi", + "flutter", + "path", + "path_provider_platform_interface", + "xdg_directories" + ] + }, + { + "name": "path_provider_foundation", + "version": "2.4.2", + "dependencies": [ + "flutter", + "path_provider_platform_interface" + ] + }, + { + "name": "path_provider_android", + "version": "2.2.17", + "dependencies": [ + "flutter", + "path_provider_platform_interface" + ] + }, { "name": "record_macos", "version": "1.1.1", @@ -543,6 +601,21 @@ "vm_service" ] }, + { + "name": "plugin_platform_interface", + "version": "2.1.8", + "dependencies": [ + "meta" + ] + }, + { + "name": "xdg_directories", + "version": "1.1.0", + "dependencies": [ + "meta", + "path" + ] + }, { "name": "web", "version": "1.1.1", @@ -560,13 +633,6 @@ "vector_math" ] }, - { - "name": "plugin_platform_interface", - "version": "2.1.8", - "dependencies": [ - "meta" - ] - }, { "name": "fixnum", "version": "1.1.1", @@ -590,72 +656,6 @@ "dependencies": [ "collection" ] - }, - { - "name": "path_provider", - "version": "2.1.5", - "dependencies": [ - "flutter", - "path_provider_android", - "path_provider_foundation", - "path_provider_linux", - "path_provider_platform_interface", - "path_provider_windows" - ] - }, - { - "name": "path_provider_linux", - "version": "2.2.1", - "dependencies": [ - "ffi", - "flutter", - "path", - "path_provider_platform_interface", - "xdg_directories" - ] - }, - { - "name": "path_provider_windows", - "version": "2.3.0", - "dependencies": [ - "ffi", - "flutter", - "path", - "path_provider_platform_interface" - ] - }, - { - "name": "path_provider_platform_interface", - "version": "2.1.2", - "dependencies": [ - "flutter", - "platform", - "plugin_platform_interface" - ] - }, - { - "name": "path_provider_foundation", - "version": "2.4.2", - "dependencies": [ - "flutter", - "path_provider_platform_interface" - ] - }, - { - "name": "xdg_directories", - "version": "1.1.0", - "dependencies": [ - "meta", - "path" - ] - }, - { - "name": "path_provider_android", - "version": "2.2.17", - "dependencies": [ - "flutter", - "path_provider_platform_interface" - ] } ], "configVersion": 1 diff --git a/example/android/app/build.gradle.kts b/example/android/app/build.gradle.kts deleted file mode 100644 index a3d79f6..0000000 --- a/example/android/app/build.gradle.kts +++ /dev/null @@ -1,44 +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") -} - -android { - namespace = "com.yuanxuan.yx_asr_example" - compileSdk = flutter.compileSdkVersion - ndkVersion = flutter.ndkVersion - - compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 - } - - kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() - } - - defaultConfig { - // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId = "com.yuanxuan.yx_asr_example" - // You can update the following values to match your application needs. - // For more information, see: https://flutter.dev/to/review-gradle-config. - minSdk = flutter.minSdkVersion - targetSdk = flutter.targetSdkVersion - versionCode = flutter.versionCode - versionName = flutter.versionName - } - - buildTypes { - release { - // TODO: Add your own signing config for the release build. - // Signing with the debug keys for now, so `flutter run --release` works. - signingConfig = signingConfigs.getByName("debug") - } - } -} - -flutter { - source = "../.." -} diff --git a/example/android/build.gradle.kts b/example/android/build.gradle.kts deleted file mode 100644 index 89176ef..0000000 --- a/example/android/build.gradle.kts +++ /dev/null @@ -1,21 +0,0 @@ -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("clean") { - delete(rootProject.layout.buildDirectory) -} diff --git a/example/android/gradle.properties b/example/android/gradle.properties index 94adc3a..c9b354d 100644 --- a/example/android/gradle.properties +++ b/example/android/gradle.properties @@ -1,3 +1,3 @@ -org.gradle.jvmargs=-Xmx1536M +org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1g android.useAndroidX=true android.enableJetifier=true diff --git a/example/android/settings.gradle.kts b/example/android/settings.gradle.kts deleted file mode 100644 index ab39a10..0000000 --- a/example/android/settings.gradle.kts +++ /dev/null @@ -1,25 +0,0 @@ -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 "8.7.3" apply false - id("org.jetbrains.kotlin.android") version "2.1.0" apply false -} - -include(":app") diff --git a/pubspec.yaml b/pubspec.yaml index 96e32a7..e4d3e36 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -24,5 +24,10 @@ dev_dependencies: flutter_lints: ^3.0.0 flutter: - assets: - - assets/models/ + plugin: + platforms: + android: + package: com.yuanxuan.yx_asr + pluginClass: YxAsrPlugin + ios: + pluginClass: YxAsrPlugin