Skip to content

Commit 4f537c5

Browse files
author
Nick Rout
committed
Attempt to prevent crypto/preferences crash
1 parent 21113ef commit 4f537c5

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

Diff for: app/proguard-rules.pro

-5
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,3 @@
100100
## Jetpack Navigation
101101

102102
-keepnames class androidx.navigation.fragment.NavHostFragment
103-
104-
## Jetpack Crypto and minifyEnabled
105-
## https://issuetracker.google.com/issues/157983099
106-
107-
-keep class com.google.crypto.** { *; }

Diff for: buildSrc/src/main/java/dev/ricknout/rugbyranker/buildsrc/Dependencies.kt

+8
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ object Versions {
3131
const val work = "2.5.0-alpha02"
3232
const val hilt = "1.0.0-alpha02"
3333
const val dataStore = "1.0.0-alpha01"
34+
// BUG: Issue with preferences/crypto (most likely DataStore)
35+
// https://issuetracker.google.com/issues/157983099
36+
const val security = "1.1.0-alpha02"
3437
object Test {
3538
const val core = "1.3.0"
3639
const val jUnit = "1.1.2"
@@ -111,6 +114,11 @@ object Libs {
111114
object DataStore {
112115
const val preferences = "androidx.datastore:datastore-preferences:${Versions.AndroidX.dataStore}"
113116
}
117+
// BUG: Issue with preferences/crypto (most likely DataStore)
118+
// https://issuetracker.google.com/issues/157983099
119+
object Security {
120+
const val cryptoKtx = "androidx.security:security-crypto-ktx:${Versions.AndroidX.security}"
121+
}
114122
object Test {
115123
const val runner = "androidx.test:runner:${Versions.AndroidX.Test.runner}"
116124
const val instrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

Diff for: core/build.gradle

+3
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ dependencies {
4444
api Libs.AndroidX.Hilt.Lifecycle.viewModel
4545
api Libs.AndroidX.Hilt.work
4646
api Libs.AndroidX.DataStore.preferences
47+
// BUG: Issue with preferences/crypto (most likely DataStore)
48+
// https://issuetracker.google.com/issues/157983099
49+
api Libs.AndroidX.Security.cryptoKtx
4750
api Libs.Square.okHttp
4851
api Libs.Square.Retrofit.retrofit
4952
api Libs.Square.Retrofit.gsonConverter

0 commit comments

Comments
 (0)