diff --git a/.github/workflows/analytics.yml b/.github/workflows/analytics.yml index 59d7ddef646..bb8d5c44141 100644 --- a/.github/workflows/analytics.yml +++ b/.github/workflows/analytics.yml @@ -43,11 +43,6 @@ jobs: run: scripts/third_party/travis/retry.sh pod spec lint GoogleAppMeasurement.podspec --platforms=${{ matrix.target }} --sources=https://github.com/firebase/SpecsDev.git,https://github.com/firebase/SpecsStaging.git,https://cdn.cocoapods.org/ - name: FirebaseAnalytics run: scripts/third_party/travis/retry.sh pod spec lint FirebaseAnalytics.podspec --platforms=${{ matrix.target }} --sources=https://github.com/firebase/SpecsDev.git,https://github.com/firebase/SpecsStaging.git,https://cdn.cocoapods.org/ - # The following steps are only run on `ios` due to product availability. - - name: GoogleAppMeasurementOnDeviceConversion - run: scripts/third_party/travis/retry.sh pod spec lint GoogleAppMeasurementOnDeviceConversion.podspec --platforms=ios --sources=https://github.com/firebase/SpecsDev.git,https://github.com/firebase/SpecsStaging.git,https://cdn.cocoapods.org/ - - name: FirebaseAnalyticsOnDeviceConversion - run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseAnalyticsOnDeviceConversion.podspec --platforms=ios # TODO: Consider pushing GoogleAppMeasurement.podspec to SpecsDev to enable similar test # for FirebaseAnalytics.podspec diff --git a/Dangerfile b/Dangerfile index 99868088875..c2fc33a1947 100644 --- a/Dangerfile +++ b/Dangerfile @@ -105,14 +105,10 @@ has_license_changes = didModify(["LICENSE"]) ## Product directories @has_analytics_changes = hasChangesIn([ - "FirebaseAnalyticsOnDeviceConversionWrapper", - "FirebaseAnalyticsWithoutAdIdSupportWrapper", "FirebaseAnalyticsWrapper" ]) || didModify([ "FirebaseAnalytics.podspec", - "FirebaseAnalyticsOnDeviceConversion.podspec", - "GoogleAppMeasurement.podspec", - "GoogleAppMeasurementOnDeviceConversion.podspec" + "GoogleAppMeasurement.podspec" ]) @has_abtesting_changes = hasChangesIn("FirebaseABTesting") @has_abtesting_api_changes = hasChangesIn("FirebaseABTesting/Sources/Public/") diff --git a/Firebase.podspec b/Firebase.podspec index 625be989545..197ce7ab758 100644 --- a/Firebase.podspec +++ b/Firebase.podspec @@ -68,21 +68,6 @@ Simplify your app development, grow your user base, and monetize more effectivel ss.dependency 'Firebase/Core' end - s.subspec 'AnalyticsWithAdIdSupport' do |ss| - ss.ios.deployment_target = '15.0' - ss.osx.deployment_target = '10.15' - ss.tvos.deployment_target = '15.0' - ss.dependency 'Firebase/Core' - end - - s.subspec 'AnalyticsWithoutAdIdSupport' do |ss| - ss.ios.deployment_target = '15.0' - ss.osx.deployment_target = '10.15' - ss.tvos.deployment_target = '15.0' - ss.dependency 'FirebaseAnalytics/WithoutAdIdSupport', '~> 12.0.0' - ss.dependency 'Firebase/CoreOnly' - end - s.subspec 'ABTesting' do |ss| ss.dependency 'Firebase/CoreOnly' ss.dependency 'FirebaseABTesting', '~> 12.0.0' diff --git a/FirebaseAnalytics.podspec b/FirebaseAnalytics.podspec index 5fdd7afb67d..9d4e611e37c 100644 --- a/FirebaseAnalytics.podspec +++ b/FirebaseAnalytics.podspec @@ -51,16 +51,4 @@ Pod::Spec.new do |s| ss.vendored_frameworks = 'Frameworks/FirebaseAnalytics.xcframework' end - # Deprecated. Use IdentitySupport subspec instead. - s.subspec 'AdIdSupport' do |ss| - ss.dependency 'GoogleAppMeasurement/AdIdSupport', '12.0.0' - ss.vendored_frameworks = 'Frameworks/FirebaseAnalytics.xcframework' - end - - # Deprecated. Use Core subspec instead. - s.subspec 'WithoutAdIdSupport' do |ss| - ss.dependency 'GoogleAppMeasurement/WithoutAdIdSupport', '12.0.0' - ss.vendored_frameworks = 'Frameworks/FirebaseAnalytics.xcframework' - end - end diff --git a/FirebaseAnalyticsOnDeviceConversion.podspec b/FirebaseAnalyticsOnDeviceConversion.podspec deleted file mode 100644 index ee8c9e823f3..00000000000 --- a/FirebaseAnalyticsOnDeviceConversion.podspec +++ /dev/null @@ -1,28 +0,0 @@ -Pod::Spec.new do |s| - s.name = 'FirebaseAnalyticsOnDeviceConversion' - s.version = '12.0.0' - s.summary = 'On device conversion measurement plugin for FirebaseAnalytics. Not intended for direct use.' - - s.description = <<-DESC - On device conversion measurement plugin for FirebaseAnalytics. This pod does not expose any headers and isn't intended for direct use, but rather as a plugin of FirebaseAnalytics. - DESC - - s.homepage = 'https://firebase.google.com/features/analytics/' - s.license = { :type => 'Copyright', :text => 'Copyright 2022 Google' } - s.authors = 'Google, Inc.' - - s.source = { - :git => 'https://github.com/firebase/firebase-ios-sdk.git', - :tag => 'CocoaPods-' + s.version.to_s - } - - s.cocoapods_version = '>= 1.12.0' - - s.dependency 'GoogleAppMeasurementOnDeviceConversion', '12.0.0' - - s.static_framework = true - - s.ios.deployment_target = '15.0' - - s.source_files = 'FirebaseAnalyticsOnDeviceConversionWrapper/*' -end diff --git a/FirebaseAnalyticsOnDeviceConversionWrapper/dummy.m b/FirebaseAnalyticsOnDeviceConversionWrapper/dummy.m deleted file mode 100644 index cddc196e0e5..00000000000 --- a/FirebaseAnalyticsOnDeviceConversionWrapper/dummy.m +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2022 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. - -// #warning "FirebaseAnalyticsOnDeviceConversion is deprecated. Use GoogleAdsOnDeviceConversion from -// https://github.com/googleads/google-ads-on-device-conversion-ios-sdk/ instead." diff --git a/FirebaseAnalyticsOnDeviceConversionWrapper/include/dummy.h b/FirebaseAnalyticsOnDeviceConversionWrapper/include/dummy.h deleted file mode 100644 index 1649affd217..00000000000 --- a/FirebaseAnalyticsOnDeviceConversionWrapper/include/dummy.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright 2022 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/FirebaseAnalyticsWithoutAdIdSupportWrapper/dummy.m b/FirebaseAnalyticsWithoutAdIdSupportWrapper/dummy.m deleted file mode 100644 index fe29ea88ecf..00000000000 --- a/FirebaseAnalyticsWithoutAdIdSupportWrapper/dummy.m +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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. - -// #warning "FirebaseAnalyticsWithoutAdIdSupport is deprecated. Use FirebaseAnalyticsCore instead." diff --git a/FirebaseAnalyticsWithoutAdIdSupportWrapper/include/dummy.h b/FirebaseAnalyticsWithoutAdIdSupportWrapper/include/dummy.h deleted file mode 100644 index 4fe40eb40cd..00000000000 --- a/FirebaseAnalyticsWithoutAdIdSupportWrapper/include/dummy.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * 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 0fa73abe680..1c43112bdd6 100644 --- a/GoogleAppMeasurement.podspec +++ b/GoogleAppMeasurement.podspec @@ -50,14 +50,4 @@ Pod::Spec.new do |s| ss.dependency 'GoogleAppMeasurement/Core', '12.0.0' ss.vendored_frameworks = 'Frameworks/GoogleAppMeasurementIdentitySupport.xcframework' end - - # Deprecated. Use IdentitySupport subspec instead. - s.subspec 'AdIdSupport' do |ss| - ss.dependency 'GoogleAppMeasurement/IdentitySupport', '12.0.0' - end - - # Deprecated. Use Core subspec instead. - s.subspec 'WithoutAdIdSupport' do |ss| - ss.dependency 'GoogleAppMeasurement/Core', '12.0.0' - end end diff --git a/GoogleAppMeasurementOnDeviceConversion.podspec b/GoogleAppMeasurementOnDeviceConversion.podspec deleted file mode 100644 index 2c6c06a93f0..00000000000 --- a/GoogleAppMeasurementOnDeviceConversion.podspec +++ /dev/null @@ -1,30 +0,0 @@ -Pod::Spec.new do |s| - s.name = 'GoogleAppMeasurementOnDeviceConversion' - s.version = '12.0.0' - s.summary = <<-SUMMARY - On device conversion measurement plugin for Google App Measurement. Not - intended for direct use. - SUMMARY - - s.description = <<-DESC - On device conversion measurement plugin for Google App Measurement. This - pod does not expose any headers and isn't intended for direct use, but - rather as a plugin of Google App Measurement. - DESC - - s.homepage = 'https://developers.google.com/ios' - s.license = { :type => 'Copyright', :text => 'Copyright 2022 Google' } - s.authors = 'Google, Inc.' - - s.source = { - :http => 'https://dl.google.com/firebase/ios/analytics/de0ea660a77ecdb8/GoogleAppMeasurementOnDeviceConversion-11.15.0.tar.gz' - } - - s.cocoapods_version = '>= 1.12.0' - - s.ios.deployment_target = '15.0' - - s.libraries = 'c++' - - s.vendored_frameworks = 'Frameworks/GoogleAppMeasurementOnDeviceConversion.xcframework' -end diff --git a/IntegrationTesting/ClientApp/ClientApp.xcodeproj/project.pbxproj b/IntegrationTesting/ClientApp/ClientApp.xcodeproj/project.pbxproj index 96db222f56c..7c4fcaf425c 100644 --- a/IntegrationTesting/ClientApp/ClientApp.xcodeproj/project.pbxproj +++ b/IntegrationTesting/ClientApp/ClientApp.xcodeproj/project.pbxproj @@ -9,7 +9,6 @@ /* Begin PBXBuildFile section */ EA05C7DE29F08D4B00D1014F /* objc-module-import-test.m in Sources */ = {isa = PBXBuildFile; fileRef = EA05C7DD29F08D4B00D1014F /* objc-module-import-test.m */; }; EA05C7E029F0911400D1014F /* objc-header-import-test.m in Sources */ = {isa = PBXBuildFile; fileRef = EA05C7DF29F0911400D1014F /* objc-header-import-test.m */; }; - EA0BC0FF29F06D5B005B8AEE /* FirebaseAnalyticsOnDeviceConversion in Frameworks */ = {isa = PBXBuildFile; platformFilter = ios; productRef = EA0BC0FE29F06D5B005B8AEE /* FirebaseAnalyticsOnDeviceConversion */; }; EA1269B429EDF98800D79E66 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA1269B329EDF98800D79E66 /* AppDelegate.swift */; }; EA1269B829EDF98A00D79E66 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EA1269B729EDF98A00D79E66 /* Assets.xcassets */; }; EA1269BC29EDF98A00D79E66 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EA1269BB29EDF98A00D79E66 /* Preview Assets.xcassets */; }; @@ -24,7 +23,6 @@ EA5A629F2A99498500F5711A /* objc-header-import-test.m in Sources */ = {isa = PBXBuildFile; fileRef = EA05C7DF29F0911400D1014F /* objc-header-import-test.m */; }; EA7DF54329EF20B9005664A7 /* swift-import-test.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA7DF54229EF20B9005664A7 /* swift-import-test.swift */; }; EA7DF58329EF3326005664A7 /* FirebaseAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = EA7DF58229EF3326005664A7 /* FirebaseAnalytics */; }; - EA7DF58929EF3326005664A7 /* FirebaseAnalyticsWithoutAdIdSupport in Frameworks */ = {isa = PBXBuildFile; productRef = EA7DF58829EF3326005664A7 /* FirebaseAnalyticsWithoutAdIdSupport */; }; EA7DF58B29EF3326005664A7 /* FirebaseAppCheck in Frameworks */ = {isa = PBXBuildFile; productRef = EA7DF58A29EF3326005664A7 /* FirebaseAppCheck */; }; EA7DF58D29EF3326005664A7 /* FirebaseAppDistribution-Beta in Frameworks */ = {isa = PBXBuildFile; platformFilter = ios; productRef = EA7DF58C29EF3326005664A7 /* FirebaseAppDistribution-Beta */; }; EA7DF59329EF3326005664A7 /* FirebaseCrashlytics in Frameworks */ = {isa = PBXBuildFile; productRef = EA7DF59229EF3326005664A7 /* FirebaseCrashlytics */; }; @@ -66,11 +64,9 @@ EA7DF59529EF3326005664A7 /* FirebaseDatabase in Frameworks */, EA7DF5A329EF3327005664A7 /* FirebaseFunctionsCombine-Community in Frameworks */, EA7DF59B29EF3326005664A7 /* FirebaseFirestore in Frameworks */, - EA0BC0FF29F06D5B005B8AEE /* FirebaseAnalyticsOnDeviceConversion in Frameworks */, EA7DF58329EF3326005664A7 /* FirebaseAnalytics in Frameworks */, EA7DF5AD29EF3327005664A7 /* FirebaseMLModelDownloader in Frameworks */, EA7DF58B29EF3326005664A7 /* FirebaseAppCheck in Frameworks */, - EA7DF58929EF3326005664A7 /* FirebaseAnalyticsWithoutAdIdSupport in Frameworks */, EA7DF5AB29EF3327005664A7 /* FirebaseMessaging in Frameworks */, EA7DF59329EF3326005664A7 /* FirebaseCrashlytics in Frameworks */, EA7DF5A529EF3327005664A7 /* FirebaseInAppMessaging-Beta in Frameworks */, @@ -196,7 +192,6 @@ name = ClientApp; packageProductDependencies = ( EA7DF58229EF3326005664A7 /* FirebaseAnalytics */, - EA7DF58829EF3326005664A7 /* FirebaseAnalyticsWithoutAdIdSupport */, EA7DF58A29EF3326005664A7 /* FirebaseAppCheck */, EA7DF58C29EF3326005664A7 /* FirebaseAppDistribution-Beta */, EA7DF59229EF3326005664A7 /* FirebaseCrashlytics */, @@ -212,7 +207,6 @@ EA7DF5AE29EF3328005664A7 /* FirebasePerformance */, EA7DF5B029EF3328005664A7 /* FirebaseRemoteConfig */, EA7DF5B629EF3328005664A7 /* FirebaseStorageCombine-Community */, - EA0BC0FE29F06D5B005B8AEE /* FirebaseAnalyticsOnDeviceConversion */, EA1FA0D02D31A8EE00DF3C07 /* FirebaseAuth */, ); productName = ClientApp; @@ -626,10 +620,6 @@ /* End XCConfigurationList section */ /* Begin XCSwiftPackageProductDependency section */ - EA0BC0FE29F06D5B005B8AEE /* FirebaseAnalyticsOnDeviceConversion */ = { - isa = XCSwiftPackageProductDependency; - productName = FirebaseAnalyticsOnDeviceConversion; - }; EA1FA0D02D31A8EE00DF3C07 /* FirebaseAuth */ = { isa = XCSwiftPackageProductDependency; productName = FirebaseAuth; @@ -638,10 +628,6 @@ isa = XCSwiftPackageProductDependency; productName = FirebaseAnalytics; }; - EA7DF58829EF3326005664A7 /* FirebaseAnalyticsWithoutAdIdSupport */ = { - isa = XCSwiftPackageProductDependency; - productName = FirebaseAnalyticsWithoutAdIdSupport; - }; EA7DF58A29EF3326005664A7 /* FirebaseAppCheck */ = { isa = XCSwiftPackageProductDependency; productName = FirebaseAppCheck; diff --git a/IntegrationTesting/ClientApp/Podfile b/IntegrationTesting/ClientApp/Podfile index e25a082c513..58aecd4e06f 100644 --- a/IntegrationTesting/ClientApp/Podfile +++ b/IntegrationTesting/ClientApp/Podfile @@ -12,7 +12,6 @@ target 'ClientApp-CocoaPods' do pod 'FirebaseCoreExtension', :path => '../../' pod 'FirebaseInstallations', :path => '../../' pod 'FirebaseAnalytics' # Binary pods don't work with `:path`. - pod 'FirebaseAnalyticsOnDeviceConversion', :path => '../../' pod 'FirebaseABTesting', :path => '../../' pod 'FirebaseAppCheck', :path => '../../' pod 'FirebaseRemoteConfig', :path => '../../' diff --git a/Package.swift b/Package.swift index 9e7a4a0b4fc..38eaf417207 100644 --- a/Package.swift +++ b/Package.swift @@ -45,21 +45,6 @@ let package = Package( 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 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( - name: "FirebaseAnalyticsOnDeviceConversion", - targets: ["FirebaseAnalyticsOnDeviceConversionTarget"] - ), .library( name: "FirebaseAuth", targets: ["FirebaseAuth"] @@ -418,53 +403,6 @@ let package = Package( .linkedFramework("StoreKit"), ] ), - - .target( - name: "FirebaseAnalyticsWithoutAdIdSupportTarget", - dependencies: [.target(name: "FirebaseAnalyticsWithoutAdIdSupportWrapper", - condition: .when(platforms: [.iOS, .macCatalyst, .macOS, .tvOS]))], - path: "SwiftPM-PlatformExclude/FirebaseAnalyticsWithoutAdIdSupportWrap" - ), - .target( - name: "FirebaseAnalyticsWithoutAdIdSupportWrapper", - dependencies: [ - .target( - name: "FirebaseAnalytics", - condition: .when(platforms: [.iOS, .macCatalyst, .macOS, .tvOS]) - ), - .product(name: "GoogleAppMeasurementWithoutAdIdSupport", - 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: "FirebaseAnalyticsWithoutAdIdSupportWrapper", - linkerSettings: [ - .linkedLibrary("sqlite3"), - .linkedLibrary("c++"), - .linkedLibrary("z"), - .linkedFramework("StoreKit"), - ] - ), - - .target( - name: "FirebaseAnalyticsOnDeviceConversionTarget", - dependencies: [ - .product(name: "GoogleAppMeasurementOnDeviceConversion", - package: "GoogleAppMeasurement", - condition: .when(platforms: [.iOS])), - ], - path: "FirebaseAnalyticsOnDeviceConversionWrapper", - linkerSettings: [ - .linkedLibrary("c++"), - ] - ), - .target( name: "FirebaseAppDistributionTarget", dependencies: [.target(name: "FirebaseAppDistribution", diff --git a/ReleaseTooling/Sources/FirebaseManifest/FirebaseManifest.swift b/ReleaseTooling/Sources/FirebaseManifest/FirebaseManifest.swift index f02eb0c579b..4e63c277a8f 100755 --- a/ReleaseTooling/Sources/FirebaseManifest/FirebaseManifest.swift +++ b/ReleaseTooling/Sources/FirebaseManifest/FirebaseManifest.swift @@ -34,9 +34,7 @@ public let shared = Manifest( Pod("FirebaseSessions"), Pod("FirebaseRemoteConfigInterop"), Pod("GoogleAppMeasurement", isClosedSource: true, platforms: ["ios", "macos", "tvos"]), - Pod("GoogleAppMeasurementOnDeviceConversion", isClosedSource: true, platforms: ["ios"]), Pod("FirebaseAnalytics", isClosedSource: true, platforms: ["ios", "macos", "tvos"], zip: true), - Pod("FirebaseAnalyticsOnDeviceConversion", platforms: ["ios"], zip: true), Pod("FirebaseABTesting", zip: true), Pod("FirebaseAppCheck", zip: true), Pod("FirebaseRemoteConfig", zip: true), diff --git a/SwiftPM-PlatformExclude/FirebaseAnalyticsWithoutAdIdSupportWrap/dummy.m b/SwiftPM-PlatformExclude/FirebaseAnalyticsWithoutAdIdSupportWrap/dummy.m deleted file mode 100644 index 11635a1a714..00000000000 --- a/SwiftPM-PlatformExclude/FirebaseAnalyticsWithoutAdIdSupportWrap/dummy.m +++ /dev/null @@ -1,18 +0,0 @@ -// 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. - -#import -#if TARGET_OS_WATCH -#warning "Firebase Analytics does not support the watchOS platform" -#endif diff --git a/SwiftPM-PlatformExclude/FirebaseAnalyticsWithoutAdIdSupportWrap/include/dummy.h b/SwiftPM-PlatformExclude/FirebaseAnalyticsWithoutAdIdSupportWrap/include/dummy.h deleted file mode 100644 index 6a0a2f41a9c..00000000000 --- a/SwiftPM-PlatformExclude/FirebaseAnalyticsWithoutAdIdSupportWrap/include/dummy.h +++ /dev/null @@ -1,15 +0,0 @@ -// 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. - -// Prevent a missing umbrella header warning. diff --git a/scripts/api_diff_report/icore_module.py b/scripts/api_diff_report/icore_module.py index 4e088347956..4f9d259a1b3 100644 --- a/scripts/api_diff_report/icore_module.py +++ b/scripts/api_diff_report/icore_module.py @@ -24,7 +24,6 @@ MODULE_LIST = [ 'FirebaseABTesting', 'FirebaseAnalytics', # Not buildable from source - 'FirebaseAnalyticsOnDeviceConversion', # Not buildable. 'FirebaseAppCheck', 'FirebaseAppDistribution', 'FirebaseAuth', @@ -45,8 +44,6 @@ 'FirebaseStorage', # Not buildable. NO "source_files" 'GoogleAppMeasurement', - # Not buildable. NO "source_files" - 'GoogleAppMeasurementOnDeviceConversion' ] diff --git a/scripts/localize_podfile.swift b/scripts/localize_podfile.swift index 8b60a2cbdd5..b6703688679 100755 --- a/scripts/localize_podfile.swift +++ b/scripts/localize_podfile.swift @@ -44,7 +44,6 @@ let implicitPods = [ let binaryPods = [ "GoogleAppMeasurement", - "GoogleAppMeasurementOnDeviceConversion", "FirebaseAnalytics", ]