flutter · alexrabin-sentracam · Mar 5, 2024 · Mar 5, 2024 · Mar 5, 2024 · Mar 5, 2024
@@ -1,12 +1,16 @@
+## 2.0.0
+
+- Adds MacOS Support. Requires MacOS 10.15 or higher
+
 ## 1.2.2
 
-* Adds compatibility with `intl` 0.19.0.
+- Adds compatibility with `intl` 0.19.0.
 
 ## 1.2.1
 
-* Renames the Objective-C plugin classes to avoid runtime conflicts with
+- Renames the Objective-C plugin classes to avoid runtime conflicts with
   `local_auth_ios` in apps that have transitive dependencies on both.
 
 ## 1.2.0
 
-* Renames the package previously published as [`local_auth_ios`](https://pub.dev/packages/local_auth_ios)
+- Renames the package previously published as [`local_auth_ios`](https://pub.dev/packages/local_auth_ios)
@@ -1,6 +1,6 @@
 # local_auth_darwin
 
-The iOS implementation of [`local_auth`][1].
+The iOS and MacOS implementation of [`local_auth`][1].
 
 ## Usage
 

diff --git a/packages/local_auth/local_auth_darwin/darwin/Classes/FLALocalAuthPlugin.h b/packages/local_auth/local_auth_darwin/darwin/Classes/FLALocalAuthPlugin.h
@@ -2,7 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#if TARGET_OS_OSX
+#import <FlutterMacOS/FlutterMacOS.h>
+#else
 #import <Flutter/Flutter.h>
+#endif
 
 #import "messages.g.h"
 

diff --git a/packages/local_auth/local_auth_darwin/darwin/Classes/FLALocalAuthPlugin.m b/packages/local_auth/local_auth_darwin/darwin/Classes/FLALocalAuthPlugin.m
@@ -153,6 +153,26 @@ - (void)showAlertWithMessage:(NSString *)message
           dismissButtonTitle:(NSString *)dismissButtonTitle
      openSettingsButtonTitle:(NSString *)openSettingsButtonTitle
                   completion:(FLADAuthCompletion)completion {
+#if TARGET_OS_OSX
+  NSAlert *alert = [[NSAlert alloc] init];
+  [alert setMessageText:message];
+  [alert addButtonWithTitle:dismissButtonTitle];
+  if (openSettingsButtonTitle != nil) {
+    [alert addButtonWithTitle:openSettingsButtonTitle];
+  }
+  [alert beginSheetModalForWindow:NSApp.keyWindow
+                completionHandler:^(NSModalResponse returnCode) {
+                  if (returnCode == NSAlertSecondButtonReturn) {
+                    NSURL *url = [NSURL URLWithString:@"x-apple.systempreferences:com.apple."
+                                                      @"preference.security?Privacy_Biometry"];
+                    [[NSWorkspace sharedWorkspace] openURL:url];
+                  }
+                  [self handleSucceeded:NO withCompletion:completion];
+                }];
+  return;
+#endif
+
+#if TARGET_OS_IOS
   UIAlertController *alert =
       [UIAlertController alertControllerWithTitle:@""
                                           message:message
@@ -182,6 +202,8 @@ - (void)showAlertWithMessage:(NSString *)message
   [[UIApplication sharedApplication].delegate.window.rootViewController presentViewController:alert
                                                                                      animated:YES
                                                                                    completion:nil];
+
+#endif
 }
 
 - (void)handleAuthReplyWithSuccess:(BOOL)success
@@ -257,12 +279,14 @@ - (void)handleError:(NSError *)authError
 
 #pragma mark - AppDelegate
 
+#if TARGET_OS_IOS
 - (void)applicationDidBecomeActive:(UIApplication *)application {
   if (self.lastCallState != nil) {
     [self authenticateWithOptions:_lastCallState.options
                           strings:_lastCallState.strings
                        completion:_lastCallState.resultHandler];
   }
 }
+#endif
 
 @end
diff --git a/packages/local_auth/local_auth_darwin/darwin/Classes/FLALocalAuthPlugin_Test.h b/packages/local_auth/local_auth_darwin/darwin/Classes/FLALocalAuthPlugin_Test.h
@@ -2,7 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#if TARGET_OS_OSX
+#import <FlutterMacOS/FlutterMacOS.h>
+#else
 #import <Flutter/Flutter.h>
+#endif
+
 #import <LocalAuthentication/LocalAuthentication.h>
 
 /// Protocol for a source of LAContext instances. Used to allow context injection in unit tests.

@@ -16,8 +16,10 @@ Downloaded by pub (not CocoaPods).
   s.documentation_url = 'https://pub.dev/packages/local_auth_darwin'
   s.source_files = 'Classes/**/*'
   s.public_header_files = 'Classes/**/*.h'
-  s.dependency 'Flutter'
+  s.ios.dependency 'Flutter'
+  s.osx.dependency 'FlutterMacOS'
   s.platform = :ios, '12.0'
+  s.osx.deployment_target = '10.15'
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
   s.resource_bundles = {'local_auth_darwin_privacy' => ['Resources/PrivacyInfo.xcprivacy']}
 end

@@ -0,0 +1,43 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+migrate_working_dir/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+**/doc/api/
+**/ios/Flutter/.last_build_id
+.dart_tool/
+.flutter-plugins
+.flutter-plugins-dependencies
+.pub-cache/
+.pub/
+/build/
+
+# Symbolication related
+app.*.symbols
+
+# Obfuscation related
+app.*.map.json
+
+# Android Studio will place build artifacts here
+/android/app/debug
+/android/app/profile
+/android/app/release
@@ -0,0 +1,30 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+  revision: "41456452f29d64e8deb623a3c927524bcf9f111b"
+  channel: "stable"
+
+project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: 41456452f29d64e8deb623a3c927524bcf9f111b
+      base_revision: 41456452f29d64e8deb623a3c927524bcf9f111b
+    - platform: macos
+      create_revision: 41456452f29d64e8deb623a3c927524bcf9f111b
+      base_revision: 41456452f29d64e8deb623a3c927524bcf9f111b
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'
@@ -227,7 +227,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1510;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "The Flutter Authors";
 				TargetAttributes = {
 					3398D2CC26163948005A052F = {

diff --git a/...uth/local_auth_darwin/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/...uth/local_auth_darwin/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1510"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/packages/local_auth/local_auth_darwin/example/lib/main.dart b/packages/local_auth/local_auth_darwin/example/lib/main.dart
@@ -84,7 +84,7 @@ class _MyAppState extends State<MyApp> {
       });
       authenticated = await LocalAuthPlatform.instance.authenticate(
         localizedReason: 'Let OS determine authentication method',
-        authMessages: <AuthMessages>[const IOSAuthMessages()],
+        authMessages: <AuthMessages>[const DarwinAuthMessages()],
         options: const AuthenticationOptions(
           stickyAuth: true,
         ),
@@ -118,7 +118,7 @@ class _MyAppState extends State<MyApp> {
       authenticated = await LocalAuthPlatform.instance.authenticate(
         localizedReason:
             'Scan your fingerprint (or face or whatever) to authenticate',
-        authMessages: <AuthMessages>[const IOSAuthMessages()],
+        authMessages: <AuthMessages>[const DarwinAuthMessages()],
         options: const AuthenticationOptions(
           stickyAuth: true,
           biometricOnly: true,

@@ -0,0 +1,7 @@
+# Flutter-related
+**/Flutter/ephemeral/
+**/Pods/
+
+# Xcode-related
+**/dgph
+**/xcuserdata/
@@ -0,0 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
+#include "ephemeral/Flutter-Generated.xcconfig"
@@ -0,0 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
+#include "ephemeral/Flutter-Generated.xcconfig"
@@ -0,0 +1,43 @@
+platform :osx, '10.15'
+
+# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
+ENV['COCOAPODS_DISABLE_STATS'] = 'true'
+
+project 'Runner', {
+  'Debug' => :debug,
+  'Profile' => :release,
+  'Release' => :release,
+}
+
+def flutter_root
+  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'ephemeral', 'Flutter-Generated.xcconfig'), __FILE__)
+  unless File.exist?(generated_xcode_build_settings_path)
+    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure \"flutter pub get\" is executed first"
+  end
+
+  File.foreach(generated_xcode_build_settings_path) do |line|
+    matches = line.match(/FLUTTER_ROOT\=(.*)/)
+    return matches[1].strip if matches
+  end
+  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Flutter-Generated.xcconfig, then run \"flutter pub get\""
+end
+
+require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
+
+flutter_macos_podfile_setup
+
+target 'Runner' do
+  use_frameworks!
+  use_modular_headers!
+
+  flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
+  target 'RunnerTests' do
+    inherit! :search_paths
+  end
+end
+
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    flutter_additional_macos_build_settings(target)
+  end
+end