Skip to content

Commit

Permalink
Upgrade dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
gbouxin-dashlane committed May 19, 2023
1 parent 8d3431b commit b670f26
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 12 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@
.externalNativeBuild
.cxx
local.properties
/app/release/
20 changes: 10 additions & 10 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ dependencies {

implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))

implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.core:core-ktx:1.10.1'
implementation 'com.google.code.gson:gson:2.10.1'
implementation 'com.google.iot.cbor:cbor:0.01.02'
implementation 'org.bouncycastle:bcpkix-jdk15on:1.69'
Expand All @@ -60,21 +60,21 @@ dependencies {

// Compose
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
implementation 'androidx.activity:activity-compose:1.7.0'
implementation "androidx.compose.material3:material3:1.0.1"
implementation "androidx.compose.ui:ui:1.4.1"
implementation "androidx.compose.ui:ui-tooling-preview:1.4.1"
implementation 'androidx.activity:activity-compose:1.7.0'
implementation 'androidx.activity:activity-compose:1.7.1'
implementation "androidx.compose.material3:material3:1.1.0"
implementation "androidx.compose.ui:ui:1.4.3"
implementation "androidx.compose.ui:ui-tooling-preview:1.4.3"
implementation 'androidx.activity:activity-compose:1.7.1'
implementation 'androidx.navigation:navigation-compose:2.5.3'

// Credentials manager
implementation "androidx.credentials:credentials:1.2.0-alpha03"
implementation "androidx.credentials:credentials-play-services-auth:1.2.0-alpha03"
implementation "androidx.credentials:credentials:1.2.0-alpha04"
implementation "androidx.credentials:credentials-play-services-auth:1.2.0-alpha04"

// Hilt
implementation "com.google.dagger:hilt-android:2.44"
implementation "com.google.dagger:hilt-android:2.46"
implementation 'androidx.hilt:hilt-navigation-compose:1.0.0'
kapt "com.google.dagger:hilt-compiler:2.44"
kapt "com.google.dagger:hilt-compiler:2.46"
}

kapt {
Expand Down
Binary file removed app/release/app-release.apk
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ class LoginViewModel @Inject constructor(
val userId = UUID.randomUUID().toString()
try {
val response = credentialManager.createCredential(
activity,
CreatePublicKeyCredentialRequest(accountRepository.getCreatePasskeyRequest(userId, email)),
activity
)
val responseData = gson.fromJson(
(response as CreatePublicKeyCredentialResponse).registrationResponseJson,
Expand Down Expand Up @@ -138,7 +138,7 @@ class LoginViewModel @Inject constructor(
option: GetPublicKeyCredentialOption
): GetPasskeyResponseData {
val getCredRequest = GetCredentialRequest(listOf(option))
val response = credentialManager.getCredential(getCredRequest, activity)
val response = credentialManager.getCredential(activity, getCredRequest)
val cred = response.credential as PublicKeyCredential
return gson.fromJson(cred.authenticationResponseJson, GetPasskeyResponseData::class.java)
}
Expand Down

0 comments on commit b670f26

Please # to comment.