Analytics 9.0.0 (#9665)

tsunghung · web-flow · commit c6a83eb8b09c · 2022-04-19T16:37:35.000-07:00
* Analytics 9.0.0
diff --git a/FirebaseAnalytics.podspec.json b/FirebaseAnalytics.podspec.json
@@ -22,7 +22,7 @@
         "z"
     ],
     "license": {
-        "text": "Copyright 2021 Google",
+        "text": "Copyright 2022 Google",
         "type": "Copyright"
     },
     "name": "FirebaseAnalytics",
@@ -32,7 +32,7 @@
         "tvos": "12.0"
     },
     "source": {
-        "http": "https://dl.google.com/firebase/ios/analytics/dcdcf15b4c4831d9/FirebaseAnalytics-8.15.0.tar.gz"
+        "http": "https://dl.google.com/firebase/ios/analytics/a596b932b0fcdc4b/FirebaseAnalytics-9.0.0.tar.gz"
     },
     "subspecs": [
         {
diff --git a/FirebaseAnalyticsOnDeviceConversion.podspec.json b/FirebaseAnalyticsOnDeviceConversion.podspec.json
@@ -0,0 +1,25 @@
+{
+    "authors": "Google, Inc.",
+    "cocoapods_version": ">= 1.10.2",
+    "dependencies": {
+        "GoogleAppMeasurementOnDeviceConversion": "9.0.0"
+    },
+    "description": "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.",
+    "homepage": "https://firebase.google.com/features/analytics/",
+    "license": {
+        "text": "Copyright 2022 Google",
+        "type": "Copyright"
+    },
+    "name": "FirebaseAnalyticsOnDeviceConversion",
+    "platforms": {
+        "ios": "10.0"
+    },
+    "source": {
+        "git": "https://github.com/firebase/firebase-ios-sdk.git",
+        "tag": "CocoaPods-9.0.0"
+    },
+    "source_files": [ "FirebaseAnalyticsOnDeviceConversionWrapper/*" ],
+    "static_framework": true,
+    "summary": "On device conversion measurement plugin for FirebaseAnalytics. Not intended for direct use.",
+    "version": "9.0.0"
+}
diff --git a/FirebaseAnalyticsOnDeviceConversionWrapper/dummy.m b/FirebaseAnalyticsOnDeviceConversionWrapper/dummy.m
@@ -0,0 +1,17 @@
+/*
+ * 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.
diff --git a/FirebaseAnalyticsOnDeviceConversionWrapper/include/dummy.h b/FirebaseAnalyticsOnDeviceConversionWrapper/include/dummy.h
@@ -0,0 +1,18 @@
+/*
+ * 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/GoogleAppMeasurement.podspec.json b/GoogleAppMeasurement.podspec.json
@@ -20,7 +20,7 @@
         "z"
     ],
     "license": {
-        "text": "Copyright 2021 Google",
+        "text": "Copyright 2022 Google",
         "type": "Copyright"
     },
     "name": "GoogleAppMeasurement",
@@ -30,7 +30,7 @@
         "tvos": "12.0"
     },
     "source": {
-        "http": "https://dl.google.com/firebase/ios/analytics/07f1277f1f905d64/GoogleAppMeasurement-8.15.0.tar.gz"
+        "http": "https://dl.google.com/firebase/ios/analytics/c7d26f9ba4e99374/GoogleAppMeasurement-9.0.0.tar.gz"
     },
     "subspecs": [
         {
diff --git a/GoogleAppMeasurementOnDeviceConversion.podspec.json b/GoogleAppMeasurementOnDeviceConversion.podspec.json
@@ -0,0 +1,25 @@
+{
+    "authors": "Google, Inc.",
+    "cocoapods_version": ">= 1.10.2",
+    "description": "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.",
+    "homepage": "https://developers.google.com/ios",
+    "libraries": [
+        "c++"
+    ],
+    "license": {
+        "text": "Copyright 2022 Google",
+        "type": "Copyright"
+    },
+    "name": "GoogleAppMeasurementOnDeviceConversion",
+    "platforms": {
+        "ios": "10.0"
+    },
+    "source": {
+        "http": "https://dl.google.com/firebase/ios/analytics/c9d8918954034e34/GoogleAppMeasurementOnDeviceConversion-9.0.0.tar.gz"
+    },
+    "summary": "On device conversion measurement plugin for Google App Measurement. Not intended for direct use.",
+    "vendored_frameworks": [
+        "Frameworks/GoogleAppMeasurementOnDeviceConversion.xcframework"
+    ],
+    "version": "9.0.0"
+}
diff --git a/Package.swift b/Package.swift
@@ -33,6 +33,10 @@ let package = Package(
       name: "FirebaseAnalyticsWithoutAdIdSupport",
       targets: ["FirebaseAnalyticsWithoutAdIdSupportTarget"]
     ),
+    .library(
+      name: "FirebaseAnalyticsOnDeviceConversion",
+      targets: ["FirebaseAnalyticsOnDeviceConversionTarget"]
+    ),
     .library(
       name: "FirebaseAnalyticsSwift",
       targets: ["FirebaseAnalyticsSwiftTarget"]
@@ -146,7 +150,7 @@ let package = Package(
       url: "https://github.com/google/GoogleAppMeasurement.git",
       // Note that CI changes the version to the head of main for CI.
       // See scripts/setup_spm_tests.sh.
-      .exact("8.15.0")
+      .exact("9.0.0")
     ),
     .package(
       name: "GoogleDataTransport",
@@ -340,8 +344,8 @@ let package = Package(
     ),
     .binaryTarget(
       name: "FirebaseAnalytics",
-      url: "https://dl.google.com/firebase/ios/swiftpm/8.15.0/FirebaseAnalytics.zip",
-      checksum: "9d075b16e9e32e2328afdee11bba33ef075ba7be106312a14c5601310d6ecd92"
+      url: "https://dl.google.com/firebase/ios/swiftpm/9.0.0/FirebaseAnalytics.zip",
+      checksum: "6e9ced53d0eda20c00edae9f8ca90493355c711a2bcd12ec0fe1e4643558c241"
     ),
     .target(
       name: "FirebaseAnalyticsSwiftTarget",
@@ -385,6 +389,19 @@ let package = Package(
       ]
     ),
 
+    .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/SwiftPMTests/analytics-import-test/analytics-import.swift b/SwiftPMTests/analytics-import-test/analytics-import.swift
@@ -21,7 +21,7 @@ import FirebaseAnalytics
 
 class importTest: XCTestCase {
   func testAnalyticsImported() {
-    Analytics.logEvent(AnalyticsEventEcommercePurchase,
+    Analytics.logEvent(AnalyticsEventPurchase,
                        parameters: [AnalyticsParameterShipping: 10.0])
   }
 
diff --git a/SwiftPMTests/analytics-import-test/firebase-import.swift b/SwiftPMTests/analytics-import-test/firebase-import.swift
@@ -17,7 +17,7 @@ import Firebase
 
 class firebaseImportTest: XCTestCase {
   func testAnalyticsImported() {
-    Analytics.logEvent(AnalyticsEventEcommercePurchase,
+    Analytics.logEvent(AnalyticsEventPurchase,
                        parameters: [AnalyticsParameterShipping: 10.0])
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ import FirebaseAnalytics`
`21`	`21`
`22`	`22`	`class importTest: XCTestCase {`
`23`	`23`	`func testAnalyticsImported() {`
`24`		`- Analytics.logEvent(AnalyticsEventEcommercePurchase,`
	`24`	`+ Analytics.logEvent(AnalyticsEventPurchase,`
`25`	`25`	`parameters: [AnalyticsParameterShipping: 10.0])`
`26`	`26`	`}`
`27`	`27`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ import Firebase`
`17`	`17`
`18`	`18`	`class firebaseImportTest: XCTestCase {`
`19`	`19`	`func testAnalyticsImported() {`
`20`		`- Analytics.logEvent(AnalyticsEventEcommercePurchase,`
	`20`	`+ Analytics.logEvent(AnalyticsEventPurchase,`
`21`	`21`	`parameters: [AnalyticsParameterShipping: 10.0])`
`22`	`22`	`}`
`23`	`23`	`}`