Update targets and CI for 8.9.0 (#8830)

Author: paulb777

.github/workflows/analytics.yml

@@ -18,14 +18,18 @@ jobs:
     if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
 
     runs-on: macos-11
+
+    strategy:
+      matrix:
+        target: [ios, tvos, macos]
     steps:
     - uses: actions/checkout@v2
     - name: Setup Bundler
       run: scripts/setup_bundler.sh
     - name: GoogleAppMeasurement
-      run: scripts/third_party/travis/retry.sh pod spec lint GoogleAppMeasurement.podspec.json --sources=https://github.com/firebase/SpecsDev.git,https://github.com/firebase/SpecsStaging.git,https://cdn.cocoapods.org/
+      run: scripts/third_party/travis/retry.sh pod spec lint GoogleAppMeasurement.podspec.json --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=ios
+      run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseAnalyticsSwift.podspec --platforms=${{ matrix.target }}
 
 # TODO: Consider pushing GoogleAppMeasurement.podspec.json to SpecsDev to enable similar test
 # for FirebaseAnalytics.podspec.json

.github/workflows/spm.yml

@@ -37,9 +37,8 @@ jobs:
     - uses: actions/checkout@v2
     - name: Initialize xcodebuild
       run: scripts/setup_spm_tests.sh
-    - name: iOS Unit Tests
-      # TODO (#7785) Change to Firebase-Package when #7785 is resolved.
-      run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseFirestoreSwift-Beta iOS-device spmbuildonly
+    - name: iOS Device and Test Build
+      run: scripts/third_party/travis/retry.sh ./scripts/build.sh Firebase-Package iOS-device spmbuildonly
 
   platforms:
     # Don't run on private repo unless it is a PR.
@@ -60,3 +59,5 @@ jobs:
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh swift-test ${{ matrix.target }} spm
     - name: Version Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh version-test ${{ matrix.target }} spm
+    - name: Analytics Build Tests
+      run: scripts/third_party/travis/retry.sh ./scripts/build.sh analytics-import-test ${{ matrix.target }} spm

Firebase.podspec

@@ -33,8 +33,10 @@ Simplify your app development, grow your user base, and monetize more effectivel
   s.subspec 'Core' do |ss|
     ss.ios.deployment_target = '9.0'
     ss.osx.deployment_target = '10.12'
-    ss.tvos.deployment_target = '10.0'
+    ss.tvos.deployment_target = '12.0'
     ss.ios.dependency 'FirebaseAnalytics', '~> 8.9.0'
+    ss.osx.dependency 'FirebaseAnalytics', '~> 8.9.0'
+    ss.tvos.dependency 'FirebaseAnalytics', '~> 8.9.0'
     ss.dependency 'Firebase/CoreOnly'
   end
 
@@ -59,16 +61,22 @@ Simplify your app development, grow your user base, and monetize more effectivel
 
   s.subspec 'Analytics' do |ss|
     ss.ios.deployment_target = '9.0'
+    ss.osx.deployment_target = '10.12'
+    ss.tvos.deployment_target = '12.0'
     ss.dependency 'Firebase/Core'
   end
 
   s.subspec 'AnalyticsWithAdIdSupport' do |ss|
     ss.ios.deployment_target = '9.0'
+    ss.osx.deployment_target = '10.12'
+    ss.tvos.deployment_target = '12.0'
     ss.dependency 'Firebase/Core'
   end
 
   s.subspec 'AnalyticsWithoutAdIdSupport' do |ss|
     ss.ios.deployment_target = '9.0'
+    ss.osx.deployment_target = '10.12'
+    ss.tvos.deployment_target = '12.0'
     ss.ios.dependency 'FirebaseAnalytics/WithoutAdIdSupport', '~> 8.9.0'
     ss.dependency 'Firebase/CoreOnly'
   end

FirebaseAnalyticsSwift.podspec

@@ -19,6 +19,8 @@ Firebase Analytics is a free, out-of-the-box analytics solution that inspires ac
   s.static_framework        = true
   s.swift_version           = '5.0'
   s.ios.deployment_target   = '13.0'
+  s.osx.deployment_target   = '10.15'
+  s.tvos.deployment_target  = '13.0'
 
   s.cocoapods_version       = '>= 1.10.0'
   s.prefix_header_file      = false

FirebaseAnalyticsSwift/Sources/Analytics+SwiftUI.swift

@@ -17,10 +17,7 @@
   import SwiftUI
 
   /// Custom view modifier to allow for easily logging screen view events.
-  @available(iOS 13, *)
-  @available(tvOS, unavailable)
-  @available(macOS, unavailable)
-  @available(macCatalyst, unavailable)
+  @available(iOS 13.0, macOS 10.15, macCatalyst 13.0, tvOS 13.0, *)
   @available(watchOS, unavailable)
   internal struct LoggedAnalyticsModifier: ViewModifier {
     /// The name of the view to log in the `AnalyticsParameterScreenName` parameter.
@@ -45,10 +42,7 @@
     }
   }
 
-  @available(iOS 13, *)
-  @available(tvOS, unavailable)
-  @available(macOS, unavailable)
-  @available(macCatalyst, unavailable)
+  @available(iOS 13.0, macOS 10.15, macCatalyst 13.0, tvOS 13.0, *)
   @available(watchOS, unavailable)
   public extension View {
     /// Logs `screen_view` events in Google Analytics for Firebase when this view appears on screen.

Package.swift

@@ -21,7 +21,7 @@ let firebaseVersion = "8.9.0"
 
 let package = Package(
   name: "Firebase",
-  platforms: [.iOS(.v11), .macOS(.v10_12), .tvOS(.v10), .watchOS(.v7)],
+  platforms: [.iOS(.v11), .macOS(.v10_12), .tvOS(.v12), .watchOS(.v7)],
   products: [
     .library(
       name: "FirebaseAnalytics",
@@ -275,10 +275,10 @@ let package = Package(
     .target(
       name: "FirebaseAnalyticsWrapper",
       dependencies: [
-        .target(name: "FirebaseAnalytics", condition: .when(platforms: [.iOS])),
+        .target(name: "FirebaseAnalytics", condition: .when(platforms: [.iOS, .macOS, .tvOS])),
         .product(name: "GoogleAppMeasurement",
                  package: "GoogleAppMeasurement",
-                 condition: .when(platforms: [.iOS])),
+                 condition: .when(platforms: [.iOS, .macOS, .tvOS])),
         "FirebaseCore",
         "FirebaseInstallations",
         .product(name: "GULAppDelegateSwizzler", package: "GoogleUtilities"),
@@ -303,7 +303,7 @@ let package = Package(
     .target(
       name: "FirebaseAnalyticsSwiftTarget",
       dependencies: [.target(name: "FirebaseAnalyticsSwift",
-                             condition: .when(platforms: [.iOS]))],
+                             condition: .when(platforms: [.iOS, .macOS, .tvOS]))],
       path: "SwiftPM-PlatformExclude/FirebaseAnalyticsSwiftWrap"
     ),
     .target(
@@ -315,13 +315,13 @@ let package = Package(
     .target(
       name: "FirebaseAnalyticsWithoutAdIdSupportTarget",
       dependencies: [.target(name: "FirebaseAnalyticsWithoutAdIdSupportWrapper",
-                             condition: .when(platforms: [.iOS]))],
+                             condition: .when(platforms: [.iOS, .macOS, .tvOS]))],
       path: "SwiftPM-PlatformExclude/FirebaseAnalyticsWithoutAdIdSupportWrap"
     ),
     .target(
       name: "FirebaseAnalyticsWithoutAdIdSupportWrapper",
       dependencies: [
-        .target(name: "FirebaseAnalytics", condition: .when(platforms: [.iOS])),
+        .target(name: "FirebaseAnalytics", condition: .when(platforms: [.iOS, .macOS, .tvOS])),
         .product(name: "GoogleAppMeasurementWithoutAdIdSupport",
                  package: "GoogleAppMeasurement",
                  condition: .when(platforms: [.iOS])),

SwiftPM-PlatformExclude/FirebaseAnalyticsSwiftWrap/dummy.m

@@ -13,6 +13,6 @@
 // limitations under the License.
 
 #import <TargetConditionals.h>
-#if !TARGET_OS_IOS
-#warning "Firebase Analytics only supports the iOS platform"
+#if TARGET_OS_WATCH
+#warning "Firebase Analytics does not support the watchOS platform"
 #endif

SwiftPMTests/analytics-import-test/analytics-import.swift

@@ -25,10 +25,7 @@ class importTest: XCTestCase {
                        parameters: [AnalyticsParameterShipping: 10.0])
   }
 
-  @available(iOS 13, *)
-  @available(tvOS, unavailable)
-  @available(macOS, unavailable)
-  @available(macCatalyst, unavailable)
+  @available(iOS 13.0, macOS 10.15, macCatalyst 13.0, tvOS 13.0, *)
   @available(watchOS, unavailable)
   func testAnalyticsSwiftImported() {
     _ = Text("Hello, Analytics")

scripts/build.sh

@@ -158,6 +158,7 @@ fi
 
 ios_device_flags=(
   -sdk 'iphoneos'
+  -destination 'generic/platform=iOS'
 )
 
 ipad_flags=(