Add support for passkey using google credential manager

wordpress-mobile · Feb 12, 2024 · 8294926 · 8294926
1 parent daca615
commit 8294926
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/WordPress/build.gradle b/WordPress/build.gradle
@@ -690,16 +690,27 @@ static def loadPropertiesFromFile(inputFile) {
 
 // For app signing
 if (["uploadStoreFile", "uploadStorePassword", "uploadKeyAlias", "uploadKeyPassword"].count { !project.hasProperty(it) } == 0) {
+    println "building release store"
     android {
         signingConfigs {
             release {
-                storeFile = rootProject.file(project.uploadStoreFile)
-                storePassword = project.uploadStorePassword
-                keyAlias = project.uploadKeyAlias
-                keyPassword = project.uploadKeyPassword
+                storeFile = rootProject.file(project.storeFile)
+                storePassword = project.storePassword
+                keyAlias = project.keyAlias
+                keyPassword = project.keyPassword
             }
         }
     }
+//    android {
+//        signingConfigs {
+//            release {
+//                storeFile = rootProject.file(project.uploadStoreFile)
+//                storePassword = project.uploadStorePassword
+//                keyAlias = project.uploadKeyAlias
+//                keyPassword = project.uploadKeyPassword
+//            }
+//        }
+//    }
     android.buildTypes.release.signingConfig = android.signingConfigs.release
 }
 
@@ -710,6 +721,7 @@ if (project.hasProperty("debugStoreFile")) {
             signingConfigs {
                 debug {
                     storeFile sharedDebugStore
+                    println "building debug store"
                 }
             }
         }

diff --git a/build.gradle b/build.gradle
@@ -25,8 +25,8 @@ ext {
     automatticTracksVersion = '3.3.0'
     gutenbergMobileVersion = 'v1.112.0'
     wordPressAztecVersion = 'v2.0'
-    wordPressFluxCVersion = '2.64.0'
-    wordPressLoginVersion = '1.12.0'
+    wordPressFluxCVersion = '2949-57f909cbe27344a514fc1bf7658f29ddc742b9cb'
+    wordPressLoginVersion = '138-3a471657411fe82389b06ea0e70501fa457548ed'
     wordPressPersistentEditTextVersion = '1.0.2'
     wordPressUtilsVersion = '3.12.0'
     indexosMediaForMobileVersion = '43a9026f0973a2f0a74fa813132f6a16f7499c3a'