mirror of
				https://gitlab.com/famedly/fluffychat.git
				synced 2025-11-03 22:07:23 +01:00 
			
		
		
		
	Revert "fix: proprietory classes included into build"
This reverts commit 1ff5851c4ae5ac25998ee29628640ccc7bdf879e
This commit is contained in:
		
							parent
							
								
									f6fd0dbbcc
								
							
						
					
					
						commit
						fa1d9fd72f
					
				@ -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'
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										41
									
								
								android/app/proguard-rules.pro
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										41
									
								
								android/app/proguard-rules.pro
									
									
									
									
										vendored
									
									
										Normal file
									
								
							@ -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)  ----------
 | 
			
		||||
@ -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)
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
@ -1594,7 +1594,7 @@ packages:
 | 
			
		||||
    description:
 | 
			
		||||
      path: "."
 | 
			
		||||
      ref: listenable
 | 
			
		||||
      resolved-ref: "2d9f2a40590c13aadfd226c2e41b08e155e6a92e"
 | 
			
		||||
      resolved-ref: "3da78eea5d222baa1b266c19284acafee090f6be"
 | 
			
		||||
      url: "https://github.com/TheOneWithTheBraid/snapping_sheet.git"
 | 
			
		||||
    source: git
 | 
			
		||||
    version: "3.1.0"
 | 
			
		||||
 | 
			
		||||
@ -11,12 +11,15 @@ index ad9ffb87..37baafb1 100644
 | 
			
		||||
         targetSdkVersion 30
 | 
			
		||||
         versionCode flutterVersionCode.toInteger()
 | 
			
		||||
         versionName flutterVersionName
 | 
			
		||||
@@ -78,8 +78,8 @@ flutter {
 | 
			
		||||
@@ -82,11 +82,11 @@ 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'
 | 
			
		||||
 }
 | 
			
		||||
 
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user