diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 01557e3..bc4f4a7 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -18,7 +18,7 @@ if (keystorePropertiesFile.exists()) { android { namespace = "com.nearle.gear" compileSdk = 36 - ndkVersion = "27.0.12077973" + ndkVersion = "28.2.13676358" defaultConfig { applicationId = "com.nearle.gear" @@ -59,6 +59,9 @@ android { )} } } +configurations.all { + exclude(group = "com.google.firebase", module = "firebase-iid") +} dependencies { diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro index f1f8993..53acfce 100644 --- a/android/app/proguard-rules.pro +++ b/android/app/proguard-rules.pro @@ -53,3 +53,18 @@ # Keep annotations ############################### -keepattributes *Annotation* + +############################### +# Firebase InstanceID (legacy, referenced by mlkit-linkfirebase only) +############################### +-dontwarn com.google.firebase.iid.** + +############################### +# ML Kit text recognition — language packs not bundled +############################### +-dontwarn com.google.mlkit.vision.text.chinese.** +-dontwarn com.google.mlkit.vision.text.devanagari.** +-dontwarn com.google.mlkit.vision.text.japanese.** +-dontwarn com.google.mlkit.vision.text.korean.** +-dontwarn com.google.mlkit.linkfirebase.** +-dontwarn com.google.mlkit.** \ No newline at end of file diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 261aa0d..da2efbb 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -2,20 +2,17 @@ - - - - + + + + @@ -63,6 +63,7 @@ + @@ -74,16 +75,50 @@ android:name="io.flutter.embedding.android.NormalTheme" android:resource="@style/NormalTheme" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +