diff --git a/GoogleAppMeasurementOnDeviceConversionWrapper/dummy.m b/GoogleAppMeasurementOnDeviceConversionWrapper/dummy.m deleted file mode 100644 index a532a24..0000000 --- a/GoogleAppMeasurementOnDeviceConversionWrapper/dummy.m +++ /dev/null @@ -1,19 +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 "GoogleAppMeasurementOnDeviceConversion is deprecated. Use GoogleAdsOnDeviceConversion instead." diff --git a/GoogleAppMeasurementOnDeviceConversionWrapper/include/dummy.h b/GoogleAppMeasurementOnDeviceConversionWrapper/include/dummy.h deleted file mode 100644 index 1649aff..0000000 --- a/GoogleAppMeasurementOnDeviceConversionWrapper/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/GoogleAppMeasurementWithoutAdIdSupportWrapper/dummy.m b/GoogleAppMeasurementWithoutAdIdSupportWrapper/dummy.m deleted file mode 100644 index a15dc9e..0000000 --- a/GoogleAppMeasurementWithoutAdIdSupportWrapper/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 "GoogleAppMeasurementWithoutAdIdSupport is deprecated. Use GoogleAppMeasurementCore instead." diff --git a/GoogleAppMeasurementWithoutAdIdSupportWrapper/include/dummy.h b/GoogleAppMeasurementWithoutAdIdSupportWrapper/include/dummy.h deleted file mode 100644 index 4fe40eb..0000000 --- a/GoogleAppMeasurementWithoutAdIdSupportWrapper/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/Package.swift b/Package.swift index b725f62..4d5afdf 100644 --- a/Package.swift +++ b/Package.swift @@ -33,17 +33,6 @@ let package = Package( name: "GoogleAppMeasurementIdentitySupport", targets: ["GoogleAppMeasurementIdentitySupportTarget"] ), - // Deprecated. Use GoogleAppMeasurementCore instead. - .library( - name: "GoogleAppMeasurementWithoutAdIdSupport", - targets: ["GoogleAppMeasurementWithoutAdIdSupportTarget"] - ), - // Deprecated. Use GoogleAdsOnDeviceConversion from - // https://github.com/googleads/google-ads-on-device-conversion-ios-sdk/ instead. - .library( - name: "GoogleAppMeasurementOnDeviceConversion", - targets: ["GoogleAppMeasurementOnDeviceConversionTarget"] - ), ], dependencies: [ .package( @@ -136,40 +125,6 @@ let package = Package( .linkedFramework("StoreKit"), ] ), - .target( - name: "GoogleAppMeasurementWithoutAdIdSupportTarget", - dependencies: [ - .target( - name: "GoogleAppMeasurement", - condition: .when(platforms: [.iOS, .macCatalyst, .macOS, .tvOS]) - ), - .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: "GoogleAppMeasurementWithoutAdIdSupportWrapper", - linkerSettings: [ - .linkedLibrary("sqlite3"), - .linkedLibrary("c++"), - .linkedLibrary("z"), - .linkedFramework("StoreKit"), - ] - ), - .target( - name: "GoogleAppMeasurementOnDeviceConversionTarget", - dependencies: [ - .target( - name: "GoogleAppMeasurementOnDeviceConversion", - condition: .when(platforms: [.iOS]) - ), - ], - path: "GoogleAppMeasurementOnDeviceConversionWrapper", - linkerSettings: [ - .linkedLibrary("c++"), - ] - ), .binaryTarget( name: "GoogleAppMeasurement", url: "https://dl.google.com/firebase/ios/swiftpm/11.15.0/GoogleAppMeasurement.zip", @@ -180,11 +135,6 @@ let package = Package( url: "https://dl.google.com/firebase/ios/swiftpm/11.15.0/GoogleAppMeasurementIdentitySupport.zip", checksum: "b03de5d48cde12af3bc7ca1f9c6b45d97db7ef6f90501277aca10c7832b5e21b" ), - .binaryTarget( - name: "GoogleAppMeasurementOnDeviceConversion", - url: "https://dl.google.com/firebase/ios/swiftpm/11.15.0/GoogleAppMeasurementOnDeviceConversion.zip", - checksum: "e8e001c865b3c68c57f8aa1638fceba72c95f9331bc5b7db3cca04615f66cc56" - ), ], cLanguageStandard: .c99, cxxLanguageStandard: CXXLanguageStandard.gnucxx14