Skip to content

Commit dbb5e4d

Browse files
authored
Analytics tvOS support. (#715)
* Add Analytics tvOS support on top of the 8.9.0 iOS update. * Update minimum tvOS version to 12.0 for testapps.
1 parent 58dbf86 commit dbb5e4d

File tree

8 files changed

+338
-7
lines changed

8 files changed

+338
-7
lines changed

CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,8 @@ if(FIREBASE_CPP_BUILD_TESTS OR FIREBASE_CPP_BUILD_STUB_TESTS)
121121
endif()
122122

123123
if (PLATFORM STREQUAL TVOS OR PLATFORM STREQUAL SIMULATOR_TVOS)
124-
# Analytics, AdMob, FDL are not supported on tvOS.
124+
# AdMob and FDL are not supported on tvOS.
125125
set(FIREBASE_INCLUDE_ADMOB OFF)
126-
set(FIREBASE_INCLUDE_ANALYTICS OFF)
127126
set(FIREBASE_INCLUDE_DYNAMIC_LINKS OFF)
128127
endif()
129128

analytics/integration_test/Podfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ platform :ios, '10.0'
44
# Firebase Analytics test application.
55

66
target 'integration_test' do
7+
platform :ios, '10.0'
8+
pod 'Firebase/Analytics', '8.9.0'
9+
end
10+
11+
target 'integration_test_tvos' do
12+
platform :tvos, '12.0'
713
pod 'Firebase/Analytics', '8.9.0'
814
end
915

analytics/integration_test/integration_test.xcodeproj/project.pbxproj

Lines changed: 272 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<document type="com.apple.InterfaceBuilder.AppleTV.Storyboard" version="3.0" toolsVersion="13122.16" targetRuntime="AppleTV" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
3+
<dependencies>
4+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
5+
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
6+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
7+
</dependencies>
8+
<scenes>
9+
<!--View Controller-->
10+
<scene sceneID="tne-QT-ifu">
11+
<objects>
12+
<viewController id="BYZ-38-t0r" sceneMemberID="viewController">
13+
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
14+
<rect key="frame" x="0.0" y="0.0" width="1920" height="1080"/>
15+
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
16+
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
17+
<viewLayoutGuide key="safeArea" id="wu6-TO-1qx"/>
18+
</view>
19+
</viewController>
20+
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
21+
</objects>
22+
</scene>
23+
</scenes>
24+
</document>
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document type="com.apple.InterfaceBuilder.AppleTV.Storyboard" version="3.0" toolsVersion="13122.16" targetRuntime="AppleTV" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
3+
<dependencies>
4+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
5+
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
6+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
7+
</dependencies>
8+
<scenes>
9+
<!--View Controller-->
10+
<scene sceneID="tne-QT-ifu">
11+
<objects>
12+
<viewController id="BYZ-38-t0r" customClass="ViewController" customModuleProvider="" sceneMemberID="viewController">
13+
<layoutGuides>
14+
<viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
15+
<viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
16+
</layoutGuides>
17+
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
18+
<rect key="frame" x="0.0" y="0.0" width="1920" height="1080"/>
19+
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
20+
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
21+
<viewLayoutGuide key="safeArea" id="wu6-TO-1qx"/>
22+
</view>
23+
</viewController>
24+
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
25+
</objects>
26+
</scene>
27+
</scenes>
28+
</document>

release_build_files/readme.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -571,6 +571,7 @@ code.
571571
- Changes
572572
- General: Variant double type now support 64-bit while saving to json.
573573
([#1133](https://github.com/firebase/quickstart-unity/issues/1133)).
574+
- Analytics (tvOS): Analytics is now supported on tvOS.
574575

575576
### 8.6.0
576577
- Changes

scripts/gha/build_ios_tvos.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,11 @@
6565
},
6666

6767
'tvos': {
68-
'supported_targets' : ('firebase_auth', 'firebase_database',
69-
'firebase_firestore', 'firebase_functions',
70-
'firebase_installations', 'firebase_messaging',
71-
'firebase_remote_config', 'firebase_storage'),
68+
'supported_targets' : ('firebase_auth', 'firebase_analytics',
69+
'firebase_database', 'firebase_firestore',
70+
'firebase_functions', 'firebase_installations',
71+
'firebase_messaging', 'firebase_remote_config',
72+
'firebase_storage'),
7273
'device': {
7374
'architectures' : ('arm64',),
7475
'toolchain' : 'cmake/toolchains/apple.toolchain.cmake',

scripts/gha/integration_testing/build_testapps.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"full_name": "FirebaseAnalytics",
3232
"bundle_id": "com.google.ios.analytics.testapp",
3333
"ios_target": "integration_test",
34-
"tvos_target": "",
34+
"tvos_target": "integration_test_tvos",
3535
"testapp_path": "analytics/integration_test",
3636
"frameworks": [
3737
"firebase_analytics.xcframework",

0 commit comments

Comments
 (0)