diff --git a/.travis.yml b/.travis.yml
index 0e0027b0bb..245606ccca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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:
diff --git a/FirebaseFunctions.podspec b/FirebaseFunctions.podspec
index b03041ef69..e85f2ad843 100644
--- a/FirebaseFunctions.podspec
+++ b/FirebaseFunctions.podspec
@@ -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
diff --git a/Functions/CHANGELOG.md b/Functions/CHANGELOG.md
index c0c91f52ae..58fb376ef1 100644
--- a/Functions/CHANGELOG.md
+++ b/Functions/CHANGELOG.md
@@ -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).
diff --git a/Functions/Example/IntegrationTests/IntegrationTests-Info.plist b/Functions/Example/IntegrationTests/IntegrationTests-Info.plist
deleted file mode 100644
index 169b6f710e..0000000000
--- a/Functions/Example/IntegrationTests/IntegrationTests-Info.plist
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- CFBundleDevelopmentRegion
- en
- CFBundleExecutable
- ${EXECUTABLE_NAME}
- CFBundleIdentifier
- $(PRODUCT_BUNDLE_IDENTIFIER)
- CFBundleInfoDictionaryVersion
- 6.0
- CFBundlePackageType
- BNDL
- CFBundleShortVersionString
- 1.0
- CFBundleSignature
- ????
- CFBundleVersion
- 1
-
-
diff --git a/Functions/Example/Tests/Tests-Info.plist b/Functions/Example/Tests/Tests-Info.plist
deleted file mode 100644
index 169b6f710e..0000000000
--- a/Functions/Example/Tests/Tests-Info.plist
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- CFBundleDevelopmentRegion
- en
- CFBundleExecutable
- ${EXECUTABLE_NAME}
- CFBundleIdentifier
- $(PRODUCT_BUNDLE_IDENTIFIER)
- CFBundleInfoDictionaryVersion
- 6.0
- CFBundlePackageType
- BNDL
- CFBundleShortVersionString
- 1.0
- CFBundleSignature
- ????
- CFBundleVersion
- 1
-
-
diff --git a/Functions/Example/Tests/en.lproj/InfoPlist.strings b/Functions/Example/Tests/en.lproj/InfoPlist.strings
deleted file mode 100644
index 477b28ff8f..0000000000
--- a/Functions/Example/Tests/en.lproj/InfoPlist.strings
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Localized versions of Info.plist keys */
-
diff --git a/Functions/Tests/Unit/Swift/FunctionsAPITests.swift b/Functions/Tests/Unit/Swift/FunctionsAPITests.swift
index ecd5e84edc..137c5e6421 100644
--- a/Functions/Tests/Unit/Swift/FunctionsAPITests.swift
+++ b/Functions/Tests/Unit/Swift/FunctionsAPITests.swift
@@ -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
@@ -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
diff --git a/Package.swift b/Package.swift
index 4b277fdc0e..2b8f5e54d2 100644
--- a/Package.swift
+++ b/Package.swift
@@ -699,6 +699,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"],
diff --git a/scripts/spm_test_schemes/FunctionsUnit.xcscheme b/scripts/spm_test_schemes/FunctionsUnit.xcscheme
new file mode 100644
index 0000000000..1ef8efc3b6
--- /dev/null
+++ b/scripts/spm_test_schemes/FunctionsUnit.xcscheme
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/scripts/spm_test_schemes/FunctionsUnitSwift.xcscheme b/scripts/spm_test_schemes/FunctionsUnitSwift.xcscheme
new file mode 100644
index 0000000000..1a7fb13aa1
--- /dev/null
+++ b/scripts/spm_test_schemes/FunctionsUnitSwift.xcscheme
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+