From cf7d442467af2fe4c96cfd3fb609a53c71d59b7f Mon Sep 17 00:00:00 2001 From: Peter Chen Date: Thu, 1 May 2025 12:28:32 -0700 Subject: [PATCH 1/7] ODM2 open beta --- FirebaseAnalytics.podspec | 21 +++++- FirebaseAnalyticsCoreWrapper/dummy.m | 17 +++++ FirebaseAnalyticsCoreWrapper/include/dummy.h | 18 +++++ .../dummy.m | 17 +++++ .../include/dummy.h | 18 +++++ GoogleAppMeasurement.podspec | 25 ++++++- Package.swift | 74 +++++++++++++++++++ .../FirebaseAnalyticsCoreWrap/dummy.m | 18 +++++ .../FirebaseAnalyticsCoreWrap/include/dummy.h | 15 ++++ 9 files changed, 217 insertions(+), 6 deletions(-) create mode 100644 FirebaseAnalyticsCoreWrapper/dummy.m create mode 100644 FirebaseAnalyticsCoreWrapper/include/dummy.h create mode 100644 FirebaseAnalyticsIdentitySupportWrapper/dummy.m create mode 100644 FirebaseAnalyticsIdentitySupportWrapper/include/dummy.h create mode 100644 SwiftPM-PlatformExclude/FirebaseAnalyticsCoreWrap/dummy.m create mode 100644 SwiftPM-PlatformExclude/FirebaseAnalyticsCoreWrap/include/dummy.h diff --git a/FirebaseAnalytics.podspec b/FirebaseAnalytics.podspec index f2531640828..137752c9671 100644 --- a/FirebaseAnalytics.podspec +++ b/FirebaseAnalytics.podspec @@ -34,13 +34,30 @@ Pod::Spec.new do |s| s.dependency 'GoogleUtilities/Network', '~> 8.1' s.dependency 'nanopb', '~> 3.30910.0' - s.default_subspecs = 'AdIdSupport' + s.default_subspecs = 'Default' + s.subspec 'Default' do |ss| + ss.dependency 'GoogleAppMeasurement/Default', '11.14.0' + ss.vendored_frameworks = 'Frameworks/FirebaseAnalytics.xcframework' + end + + s.subspec 'Core' do |ss| + ss.dependency 'GoogleAppMeasurement/Core', '11.14.0' + ss.vendored_frameworks = 'Frameworks/FirebaseAnalytics.xcframework' + end + + s.subspec 'IdentitySupport' do |ss| + ss.dependency 'GoogleAppMeasurement/IdentitySupport', '11.14.0' + ss.vendored_frameworks = 'Frameworks/FirebaseAnalytics.xcframework' + end + + # Deprecated. Use IdentitySupport subspec instead. s.subspec 'AdIdSupport' do |ss| - ss.dependency 'GoogleAppMeasurement', '11.14.0' + ss.dependency 'GoogleAppMeasurement/AdIdSupport', '11.14.0' ss.vendored_frameworks = 'Frameworks/FirebaseAnalytics.xcframework' end + # Deprecated. Use Core subspec instead. s.subspec 'WithoutAdIdSupport' do |ss| ss.dependency 'GoogleAppMeasurement/WithoutAdIdSupport', '11.14.0' ss.vendored_frameworks = 'Frameworks/FirebaseAnalytics.xcframework' diff --git a/FirebaseAnalyticsCoreWrapper/dummy.m b/FirebaseAnalyticsCoreWrapper/dummy.m new file mode 100644 index 00000000000..f340cb75e04 --- /dev/null +++ b/FirebaseAnalyticsCoreWrapper/dummy.m @@ -0,0 +1,17 @@ +/* + * Copyright 2021 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. + */ + +// Swift Package Manager needs at least one source file. diff --git a/FirebaseAnalyticsCoreWrapper/include/dummy.h b/FirebaseAnalyticsCoreWrapper/include/dummy.h new file mode 100644 index 00000000000..4fe40eb40cd --- /dev/null +++ b/FirebaseAnalyticsCoreWrapper/include/dummy.h @@ -0,0 +1,18 @@ +/* + * Copyright 2021 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. + */ + +// Swift Package Manager needs at least one header to prevent a warning. See +// https://github.com/firebase/firebase-ios-sdk/pull/6504. diff --git a/FirebaseAnalyticsIdentitySupportWrapper/dummy.m b/FirebaseAnalyticsIdentitySupportWrapper/dummy.m new file mode 100644 index 00000000000..f340cb75e04 --- /dev/null +++ b/FirebaseAnalyticsIdentitySupportWrapper/dummy.m @@ -0,0 +1,17 @@ +/* + * Copyright 2021 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. + */ + +// Swift Package Manager needs at least one source file. diff --git a/FirebaseAnalyticsIdentitySupportWrapper/include/dummy.h b/FirebaseAnalyticsIdentitySupportWrapper/include/dummy.h new file mode 100644 index 00000000000..4fe40eb40cd --- /dev/null +++ b/FirebaseAnalyticsIdentitySupportWrapper/include/dummy.h @@ -0,0 +1,18 @@ +/* + * Copyright 2021 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. + */ + +// Swift Package Manager needs at least one header to prevent a warning. See +// https://github.com/firebase/firebase-ios-sdk/pull/6504. diff --git a/GoogleAppMeasurement.podspec b/GoogleAppMeasurement.podspec index e388a56c778..32b14f523ef 100644 --- a/GoogleAppMeasurement.podspec +++ b/GoogleAppMeasurement.podspec @@ -34,15 +34,32 @@ Pod::Spec.new do |s| s.dependency 'GoogleUtilities/Network', '~> 8.1' s.dependency 'nanopb', '~> 3.30910.0' - s.default_subspecs = 'AdIdSupport' + s.default_subspecs = 'Default' - s.subspec 'AdIdSupport' do |ss| - ss.dependency 'GoogleAppMeasurement/WithoutAdIdSupport', '11.14.0' + s.subspec 'Default' do |ss| + ss.dependency 'GoogleAppMeasurement/Core', '11.14.0' + ss.dependency 'GoogleAppMeasurement/IdentitySupport', '11.14.0' + # TODO Update to 2.0.0 + ss.dependency 'GoogleAdsOnDeviceConversion', '1.3.0' + end + + s.subspec 'Core' do |ss| + ss.vendored_frameworks = 'Frameworks/GoogleAppMeasurement.xcframework' + end + + s.subspec 'IdentitySupport' do |ss| + ss.dependency 'GoogleAppMeasurement/Core', '11.14.0' ss.vendored_frameworks = 'Frameworks/GoogleAppMeasurementIdentitySupport.xcframework' end + # Deprecated. Use IdentitySupport subspec instead. + s.subspec 'AdIdSupport' do |ss| + ss.dependency 'GoogleAppMeasurement/IdentitySupport', '11.14.0' + end + + # Deprecated. Use Core subspec instead. s.subspec 'WithoutAdIdSupport' do |ss| - ss.vendored_frameworks = 'Frameworks/GoogleAppMeasurement.xcframework' + ss.dependency 'GoogleAppMeasurement/Core', '11.14.0' end end diff --git a/Package.swift b/Package.swift index 7d8b1306601..8c08da9b43c 100644 --- a/Package.swift +++ b/Package.swift @@ -43,10 +43,24 @@ let package = Package( ), // Adding this library to your project is enough for it to take effect. The module // does not need to be imported into any source files. + .library( + name: "FirebaseAnalyticsCore", + targets: ["FirebaseAnalyticsCoreTarget"] + ), + // Adding this library to your project is enough for it to take effect. The module + // does not need to be imported into any source files. + .library( + name: "FirebaseAnalyticsIdentitySupport", + targets: ["FirebaseAnalyticsIdentitySupportTarget"] + ), + // Deprecated. Use FirebaseAnalyticsCore instead. + // Adding this library to your project is enough for it to take effect. The module + // does not need to be imported into any source files. .library( name: "FirebaseAnalyticsWithoutAdIdSupport", targets: ["FirebaseAnalyticsWithoutAdIdSupportTarget"] ), + // Deprecated. Use GoogleAdsOnDeviceConversion instead. // Adding this library to your project is enough for it to take effect. The module // does not need to be imported into any source files. .library( @@ -374,6 +388,66 @@ let package = Package( path: "FirebaseAnalytics/Tests/ObjCAPI" ), + .target( + name: "FirebaseAnalyticsCoreTarget", + dependencies: [.target(name: "FirebaseAnalyticsCoreWrapper", + condition: .when(platforms: [.iOS, .macCatalyst, .macOS, .tvOS]))], + path: "SwiftPM-PlatformExclude/FirebaseAnalyticsCoreWrap" + ), + .target( + name: "FirebaseAnalyticsCoreWrapper", + dependencies: [ + .target( + name: "FirebaseAnalytics", + condition: .when(platforms: [.iOS, .macCatalyst, .macOS, .tvOS]) + ), + .product(name: "GoogleAppMeasurementCore", + package: "GoogleAppMeasurement", + condition: .when(platforms: [.iOS, .macCatalyst, .macOS, .tvOS])), + "FirebaseCore", + "FirebaseInstallations", + .product(name: "GULAppDelegateSwizzler", package: "GoogleUtilities"), + .product(name: "GULMethodSwizzler", package: "GoogleUtilities"), + .product(name: "GULNSData", package: "GoogleUtilities"), + .product(name: "GULNetwork", package: "GoogleUtilities"), + .product(name: "nanopb", package: "nanopb"), + ], + path: "FirebaseAnalyticsCoreWrapper", + linkerSettings: [ + .linkedLibrary("sqlite3"), + .linkedLibrary("c++"), + .linkedLibrary("z"), + .linkedFramework("StoreKit"), + ] + ), + + .target( + name: "FirebaseAnalyticsIdentitySupportTarget", + dependencies: [ + .target( + name: "FirebaseAnalytics", + condition: .when(platforms: [.iOS, .macCatalyst, .macOS, .tvOS]) + ), + .product(name: "GoogleAppMeasurementIdentitySupport", + package: "GoogleAppMeasurement", + condition: .when(platforms: [.iOS, .macCatalyst, .macOS, .tvOS])), + "FirebaseCore", + "FirebaseInstallations", + .product(name: "GULAppDelegateSwizzler", package: "GoogleUtilities"), + .product(name: "GULMethodSwizzler", package: "GoogleUtilities"), + .product(name: "GULNSData", package: "GoogleUtilities"), + .product(name: "GULNetwork", package: "GoogleUtilities"), + .product(name: "nanopb", package: "nanopb"), + ], + path: "FirebaseAnalyticsIdentitySupportWrapper", + linkerSettings: [ + .linkedLibrary("sqlite3"), + .linkedLibrary("c++"), + .linkedLibrary("z"), + .linkedFramework("StoreKit"), + ] + ), + .target( name: "FirebaseAnalyticsWithoutAdIdSupportTarget", dependencies: [.target(name: "FirebaseAnalyticsWithoutAdIdSupportWrapper", diff --git a/SwiftPM-PlatformExclude/FirebaseAnalyticsCoreWrap/dummy.m b/SwiftPM-PlatformExclude/FirebaseAnalyticsCoreWrap/dummy.m new file mode 100644 index 00000000000..5197e17486a --- /dev/null +++ b/SwiftPM-PlatformExclude/FirebaseAnalyticsCoreWrap/dummy.m @@ -0,0 +1,18 @@ +// Copyright 2020 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 +#if TARGET_OS_WATCH +#warning "Firebase Analytics does not support the watchOS platform" +#endif diff --git a/SwiftPM-PlatformExclude/FirebaseAnalyticsCoreWrap/include/dummy.h b/SwiftPM-PlatformExclude/FirebaseAnalyticsCoreWrap/include/dummy.h new file mode 100644 index 00000000000..5224d0b2249 --- /dev/null +++ b/SwiftPM-PlatformExclude/FirebaseAnalyticsCoreWrap/include/dummy.h @@ -0,0 +1,15 @@ +// Copyright 2020 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. + +// Prevent a missing umbrella header warning. From b3a04b9a41e0bba2da29f02849900f972872bad7 Mon Sep 17 00:00:00 2001 From: Peter Chen Date: Thu, 22 May 2025 12:58:59 -0700 Subject: [PATCH 2/7] Fix GoogleAdsOnDeviceConversion dependency failing for macos --- FirebaseAnalytics.podspec | 2 +- GoogleAppMeasurement.podspec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/FirebaseAnalytics.podspec b/FirebaseAnalytics.podspec index 137752c9671..bea711ae980 100644 --- a/FirebaseAnalytics.podspec +++ b/FirebaseAnalytics.podspec @@ -37,7 +37,7 @@ Pod::Spec.new do |s| s.default_subspecs = 'Default' s.subspec 'Default' do |ss| - ss.dependency 'GoogleAppMeasurement/Default', '11.14.0' + ss.dependency 'GoogleAppMeasurement', '11.14.0' ss.vendored_frameworks = 'Frameworks/FirebaseAnalytics.xcframework' end diff --git a/GoogleAppMeasurement.podspec b/GoogleAppMeasurement.podspec index 32b14f523ef..29be6948bf4 100644 --- a/GoogleAppMeasurement.podspec +++ b/GoogleAppMeasurement.podspec @@ -34,11 +34,15 @@ Pod::Spec.new do |s| s.dependency 'GoogleUtilities/Network', '~> 8.1' s.dependency 'nanopb', '~> 3.30910.0' - s.default_subspecs = 'Default' + s.default_subspecs = ['Default', 'GoogleAdsOnDeviceConversion'] s.subspec 'Default' do |ss| ss.dependency 'GoogleAppMeasurement/Core', '11.14.0' ss.dependency 'GoogleAppMeasurement/IdentitySupport', '11.14.0' + end + + s.subspec 'GoogleAdsOnDeviceConversion' do |ss| + ss.ios.deployment_target = '12.0' # TODO Update to 2.0.0 ss.dependency 'GoogleAdsOnDeviceConversion', '1.3.0' end @@ -61,5 +65,4 @@ Pod::Spec.new do |s| s.subspec 'WithoutAdIdSupport' do |ss| ss.dependency 'GoogleAppMeasurement/Core', '11.14.0' end - end From edd1037925f1e766a6bfe19294a985abff934ac0 Mon Sep 17 00:00:00 2001 From: Peter Chen Date: Thu, 22 May 2025 13:07:56 -0700 Subject: [PATCH 3/7] Add deprecation warning to dummy.m in FirebaseAnalyticsOnDeviceConversionWrapper/ and FirebaseAnalyticsWithoutAdIdSupportWrapper/ --- FirebaseAnalyticsOnDeviceConversionWrapper/dummy.m | 2 ++ FirebaseAnalyticsWithoutAdIdSupportWrapper/dummy.m | 2 ++ 2 files changed, 4 insertions(+) diff --git a/FirebaseAnalyticsOnDeviceConversionWrapper/dummy.m b/FirebaseAnalyticsOnDeviceConversionWrapper/dummy.m index 2e503fe69d0..726f9077875 100644 --- a/FirebaseAnalyticsOnDeviceConversionWrapper/dummy.m +++ b/FirebaseAnalyticsOnDeviceConversionWrapper/dummy.m @@ -15,3 +15,5 @@ */ // Swift Package Manager needs at least one source file. + +#warning "FirebaseAnalyticsOnDeviceConversion is deprecated. Use GoogleAdsOnDeviceConversion instead." diff --git a/FirebaseAnalyticsWithoutAdIdSupportWrapper/dummy.m b/FirebaseAnalyticsWithoutAdIdSupportWrapper/dummy.m index f340cb75e04..77e1625bcb6 100644 --- a/FirebaseAnalyticsWithoutAdIdSupportWrapper/dummy.m +++ b/FirebaseAnalyticsWithoutAdIdSupportWrapper/dummy.m @@ -15,3 +15,5 @@ */ // Swift Package Manager needs at least one source file. + +#warning "FirebaseAnalyticsWithoutAdIdSupport is deprecated. Use FirebaseAnalyticsCore instead." From aef5ef21ad42a807ef30307669b5f4b27ceacd8f Mon Sep 17 00:00:00 2001 From: Peter Chen Date: Thu, 22 May 2025 13:25:20 -0700 Subject: [PATCH 4/7] Use ss.ios.dependency for GoogleAdsOnDeviceConversion dependency instead of a separate ios-only subspec --- FirebaseAnalytics.podspec | 2 +- GoogleAppMeasurement.podspec | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/FirebaseAnalytics.podspec b/FirebaseAnalytics.podspec index bea711ae980..137752c9671 100644 --- a/FirebaseAnalytics.podspec +++ b/FirebaseAnalytics.podspec @@ -37,7 +37,7 @@ Pod::Spec.new do |s| s.default_subspecs = 'Default' s.subspec 'Default' do |ss| - ss.dependency 'GoogleAppMeasurement', '11.14.0' + ss.dependency 'GoogleAppMeasurement/Default', '11.14.0' ss.vendored_frameworks = 'Frameworks/FirebaseAnalytics.xcframework' end diff --git a/GoogleAppMeasurement.podspec b/GoogleAppMeasurement.podspec index 29be6948bf4..760533a9c5a 100644 --- a/GoogleAppMeasurement.podspec +++ b/GoogleAppMeasurement.podspec @@ -34,17 +34,13 @@ Pod::Spec.new do |s| s.dependency 'GoogleUtilities/Network', '~> 8.1' s.dependency 'nanopb', '~> 3.30910.0' - s.default_subspecs = ['Default', 'GoogleAdsOnDeviceConversion'] + s.default_subspecs = 'Default' s.subspec 'Default' do |ss| ss.dependency 'GoogleAppMeasurement/Core', '11.14.0' ss.dependency 'GoogleAppMeasurement/IdentitySupport', '11.14.0' - end - - s.subspec 'GoogleAdsOnDeviceConversion' do |ss| - ss.ios.deployment_target = '12.0' # TODO Update to 2.0.0 - ss.dependency 'GoogleAdsOnDeviceConversion', '1.3.0' + ss.ios.dependency 'GoogleAdsOnDeviceConversion', '1.3.0' end s.subspec 'Core' do |ss| From ebe904fae491eccecac932ee9d24f00ae302e46a Mon Sep 17 00:00:00 2001 From: Peter Chen Date: Thu, 22 May 2025 14:31:47 -0700 Subject: [PATCH 5/7] Comment out warnings for now --- FirebaseAnalyticsOnDeviceConversionWrapper/dummy.m | 2 +- FirebaseAnalyticsWithoutAdIdSupportWrapper/dummy.m | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/FirebaseAnalyticsOnDeviceConversionWrapper/dummy.m b/FirebaseAnalyticsOnDeviceConversionWrapper/dummy.m index 726f9077875..8bd34b0c94e 100644 --- a/FirebaseAnalyticsOnDeviceConversionWrapper/dummy.m +++ b/FirebaseAnalyticsOnDeviceConversionWrapper/dummy.m @@ -16,4 +16,4 @@ // Swift Package Manager needs at least one source file. -#warning "FirebaseAnalyticsOnDeviceConversion is deprecated. Use GoogleAdsOnDeviceConversion instead." +// #warning "FirebaseAnalyticsOnDeviceConversion is deprecated. Use GoogleAdsOnDeviceConversion instead." diff --git a/FirebaseAnalyticsWithoutAdIdSupportWrapper/dummy.m b/FirebaseAnalyticsWithoutAdIdSupportWrapper/dummy.m index 77e1625bcb6..fe29ea88ecf 100644 --- a/FirebaseAnalyticsWithoutAdIdSupportWrapper/dummy.m +++ b/FirebaseAnalyticsWithoutAdIdSupportWrapper/dummy.m @@ -16,4 +16,4 @@ // Swift Package Manager needs at least one source file. -#warning "FirebaseAnalyticsWithoutAdIdSupport is deprecated. Use FirebaseAnalyticsCore instead." +// #warning "FirebaseAnalyticsWithoutAdIdSupport is deprecated. Use FirebaseAnalyticsCore instead." From 51b0f836ad318a0c0c9c1c8015927e01d82c66af Mon Sep 17 00:00:00 2001 From: Peter Chen Date: Thu, 22 May 2025 15:32:15 -0700 Subject: [PATCH 6/7] Add GoogleAdsOnDeviceConversion URL to deprecation message --- FirebaseAnalyticsOnDeviceConversionWrapper/dummy.m | 2 +- Package.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/FirebaseAnalyticsOnDeviceConversionWrapper/dummy.m b/FirebaseAnalyticsOnDeviceConversionWrapper/dummy.m index 8bd34b0c94e..ae7a2f3b67c 100644 --- a/FirebaseAnalyticsOnDeviceConversionWrapper/dummy.m +++ b/FirebaseAnalyticsOnDeviceConversionWrapper/dummy.m @@ -16,4 +16,4 @@ // Swift Package Manager needs at least one source file. -// #warning "FirebaseAnalyticsOnDeviceConversion is deprecated. Use GoogleAdsOnDeviceConversion instead." +// #warning "FirebaseAnalyticsOnDeviceConversion is deprecated. Use GoogleAdsOnDeviceConversion from https://github.com/googleads/google-ads-on-device-conversion-ios-sdk/ instead." diff --git a/Package.swift b/Package.swift index 8c08da9b43c..f26ffeaa815 100644 --- a/Package.swift +++ b/Package.swift @@ -60,7 +60,7 @@ let package = Package( name: "FirebaseAnalyticsWithoutAdIdSupport", targets: ["FirebaseAnalyticsWithoutAdIdSupportTarget"] ), - // Deprecated. Use GoogleAdsOnDeviceConversion instead. + // Deprecated. Use GoogleAdsOnDeviceConversion from https://github.com/googleads/google-ads-on-device-conversion-ios-sdk/ instead. // Adding this library to your project is enough for it to take effect. The module // does not need to be imported into any source files. .library( From 5908e65c609f7960d201f2096df8cae6ac0a1e97 Mon Sep 17 00:00:00 2001 From: Peter Chen Date: Thu, 22 May 2025 15:58:07 -0700 Subject: [PATCH 7/7] Fix formatting --- FirebaseAnalyticsOnDeviceConversionWrapper/dummy.m | 3 ++- Package.swift | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/FirebaseAnalyticsOnDeviceConversionWrapper/dummy.m b/FirebaseAnalyticsOnDeviceConversionWrapper/dummy.m index ae7a2f3b67c..cddc196e0e5 100644 --- a/FirebaseAnalyticsOnDeviceConversionWrapper/dummy.m +++ b/FirebaseAnalyticsOnDeviceConversionWrapper/dummy.m @@ -16,4 +16,5 @@ // Swift Package Manager needs at least one source file. -// #warning "FirebaseAnalyticsOnDeviceConversion is deprecated. Use GoogleAdsOnDeviceConversion from https://github.com/googleads/google-ads-on-device-conversion-ios-sdk/ instead." +// #warning "FirebaseAnalyticsOnDeviceConversion is deprecated. Use GoogleAdsOnDeviceConversion from +// https://github.com/googleads/google-ads-on-device-conversion-ios-sdk/ instead." diff --git a/Package.swift b/Package.swift index f26ffeaa815..9a7ac52f702 100644 --- a/Package.swift +++ b/Package.swift @@ -60,7 +60,8 @@ let package = Package( name: "FirebaseAnalyticsWithoutAdIdSupport", targets: ["FirebaseAnalyticsWithoutAdIdSupportTarget"] ), - // Deprecated. Use GoogleAdsOnDeviceConversion from https://github.com/googleads/google-ads-on-device-conversion-ios-sdk/ instead. + // Deprecated. Use GoogleAdsOnDeviceConversion from + // https://github.com/googleads/google-ads-on-device-conversion-ios-sdk/ instead. // Adding this library to your project is enough for it to take effect. The module // does not need to be imported into any source files. .library(