diff --git a/.xcode-version b/.xcode-version index 9dc738e6..441e3fb3 100644 --- a/.xcode-version +++ b/.xcode-version @@ -1 +1 @@ -15.0.1 \ No newline at end of file +15.4 \ No newline at end of file diff --git a/Demo/Demo.xcconfig b/Demo/Demo.xcconfig index 7418dddb..b33ecee9 100644 --- a/Demo/Demo.xcconfig +++ b/Demo/Demo.xcconfig @@ -1,5 +1,5 @@ // Version information -MARKETING_VERSION = 9.1.0 +MARKETING_VERSION = 9.1.1 // Deployment targets IPHONEOS_DEPLOYMENT_TARGET = 12.0 diff --git a/Gemfile.lock b/Gemfile.lock index ef6facd5..7a393144 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -168,7 +168,8 @@ GEM trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.2.5) + rexml (3.2.8) + strscan (>= 3.0.9) rouge (2.0.7) ruby2_keywords (0.0.5) rubyzip (2.3.2) @@ -181,6 +182,7 @@ GEM simctl (1.6.10) CFPropertyList naturally + strscan (3.1.0) terminal-notifier (2.0.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) diff --git a/Package.swift b/Package.swift index b425e466..39c2dc18 100644 --- a/Package.swift +++ b/Package.swift @@ -3,7 +3,7 @@ import PackageDescription struct ProjectSettings { - static let marketingVersion: String = "9.1.0" + static let marketingVersion: String = "9.1.1" } let package = Package( diff --git a/Sources/SRGAnalytics/SRGAnalytics.m b/Sources/SRGAnalytics/SRGAnalytics.m index 62b35f41..49d08df2 100644 --- a/Sources/SRGAnalytics/SRGAnalytics.m +++ b/Sources/SRGAnalytics/SRGAnalytics.m @@ -6,6 +6,8 @@ #import "SRGAnalytics.h" +#warning "SRG Analytics will be sunset in August 2025. Please upgrade to Pillarbox Analytics (https://github.com/SRGSSR/pillarbox-apple)." + NSString *SRGAnalyticsMarketingVersion(void) { return @MARKETING_VERSION; diff --git a/Sources/SRGAnalyticsMediaPlayer/SRGMediaPlayerTracker.m b/Sources/SRGAnalyticsMediaPlayer/SRGMediaPlayerTracker.m index 129a822b..3e2e628a 100644 --- a/Sources/SRGAnalyticsMediaPlayer/SRGMediaPlayerTracker.m +++ b/Sources/SRGAnalyticsMediaPlayer/SRGMediaPlayerTracker.m @@ -234,6 +234,9 @@ - (void)recordEvent:(MediaPlayerTrackerEvent)event if (self.lastAudioTrackMediaOption) { NSString *audioTrackLanguageCode = [self.lastAudioTrackMediaOption.locale objectForKey:NSLocaleLanguageCode] ?: @"und"; [labels srg_safelySetString:audioTrackLanguageCode.uppercaseString forKey:@"media_audio_track"]; + + BOOL audioDescribed = [self.lastAudioTrackMediaOption hasMediaCharacteristic:AVMediaCharacteristicDescribesVideoForAccessibility]; + [labels srg_safelySetString:audioDescribed ? @"true" : @"false" forKey:@"media_audiodescription_on"]; } [labels srg_safelySetString:self.bandwidthInBitsPerSecond.stringValue forKey:@"media_bandwidth"]; diff --git a/docs/README.md b/docs/README.md index a44f6770..6a5dde28 100644 --- a/docs/README.md +++ b/docs/README.md @@ -2,6 +2,11 @@ [![GitHub releases](https://img.shields.io/github/v/release/SRGSSR/srganalytics-apple)](https://github.com/SRGSSR/srganalytics-apple/releases) [![platform](https://img.shields.io/badge/platfom-ios%20%7C%20tvos-blue)](https://github.com/SRGSSR/srganalytics-apple) [![SPM compatible](https://img.shields.io/badge/SPM-compatible-4BC51D.svg?style=flat)](https://swift.org/package-manager) [![GitHub license](https://img.shields.io/github/license/SRGSSR/srganalytics-apple)](https://github.com/SRGSSR/srganalytics-apple/blob/master/LICENSE) +> [!IMPORTANT] +> Letterbox will be sunset in August 2025, replaced by [Pillarbox](https://github.com/SRGSSR/pillarbox-apple). SRG Analytics will be decommissioned as well, replaced by an equivalent Analytics package available from Pillarbox: +> - New SRG SSR products must use Pillarbox Analytics only. +> - Existing SRG SSR products using SRG Analytics must transition to Pillarbox Analytics before this date. + ## About The SRG Analytics library makes it easy to add usage tracking information to your iOS and tvOS applications, following the SRG SSR standards. diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 44eba153..93f786bf 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -26,8 +26,8 @@ platform :ios do clean_result_files clean_derived_data - iphone14 = Device.new('iOS', 'iPhone 14') - appletv = Device.new('tvOS', 'Apple TV,OS=17.0') + iphone14 = Device.new('iOS', 'iPhone 15') + appletv = Device.new('tvOS', 'Apple TV') devices = [iphone14, appletv] scheme = swift_package_name