diff --git a/packages/local_auth/local_auth_darwin/CHANGELOG.md b/packages/local_auth/local_auth_darwin/CHANGELOG.md index 2d209e97bef..f6df9023d3f 100644 --- a/packages/local_auth/local_auth_darwin/CHANGELOG.md +++ b/packages/local_auth/local_auth_darwin/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.3.0 + +* Adds Swift Package Manager compatibility. + ## 1.2.2 * Adds compatibility with `intl` 0.19.0. diff --git a/packages/local_auth/local_auth_darwin/darwin/Assets/.gitkeep b/packages/local_auth/local_auth_darwin/darwin/Assets/.gitkeep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/packages/local_auth/local_auth_darwin/darwin/local_auth_darwin.podspec b/packages/local_auth/local_auth_darwin/darwin/local_auth_darwin.podspec index 38dd90cf105..e3947dd2817 100644 --- a/packages/local_auth/local_auth_darwin/darwin/local_auth_darwin.podspec +++ b/packages/local_auth/local_auth_darwin/darwin/local_auth_darwin.podspec @@ -14,11 +14,10 @@ Downloaded by pub (not CocoaPods). s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' } s.source = { :http => 'https://github.com/flutter/packages/tree/main/packages/local_auth' } s.documentation_url = 'https://pub.dev/packages/local_auth_darwin' - s.source_files = 'Classes/**/*' - s.public_header_files = 'Classes/**/*.h' + s.source_files = 'local_auth_darwin/Sources/local_auth_darwin/**/*.{h,m}' + s.public_header_files = 'local_auth_darwin/Sources/local_auth_darwin/include/**/*.h' s.dependency 'Flutter' s.platform = :ios, '12.0' s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' } - s.resource_bundles = {'local_auth_darwin_privacy' => ['Resources/PrivacyInfo.xcprivacy']} + s.resource_bundles = {'local_auth_darwin_privacy' => ['local_auth_darwin/Sources/local_auth_darwin/Resources/PrivacyInfo.xcprivacy']} end - diff --git a/packages/local_auth/local_auth_darwin/darwin/local_auth_darwin/Package.swift b/packages/local_auth/local_auth_darwin/darwin/local_auth_darwin/Package.swift new file mode 100644 index 00000000000..952abfeac80 --- /dev/null +++ b/packages/local_auth/local_auth_darwin/darwin/local_auth_darwin/Package.swift @@ -0,0 +1,32 @@ +// swift-tools-version: 5.9 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import PackageDescription + +let package = Package( + name: "local_auth_darwin", + platforms: [ + .iOS("12.0"), + .macOS("10.14"), + ], + products: [ + .library(name: "local-auth-darwin", targets: ["local_auth_darwin"]) + ], + dependencies: [], + targets: [ + .target( + name: "local_auth_darwin", + dependencies: [], + resources: [ + .process("Resources") + ], + cSettings: [ + .headerSearchPath("include/local_auth_darwin") + ] + ) + ] +) diff --git a/packages/local_auth/local_auth_darwin/darwin/Classes/FLALocalAuthPlugin.m b/packages/local_auth/local_auth_darwin/darwin/local_auth_darwin/Sources/local_auth_darwin/FLALocalAuthPlugin.m similarity index 98% rename from packages/local_auth/local_auth_darwin/darwin/Classes/FLALocalAuthPlugin.m rename to packages/local_auth/local_auth_darwin/darwin/local_auth_darwin/Sources/local_auth_darwin/FLALocalAuthPlugin.m index e57adcdff30..4563686b364 100644 --- a/packages/local_auth/local_auth_darwin/darwin/Classes/FLALocalAuthPlugin.m +++ b/packages/local_auth/local_auth_darwin/darwin/local_auth_darwin/Sources/local_auth_darwin/FLALocalAuthPlugin.m @@ -1,8 +1,8 @@ // Copyright 2013 The Flutter Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FLALocalAuthPlugin.h" -#import "FLALocalAuthPlugin_Test.h" +#import "./include/local_auth_darwin/FLALocalAuthPlugin.h" +#import "./include/local_auth_darwin/FLALocalAuthPlugin_Test.h" #import diff --git a/packages/local_auth/local_auth_darwin/darwin/Resources/PrivacyInfo.xcprivacy b/packages/local_auth/local_auth_darwin/darwin/local_auth_darwin/Sources/local_auth_darwin/Resources/PrivacyInfo.xcprivacy similarity index 100% rename from packages/local_auth/local_auth_darwin/darwin/Resources/PrivacyInfo.xcprivacy rename to packages/local_auth/local_auth_darwin/darwin/local_auth_darwin/Sources/local_auth_darwin/Resources/PrivacyInfo.xcprivacy diff --git a/packages/local_auth/local_auth_darwin/darwin/Classes/FLALocalAuthPlugin.h b/packages/local_auth/local_auth_darwin/darwin/local_auth_darwin/Sources/local_auth_darwin/include/local_auth_darwin/FLALocalAuthPlugin.h similarity index 100% rename from packages/local_auth/local_auth_darwin/darwin/Classes/FLALocalAuthPlugin.h rename to packages/local_auth/local_auth_darwin/darwin/local_auth_darwin/Sources/local_auth_darwin/include/local_auth_darwin/FLALocalAuthPlugin.h diff --git a/packages/local_auth/local_auth_darwin/darwin/Classes/FLALocalAuthPlugin_Test.h b/packages/local_auth/local_auth_darwin/darwin/local_auth_darwin/Sources/local_auth_darwin/include/local_auth_darwin/FLALocalAuthPlugin_Test.h similarity index 100% rename from packages/local_auth/local_auth_darwin/darwin/Classes/FLALocalAuthPlugin_Test.h rename to packages/local_auth/local_auth_darwin/darwin/local_auth_darwin/Sources/local_auth_darwin/include/local_auth_darwin/FLALocalAuthPlugin_Test.h diff --git a/packages/local_auth/local_auth_darwin/darwin/Classes/messages.g.h b/packages/local_auth/local_auth_darwin/darwin/local_auth_darwin/Sources/local_auth_darwin/include/local_auth_darwin/messages.g.h similarity index 100% rename from packages/local_auth/local_auth_darwin/darwin/Classes/messages.g.h rename to packages/local_auth/local_auth_darwin/darwin/local_auth_darwin/Sources/local_auth_darwin/include/local_auth_darwin/messages.g.h diff --git a/packages/local_auth/local_auth_darwin/darwin/Classes/messages.g.m b/packages/local_auth/local_auth_darwin/darwin/local_auth_darwin/Sources/local_auth_darwin/messages.g.m similarity index 98% rename from packages/local_auth/local_auth_darwin/darwin/Classes/messages.g.m rename to packages/local_auth/local_auth_darwin/darwin/local_auth_darwin/Sources/local_auth_darwin/messages.g.m index 421b31e9424..6ab8ee5edf9 100644 --- a/packages/local_auth/local_auth_darwin/darwin/Classes/messages.g.m +++ b/packages/local_auth/local_auth_darwin/darwin/local_auth_darwin/Sources/local_auth_darwin/messages.g.m @@ -4,7 +4,9 @@ // Autogenerated from Pigeon (v13.1.2), do not edit directly. // See also: https://pub.dev/packages/pigeon -#import "messages.g.h" +// The line below is manually edited. See: +// https://github.com/flutter/flutter/issues/147587 +#import "./include/local_auth_darwin/messages.g.h" #if TARGET_OS_OSX #import diff --git a/packages/local_auth/local_auth_darwin/pigeons/messages.dart b/packages/local_auth/local_auth_darwin/pigeons/messages.dart index 15be1f043f3..121e8988651 100644 --- a/packages/local_auth/local_auth_darwin/pigeons/messages.dart +++ b/packages/local_auth/local_auth_darwin/pigeons/messages.dart @@ -6,9 +6,12 @@ import 'package:pigeon/pigeon.dart'; @ConfigurePigeon(PigeonOptions( dartOut: 'lib/src/messages.g.dart', - objcHeaderOut: 'darwin/Classes/messages.g.h', - objcSourceOut: 'darwin/Classes/messages.g.m', + objcHeaderOut: + 'darwin/local_auth_darwin/Sources/local_auth_darwin/include/local_auth_darwin/messages.g.h', + objcSourceOut: + 'darwin/local_auth_darwin/Sources/local_auth_darwin/messages.g.m', objcOptions: ObjcOptions( + headerIncludePath: './include/local_auth_darwin/messages.g.h', prefix: 'FLAD', // Avoid runtime collisions with old local_auth_ios classes. ), copyrightHeader: 'pigeons/copyright.txt', diff --git a/packages/local_auth/local_auth_darwin/pubspec.yaml b/packages/local_auth/local_auth_darwin/pubspec.yaml index e4482d2eb9b..2c914c34004 100644 --- a/packages/local_auth/local_auth_darwin/pubspec.yaml +++ b/packages/local_auth/local_auth_darwin/pubspec.yaml @@ -2,7 +2,7 @@ name: local_auth_darwin description: iOS implementation of the local_auth plugin. repository: https://github.com/flutter/packages/tree/main/packages/local_auth/local_auth_darwin issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+local_auth%22 -version: 1.2.2 +version: 1.3.0 environment: sdk: ^3.2.3