Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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/google_sign_in/google_sign_in_ios/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 6.3.3

* Creates Swift Package Manager target for Swift implementation.

## 6.3.2

* Updates pigeon dev_dependency to ^27.3.2 for analyzer 14 compatibility.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ import Testing

@testable import google_sign_in_ios

#if canImport(google_sign_in_ios_objc)
@testable import google_sign_in_ios_objc
#endif

#if os(OSX)
import FlutterMacOS
#else
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,15 @@ Enables Google Sign-In in Flutter apps.
s.license = { :type => 'BSD', :file => '../LICENSE' }
s.author = { 'Flutter Team' => 'flutter-dev@googlegroups.com' }
s.source = { :http => 'https://github.com/flutter/packages/tree/main/packages/google_sign_in/google_sign_in_ios' }
s.source_files = 'google_sign_in_ios/Sources/google_sign_in_ios/**/*.{h,m}'
s.public_header_files = 'google_sign_in_ios/Sources/google_sign_in_ios/include/**/*.h'
# Combine google_sign_in_ios and google_sign_in_ios_objc sources into a single
# pod, unlike SwiftPM, where separate Swift and Objective-C targets are required.
s.source_files = 'google_sign_in_ios/Sources/google_sign_in_ios*/**/*.{h,m,swift}'
s.public_header_files = 'google_sign_in_ios/Sources/google_sign_in_ios_objc/include/**/*.h'
s.swift_version = '5.0'
s.xcconfig = {
'LIBRARY_SEARCH_PATHS' => '$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)/ $(SDKROOT)/usr/lib/swift',
'LD_RUNPATH_SEARCH_PATHS' => '/usr/lib/swift',
}

# GTMSessionFetcher is a GoogleSignIn transitive dependency, added here as a
# direct dependency to ensure a version which defines modules.
Expand All @@ -26,10 +33,5 @@ Enables Google Sign-In in Flutter apps.
s.osx.deployment_target = '10.15'
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }

# google_sign_in_ios does not contain Swift files. For some reason, there
# is a "pod lib lint" warning unless swift_version is set. This seems related to
# GoogleSignIn depending a Swift pod (GTMAppAuth).
s.swift_version = '5.0'

s.resource_bundles = {'google_sign_in_ios_privacy' => ['google_sign_in_ios/Sources/google_sign_in_ios/Resources/PrivacyInfo.xcprivacy']}
end
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,21 @@ let package = Package(
.target(
name: "google_sign_in_ios",
dependencies: [
.product(name: "GoogleSignIn", package: "GoogleSignIn-iOS")
"google_sign_in_ios_objc"
],
resources: [
.process("Resources")
]
),
.target(
name: "google_sign_in_ios_objc",
dependencies: [
.product(name: "GoogleSignIn", package: "GoogleSignIn-iOS")
],
publicHeadersPath: "include",
cSettings: [
.headerSearchPath("include/google_sign_in_ios")
]
)
),
]
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// Copyright 2013 The Flutter Authors
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#if canImport(google_sign_in_ios_objc)
@_exported import google_sign_in_ios_objc
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import 'package:pigeon/pigeon.dart';
PigeonOptions(
dartOut: 'lib/src/messages.g.dart',
objcHeaderOut:
'darwin/google_sign_in_ios/Sources/google_sign_in_ios/include/google_sign_in_ios/messages.g.h',
objcSourceOut: 'darwin/google_sign_in_ios/Sources/google_sign_in_ios/messages.g.m',
'darwin/google_sign_in_ios/Sources/google_sign_in_ios_objc/include/google_sign_in_ios/messages.g.h',
objcSourceOut: 'darwin/google_sign_in_ios/Sources/google_sign_in_ios_objc/messages.g.m',
objcOptions: ObjcOptions(
prefix: 'FSI',
headerIncludePath: './include/google_sign_in_ios/messages.g.h',
Expand Down
2 changes: 1 addition & 1 deletion packages/google_sign_in/google_sign_in_ios/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: google_sign_in_ios
description: iOS implementation of the google_sign_in plugin.
repository: https://github.com/flutter/packages/tree/main/packages/google_sign_in/google_sign_in_ios
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+google_sign_in%22
version: 6.3.2
version: 6.3.3

environment:
sdk: ^3.10.0
Expand Down
Loading