Merge pull request #17 from joaomanaia/math-quiz

Fix problems with proguard
joaomanaia · Dec 25, 2022 · 7d21657 · 7d21657
2 parents 792b819 + 7b0046e
commit 7d21657
Show file tree

Hide file tree

Showing 33 changed files with 442 additions and 106 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -32,7 +32,7 @@ android {
             isMinifyEnabled = true
             isShrinkResources = true
             isDebuggable = false
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
 
         getByName("debug") {

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -25,7 +25,25 @@
 # @Serializable and @Polymorphic are used at runtime for polymorphic serialization.
 -keepattributes RuntimeVisibleAnnotations,AnnotationDefault
 
+-keepclassmembers @kotlinx.serialization.Serializable class ** {
+    *** Companion;
+}
+
+# Keep `INSTANCE.serializer()` of serializable objects.
+-if @kotlinx.serialization.Serializable class ** {
+    public static ** INSTANCE;
+}
+-keepclassmembers class <1> {
+    public static <1> INSTANCE;
+    kotlinx.serialization.KSerializer serializer(...);
+}
+
+-keep class kotlin.reflect.** { *; }
+-dontwarn kotlin.reflect.**
+-keep class org.jetbrains.** { *; }
+
 # Firebase
+-keep class com.google.firebase.** { *; }
 -keep class com.firebase.** { *; }
 -keep class org.apache.** { *; }
 -keepnames class com.fasterxml.jackson.** { *; }
@@ -35,6 +53,83 @@
 -dontwarn org.joda.time.**
 -dontwarn org.shaded.apache.**
 -dontwarn org.ietf.jgss.**
+-keep class com.google.android.gms.** { *; }
+-keep class org.apache** { *; }
 
 # Only necessary if you downloaded the SDK jar directly instead of from maven.
--keep class com.shaded.fasterxml.jackson.** { *; }
+-keep class com.shaded.fasterxml.jackson.** { *; }
+
+-dontwarn java.lang.invoke.StringConcatFactory
+
+-dontwarn kotlin.**
+-dontwarn org.w3c.dom.events.*
+-dontwarn org.jetbrains.kotlin.di.InjectorForRuntimeDescriptorLoader
+
+-keepattributes SourceFile,LineNumberTable
+
+-keep class kotlin.** { *; }
+#-keep class kotlin.reflect.** { *; }
+#-keep class org.jetbrains.kotlin.** { *; }
+
+-keepclassmembers,allowoptimization enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+    **[] $VALUES;
+    public *;
+}
+
+-keepattributes InnerClasses
+
+# Ktor
+-keep class io.ktor.** { *; }
+-keep class kotlinx.coroutines.** { *; }
+-dontwarn kotlinx.atomicfu.**
+-dontwarn io.netty.**
+-dontwarn com.typesafe.**
+-dontwarn org.slf4j.**
+
+-keepattributes *Annotation*, InnerClasses
+-dontnote kotlinx.serialization.SerializationKt
+-keep,includedescriptorclasses class com.infinitepower.newsocial.compose.**$$serializer { *; }
+
+-keep class kotlin.reflect.** { *; }
+-dontwarn kotlin.reflect.**
+-keep class org.jetbrains.** { *; }
+
+-dontwarn kotlin.**
+-dontwarn org.w3c.dom.events.*
+-dontwarn org.jetbrains.kotlin.di.InjectorForRuntimeDescriptorLoader
+
+-keepattributes SourceFile,LineNumberTable
+
+-keep class kotlin.** { *; }
+#-keep class kotlin.reflect.** { *; }
+#-keep class org.jetbrains.kotlin.** { *; }
+
+-keepclassmembers,allowoptimization enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+    **[] $VALUES;
+    public *;
+}
+
+-keepattributes InnerClasses
+
+# Ktor
+-keep class io.ktor.** { *; }
+-keep class kotlinx.coroutines.** { *; }
+-dontwarn kotlinx.atomicfu.**
+-dontwarn io.netty.**
+-dontwarn com.typesafe.**
+-dontwarn org.slf4j.**
+
+-keepattributes *Annotation*, InnerClasses
+-dontnote kotlinx.serialization.SerializationKt
+-keep,includedescriptorclasses class com.infinitepower.newsocial.compose.**$$serializer { *; }
+
+-keep class kotlin.reflect.** { *; }
+-dontwarn kotlin.reflect.**
+-keep class org.jetbrains.** { *; }
+
+-dontwarn java.lang.management.ManagementFactory
+-dontwarn java.lang.management.RuntimeMXBean
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -23,7 +23,7 @@ android {
 
     buildTypes {
         release {
-            isMinifyEnabled = false
+            isMinifyEnabled = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"

diff --git a/core/proguard-rules.pro b/core/proguard-rules.pro
@@ -0,0 +1 @@
+-dontwarn java.lang.invoke.StringConcatFactory
diff --git a/data/build.gradle.kts b/data/build.gradle.kts
@@ -21,7 +21,7 @@ android {
 
     buildTypes {
         release {
-            isMinifyEnabled = false
+            isMinifyEnabled = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"

diff --git a/data/proguard-rules.pro b/data/proguard-rules.pro
@@ -23,4 +23,61 @@
 }
 
 # @Serializable and @Polymorphic are used at runtime for polymorphic serialization.
--keepattributes RuntimeVisibleAnnotations,AnnotationDefault
+-keepattributes RuntimeVisibleAnnotations,AnnotationDefault
+
+-keepclassmembers @kotlinx.serialization.Serializable class ** {
+    *** Companion;
+}
+
+# Keep `INSTANCE.serializer()` of serializable objects.
+-if @kotlinx.serialization.Serializable class ** {
+    public static ** INSTANCE;
+}
+-keepclassmembers class <1> {
+    public static <1> INSTANCE;
+    kotlinx.serialization.KSerializer serializer(...);
+}
+
+-keep class kotlin.reflect.** { *; }
+-dontwarn kotlin.reflect.**
+-keep class org.jetbrains.** { *; }
+
+# @Serializable and @Polymorphic are used at runtime for polymorphic serialization.
+-keepattributes RuntimeVisibleAnnotations,AnnotationDefault
+
+-dontwarn java.lang.invoke.StringConcatFactory
+
+-dontwarn kotlin.**
+-dontwarn org.w3c.dom.events.*
+-dontwarn org.jetbrains.kotlin.di.InjectorForRuntimeDescriptorLoader
+
+-keepattributes SourceFile,LineNumberTable
+
+-keep class kotlin.** { *; }
+#-keep class kotlin.reflect.** { *; }
+#-keep class org.jetbrains.kotlin.** { *; }
+
+-keepclassmembers,allowoptimization enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+    **[] $VALUES;
+    public *;
+}
+
+-keepattributes InnerClasses
+
+# Ktor
+-keep class io.ktor.** { *; }
+-keep class kotlinx.coroutines.** { *; }
+-dontwarn kotlinx.atomicfu.**
+-dontwarn io.netty.**
+-dontwarn com.typesafe.**
+-dontwarn org.slf4j.**
+
+-keepattributes *Annotation*, InnerClasses
+-dontnote kotlinx.serialization.SerializationKt
+-keep,includedescriptorclasses class com.infinitepower.newsocial.compose.**$$serializer { *; }
+
+-keep class kotlin.reflect.** { *; }
+-dontwarn kotlin.reflect.**
+-keep class org.jetbrains.** { *; }
diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts
@@ -20,7 +20,7 @@ android {
 
     buildTypes {
         release {
-            isMinifyEnabled = false
+            isMinifyEnabled = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"

diff --git a/domain/proguard-rules.pro b/domain/proguard-rules.pro
@@ -0,0 +1,80 @@
+# Keep `Companion` object fields of serializable classes.
+# This avoids serializer lookup through `getDeclaredClasses` as done for named companion objects.
+-if @kotlinx.serialization.Serializable class **
+-keepclassmembers class <1> {
+    static <1>$Companion Companion;
+}
+
+# Keep `serializer()` on companion objects (both default and named) of serializable classes.
+-if @kotlinx.serialization.Serializable class ** {
+    static **$* *;
+}
+-keepclassmembers class <2>$<3> {
+    kotlinx.serialization.KSerializer serializer(...);
+}
+
+# Keep `INSTANCE.serializer()` of serializable objects.
+-if @kotlinx.serialization.Serializable class ** {
+    public static ** INSTANCE;
+}
+-keepclassmembers class <1> {
+    public static <1> INSTANCE;
+    kotlinx.serialization.KSerializer serializer(...);
+}
+
+# @Serializable and @Polymorphic are used at runtime for polymorphic serialization.
+-keepattributes RuntimeVisibleAnnotations,AnnotationDefault
+
+-keepclassmembers @kotlinx.serialization.Serializable class ** {
+    *** Companion;
+}
+
+# Keep `INSTANCE.serializer()` of serializable objects.
+-if @kotlinx.serialization.Serializable class ** {
+    public static ** INSTANCE;
+}
+-keepclassmembers class <1> {
+    public static <1> INSTANCE;
+    kotlinx.serialization.KSerializer serializer(...);
+}
+
+-keep class kotlin.reflect.** { *; }
+-dontwarn kotlin.reflect.**
+-keep class org.jetbrains.** { *; }
+
+-dontwarn java.lang.invoke.StringConcatFactory
+
+-dontwarn kotlin.**
+-dontwarn org.w3c.dom.events.*
+-dontwarn org.jetbrains.kotlin.di.InjectorForRuntimeDescriptorLoader
+
+-keepattributes SourceFile,LineNumberTable
+
+-keep class kotlin.** { *; }
+#-keep class kotlin.reflect.** { *; }
+#-keep class org.jetbrains.kotlin.** { *; }
+
+-keepclassmembers,allowoptimization enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+    **[] $VALUES;
+    public *;
+}
+
+-keepattributes InnerClasses
+
+# Ktor
+-keep class io.ktor.** { *; }
+-keep class kotlinx.coroutines.** { *; }
+-dontwarn kotlinx.atomicfu.**
+-dontwarn io.netty.**
+-dontwarn com.typesafe.**
+-dontwarn org.slf4j.**
+
+-keepattributes *Annotation*, InnerClasses
+-dontnote kotlinx.serialization.SerializationKt
+-keep,includedescriptorclasses class com.infinitepower.newsocial.compose.**$$serializer { *; }
+
+-keep class kotlin.reflect.** { *; }
+-dontwarn kotlin.reflect.**
+-keep class org.jetbrains.** { *; }
diff --git a/home-presentation/build.gradle.kts b/home-presentation/build.gradle.kts
@@ -22,7 +22,7 @@ android {
 
     buildTypes {
         release {
-            isMinifyEnabled = false
+            isMinifyEnabled = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
@@ -87,6 +87,8 @@ dependencies {
 
     implementation(platform(Firebase.bom))
     implementation(Firebase.remoteConfigKtx)
+    implementation(Firebase.authenticationKtx)
+    implementation("com.google.android.gms:play-services-auth:20.4.0")
 
     implementation(project(Modules.core))
     implementation(project(Modules.model))

diff --git a/home-presentation/proguard-rules.pro b/home-presentation/proguard-rules.pro
@@ -1,21 +1,19 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
+# Firebase
+-keep class com.google.firebase.** { *; }
+-keep class com.firebase.** { *; }
+-keep class org.apache.** { *; }
+-keepnames class com.fasterxml.jackson.** { *; }
+-keepnames class javax.servlet.** { *; }
+-keepnames class org.ietf.jgss.** { *; }
+-dontwarn org.w3c.dom.**
+-dontwarn org.joda.time.**
+-dontwarn org.shaded.apache.**
+-dontwarn org.ietf.jgss.**
 
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
+-keep class com.google.android.gms.** { *; }
+-keep class org.apache** { *; }
 
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
+# Only necessary if you downloaded the SDK jar directly instead of from maven.
+-keep class com.shaded.fasterxml.jackson.** { *; }
 
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
+-dontwarn java.lang.invoke.StringConcatFactory
diff --git a/...esentation/src/main/java/com/infinitepower/newquiz/home_presentation/login/LoginScreen.kt b/...esentation/src/main/java/com/infinitepower/newquiz/home_presentation/login/LoginScreen.kt
@@ -1,5 +1,6 @@
 package com.infinitepower.newquiz.home_presentation.login
 
+import android.util.Log
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -32,6 +33,7 @@ private fun LoginScreenImpl(
     onBack: () -> Unit
 ) {
     val firebaseLogin = rememberLauncherForActivityResult(contract = FirebaseAuthUIActivityResultContract()) {
+        Log.d("LoginScreen", it.toString())
         onBack()
     }
 

diff --git a/math-quiz/build.gradle.kts b/math-quiz/build.gradle.kts
@@ -22,7 +22,7 @@ android {
 
     buildTypes {
         release {
-            isMinifyEnabled = false
+            isMinifyEnabled = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"