Skip to content

Commit 23d76fb

Browse files
dconeybedconeybe
committed
Merge remote-tracking branch 'origin/main' into PartialErrors
2 parents 3a03ef9 + 804fece commit 23d76fb

File tree

15 files changed

+230
-214
lines changed

15 files changed

+230
-214
lines changed

‎.github/workflows/check.yml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
- uses: actions/setup-python@v5
2121
with:
22-
python-version: '3.10'
22+
python-version: '3.11'
2323

2424
- name: Cache Mint packages
2525
uses: actions/cache@v4
@@ -32,11 +32,7 @@ jobs:
3232
run: ./setup-scripts.sh
3333

3434
- name: Setup check
35-
run: |
36-
brew update
37-
brew install clang-format@19
38-
brew install mint
39-
mint bootstrap
35+
run: scripts/setup_check.sh
4036

4137
- name: Style
4238
run: scripts/style.sh test-only

‎.github/workflows/spm.yml‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ jobs:
3030
env:
3131
FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1
3232
FIREBASE_MAIN: 1
33-
DISABLE_INTEGRATION_TESTS: 1
3433
steps:
3534
- uses: actions/checkout@v4
3635
- name: Generate Swift Package.resolved
@@ -54,15 +53,14 @@ jobs:
5453

5554
strategy:
5655
matrix:
57-
os: [macos-14]
56+
os: [macos-15]
5857
# GitHub actions' runners do not include visionOS. https://github.com/actions/runner-images/issues/10559
59-
target: [iOS, tvOS, macOS, catalyst]
60-
xcode: [Xcode_15.2, Xcode_15.4, Xcode_16]
58+
target: [iOS, macOS, tvOS, catalyst]
59+
xcode: [Xcode_16.2]
6160
runs-on: ${{ matrix.os }}
6261
env:
6362
FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1
6463
FIREBASE_MAIN: 1
65-
DISABLE_INTEGRATION_TESTS: 1
6664
steps:
6765
- uses: actions/checkout@v4
6866
- uses: actions/cache/restore@v4
@@ -73,5 +71,9 @@ jobs:
7371
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
7472
- name: Setup Scripts Directory
7573
run: ./setup-scripts.sh
76-
- name: Unit Tests
77-
run: scripts/third_party/travis/retry.sh scripts/build.sh FirebaseDataConnect ${{ matrix.target }} spm
74+
- name: Install iOS Platform
75+
run: xcodebuild -downloadPlatform iOS
76+
- name: Integration Test Setup
77+
run: Tests/Integration/Emulator/start-emulator.sh
78+
- name: Unit and Integration Tests
79+
run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseDataConnect ${{ matrix.target }} spm

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# 11.6.0-beta
2+
- [changed] Dependency on Firebase iOS SDK changed to 'minimum version required' instead of an 'exact version'. This lets apps use the latest version of the Firebase iOS SDK.
3+
14
# 11.5.0-beta
25
- [added] FriendlyFlix - a comprehensive SwiftUI sample app.
36
- [changed] Switched to using AppCheckInterop APIs to remove hard dependency on FirebaseAppCheck library.

‎Package.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func firebaseDependency() -> Package.Dependency {
7979
return .package(url: firebaseURL, branch: "main")
8080
}
8181

82-
return .package(url: firebaseURL, exact: "11.5.0")
82+
return .package(url: firebaseURL, from: "11.5.0")
8383
}
8484

8585
func integrationTestPath() -> String? {

‎Protos/connector_service.proto‎

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2024 Google LLC
1+
// Copyright 2025 Google LLC
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -16,42 +16,24 @@
1616
//adopted from third_party/firebase/dataconnect/emulator/server/api/connector_service.proto
1717
syntax = "proto3";
1818

19-
package google.firebase.dataconnect.v1beta;
19+
package google.firebase.dataconnect.v1;
2020

2121
import "google/api/annotations.proto";
2222
import "google/api/field_behavior.proto";
2323
import "google/protobuf/struct.proto";
2424
import "graphql_error.proto";
2525

26-
option java_package = "com.google.firebase.dataconnect.v1beta";
26+
option java_package = "com.google.firebase.dataconnect.v1";
2727
option java_multiple_files = true;
2828
option java_outer_classname = "ConnectorServiceProto";
2929

3030
service ConnectorService {
3131
// Execute a predefined query in a Connector.
32-
rpc ExecuteQuery(ExecuteQueryRequest) returns (ExecuteQueryResponse) {
33-
option (google.api.http) = {
34-
post: "/v1alpha/{name=projects/*/locations/*/services/*/connectors/*}:executeQuery"
35-
body: "*"
36-
additional_bindings {
37-
post: "/v1beta/{name=projects/*/locations/*/services/*/connectors/*}:executeQuery"
38-
body: "*"
39-
}
40-
};
41-
}
32+
rpc ExecuteQuery(ExecuteQueryRequest) returns (ExecuteQueryResponse) {}
4233

4334
// Execute a predefined mutation in a Connector.
4435
rpc ExecuteMutation(ExecuteMutationRequest)
45-
returns (ExecuteMutationResponse) {
46-
option (google.api.http) = {
47-
post: "/v1alpha/{name=projects/*/locations/*/services/*/connectors/*}:executeMutation"
48-
body: "*"
49-
additional_bindings {
50-
post: "/v1beta/{name=projects/*/locations/*/services/*/connectors/*}:executeMutation"
51-
body: "*"
52-
}
53-
};
54-
}
36+
returns (ExecuteMutationResponse) {}
5537
}
5638

5739
// The ExecuteQuery request to Firebase Data Connect.

‎Protos/graphql_error.proto‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2024 Google LLC
1+
// Copyright 2025 Google LLC
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -16,11 +16,11 @@
1616

1717
syntax = "proto3";
1818

19-
package google.firebase.dataconnect.v1beta;
19+
package google.firebase.dataconnect.v1;
2020

2121
import "google/protobuf/struct.proto";
2222

23-
option java_package = "com.google.firebase.dataconnect.v1beta";
23+
option java_package = "com.google.firebase.dataconnect.v1";
2424
option java_multiple_files = true;
2525
option java_outer_classname = "GraphqlErrorProto";
2626

‎Sources/Internal/Codec.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ import SwiftProtobuf
1818

1919
@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
2020
typealias FirebaseDataConnectExecuteMutationRequest =
21-
Google_Firebase_Dataconnect_V1beta_ExecuteMutationRequest
21+
Google_Firebase_Dataconnect_V1_ExecuteMutationRequest
2222
typealias FirebaseDataConnectExecuteQueryRequest =
23-
Google_Firebase_Dataconnect_V1beta_ExecuteQueryRequest
23+
Google_Firebase_Dataconnect_V1_ExecuteQueryRequest
2424

2525
@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
2626
class Codec {

‎Sources/Internal/GrpcClient.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ import SwiftProtobuf
2727

2828
@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
2929
typealias FirebaseDataConnectAsyncClient =
30-
Google_Firebase_Dataconnect_V1beta_ConnectorServiceAsyncClient
31-
typealias FirebaseDataConnectGraphqlError = Google_Firebase_Dataconnect_V1beta_GraphqlError
30+
Google_Firebase_Dataconnect_V1_ConnectorServiceAsyncClient
31+
typealias FirebaseDataConnectGraphqlError = Google_Firebase_Dataconnect_V1_GraphqlError
3232

3333
@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
3434
actor GrpcClient: CustomStringConvertible {

‎Sources/Internal/Version.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import GoogleUtilities_Environment
1818

1919
@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
2020
struct Version {
21-
static let sdkVersion = "11.3.0-beta"
21+
static let sdkVersion = "11.6.0-beta"
2222

2323
// returns value of form gl-PLATFORM_NAME/PLATFORM_VERSION
2424
static func platformVersionHeader() -> String {

0 commit comments

Comments
 (0)