From 497cbf8021995cc247ba4ce75924a971a2d7da37 Mon Sep 17 00:00:00 2001 From: cherylEnkidu Date: Fri, 1 Nov 2024 16:06:39 -0400 Subject: [PATCH] Fix style --- FirebaseFirestore.podspec | 4 ++-- .../Swift/Source/SwiftAPI/SwiftCppAPI.swift | 21 +++++++++++++------ Firestore/core/CMakeLists.txt | 1 - .../core/swift/include/FirebaseFirestoreCpp.h | 18 +++++++++++++--- Firestore/core/swift/include/used_by_swift.h | 18 +++++++++++++--- Firestore/core/swift/src/used_by_swift.cc | 18 +++++++++++++--- 6 files changed, 62 insertions(+), 18 deletions(-) diff --git a/FirebaseFirestore.podspec b/FirebaseFirestore.podspec index 1f0d3f9da6e..8ea3479bdc1 100644 --- a/FirebaseFirestore.podspec +++ b/FirebaseFirestore.podspec @@ -31,12 +31,12 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling, 'FirebaseFirestoreInternal/**/*.[mh]', 'Firestore/Swift/Source/**/*.swift', ] - + s.pod_target_xcconfig = { # Enables C++ <-> Swift interop (by default it's only C) "SWIFT_OBJC_INTEROP_MODE" => "objcxx", } - + s.resource_bundles = { "#{s.module_name}_Privacy" => 'Firestore/Swift/Source/Resources/PrivacyInfo.xcprivacy' } diff --git a/Firestore/Swift/Source/SwiftAPI/SwiftCppAPI.swift b/Firestore/Swift/Source/SwiftAPI/SwiftCppAPI.swift index 1c83eb92de5..4b2db92536c 100644 --- a/Firestore/Swift/Source/SwiftAPI/SwiftCppAPI.swift +++ b/Firestore/Swift/Source/SwiftAPI/SwiftCppAPI.swift @@ -1,9 +1,18 @@ -// -// SwiftCppAPI.swift -// Firebase -// -// Created by Cheryl Lin on 2024-10-22. -// +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ import FirebaseFirestoreCpp diff --git a/Firestore/core/CMakeLists.txt b/Firestore/core/CMakeLists.txt index 79ce44ec4c5..4da90c896ee 100644 --- a/Firestore/core/CMakeLists.txt +++ b/Firestore/core/CMakeLists.txt @@ -220,7 +220,6 @@ firebase_ios_glob( src/remote/*.h swift/include/*.h swift/src/*.cc - swift/umbrella/*.h EXCLUDE ${nanopb_sources} ) diff --git a/Firestore/core/swift/include/FirebaseFirestoreCpp.h b/Firestore/core/swift/include/FirebaseFirestoreCpp.h index 029e364a6fc..dd769230b8f 100644 --- a/Firestore/core/swift/include/FirebaseFirestoreCpp.h +++ b/Firestore/core/swift/include/FirebaseFirestoreCpp.h @@ -1,6 +1,18 @@ -// -// Created by Cheryl Lin on 2024-10-22. -// +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ #ifndef FIREBASE_FIREBASEFIRESTORECPP_H #define FIREBASE_FIREBASEFIRESTORECPP_H diff --git a/Firestore/core/swift/include/used_by_swift.h b/Firestore/core/swift/include/used_by_swift.h index d06b8effbe4..c5d5c516fc4 100644 --- a/Firestore/core/swift/include/used_by_swift.h +++ b/Firestore/core/swift/include/used_by_swift.h @@ -1,6 +1,18 @@ -// -// Created by Cheryl Lin on 2024-10-22. -// +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ #ifndef FIREBASE_USED_BY_SWIFT_H #define FIREBASE_USED_BY_SWIFT_H diff --git a/Firestore/core/swift/src/used_by_swift.cc b/Firestore/core/swift/src/used_by_swift.cc index c497d8ee1b1..87981e2c4c7 100644 --- a/Firestore/core/swift/src/used_by_swift.cc +++ b/Firestore/core/swift/src/used_by_swift.cc @@ -1,6 +1,18 @@ -// -// Created by Cheryl Lin on 2024-10-22. -// +/* + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ #include "../include/used_by_swift.h" #include