mirror of
https://gitlab.com/famedly/fluffychat.git
synced 2024-11-09 21:49:31 +01:00
0ad56c41a8
- remove the proprietary classes from build - second try Signed-off-by: TheOneWithTheBraid <the-one@with-the-braid.cf>
111 lines
4.2 KiB
Diff
111 lines
4.2 KiB
Diff
diff --git b/android/app/build.gradle a/android/app/build.gradle
|
|
index 001fbd72..3a1f9293 100644
|
|
--- b/android/app/build.gradle
|
|
+++ a/android/app/build.gradle
|
|
@@ -68,6 +68,10 @@ android {
|
|
}
|
|
release {
|
|
signingConfig signingConfigs.release
|
|
+ minifyEnabled false
|
|
+ shrinkResources false
|
|
+
|
|
+ proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
|
}
|
|
}
|
|
}
|
|
@@ -79,6 +83,9 @@ 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 b/android/app/proguard-rules.pro a/android/app/proguard-rules.pro
|
|
new file mode 100644
|
|
index 00000000..40570865
|
|
--- /dev/null
|
|
+++ a/android/app/proguard-rules.pro
|
|
@@ -0,0 +1,41 @@
|
|
+-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.** { <fields>; }
|
|
+
|
|
+# 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 <fields>;
|
|
+}
|
|
+
|
|
+# 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 b/android/app/src/main/kotlin/chat/fluffy/fluffychat/MainActivity.kt a/android/app/src/main/kotlin/chat/fluffy/fluffychat/MainActivity.kt
|
|
index 1afc4606..894d1571 100644
|
|
--- b/android/app/src/main/kotlin/chat/fluffy/fluffychat/MainActivity.kt
|
|
+++ a/android/app/src/main/kotlin/chat/fluffy/fluffychat/MainActivity.kt
|
|
@@ -7,13 +7,11 @@ 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 b/pubspec.lock a/pubspec.lock
|
|
index 9bb85c04..3e6c42df 100644
|
|
--- b/pubspec.lock
|
|
+++ a/pubspec.lock
|
|
@@ -1592,11 +1592,9 @@ packages:
|
|
snapping_sheet:
|
|
dependency: "direct main"
|
|
description:
|
|
- path: "."
|
|
- ref: listenable
|
|
- resolved-ref: "2d9f2a40590c13aadfd226c2e41b08e155e6a92e"
|
|
- url: "https://github.com/TheOneWithTheBraid/snapping_sheet.git"
|
|
- source: git
|
|
+ name: snapping_sheet
|
|
+ url: "https://pub.dartlang.org"
|
|
+ source: hosted
|
|
version: "3.1.0"
|
|
source_map_stack_trace:
|
|
dependency: transitive
|