Skip to content

[local_auth_darwin] Adds Swift Package Manager compatibility#6708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
auto-submit merged 3 commits into from
May 10, 2024
Merged

[local_auth_darwin] Adds Swift Package Manager compatibility #6708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f24e13a
[local_auth_darwin] Adds Swift Package Manager compatibility
loic-sharma May 9, 2024
87950f1
Feedback
loic-sharma May 10, 2024
6ff8810
Feedback
loic-sharma May 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/local_auth/local_auth_darwin/CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
## 1.3.0

* Adds Swift Package Manager compatibility.

## 1.2.2

* Adds compatibility with `intl` 0.19.0.
Expand Down
Empty file removedpackages/local_auth/local_auth_darwin/darwin/Assets/.gitkeep
View file
Open in desktop
Empty file.
7 changes: 3 additions & 4 deletions packages/local_auth/local_auth_darwin/darwin/local_auth_darwin.podspec
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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

Comment thread
vashworth marked this conversation as resolved.
32 changes: 32 additions & 0 deletions packages/local_auth/local_auth_darwin/darwin/local_auth_darwin/Package.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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")
]
)
]
)
4 changes: 2 additions & 2 deletions ...arwin/darwin/Classes/FLALocalAuthPlugin.m → ...es/local_auth_darwin/FLALocalAuthPlugin.m
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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 <LocalAuthentication/LocalAuthentication.h>

Expand Down
0 ...in/darwin/Resources/PrivacyInfo.xcprivacy → ...th_darwin/Resources/PrivacyInfo.xcprivacy
View file
Open in desktop
File renamed without changes.
0 ...arwin/darwin/Classes/FLALocalAuthPlugin.h → ...de/local_auth_darwin/FLALocalAuthPlugin.h
View file
Open in desktop
File renamed without changes.
0 .../darwin/Classes/FLALocalAuthPlugin_Test.h → ...cal_auth_darwin/FLALocalAuthPlugin_Test.h
View file
Open in desktop
File renamed without changes.
0 ...l_auth_darwin/darwin/Classes/messages.g.h → ...in/include/local_auth_darwin/messages.g.h
View file
Open in desktop
File renamed without changes.
4 changes: 3 additions & 1 deletion ...l_auth_darwin/darwin/Classes/messages.g.m → ...in/Sources/local_auth_darwin/messages.g.m
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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"

@loic-sharmaloic-sharmaMay 9, 2024•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was edited manually and will be reverted if Pigeon is ran again. See: flutter/flutter#147587

@HixieHixieMay 9, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we leave a comment?

@loic-sharmaloic-sharmaMay 10, 2024

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea, added comment that points to the tracking issue


#if TARGET_OS_OSX
#import <FlutterMacOS/FlutterMacOS.h>
Expand Down
7 changes: 5 additions & 2 deletions packages/local_auth/local_auth_darwin/pigeons/messages.dart
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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',
Expand Down
2 changes: 1 addition & 1 deletion packages/local_auth/local_auth_darwin/pubspec.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down