Skip to content
Merged
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: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,9 @@ jobs:
before_install:
- ./scripts/if_changed.sh ./scripts/install_prereqs.sh # Start integration test server
script:
- travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseFunctions.podspec
- travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseFunctions.podspec --platforms=ios
- travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseFunctions.podspec --platforms=tvos
- travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb FirebaseFunctions.podspec --platforms=macos

- stage: test
env:
Expand Down
1 change: 1 addition & 0 deletions FirebaseFunctions.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Cloud Functions for Firebase.
s.ios.deployment_target = '10.0'
s.osx.deployment_target = '10.12'
s.tvos.deployment_target = '10.0'
s.watchos.deployment_target = '6.0'

s.cocoapods_version = '>= 1.4.0'
s.prefix_header_file = false
Expand Down
3 changes: 3 additions & 0 deletions Functions/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# v8.7.0
- [fixed] Add watchOS support (#8499).

# v8.3.0
- [fixed] Fixed an issue where subclassing Functions was unusable (#8265).

Expand Down
22 changes: 0 additions & 22 deletions Functions/Example/IntegrationTests/IntegrationTests-Info.plist

This file was deleted.

22 changes: 0 additions & 22 deletions Functions/Example/Tests/Tests-Info.plist

This file was deleted.

2 changes: 0 additions & 2 deletions Functions/Example/Tests/en.lproj/InfoPlist.strings

This file was deleted.

8 changes: 4 additions & 4 deletions Functions/Tests/Unit/Swift/FunctionsAPITests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ final class FunctionsAPITests {
}

#if swift(>=5.5)
if #available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, *) {
if #available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, watchOS 8.0, *) {
// async/await is a Swift 5.5+ feature available on iOS 15+
async {
Task {
do {
let result = try await callableRef.call(data)
_ = result.data
Expand All @@ -83,9 +83,9 @@ final class FunctionsAPITests {
}

#if swift(>=5.5)
if #available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, *) {
if #available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, watchOS 8.0, *) {
// async/await is a Swift 5.5+ feature available on iOS 15+
async {
Task {
do {
let result = try await callableRef.call()
_ = result.data
Expand Down
14 changes: 14 additions & 0 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -690,6 +690,20 @@ let package = Package(
"SharedTestUtilities"],
path: "Functions/Tests/CombineUnit"
),
.testTarget(
name: "FunctionsUnit",
dependencies: ["FirebaseFunctions",
"SharedTestUtilities"],
path: "Functions/Example/Tests/",
cSettings: [
.headerSearchPath("../../../"),
]
),
.testTarget(
name: "FunctionsUnitSwift",
dependencies: ["FirebaseFunctions"],
path: "Functions/Tests/Unit/Swift"
),
.target(
name: "FirebaseFunctionsTestingSupport",
dependencies: ["FirebaseFunctions"],
Expand Down
52 changes: 52 additions & 0 deletions scripts/spm_test_schemes/FunctionsUnit.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1300"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "FunctionsUnit"
BuildableName = "FunctionsUnit"
BlueprintName = "FunctionsUnit"
ReferencedContainer = "container:">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
52 changes: 52 additions & 0 deletions scripts/spm_test_schemes/FunctionsUnitSwift.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1300"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "FunctionsUnitSwift"
BuildableName = "FunctionsUnitSwift"
BlueprintName = "FunctionsUnitSwift"
ReferencedContainer = "container:">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>