Skip to content

Commit 05f796c

Browse files
ryanwilsonmoemcd
ryanwilson
and
moemcd
authored
Analytics 7.11.0 (#7900) (#7903)
* Analytics 7.11.0 (#7900) * Analytics 7.11.0 podspec.json files, SPM, and Firebase podspec additions * Update: Analytics 7.11.0 * Update: Analytics 7.11.0 * Bump AnalyticsSwift dependency * Revert "Bump AnalyticsSwift dependency" This reverts commit 002de3c. Co-authored-by: Morgan McDowell <[email protected]>
1 parent 64dea4a commit 05f796c

File tree

8 files changed

+158
-14
lines changed

8 files changed

+158
-14
lines changed

‎Firebase.podspec‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,17 @@ Simplify your app development, grow your user base, and monetize more effectivel
6262
ss.dependency 'Firebase/Core'
6363
end
6464

65+
s.subspec 'AnalyticsWithAdIdSupport' do |ss|
66+
ss.ios.deployment_target = '9.0'
67+
ss.dependency 'Firebase/Core'
68+
end
69+
70+
s.subspec 'AnalyticsWithoutAdIdSupport' do |ss|
71+
ss.ios.deployment_target = '9.0'
72+
ss.ios.dependency 'FirebaseAnalytics/WithoutAdIdSupport', '~> 7.11.0'
73+
ss.dependency 'Firebase/CoreOnly'
74+
end
75+
6576
s.subspec 'ABTesting' do |ss|
6677
ss.dependency 'Firebase/CoreOnly'
6778
ss.dependency 'FirebaseABTesting', '~> 7.11.0'

‎FirebaseAnalytics.podspec.json‎

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"authors": "Google, Inc.",
33
"cocoapods_version": ">= 1.10.0",
4+
"default_subspecs": "AdIdSupport",
45
"dependencies": {
56
"FirebaseCore": "~> 7.0",
67
"FirebaseInstallations": "~> 7.0",
7-
"GoogleAppMeasurement": "7.10.0",
88
"GoogleUtilities/AppDelegateSwizzler": "~> 7.0",
99
"GoogleUtilities/MethodSwizzler": "~> 7.0",
1010
"GoogleUtilities/NSData+zlib": "~> 7.0",
@@ -30,11 +30,30 @@
3030
"ios": "9.0"
3131
},
3232
"source": {
33-
"http": "https://dl.google.com/firebase/ios/analytics/c224fb8e370c1cfd/FirebaseAnalytics-7.9.0.tar.gz"
33+
"http": "https://dl.google.com/firebase/ios/analytics/b137db10f410cdb2/FirebaseAnalytics-7.11.0.tar.gz"
3434
},
35-
"summary": "Firebase Analytics for iOS",
36-
"vendored_frameworks": [
37-
"Frameworks/FirebaseAnalytics.xcframework"
35+
"subspecs": [
36+
{
37+
"name": "AdIdSupport",
38+
"dependencies": {
39+
"FirebaseAnalytics/Base": "7.11.0",
40+
"GoogleAppMeasurement/AdIdSupport": "7.11.0"
41+
}
42+
},
43+
{
44+
"name": "WithoutAdIdSupport",
45+
"dependencies": {
46+
"FirebaseAnalytics/Base": "7.11.0",
47+
"GoogleAppMeasurement/WithoutAdIdSupport": "7.11.0"
48+
}
49+
},
50+
{
51+
"name": "Base",
52+
"vendored_frameworks": [
53+
"Frameworks/FirebaseAnalytics.xcframework"
54+
]
55+
}
3856
],
39-
"version": "7.10.0"
57+
"summary": "Firebase Analytics for iOS",
58+
"version": "7.11.0"
4059
}

‎FirebaseAnalyticsWithoutAdIdSupportWrapper/dummy.m‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
/*
2+
* Copyright 2021 Google LLC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
// Swift Package Manager needs at least one source file.

‎FirebaseAnalyticsWithoutAdIdSupportWrapper/include/dummy.h‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
/*
2+
* Copyright 2021 Google LLC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
// Swift Package Manager needs at least one header to prevent a warning. See
18+
// https://github.com/firebase/firebase-ios-sdk/pull/6504.

‎GoogleAppMeasurement.podspec.json‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"authors": "Google, Inc.",
33
"cocoapods_version": ">= 1.10.0",
4+
"default_subspecs": "AdIdSupport",
45
"dependencies": {
56
"GoogleUtilities/AppDelegateSwizzler": "~> 7.0",
67
"GoogleUtilities/MethodSwizzler": "~> 7.0",
@@ -27,11 +28,22 @@
2728
"ios": "9.0"
2829
},
2930
"source": {
30-
"http": "https://dl.google.com/firebase/ios/analytics/dd4bf2e43d43af9f/GoogleAppMeasurement-7.9.0.tar.gz"
31+
"http": "https://dl.google.com/firebase/ios/analytics/2053f0bf92324be1/GoogleAppMeasurement-7.11.0.tar.gz"
3132
},
32-
"summary": "Shared measurement methods for Google libraries. Not intended for direct use.",
33-
"vendored_frameworks": [
34-
"Frameworks/GoogleAppMeasurement.xcframework"
33+
"subspecs": [
34+
{
35+
"name": "AdIdSupport",
36+
"vendored_frameworks": [
37+
"Frameworks/GoogleAppMeasurement.xcframework"
38+
]
39+
},
40+
{
41+
"name": "WithoutAdIdSupport",
42+
"vendored_frameworks": [
43+
"Frameworks/GoogleAppMeasurementWithoutAdIdSupport.xcframework"
44+
]
45+
}
3546
],
36-
"version": "7.10.0"
47+
"summary": "Shared measurement methods for Google libraries. Not intended for direct use.",
48+
"version": "7.11.0"
3749
}

‎Package.swift‎

Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ let package = Package(
2727
name: "FirebaseAnalytics",
2828
targets: ["FirebaseAnalyticsTarget"]
2929
),
30+
.library(
31+
name: "FirebaseAnalyticsWithoutAdIdSupport",
32+
targets: ["FirebaseAnalyticsWithoutAdIdSupportTarget"]
33+
),
3034
.library(
3135
name: "FirebaseAnalyticsSwift-Beta",
3236
targets: ["FirebaseAnalyticsSwiftTarget"]
@@ -115,7 +119,7 @@ let package = Package(
115119
.package(
116120
name: "GoogleAppMeasurement",
117121
url: "https://github.com/google/GoogleAppMeasurement.git",
118-
.exact("7.10.0")
122+
.exact("7.11.0")
119123
),
120124
.package(
121125
name: "GoogleDataTransport",
@@ -263,8 +267,8 @@ let package = Package(
263267
),
264268
.binaryTarget(
265269
name: "FirebaseAnalytics",
266-
url: "https://dl.google.com/firebase/ios/swiftpm/7.9.0/FirebaseAnalytics.zip",
267-
checksum: "939cf0df51b97de5f53bfa3cb1e3d6fa83e875a9d3c47d1dff1ba67fdd9c7538"
270+
url: "https://dl.google.com/firebase/ios/swiftpm/7.11.0/FirebaseAnalytics.zip",
271+
checksum: "96fdd7d7e7812748b11ec2e8ca9c0cec186e1caa6037996b74410d89a4ddf6af"
268272
),
269273
.target(
270274
name: "FirebaseAnalyticsSwiftTarget",
@@ -278,6 +282,36 @@ let package = Package(
278282
path: "FirebaseAnalyticsSwift/Sources"
279283
),
280284

285+
.target(
286+
name: "FirebaseAnalyticsWithoutAdIdSupportTarget",
287+
dependencies: [.target(name: "FirebaseAnalyticsWithoutAdIdSupportWrapper",
288+
condition: .when(platforms: [.iOS]))],
289+
path: "SwiftPM-PlatformExclude/FirebaseAnalyticsWithoutAdIdSupportWrap"
290+
),
291+
.target(
292+
name: "FirebaseAnalyticsWithoutAdIdSupportWrapper",
293+
dependencies: [
294+
.target(name: "FirebaseAnalytics", condition: .when(platforms: [.iOS])),
295+
.product(name: "GoogleAppMeasurementWithoutAdIdSupport",
296+
package: "GoogleAppMeasurement",
297+
condition: .when(platforms: [.iOS])),
298+
"FirebaseCore",
299+
"FirebaseInstallations",
300+
.product(name: "GULAppDelegateSwizzler", package: "GoogleUtilities"),
301+
.product(name: "GULMethodSwizzler", package: "GoogleUtilities"),
302+
.product(name: "GULNSData", package: "GoogleUtilities"),
303+
.product(name: "GULNetwork", package: "GoogleUtilities"),
304+
.product(name: "nanopb", package: "nanopb"),
305+
],
306+
path: "FirebaseAnalyticsWithoutAdIdSupportWrapper",
307+
linkerSettings: [
308+
.linkedLibrary("sqlite3"),
309+
.linkedLibrary("c++"),
310+
.linkedLibrary("z"),
311+
.linkedFramework("StoreKit"),
312+
]
313+
),
314+
281315
.target(
282316
name: "FirebaseAppDistributionTarget",
283317
dependencies: [.target(name: "FirebaseAppDistribution",

‎SwiftPM-PlatformExclude/FirebaseAnalyticsWithoutAdIdSupportWrap/dummy.m‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// Copyright 2021 Google LLC
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
#import <TargetConditionals.h>
16+
#if !TARGET_OS_IOS
17+
#warning "Firebase Analytics only supports the iOS platform"
18+
#endif

‎SwiftPM-PlatformExclude/FirebaseAnalyticsWithoutAdIdSupportWrap/include/dummy.h‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// Copyright 2021 Google LLC
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
// Prevent a missing umbrella header warning.

0 commit comments

Comments
 (0)