Skip to content

Commit

Permalink
Fix proguarding
Browse files Browse the repository at this point in the history
Lower the versions of Firestore and Auth.

The previously included versions were not compatible with older libraries currently in use within the project.

I also added a dontwarn to proguard for FirestoreChannel
  • Loading branch information
adhiamboperes committed Jul 31, 2023
1 parent ec2e3f8 commit 52c438a
Show file tree
Hide file tree
Showing 7 changed files with 279 additions and 360 deletions.
3 changes: 2 additions & 1 deletion config/proguard/firebase-components-proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# Reference: https://github.com/firebase/firebase-android-sdk/blob/82b02af331/firebase-components/proguard.txt.
# Reference: https://github.com/firebase/firebase-android-sdk/blob/master/firebase-firestore/proguard.txt.
# Reference: https://github.com/firebase/firebase-android-sdk/blob/00d4626/firebase-firestore/proguard.txt.

-dontwarn com.google.firebase.components.Component$Instantiation
-dontwarn com.google.firebase.components.Component$ComponentType
-dontwarn com.google.firebase.firestore.remote.FirestoreChannel
-dontwarn javax.naming.**

-keep class * implements com.google.firebase.components.ComponentRegistrar
2 changes: 1 addition & 1 deletion domain/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ dependencies {
'com.google.dagger:dagger:2.24',
'com.google.firebase:firebase-analytics-ktx:17.5.0',
'com.google.firebase:firebase-crashlytics:17.0.0',
'com.google.firebase:firebase-auth-ktx:20.0.0',
'com.google.firebase:firebase-auth-ktx:19.3.1',
'com.google.guava:guava:28.1-android',
'com.google.protobuf:protobuf-javalite:3.17.3',
"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
Expand Down
23 changes: 17 additions & 6 deletions scripts/assets/maven_dependencies.textproto
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,17 @@ maven_dependency {
}
}
}
maven_dependency {
artifact_name: "com.google.auto.value:auto-value-annotations:1.8.1"
artifact_version: "1.8.1"
license {
license_name: "The Apache Software License, Version 2.0"
original_link: "https://www.apache.org/licenses/LICENSE-2.0.txt"
scrapable_link {
url: "https://www.apache.org/licenses/LICENSE-2.0.txt"
}
}
}
maven_dependency {
artifact_name: "com.google.code.findbugs:jsr305:3.0.2"
artifact_version: "3.0.2"
Expand Down Expand Up @@ -590,8 +601,8 @@ maven_dependency {
}
}
maven_dependency {
artifact_name: "com.google.firebase:firebase-auth-ktx:20.0.0"
artifact_version: "20.0.0"
artifact_name: "com.google.firebase:firebase-auth-ktx:19.3.1"
artifact_version: "19.3.1"
license {
license_name: "Android Software Development Kit License"
original_link: "https://developer.android.com/studio/terms.html"
Expand All @@ -601,8 +612,8 @@ maven_dependency {
}
}
maven_dependency {
artifact_name: "com.google.firebase:firebase-common:19.3.1"
artifact_version: "19.3.1"
artifact_name: "com.google.firebase:firebase-common:19.3.0"
artifact_version: "19.3.0"
license {
license_name: "The Apache Software License, Version 2.0"
original_link: "https://www.apache.org/licenses/LICENSE-2.0.txt"
Expand All @@ -623,8 +634,8 @@ maven_dependency {
}
}
maven_dependency {
artifact_name: "com.google.firebase:firebase-firestore-ktx:21.6.0"
artifact_version: "21.6.0"
artifact_name: "com.google.firebase:firebase-firestore-ktx:21.5.0"
artifact_version: "21.5.0"
license {
license_name: "The Apache Software License, Version 2.0"
original_link: "https://www.apache.org/licenses/LICENSE-2.0.txt"
Expand Down
2 changes: 1 addition & 1 deletion testing/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ dependencies {
'androidx.test:runner:1.2.0',
'com.google.android.material:material:1.3.0',
'com.google.dagger:dagger:2.24',
'com.google.firebase:firebase-auth-ktx:20.0.0',
'com.google.firebase:firebase-auth-ktx:19.3.1',
'com.google.protobuf:protobuf-javalite:3.17.3',
'com.google.truth:truth:1.1.3',
'com.google.truth.extensions:truth-liteproto-extension:1.1.3',
Expand Down
603 changes: 255 additions & 348 deletions third_party/maven_install.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions third_party/versions.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ MAVEN_PRODUCTION_DEPENDENCY_VERSIONS = {
"com.google.android.flexbox:flexbox": "3.0.0",
"com.google.android.material:material": "1.3.0",
"com.google.firebase:firebase-analytics": "17.5.0",
"com.google.firebase:firebase-auth-ktx": "20.0.0",
"com.google.firebase:firebase-auth-ktx": "19.3.1",
"com.google.firebase:firebase-common": "19.3.0",
"com.google.firebase:firebase-crashlytics": "17.1.1",
"com.google.firebase:firebase-firestore-ktx": "21.6.0",
"com.google.firebase:firebase-firestore-ktx": "21.5.0",
"com.google.gms:google-services": "4.3.3",
"com.google.guava:guava": "28.1-android",
"com.google.protobuf:protobuf-javalite": "3.17.3",
Expand Down
2 changes: 1 addition & 1 deletion utility/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ dependencies {
'com.google.firebase:firebase-analytics-ktx:17.5.0',
'com.google.firebase:firebase-core:17.5.0',
'com.google.firebase:firebase-crashlytics:17.0.0',
'com.google.firebase:firebase-firestore-ktx:21.6.0',
'com.google.firebase:firebase-firestore-ktx:21.5.0',
'com.google.protobuf:protobuf-javalite:3.17.3',
"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version",
'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1',
Expand Down

0 comments on commit 52c438a

Please sign in to comment.