From fa5aca02ae57d0e3c942a3a99751dc072450c2ed Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Mon, 12 Feb 2024 10:40:29 -0500 Subject: [PATCH 1/7] Switch to local_auth_darwin --- packages/local_auth/local_auth/CHANGELOG.md | 3 +++ packages/local_auth/local_auth/README.md | 4 ++-- .../local_auth/local_auth/example/lib/readme_excerpts.dart | 2 +- packages/local_auth/local_auth/example/pubspec.yaml | 2 +- packages/local_auth/local_auth/pubspec.yaml | 4 ++-- packages/local_auth/local_auth/test/local_auth_test.dart | 2 +- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/packages/local_auth/local_auth/CHANGELOG.md b/packages/local_auth/local_auth/CHANGELOG.md index 59bea2be7328..998b9154fc87 100644 --- a/packages/local_auth/local_auth/CHANGELOG.md +++ b/packages/local_auth/local_auth/CHANGELOG.md @@ -1,5 +1,8 @@ ## NEXT +* Switches endorsed iOS implementation to `local_auth_darwin`. + * Clients directly importing `local_auth_ios` for auth strings should switch + dependencies and imports to `local_auth_darwin`. No other change is necessary. * Updates support matrix in README to indicate that iOS 11 is no longer supported. * Clients on versions of Flutter that still support iOS 11 can continue to use this package with iOS 11, but will not receive any further updates to the iOS implementation. diff --git a/packages/local_auth/local_auth/README.md b/packages/local_auth/local_auth/README.md index 8c86785d21f3..78c0b2038a19 100644 --- a/packages/local_auth/local_auth/README.md +++ b/packages/local_auth/local_auth/README.md @@ -136,7 +136,7 @@ instance, to customize Android and iOS: ```dart import 'package:local_auth_android/local_auth_android.dart'; -import 'package:local_auth_ios/local_auth_ios.dart'; +import 'package:local_auth_darwin/local_auth_darwin.dart'; // ยทยทยท final bool didAuthenticate = await auth.authenticate( localizedReason: 'Please authenticate to show account balance', @@ -281,7 +281,7 @@ the Android theme directly in `android/app/src/main/AndroidManifest.xml`: diff --git a/packages/local_auth/local_auth/example/lib/readme_excerpts.dart b/packages/local_auth/local_auth/example/lib/readme_excerpts.dart index 8ae4a3c34178..b0ee0e9daf0d 100644 --- a/packages/local_auth/local_auth/example/lib/readme_excerpts.dart +++ b/packages/local_auth/local_auth/example/lib/readme_excerpts.dart @@ -20,7 +20,7 @@ import 'package:local_auth/local_auth.dart'; // #docregion CustomMessages import 'package:local_auth_android/local_auth_android.dart'; -import 'package:local_auth_ios/local_auth_ios.dart'; +import 'package:local_auth_darwin/local_auth_darwin.dart'; // #enddocregion CustomMessages void main() { diff --git a/packages/local_auth/local_auth/example/pubspec.yaml b/packages/local_auth/local_auth/example/pubspec.yaml index fed63a9c674b..fc548b009d73 100644 --- a/packages/local_auth/local_auth/example/pubspec.yaml +++ b/packages/local_auth/local_auth/example/pubspec.yaml @@ -17,7 +17,7 @@ dependencies: # the parent directory to use the current plugin's version. path: ../ local_auth_android: ^1.0.0 - local_auth_ios: ^1.0.1 + local_auth_darwin: ^1.2.0 dev_dependencies: build_runner: ^2.1.10 diff --git a/packages/local_auth/local_auth/pubspec.yaml b/packages/local_auth/local_auth/pubspec.yaml index 4e2d8682a4b5..8a1e8a7f3611 100644 --- a/packages/local_auth/local_auth/pubspec.yaml +++ b/packages/local_auth/local_auth/pubspec.yaml @@ -15,7 +15,7 @@ flutter: android: default_package: local_auth_android ios: - default_package: local_auth_ios + default_package: local_auth_darwin windows: default_package: local_auth_windows @@ -23,7 +23,7 @@ dependencies: flutter: sdk: flutter local_auth_android: ^1.0.0 - local_auth_ios: ^1.0.1 + local_auth_darwin: ^1.2.0 local_auth_platform_interface: ^1.0.1 local_auth_windows: ^1.0.0 diff --git a/packages/local_auth/local_auth/test/local_auth_test.dart b/packages/local_auth/local_auth/test/local_auth_test.dart index 00196a8b875e..aa9c5cf5e6b6 100644 --- a/packages/local_auth/local_auth/test/local_auth_test.dart +++ b/packages/local_auth/local_auth/test/local_auth_test.dart @@ -6,7 +6,7 @@ import 'package:flutter/widgets.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:local_auth/local_auth.dart'; import 'package:local_auth_android/local_auth_android.dart'; -import 'package:local_auth_ios/local_auth_ios.dart'; +import 'package:local_auth_darwin/local_auth_darwin.dart'; import 'package:local_auth_platform_interface/local_auth_platform_interface.dart'; import 'package:local_auth_windows/local_auth_windows.dart'; import 'package:mockito/mockito.dart'; From cb1e54080a020c65e8b0c9036bfc6c9962620738 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Mon, 12 Feb 2024 15:52:56 -0500 Subject: [PATCH 2/7] Fix a missed import --- packages/local_auth/local_auth/lib/src/local_auth.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/local_auth/local_auth/lib/src/local_auth.dart b/packages/local_auth/local_auth/lib/src/local_auth.dart index e369f67187a5..9046743dd5d3 100644 --- a/packages/local_auth/local_auth/lib/src/local_auth.dart +++ b/packages/local_auth/local_auth/lib/src/local_auth.dart @@ -12,7 +12,7 @@ import 'dart:async'; import 'package:flutter/services.dart'; import 'package:local_auth_android/local_auth_android.dart'; -import 'package:local_auth_ios/local_auth_ios.dart'; +import 'package:local_auth_darwin/local_auth_darwin.dart'; import 'package:local_auth_platform_interface/local_auth_platform_interface.dart'; import 'package:local_auth_windows/local_auth_windows.dart'; From f3f140467fe8a855d130abb534f0f22b9bfa479b Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Mon, 12 Feb 2024 15:53:29 -0500 Subject: [PATCH 3/7] Leave a marker --- packages/local_auth/local_auth/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/local_auth/local_auth/pubspec.yaml b/packages/local_auth/local_auth/pubspec.yaml index 8a1e8a7f3611..a249afafa552 100644 --- a/packages/local_auth/local_auth/pubspec.yaml +++ b/packages/local_auth/local_auth/pubspec.yaml @@ -23,7 +23,7 @@ dependencies: flutter: sdk: flutter local_auth_android: ^1.0.0 - local_auth_darwin: ^1.2.0 + local_auth_darwin: ^1.2.0 # UPDATE BEFORE LANDING local_auth_platform_interface: ^1.0.1 local_auth_windows: ^1.0.0 From 1c5498515c670d96e2b0cce44b457f2d92d4e9e8 Mon Sep 17 00:00:00 2001 From: stuartmorgan Date: Wed, 14 Feb 2024 13:40:37 -0500 Subject: [PATCH 4/7] Rev constraint for class rename --- packages/local_auth/local_auth/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/local_auth/local_auth/pubspec.yaml b/packages/local_auth/local_auth/pubspec.yaml index a249afafa552..ca17a1df326a 100644 --- a/packages/local_auth/local_auth/pubspec.yaml +++ b/packages/local_auth/local_auth/pubspec.yaml @@ -23,7 +23,7 @@ dependencies: flutter: sdk: flutter local_auth_android: ^1.0.0 - local_auth_darwin: ^1.2.0 # UPDATE BEFORE LANDING + local_auth_darwin: ^1.2.1 local_auth_platform_interface: ^1.0.1 local_auth_windows: ^1.0.0 From 3c83534a5c7c0281a1c035cd4230f7ebdf3f2cd6 Mon Sep 17 00:00:00 2001 From: stuartmorgan Date: Wed, 14 Feb 2024 14:31:06 -0500 Subject: [PATCH 5/7] Remove temp allowance for previous dependency --- script/configs/allowed_unpinned_deps.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/script/configs/allowed_unpinned_deps.yaml b/script/configs/allowed_unpinned_deps.yaml index 7387401c5313..fe4c138b0a63 100644 --- a/script/configs/allowed_unpinned_deps.yaml +++ b/script/configs/allowed_unpinned_deps.yaml @@ -6,10 +6,6 @@ ## Explicit allowances -# Temporary during transition to local_auth_darwin. Can be removed once -# the default endorsement changes. -- local_auth_ios - # Owned by individual Flutter Team members. # Ideally we would not do this, since there's no clear plan for what # would happen if the individuals left the Flutter Team, and the From f650f79fe037a14550ed8e410b5b0daf49a039f6 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Fri, 16 Feb 2024 11:29:25 -0500 Subject: [PATCH 6/7] Version update to match dependency --- packages/local_auth/local_auth/CHANGELOG.md | 5 ++--- packages/local_auth/local_auth/example/pubspec.yaml | 4 ++-- packages/local_auth/local_auth/pubspec.yaml | 6 +++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/local_auth/local_auth/CHANGELOG.md b/packages/local_auth/local_auth/CHANGELOG.md index 998b9154fc87..b7b2c263da5f 100644 --- a/packages/local_auth/local_auth/CHANGELOG.md +++ b/packages/local_auth/local_auth/CHANGELOG.md @@ -1,11 +1,10 @@ -## NEXT +## 2.2.0 * Switches endorsed iOS implementation to `local_auth_darwin`. * Clients directly importing `local_auth_ios` for auth strings should switch dependencies and imports to `local_auth_darwin`. No other change is necessary. * Updates support matrix in README to indicate that iOS 11 is no longer supported. -* Clients on versions of Flutter that still support iOS 11 can continue to use this - package with iOS 11, but will not receive any further updates to the iOS implementation. +* Updates minimum supported SDK version to Flutter 3.16.6. ## 2.1.8 diff --git a/packages/local_auth/local_auth/example/pubspec.yaml b/packages/local_auth/local_auth/example/pubspec.yaml index fc548b009d73..4afc978dcd3b 100644 --- a/packages/local_auth/local_auth/example/pubspec.yaml +++ b/packages/local_auth/local_auth/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the local_auth plugin. publish_to: none environment: - sdk: ">=3.0.0 <4.0.0" - flutter: ">=3.10.0" + sdk: ^3.2.3 + flutter: ">=3.16.6" dependencies: flutter: diff --git a/packages/local_auth/local_auth/pubspec.yaml b/packages/local_auth/local_auth/pubspec.yaml index ca17a1df326a..f36bc4049def 100644 --- a/packages/local_auth/local_auth/pubspec.yaml +++ b/packages/local_auth/local_auth/pubspec.yaml @@ -3,11 +3,11 @@ description: Flutter plugin for Android and iOS devices to allow local authentication via fingerprint, touch ID, face ID, passcode, pin, or pattern. repository: https://github.com/flutter/packages/tree/main/packages/local_auth/local_auth issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+local_auth%22 -version: 2.1.8 +version: 2.2.0 environment: - sdk: ">=3.0.0 <4.0.0" - flutter: ">=3.10.0" + sdk: ^3.2.3 + flutter: ">=3.16.6" flutter: plugin: From 8cbf514c3cab8988f516c08f5e0a47d8e7fbf739 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Fri, 16 Feb 2024 12:38:06 -0500 Subject: [PATCH 7/7] Minor version adjustment --- packages/local_auth/local_auth/example/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/local_auth/local_auth/example/pubspec.yaml b/packages/local_auth/local_auth/example/pubspec.yaml index 4afc978dcd3b..73265f90cd33 100644 --- a/packages/local_auth/local_auth/example/pubspec.yaml +++ b/packages/local_auth/local_auth/example/pubspec.yaml @@ -17,7 +17,7 @@ dependencies: # the parent directory to use the current plugin's version. path: ../ local_auth_android: ^1.0.0 - local_auth_darwin: ^1.2.0 + local_auth_darwin: ^1.2.1 dev_dependencies: build_runner: ^2.1.10