Merge branch 'release/3.3.1'

.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_PATH: "vendor/bundle"

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,17 @@
+# Description
+
+> Why is this change required? What problem does it solve?
+
+# Changes made
+
+> Please list the specific changes made in this pull request.
+
+# Checklist
+
+- The branch should be rebased onto the `develop` branch for whole tests.
+- [ ] APIs have been properly documented (if relevant).
+- [ ] The documentation has been updated (if relevant).
+- [ ] New unit tests have been written (if relevant).
+- [ ] All `UserObjectTestCase` tests has passed successfully locally, included flacky disabled ones.
+- [ ] The demo has been updated (if relevant).
+- [ ] Issues are linked to the PR, if any.

.gitignore

@@ -12,6 +12,5 @@ xcuserdata
 /fastlane/*.xml
 
 /vendor
-/.bundle
 
 .vscode

.ruby-version

@@ -0,0 +1 @@
+3.1.3

.xcode-version

@@ -0,0 +1 @@
+14.3

Demo/Demo.xcconfig

@@ -1,5 +1,5 @@
 // Version information
-MARKETING_VERSION = 3.3.0
+MARKETING_VERSION = 3.3.1
 
 // Deployment targets
 IPHONEOS_DEPLOYMENT_TARGET = 12.0

Demo/SRGUserData-demo.xcodeproj/project.pbxproj

@@ -272,7 +272,8 @@
 		6F0EB52820FC7F58009C02CF /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1400;
+				BuildIndependentTargetsInParallel = YES;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "SRG SSR";
 				TargetAttributes = {
 					6F8A93D720FDCA0800AA6434 = {
@@ -497,7 +498,7 @@
 			baseConfigurationReference = 6FC7C58B23A2A59B0058349C /* Demo.xcconfig */;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
-				DEVELOPMENT_TEAM = VMGRRW6SG7;
+				DEVELOPMENT_TEAM = ABW92QGFZ7;
 				INFOPLIST_FILE = Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -515,7 +516,7 @@
 			baseConfigurationReference = 6FC7C58B23A2A59B0058349C /* Demo.xcconfig */;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
-				DEVELOPMENT_TEAM = VMGRRW6SG7;
+				DEVELOPMENT_TEAM = ABW92QGFZ7;
 				INFOPLIST_FILE = Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -564,7 +565,7 @@
 			repositoryURL = "https://github.com/SRGSSR/srgletterbox-apple.git";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 8.3.0;
+				minimumVersion = 8.4.0;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

Demo/SRGUserData-demo.xcodeproj/xcshareddata/xcschemes/SRGUserData-demo.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1430"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

Demo/SRGUserData-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -60,17 +60,17 @@
         "repositoryURL": "https://github.com/SRGSSR/srganalytics-apple.git",
         "state": {
           "branch": null,
-          "revision": "1ae66aa9dc392c5dbf2cd9dd7be72d277c73c685",
-          "version": "7.9.0"
+          "revision": "45a2a1b1a879ad60b9857c1bc3fa5b4e314f6565",
+          "version": "7.10.0"
         }
       },
       {
         "package": "SRGAppearance",
         "repositoryURL": "https://github.com/SRGSSR/srgappearance-apple.git",
         "state": {
           "branch": null,
-          "revision": "72d9475b46d97ecde0298b5bc80a654e8b424ebb",
-          "version": "5.2.0"
+          "revision": "37858eb83365f498d3861cc546ba86a51e061293",
+          "version": "5.2.1"
         }
       },
       {
@@ -87,8 +87,8 @@
         "repositoryURL": "https://github.com/SRGSSR/srgdataprovider-apple.git",
         "state": {
           "branch": null,
-          "revision": "340c676f77eec1bd437bed91f30165736fc10abb",
-          "version": "16.1.0"
+          "revision": "75818e9de479d6cc460840d6f924be9f144513d8",
+          "version": "17.0.1"
         }
       },
       {
@@ -114,8 +114,8 @@
         "repositoryURL": "https://github.com/SRGSSR/srgletterbox-apple.git",
         "state": {
           "branch": null,
-          "revision": "2db25a0d0729b7f93c137906ea9f921a107d8334",
-          "version": "8.3.0"
+          "revision": "601ba160f29ef4fe8bf024d65c64963b5faf5c9f",
+          "version": "8.4.0"
         }
       },
       {

Gemfile

@@ -7,4 +7,3 @@
 source 'https://rubygems.org'
 
 gem 'fastlane'
-gem 'xcode-install'

Gemfile.lock

@@ -1,27 +1,27 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.5)
+    CFPropertyList (3.0.6)
       rexml
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.616.0)
-    aws-sdk-core (3.132.0)
+    aws-partitions (1.709.0)
+    aws-sdk-core (3.170.0)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.525.0)
-      aws-sigv4 (~> 1.1)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.58.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-kms (1.62.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.114.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-s3 (1.119.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.5.1)
+    aws-sigv4 (1.5.2)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     claide (1.1.0)
@@ -36,8 +36,8 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.92.4)
-    faraday (1.10.1)
+    excon (0.99.0)
+    faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -66,7 +66,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.2.6)
-    fastlane (2.208.0)
+    fastlane (2.211.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -106,9 +106,9 @@ GEM
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.25.0)
-      google-apis-core (>= 0.7, < 2.a)
-    google-apis-core (0.7.0)
+    google-apis-androidpublisher_v3 (0.33.0)
+      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-core (0.11.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -117,27 +117,27 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-iamcredentials_v1 (0.13.0)
-      google-apis-core (>= 0.7, < 2.a)
-    google-apis-playcustomapp_v1 (0.10.0)
-      google-apis-core (>= 0.7, < 2.a)
-    google-apis-storage_v1 (0.17.0)
-      google-apis-core (>= 0.7, < 2.a)
+    google-apis-iamcredentials_v1 (0.16.0)
+      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-playcustomapp_v1 (0.12.0)
+      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-storage_v1 (0.19.0)
+      google-apis-core (>= 0.9.0, < 2.a)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.2.0)
-    google-cloud-storage (1.38.0)
+    google-cloud-errors (1.3.0)
+    google-cloud-storage (1.44.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.17.0)
+      google-apis-storage_v1 (~> 0.19.0)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.2.0)
+    googleauth (1.3.0)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -148,11 +148,11 @@ GEM
     http-cookie (1.0.5)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    jmespath (1.6.1)
-    json (2.6.2)
-    jwt (2.4.1)
+    jmespath (1.6.2)
+    json (2.6.3)
+    jwt (2.7.0)
     memoist (0.16.2)
-    mini_magick (4.11.0)
+    mini_magick (4.12.0)
     mini_mime (1.1.2)
     multi_json (1.15.0)
     multipart-post (2.0.0)
@@ -161,7 +161,7 @@ GEM
     optparse (0.1.1)
     os (1.1.4)
     plist (3.6.0)
-    public_suffix (4.0.7)
+    public_suffix (5.0.1)
     rake (13.0.6)
     representable (3.2.0)
       declarative (< 0.1.0)
@@ -178,7 +178,7 @@ GEM
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    simctl (1.6.8)
+    simctl (1.6.10)
       CFPropertyList
       naturally
     terminal-notifier (2.0.0)
@@ -194,11 +194,8 @@ GEM
       unf_ext
     unf_ext (0.0.8.2)
     unicode-display_width (1.8.0)
-    webrick (1.7.0)
+    webrick (1.8.1)
     word_wrap (1.0.0)
-    xcode-install (2.8.1)
-      claide (>= 0.9.1)
-      fastlane (>= 2.1.0, < 3.0.0)
     xcodeproj (1.22.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
@@ -216,7 +213,6 @@ PLATFORMS
 
 DEPENDENCIES
   fastlane
-  xcode-install
 
 BUNDLED WITH
-   1.17.2
+   2.4.6

Makefile

@@ -15,10 +15,17 @@ test-tvos:
 	@pushd Tests > /dev/null; xcodebuild test -workspace SRGUserData-tests.xcworkspace -scheme SRGUserData-tests -destination 'platform=tvOS Simulator,name=Apple TV' 2> /dev/null
 	@echo "... done.\n"
 
+.PHONY: rbenv
+rbenv:
+	@echo "Installing needed ruby version if missing..."
+	@Scripts/rbenv-install.sh "./"
+	@echo "... done.\n"
+
 .PHONY: help
 help:
 	@echo "The following targets are available:"
 	@echo "   all                 Build and run unit tests for all platforms"
 	@echo "   test-ios            Build and run unit tests for iOS"
 	@echo "   test-tvos           Build and run unit tests for tvOS"
+	@echo "   rbenv               Install needed ruby version if missing"
 	@echo "   help                Display this help message"

Package.swift

@@ -3,7 +3,7 @@
 import PackageDescription
 
 struct ProjectSettings {
-    static let marketingVersion: String = "3.3.0"
+    static let marketingVersion: String = "3.3.1"
 }
 
 let package = Package(
@@ -27,7 +27,6 @@ let package = Package(
             name: "SRGUserData",
             dependencies: ["SRGIdentity"],
             resources: [
-                .process("Data"),
                 .process("Resources")
             ],
             cSettings: [

Scripts/coredata-compilation-fix.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# This script attempts to apply write permission on XC mapping files, to avoid MappingModelCompile errors.
+# It should be applied as a pre-action of a target build. 
+
+REPOSITORY_FOLDER=$1
+
+echo "SRGUserData: pre-action started."
+
+if [[ -z "${REPOSITORY_FOLDER}" ]]; then
+    echo "SRGUserData: a repository folder must be provided."
+    exit 1
+fi
+
+# Get SRGUserData CoreData checkout path.
+SRG_USER_DATA_DATA="${REPOSITORY_FOLDER}/Sources/SRGUserData/Data"
+
+if [[ -z "${SRG_USER_DATA_DATA}" ]]; then
+    echo "SRGUserData: warning, SRGUserData Data folder does not exist."
+    exit 0
+fi
+
+find "$SRG_USER_DATA_DATA" -type d -name "*.xcmappingmodel" -exec chmod +w {}/xcmapping.xml \;
+echo "SRGUserData: the xcmapping.xml files have write permission now."

Scripts/rbenv-install.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# This script attempts to install the local ruby version if not installed.
+
+REPOSITORY_FOLDER=$1
+
+if [[ -z "${REPOSITORY_FOLDER}" ]]; then
+    echo "A repository folder must be provided."
+    exit 1
+fi
+
+RUBY_VERSION=$(cat "${REPOSITORY_FOLDER}/.ruby-version")
+
+if [[ -z "${RUBY_VERSION}" ]]; then
+    echo "A local ruby version must be provided in .ruby-version file. See rbenv local command."
+    exit 1
+fi
+
+if ! rbenv versions | grep "${RUBY_VERSION}" &> /dev/null; then
+    echo "Need to install Ruby ${RUBY_VERSION}."
+    rbenv install "${RUBY_VERSION}"
+    echo "Ruby ${RUBY_VERSION} now installed."
+else 
+    echo "Ruby ${RUBY_VERSION} already installed."
+fi