From df7d494a93743fec017fc5590a7c3548e38049a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20De=CC=81fago?= Date: Thu, 25 Jan 2024 14:24:42 +0100 Subject: [PATCH 1/7] Bump version number --- Demo/Demo.xcconfig | 2 +- Package.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/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( From 7630d85380a64e39fc49657cfbfd0d8cf2aa0598 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20D=C3=A9fago?= Date: Mon, 11 Mar 2024 12:44:33 +0100 Subject: [PATCH 2/7] Add Pillarbox migration instructions (#86) --- docs/README.md | 5 +++++ 1 file changed, 5 insertions(+) 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. From 1f2b6cf70e462bc9ae6811d37150b4e8e5ae2f65 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Date: Wed, 13 Mar 2024 00:06:43 +0100 Subject: [PATCH 3/7] Build and test with Xcode 15.3 (#87) --- .xcode-version | 2 +- fastlane/Fastfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.xcode-version b/.xcode-version index 9dc738e6..8e0f4114 100644 --- a/.xcode-version +++ b/.xcode-version @@ -1 +1 @@ -15.0.1 \ No newline at end of file +15.3 \ No newline at end of file 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 From d8a0a3dd0bb91d6ffd7879a45e76915d2e406705 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20D=C3=A9fago?= Date: Mon, 18 Mar 2024 13:52:04 +0100 Subject: [PATCH 4/7] Add compilation warning about SRG Analytics decommissioning (#88) --- Sources/SRGAnalytics/SRGAnalytics.m | 2 ++ 1 file changed, 2 insertions(+) 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; From 1dc5904b6a9319b0794898bc25d75d5f2bf0a4cf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 May 2024 18:23:12 +0200 Subject: [PATCH 5/7] Bump rexml from 3.2.5 to 3.2.8 (#89) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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) From 36f3bc6b596398979bdc2a976d9fe1adc231da13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20D=C3=A9fago?= Date: Mon, 3 Jun 2024 08:20:25 +0200 Subject: [PATCH 6/7] Provide audio description information in analytics labels (#90) Co-authored-by: Pierre-Yves Bertholon --- Sources/SRGAnalyticsMediaPlayer/SRGMediaPlayerTracker.m | 3 +++ 1 file changed, 3 insertions(+) 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"]; From 73c167faf797c007671fc87c0999a975c8f8e066 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Date: Wed, 5 Jun 2024 15:26:46 +0200 Subject: [PATCH 7/7] Build and test with Xcode 15.4 (#91) --- .xcode-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.xcode-version b/.xcode-version index 8e0f4114..441e3fb3 100644 --- a/.xcode-version +++ b/.xcode-version @@ -1 +1 @@ -15.3 \ No newline at end of file +15.4 \ No newline at end of file