Skip to content

Commit

Permalink
[Analytics] Consolidate Analytics and AnalyticsSwift
Browse files Browse the repository at this point in the history
  • Loading branch information
ncooke3 committed Oct 18, 2023
1 parent c423781 commit 7df616f
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/analytics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- 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/
- name: FirebaseAnalyticsSwift
run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseAnalyticsSwift.podspec --platforms=${{ matrix.target }}
run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseAnalyticsSwift.podspec --allow-warnings --platforms=${{ matrix.target }}
# 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/
Expand Down
File renamed without changes.
2 changes: 2 additions & 0 deletions FirebaseAnalytics/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
This directory open sources select files from the Firebase Analytics SDK. Note
that there is no open source infastructure to build or package them.
2 changes: 1 addition & 1 deletion FirebaseAnalyticsSwift.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Firebase Analytics is a free, out-of-the-box analytics solution that inspires ac
'FirebaseAnalyticsSwift/Sources/*.swift',
]

s.dependency 'FirebaseAnalytics', '~> 10.0'
s.dependency 'FirebaseAnalytics', '~> 10.17'

s.test_spec 'swift-unit' do |swift_unit_tests|
swift_unit_tests.platforms = {
Expand Down
7 changes: 7 additions & 0 deletions FirebaseAnalyticsSwift/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# 10.17.0
- [deprecated] All of the public API from `FirebaseAnalyticsSwift` can now
be accessed through the `FirebaseAnalytics` module. Therefore,
`FirebaseAnalyticsSwift` has been deprecated, and will be removed in a
future release. See https://firebase.google.com/docs/ios/swift-migration for
migration instructions.

# 9.0.0
- [added] **Breaking change:** `FirebaseAnalyticsSwift` has exited beta and is
now generally available for use.
Expand Down
17 changes: 17 additions & 0 deletions FirebaseAnalyticsSwift/Sources/FirebaseAnalyticsSwift.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// Copyright 2023 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.

#warning(
"All of the public API from `FirebaseAnalyticsSwift` can now be accessed through the `FirebaseAnalytics` module. Therefore, the `FirebaseAnalyticsSwift` module is deprecated and will be removed in the future. See https://firebase.google.com/docs/ios/swift-migration for migration instructions."
)
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public let shared = Manifest(
Pod("GoogleAppMeasurementOnDeviceConversion", isClosedSource: true, platforms: ["ios"]),
Pod("FirebaseAnalytics", isClosedSource: true),
Pod("FirebaseAnalyticsOnDeviceConversion", platforms: ["ios"], zip: true),
Pod("FirebaseAnalyticsSwift", zip: true),
Pod("FirebaseAnalyticsSwift", allowWarnings: true, zip: true),
Pod("FirebaseABTesting", zip: true),
Pod("FirebaseAppCheck", zip: true),
Pod("FirebaseRemoteConfig"),
Expand Down

0 comments on commit 7df616f

Please sign in to comment.