Skip to content

Commit e0d69a0

Browse files
paulb777paulb777
authored
Merge f1c4d07 into f023aa5 
2 parents f023aa5 + f1c4d07 commit e0d69a0

File tree

11 files changed

+232
-30
lines changed

11 files changed

+232
-30
lines changed

‎.github/workflows/combine.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ on:
2020
# Combine sources
2121
- 'FirebaseCombineSwift/**'
2222

23-
# Podspec
23+
# Podspecs
2424
- 'FirebaseCombineSwift.podspec'
25+
- 'FirebaseFunctionsTestingSupport.podspec'
2526

2627
# This workflow
2728
- '.github/workflows/combine.yml'

‎.github/workflows/functions.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
runs-on: macos-11
2626
strategy:
2727
matrix:
28-
target: [ios, tvos, macos]
28+
target: [ios, tvos, macos, watchos]
2929
steps:
3030
- uses: actions/checkout@v2
3131
- name: Setup Bundler

‎FirebaseAppCheck/Tests/Unit/Swift/AppCheckAPITests.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ final class AppCheckAPITests {
6666

6767
// Get token (async/await)
6868
#if compiler(>=5.5) && canImport(_Concurrency)
69-
if #available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, watchOS 8.0, *) {
69+
if #available(iOS 15.0, macOS 11.0, macCatalyst 15.0, tvOS 15.0, watchOS 8.0, *) {
7070
// async/await is a Swift 5.5+ feature available on iOS 15+
7171
Task {
7272
do {
@@ -100,7 +100,7 @@ final class AppCheckAPITests {
100100

101101
// Get token (async/await)
102102
#if compiler(>=5.5) && canImport(_Concurrency)
103-
if #available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, watchOS 8.0, *) {
103+
if #available(iOS 15.0, macOS 11.0, macCatalyst 15.0, tvOS 15.0, watchOS 8.0, *) {
104104
// async/await is a Swift 5.5+ feature available on iOS 15+
105105
Task {
106106
do {
@@ -172,7 +172,7 @@ final class AppCheckAPITests {
172172
}
173173
// Get token (async/await)
174174
#if compiler(>=5.5) && canImport(_Concurrency)
175-
if #available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, watchOS 8.0, *) {
175+
if #available(iOS 15.0, macOS 11.0, macCatalyst 15.0, tvOS 15.0, watchOS 8.0, *) {
176176
// async/await is a Swift 5.5+ feature available on iOS 15+
177177
Task {
178178
do {

‎FirebaseCore/Tests/SwiftUnit/CoreAPITests.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ final class CoreAPITests {
5353
}
5454

5555
#if swift(>=5.5)
56-
if #available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, watchOS 8.0, *) {
56+
if #available(iOS 15.0, macOS 11.0, macCatalyst 15.0, tvOS 15.0, watchOS 8.0, *) {
5757
// async/await is a Swift 5.5+ feature available on iOS 15+
5858
async {
5959
do {

‎FirebaseDatabase/Tests/Unit/Swift/DatabaseAPITests.swift‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ final class DatabaseAPITests {
113113
}
114114

115115
#if compiler(>=5.5) && canImport(_Concurrency)
116-
if #available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, *) {
116+
if #available(iOS 15.0, macOS 11.0, macCatalyst 15.0, tvOS 15.0, *) {
117117
// async/await is a Swift 5.5+ feature available on iOS 15+
118118
Task {
119119
do {
@@ -139,7 +139,7 @@ final class DatabaseAPITests {
139139
}
140140

141141
#if compiler(>=5.5) && canImport(_Concurrency)
142-
if #available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, *) {
142+
if #available(iOS 15.0, macOS 11.0, macCatalyst 15.0, tvOS 15.0, *) {
143143
// async/await is a Swift 5.5+ feature available on iOS 15+
144144
Task {
145145
// observeSingleEvent(of eventType:)
@@ -211,7 +211,7 @@ final class DatabaseAPITests {
211211
}
212212

213213
#if compiler(>=5.5) && canImport(_Concurrency)
214-
if #available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, *) {
214+
if #available(iOS 15.0, macOS 11.0, macCatalyst 15.0, tvOS 15.0, *) {
215215
// async/await is a Swift 5.5+ feature available on iOS 15+
216216
Task {
217217
do {
@@ -233,7 +233,7 @@ final class DatabaseAPITests {
233233
}
234234

235235
#if compiler(>=5.5) && canImport(_Concurrency)
236-
if #available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, *) {
236+
if #available(iOS 15.0, macOS 11.0, macCatalyst 15.0, tvOS 15.0, *) {
237237
// async/await is a Swift 5.5+ feature available on iOS 15+
238238
Task {
239239
do {
@@ -257,7 +257,7 @@ final class DatabaseAPITests {
257257
}
258258

259259
#if compiler(>=5.5) && canImport(_Concurrency)
260-
if #available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, *) {
260+
if #available(iOS 15.0, macOS 11.0, macCatalyst 15.0, tvOS 15.0, *) {
261261
// async/await is a Swift 5.5+ feature available on iOS 15+
262262
Task {
263263
do {
@@ -279,7 +279,7 @@ final class DatabaseAPITests {
279279
}
280280

281281
#if compiler(>=5.5) && canImport(_Concurrency)
282-
if #available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, *) {
282+
if #available(iOS 15.0, macOS 11.0, macCatalyst 15.0, tvOS 15.0, *) {
283283
// async/await is a Swift 5.5+ feature available on iOS 15+
284284
Task {
285285
do {
@@ -302,7 +302,7 @@ final class DatabaseAPITests {
302302
}
303303

304304
#if compiler(>=5.5) && canImport(_Concurrency)
305-
if #available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, *) {
305+
if #available(iOS 15.0, macOS 11.0, macCatalyst 15.0, tvOS 15.0, *) {
306306
// async/await is a Swift 5.5+ feature available on iOS 15+
307307
Task {
308308
do {
@@ -358,7 +358,7 @@ final class DatabaseAPITests {
358358
}
359359

360360
#if compiler(>=5.5) && canImport(_Concurrency)
361-
if #available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, *) {
361+
if #available(iOS 15.0, macOS 11.0, macCatalyst 15.0, tvOS 15.0, *) {
362362
// async/await is a Swift 5.5+ feature available on iOS 15+
363363
Task {
364364
// observeSingleEvent(of eventType:)
@@ -392,7 +392,7 @@ final class DatabaseAPITests {
392392
}
393393

394394
#if compiler(>=5.5) && canImport(_Concurrency)
395-
if #available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, *) {
395+
if #available(iOS 15.0, macOS 11.0, macCatalyst 15.0, tvOS 15.0, *) {
396396
// async/await is a Swift 5.5+ feature available on iOS 15+
397397
Task {
398398
do {
@@ -436,7 +436,7 @@ final class DatabaseAPITests {
436436
}
437437

438438
#if compiler(>=5.5) && canImport(_Concurrency)
439-
if #available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, *) {
439+
if #available(iOS 15.0, macOS 11.0, macCatalyst 15.0, tvOS 15.0, *) {
440440
// async/await is a Swift 5.5+ feature available on iOS 15+
441441
Task {
442442
do {
@@ -460,7 +460,7 @@ final class DatabaseAPITests {
460460
}
461461

462462
#if compiler(>=5.5) && canImport(_Concurrency)
463-
if #available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, *) {
463+
if #available(iOS 15.0, macOS 11.0, macCatalyst 15.0, tvOS 15.0, *) {
464464
// async/await is a Swift 5.5+ feature available on iOS 15+
465465
Task {
466466
do {
@@ -486,7 +486,7 @@ final class DatabaseAPITests {
486486
}
487487

488488
#if compiler(>=5.5) && canImport(_Concurrency)
489-
if #available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, *) {
489+
if #available(iOS 15.0, macOS 11.0, macCatalyst 15.0, tvOS 15.0, *) {
490490
// async/await is a Swift 5.5+ feature available on iOS 15+
491491
Task {
492492
do {
@@ -509,7 +509,7 @@ final class DatabaseAPITests {
509509
}
510510

511511
#if compiler(>=5.5) && canImport(_Concurrency)
512-
if #available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, *) {
512+
if #available(iOS 15.0, macOS 11.0, macCatalyst 15.0, tvOS 15.0, *) {
513513
// async/await is a Swift 5.5+ feature available on iOS 15+
514514
Task {
515515
do {
@@ -533,7 +533,7 @@ final class DatabaseAPITests {
533533
}
534534

535535
#if compiler(>=5.5) && canImport(_Concurrency)
536-
if #available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, *) {
536+
if #available(iOS 15.0, macOS 11.0, macCatalyst 15.0, tvOS 15.0, *) {
537537
// async/await is a Swift 5.5+ feature available on iOS 15+
538538
Task {
539539
do {
@@ -565,7 +565,7 @@ final class DatabaseAPITests {
565565
}
566566

567567
#if compiler(>=5.5) && canImport(_Concurrency)
568-
if #available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, *) {
568+
if #available(iOS 15.0, macOS 11.0, macCatalyst 15.0, tvOS 15.0, *) {
569569
// async/await is a Swift 5.5+ feature available on iOS 15+
570570
Task {
571571
do {

‎FirebaseFunctions.podspec‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,19 @@ Cloud Functions for Firebase.
5454
s.test_spec 'integration' do |int_tests|
5555
int_tests.scheme = { :code_coverage => true }
5656
int_tests.source_files = 'FirebaseFunctions/Tests/Integration/*.[mh]',
57-
'FirebaseFunctions/Tests/Integration/*.plist',
5857
'SharedTestUtilities/FIRAuthInteropFake*',
5958
'SharedTestUtilities/FIRMessagingInteropFake*'
6059
end
60+
61+
# Uncomment to use pod gen to run the Swift Integration tests. This can't be
62+
# committed because of the dependency on the unpublished FirebaseFunctionsTestingSupport.
63+
# Alternatively, use Swift Package Manager to run the swift integration tests locally.
64+
#
65+
# s.test_spec 'swift-integration' do |swift_int|
66+
# swift_int.platforms = {:ios => '15.0', :osx => '11.0', :tvos => '15.0', :watchos => '8.0'}
67+
# swift_int.scheme = { :code_coverage => true }
68+
# swift_int.dependency 'FirebaseFunctionsTestingSupport'
69+
# swift_int.source_files = 'FirebaseFunctions/Tests/SwiftIntegration/*',
70+
# 'FirebaseTestingSupport/Functions/Sources/*'
71+
# end
6172
end

0 commit comments

Comments
 (0)