Merge pull request #63 from raccoongang/fix/firebase_release_build

Fixed release build with proguard
openedx · Sep 28, 2023 · 81b85d8 · 81b85d8
2 parents d3149ff + 0f92c46
commit 81b85d8
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id 'org.jetbrains.kotlin.android'
     id 'kotlin-parcelize'
     id 'kotlin-kapt'
-    id "com.google.firebase.crashlytics"
+    id 'com.google.firebase.crashlytics'
 }
 
 android {
@@ -40,6 +40,10 @@ android {
         release {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+
+            firebaseCrashlytics {
+                mappingFileUploadEnabled false
+            }
         }
     }
     compileOptions {

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -99,3 +99,13 @@
     public static **[] values();
     public static ** valueOf(java.lang.String);
 }
+
+-dontwarn org.bouncycastle.jsse.BCSSLParameters
+-dontwarn org.bouncycastle.jsse.BCSSLSocket
+-dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
+-dontwarn org.conscrypt.Conscrypt$Version
+-dontwarn org.conscrypt.Conscrypt
+-dontwarn org.conscrypt.ConscryptHostnameVerifier
+-dontwarn org.openjsse.javax.net.ssl.SSLParameters
+-dontwarn org.openjsse.javax.net.ssl.SSLSocket
+-dontwarn org.openjsse.net.ssl.OpenJSSE
diff --git a/build.gradle b/build.gradle
@@ -8,8 +8,8 @@ buildscript {
 }
 
 plugins {
-    id 'com.android.application' version '8.1.0' apply false
-    id 'com.android.library' version '8.1.0' apply false
+    id 'com.android.application' version '8.1.1' apply false
+    id 'com.android.library' version '8.1.1' apply false
     id 'org.jetbrains.kotlin.android' version "$kotlin_version" apply false
     id 'com.google.gms.google-services' version '4.3.15' apply false
     id "com.google.firebase.crashlytics" version "2.9.6" apply false

diff --git a/core/consumer-rules.pro b/core/consumer-rules.pro
@@ -0,0 +1,2 @@
+-dontwarn java.lang.invoke.StringConcatFactory
+-dontwarn org.openedx.core.R$string
diff --git a/core/proguard-rules.pro b/core/proguard-rules.pro
@@ -18,4 +18,6 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+-dontwarn java.lang.invoke.StringConcatFactory
diff --git a/settings.gradle b/settings.gradle
@@ -4,6 +4,17 @@ pluginManagement {
         google()
         mavenCentral()
     }
+    buildscript {
+        repositories {
+            mavenCentral()
+            maven {
+                url = uri("https://storage.googleapis.com/r8-releases/raw")
+            }
+        }
+        dependencies {
+            classpath("com.android.tools:r8:8.2.26")
+        }
+    }
 }
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		-dontwarn java.lang.invoke.StringConcatFactory
		-dontwarn org.openedx.core.R$string