diff --git a/android/.gitignore b/android/.gitignore index 55afd91..98cb89f 100644 --- a/android/.gitignore +++ b/android/.gitignore @@ -11,3 +11,5 @@ GeneratedPluginRegistrant.java key.properties **/*.keystore **/*.jks + +app/.cxx \ No newline at end of file diff --git a/android/app/build.gradle b/android/app/build.gradle index f6dccd7..3dc37aa 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -10,12 +10,15 @@ plugins { } dependencies { - implementation 'com.facebook.fresco:webpsupport:2.6.0' - implementation 'com.facebook.react:react-android:0.75.5' +// implementation('org.jitsi.react:jitsi-meet-sdk:11.1.1') { transitive = true } +// implementation 'com.facebook.fresco:webpsupport:2.6.0' +// implementation 'com.facebook.fresco:animated-webp:2.6.0' +// implementation 'com.facebook.react:react-android:0.75.5' +// implementation 'com.facebook.react:hermes-android:0.75.5' implementation 'com.google.android.material:material:1.12.0' implementation 'androidx.glance:glance:1.1.1' implementation 'androidx.glance:glance-appwidget:1.1.1' - implementation 'androidx.compose.foundation:foundation-layout-android:1.7.6' + implementation 'androidx.compose.foundation:foundation-layout-android:1.7.8' implementation 'com.google.code.gson:gson:2.10.1' implementation 'com.squareup.okhttp3:okhttp:4.12.0' implementation 'io.coil-kt.coil3:coil-compose:3.0.4' @@ -75,8 +78,10 @@ android { } release { signingConfig = signingConfigs.release + minifyEnabled true + shrinkResources true - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } } diff --git a/android/app/src/proguard-rules.pro b/android/app/proguard-rules.pro similarity index 90% rename from android/app/src/proguard-rules.pro rename to android/app/proguard-rules.pro index 4de8f33..2001165 100644 --- a/android/app/src/proguard-rules.pro +++ b/android/app/proguard-rules.pro @@ -13,17 +13,10 @@ @com.google.gson.annotations.SerializedName ; } -# React Native +-dontwarn com.facebook.imagepipeline.nativecode.WebpTranscoder -# Keep our interfaces so they can be used by other ProGuard rules. -# See http://sourceforge.net/p/proguard/bugs/466/ -keep,allowobfuscation @interface com.facebook.proguard.annotations.DoNotStrip -keep,allowobfuscation @interface com.facebook.proguard.annotations.KeepGettersAndSetters --keep class com.facebook.imagepipeline.nativecode.WebpTranscoderImpl { *; } --keep class com.facebook.imagepipeline.nativecode.WebpTranscoder { *; } - --dontwarn com.facebook.imagepipeline.nativecode.** --dontwarn com.facebook.imagepipeline.nativecode.WebpTranscoder # Do not strip any method/class that is annotated with @DoNotStrip -keep @com.facebook.proguard.annotations.DoNotStrip class * @@ -100,4 +93,4 @@ # https://github.com/facebook/fresco/issues/2638 -keep public class com.facebook.imageutils.** { public *; -} +} \ No newline at end of file diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 348c409..efdcc4a 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip diff --git a/android/settings.gradle b/android/settings.gradle index 4c34d90..a602816 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -10,18 +10,22 @@ pluginManagement { includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") repositories { + maven { + url "https://github.com/jitsi/jitsi-maven-repository/raw/master/releases" + } google() mavenCentral() gradlePluginPortal() + maven { url 'https://www.jitpack.io' } } } plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version '8.7.3' apply false + id "com.android.application" version '8.9.1' apply false // START: FlutterFire Configuration - id "com.google.gms.google-services" version "4.3.15" apply false - id "com.google.firebase.crashlytics" version "2.8.1" apply false + id "com.google.gms.google-services" version "4.4.2" apply false + id "com.google.firebase.crashlytics" version "3.0.3" apply false // END: FlutterFire Configuration id "org.jetbrains.kotlin.android" version "1.8.22" apply false }