From 14ea808013d3a43577fc0c50e90bbe56a2d35aea Mon Sep 17 00:00:00 2001 From: qianmo2233 <67282958@qq.com> Date: Mon, 23 Dec 2024 18:09:58 +0800 Subject: [PATCH] fix Android platform build --- android/app/build.gradle | 6 +++++ android/app/src/main/AndroidManifest.xml | 18 +++++++++++++++ android/build.gradle | 29 ++++++++++++++++++++++++ android/gradle.properties | 3 ++- 4 files changed, 55 insertions(+), 1 deletion(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 1660a8a..116e8c0 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -11,6 +11,8 @@ android { ndkVersion = "25.1.8937393" compileOptions { + coreLibraryDesugaringEnabled true + sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } @@ -39,6 +41,10 @@ android { } } +dependencies { + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3' +} + flutter { source = "../.." } diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 526a2be..7bc8102 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -4,6 +4,11 @@ + + + + + + + + + + + + + + + + if (project.hasProperty('android')) { + project.android { + if (namespace == null) { + namespace project.group + } + } + } + } +} + allprojects { repositories { google() @@ -9,6 +21,17 @@ rootProject.buildDir = "../build" subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" } +subprojects { + afterEvaluate { project -> + if (project.plugins.hasPlugin("com.android.application") || + project.plugins.hasPlugin("com.android.library")) { + project.android { + compileSdkVersion 34 + buildToolsVersion "34.0.0" + } + } + } +} subprojects { project.evaluationDependsOn(":app") } @@ -16,3 +39,9 @@ subprojects { tasks.register("clean", Delete) { delete rootProject.buildDir } + +configurations.all { + resolutionStrategy { + force 'androidx.core:core-ktx:1.6.0' + } +} diff --git a/android/gradle.properties b/android/gradle.properties index 1c12318..c485625 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,4 +1,5 @@ org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip +kotlin.jvm.target.validation.mode = IGNORE \ No newline at end of file