From 2721888de9667a450c4449bc5da7854d0409cce3 Mon Sep 17 00:00:00 2001 From: TheOneWithTheBraid Date: Fri, 20 May 2022 07:11:08 +0200 Subject: [PATCH] fix: proprietory classes included into build - update Android build files - update dependency override commit SHA Fixes: #903 Signed-off-by: TheOneWithTheBraid --- android/app/build.gradle | 7 ---- android/app/proguard-rules.pro | 41 ------------------- .../chat/fluffy/fluffychat/MainActivity.kt | 2 + pubspec.lock | 2 +- scripts/enable-android-google-services.patch | 5 +-- 5 files changed, 4 insertions(+), 53 deletions(-) delete mode 100644 android/app/proguard-rules.pro diff --git a/android/app/build.gradle b/android/app/build.gradle index 3a1f92934..001fbd72d 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -68,10 +68,6 @@ android { } release { signingConfig signingConfigs.release - minifyEnabled false - shrinkResources false - - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } } @@ -83,9 +79,6 @@ flutter { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" //implementation 'com.google.firebase:firebase-messaging:19.0.1' // Workaround for https://github.com/microg/android_packages_apps_GmsCore/issues/313#issuecomment-617651698 - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' implementation 'androidx.multidex:multidex:2.0.1' } diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro deleted file mode 100644 index 40570865e..000000000 --- a/android/app/proguard-rules.pro +++ /dev/null @@ -1,41 +0,0 @@ --optimizationpasses 5 -## Flutter wrapper --keep class io.flutter.app.** { *; } --keep class io.flutter.plugin.** { *; } --keep class io.flutter.util.** { *; } --keep class io.flutter.view.** { *; } --keep class io.flutter.** { *; } --keep class io.flutter.plugins.** { *; } --dontwarn io.flutter.embedding.** - -##---------------Begin: proguard configuration for Gson (Needed for flutter_local_notifications) ---------- -# Gson uses generic type information stored in a class file when working with fields. Proguard -# removes such information by default, so configure it to keep all of it. --keepattributes Signature - -# For using GSON @Expose annotation --keepattributes *Annotation* - -# Gson specific classes --dontwarn sun.misc.** - -# Application classes that will be serialized/deserialized over Gson --keep class com.google.gson.examples.android.model.** { ; } - -# Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory, -# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter) --keep class * extends com.google.gson.TypeAdapter --keep class * implements com.google.gson.TypeAdapterFactory --keep class * implements com.google.gson.JsonSerializer --keep class * implements com.google.gson.JsonDeserializer - -# Prevent R8 from leaving Data object members always null --keepclassmembers,allowobfuscation class * { - @com.google.gson.annotations.SerializedName ; -} - -# Retain generic signatures of TypeToken and its subclasses with R8 version 3.0 and higher. --keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken --keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken - -##---------------End: proguard configuration for Gson (Needed for flutter_local_notifications) ---------- \ No newline at end of file diff --git a/android/app/src/main/kotlin/chat/fluffy/fluffychat/MainActivity.kt b/android/app/src/main/kotlin/chat/fluffy/fluffychat/MainActivity.kt index 894d1571c..1afc46062 100644 --- a/android/app/src/main/kotlin/chat/fluffy/fluffychat/MainActivity.kt +++ b/android/app/src/main/kotlin/chat/fluffy/fluffychat/MainActivity.kt @@ -7,11 +7,13 @@ import android.content.Context import androidx.multidex.MultiDex class MainActivity : FlutterActivity() { + override fun attachBaseContext(base: Context) { super.attachBaseContext(base) MultiDex.install(this) } + override fun provideFlutterEngine(context: Context): FlutterEngine? { return provideEngine(this) } diff --git a/pubspec.lock b/pubspec.lock index 18debc541..9bb85c04c 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1594,7 +1594,7 @@ packages: description: path: "." ref: listenable - resolved-ref: "3da78eea5d222baa1b266c19284acafee090f6be" + resolved-ref: "2d9f2a40590c13aadfd226c2e41b08e155e6a92e" url: "https://github.com/TheOneWithTheBraid/snapping_sheet.git" source: git version: "3.1.0" diff --git a/scripts/enable-android-google-services.patch b/scripts/enable-android-google-services.patch index 31a2f21b9..6202b8712 100644 --- a/scripts/enable-android-google-services.patch +++ b/scripts/enable-android-google-services.patch @@ -11,15 +11,12 @@ index ad9ffb87..37baafb1 100644 targetSdkVersion 30 versionCode flutterVersionCode.toInteger() versionName flutterVersionName -@@ -82,11 +82,11 @@ flutter { +@@ -78,8 +78,8 @@ flutter { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - //implementation 'com.google.firebase:firebase-messaging:19.0.1' // Workaround for https://github.com/microg/android_packages_apps_GmsCore/issues/313#issuecomment-617651698 + implementation 'com.google.firebase:firebase-messaging:19.0.1' // Workaround for https://github.com/microg/android_packages_apps_GmsCore/issues/313#issuecomment-617651698 - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' implementation 'androidx.multidex:multidex:2.0.1' }