From cafa7ea70a5d8cc4859a11e144fced955d1a4721 Mon Sep 17 00:00:00 2001 From: Joshua Lin Date: Wed, 25 Oct 2023 21:38:50 +0800 Subject: [PATCH] upgrade androidx.credentials version to 1.2.0-rc01 --- CHANGELOG.md | 4 ++ android/build.gradle | 6 +- .../flutter_passkey/FlutterPasskeyPlugin.kt | 7 +-- example/pubspec.lock | 56 +++++++++---------- ios/flutter_passkey.podspec | 2 +- pubspec.yaml | 2 +- 6 files changed, 40 insertions(+), 37 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ecd4a0..8726741 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.0.4 + +* Upgrade androidx.credentials version to 1.2.0-rc01 + ## 1.0.3 * Improve Android DomeException error reporting diff --git a/android/build.gradle b/android/build.gradle index 5013616..c374bf3 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -25,7 +25,7 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - compileSdkVersion 31 + compileSdkVersion 34 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -47,9 +47,9 @@ android { dependencies { implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1" - implementation "androidx.credentials:credentials:1.0.0-alpha03" + implementation "androidx.credentials:credentials:1.2.0-rc01" // optional - needed for credentials support from play services, for devices running // Android 13 and below. - implementation "androidx.credentials:credentials-play-services-auth:1.0.0-alpha03" + implementation "androidx.credentials:credentials-play-services-auth:1.2.0-rc01" } diff --git a/android/src/main/kotlin/com/authentrend/flutter_passkey/FlutterPasskeyPlugin.kt b/android/src/main/kotlin/com/authentrend/flutter_passkey/FlutterPasskeyPlugin.kt index 72c2410..4725118 100644 --- a/android/src/main/kotlin/com/authentrend/flutter_passkey/FlutterPasskeyPlugin.kt +++ b/android/src/main/kotlin/com/authentrend/flutter_passkey/FlutterPasskeyPlugin.kt @@ -49,8 +49,8 @@ class FlutterPasskeyPlugin: FlutterPlugin, MethodCallHandler, ActivityAware, Vie try { val credentialManager = CredentialManager.create(activity!!) val result = credentialManager.createCredential( + context = activity!!, request = createPublicKeyCredentialRequest, - activity = activity!!, ) val credential = result as CreatePublicKeyCredentialResponse callback(credential.registrationResponseJson, null) @@ -66,15 +66,14 @@ class FlutterPasskeyPlugin: FlutterPlugin, MethodCallHandler, ActivityAware, Vie } JSONObject(options) // check if options is a valid json string val getPublicKeyCredentialOption = GetPublicKeyCredentialOption( - requestJson = options, - preferImmediatelyAvailableCredentials = false + requestJson = options ) viewModelScope.launch { try { val credentialManager = CredentialManager.create(activity!!) val result = credentialManager.getCredential( + context = activity!!, request = GetCredentialRequest(listOf(getPublicKeyCredentialOption)), - activity = activity!!, ) val credential = result.credential as PublicKeyCredential callback(credential.authenticationResponseJson, null) diff --git a/example/pubspec.lock b/example/pubspec.lock index d03dfa4..28ca460 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -5,10 +5,10 @@ packages: dependency: transitive description: name: async - sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" url: "https://pub.dev" source: hosted - version: "2.10.0" + version: "2.11.0" boolean_selector: dependency: transitive description: @@ -21,10 +21,10 @@ packages: dependency: transitive description: name: characters - sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.3.0" clock: dependency: transitive description: @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: collection - sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.17.2" cupertino_icons: dependency: "direct main" description: @@ -76,20 +76,12 @@ packages: path: ".." relative: true source: path - version: "1.0.2" + version: "1.0.4" flutter_test: dependency: "direct dev" description: flutter source: sdk version: "0.0.0" - js: - dependency: transitive - description: - name: js - sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" - url: "https://pub.dev" - source: hosted - version: "0.6.5" lints: dependency: transitive description: @@ -102,34 +94,34 @@ packages: dependency: transitive description: name: matcher - sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" url: "https://pub.dev" source: hosted - version: "0.12.13" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.5.0" meta: dependency: transitive description: name: meta - sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.9.1" path: dependency: transitive description: name: path - sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "1.8.3" plugin_platform_interface: dependency: transitive description: @@ -147,10 +139,10 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" stack_trace: dependency: transitive description: @@ -187,10 +179,10 @@ packages: dependency: transitive description: name: test_api - sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" url: "https://pub.dev" source: hosted - version: "0.4.16" + version: "0.6.0" vector_math: dependency: transitive description: @@ -199,6 +191,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + web: + dependency: transitive + description: + name: web + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + url: "https://pub.dev" + source: hosted + version: "0.1.4-beta" sdks: - dart: ">=2.19.6 <3.0.0" + dart: ">=3.1.0-185.0.dev <4.0.0" flutter: ">=2.5.0" diff --git a/ios/flutter_passkey.podspec b/ios/flutter_passkey.podspec index f9cdf28..6d800dd 100644 --- a/ios/flutter_passkey.podspec +++ b/ios/flutter_passkey.podspec @@ -4,7 +4,7 @@ # Pod::Spec.new do |s| s.name = 'flutter_passkey' - s.version = '1.0.3' + s.version = '1.0.4' s.summary = 'A Flutter plugin for Passkey.' s.description = <<-DESC Flutter plugin for using Passkey easily. diff --git a/pubspec.yaml b/pubspec.yaml index d8365cb..267ae3c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: flutter_passkey description: Flutter plugin for using Passkey easily on iOS and Android platforms. -version: 1.0.3 +version: 1.0.4 homepage: https://github.com/AuthenTrend/flutter_passkey environment: