Merge branch 'release/7.0.0'

SRGSSR · Feb 12, 2021 · 8d2ccb6 · 8d2ccb6
2 parents 635e3b5 + c67e8d2
commit 8d2ccb6
Show file tree

Hide file tree

Showing 30 changed files with 311 additions and 454 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,7 +8,7 @@ xcuserdata/
 *.xcscmblueprint
 xcuserdata
 
-/fastlane/*.xcresult
+/fastlane/xcresult
 /fastlane/*.xml
 
 /vendor

diff --git a/.rubocop.yml b/.rubocop.yml
@@ -0,0 +1,35 @@
+inherit_mode:
+  merge:
+    - Include
+
+AllCops:
+  Exclude:
+    - 'Carthage/**/*'
+    - 'Demo/Carthage/**/*'
+    - 'vendor/**/*'
+  Include:
+    - 'fastlane/Pluginfile'
+
+# this would cause errors with long lanes
+Metrics/BlockLength:
+  Enabled: true
+  ExcludedMethods: ['platform', 'for_platform']
+
+# Lane description and gem lines can be long
+Layout/LineLength:
+  Enabled: true
+  Max: 100
+  IgnoredPatterns: ['^gem', '^(\s+|)desc', '^(\s+|)UI.']
+
+# They have not to be snake_case
+Naming/FileName:
+  Exclude:
+    - '**/Appfile'
+    - '**/Gemfile'
+    - '**/Pluginfile'
+    - '**/Fastfile'
+
+# Variables have to be as described in fastlane documentation
+Style/RedundantInterpolation:
+  Exclude:
+    - '**/Appfile'
diff --git a/Demo/Demo.xcconfig b/Demo/Demo.xcconfig
@@ -1,5 +1,5 @@
 // Version information
-MARKETING_VERSION = 6.1.1
+MARKETING_VERSION = 7.0.0
 
 // Deployment targets
 IPHONEOS_DEPLOYMENT_TARGET = 9.0

diff --git a/Demo/SRGAnalytics-demo.xcodeproj/project.pbxproj b/Demo/SRGAnalytics-demo.xcodeproj/project.pbxproj
@@ -185,7 +185,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = SRG;
-				LastUpgradeCheck = 1220;
+				LastUpgradeCheck = 1240;
 				ORGANIZATIONNAME = "SRG SSR";
 				TargetAttributes = {
 					E6FC7E871D61F95C00A55085 = {

diff --git a/Demo/SRGAnalytics-demo.xcodeproj/xcshareddata/xcschemes/SRGAnalytics-demo.xcscheme b/Demo/SRGAnalytics-demo.xcodeproj/xcshareddata/xcschemes/SRGAnalytics-demo.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1220"
+   LastUpgradeVersion = "1240"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Demo/SRGAnalytics-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Demo/SRGAnalytics-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -3,11 +3,11 @@
     "pins": [
       {
         "package": "ComScore",
-        "repositoryURL": "https://github.com/SRGSSR/ComScore-xcframework-apple.git",
+        "repositoryURL": "https://github.com/comScore/Comscore-Swift-Package-Manager.git",
         "state": {
           "branch": null,
-          "revision": "b5dc5dc60435f363a744e17975957361c844aa38",
-          "version": "6.6.0"
+          "revision": "805ef197755a66e634fccb5d23d9068ca5c1f395",
+          "version": "6.7.0"
         }
       },
       {
@@ -51,71 +51,71 @@
         "repositoryURL": "https://github.com/SRGSSR/srgappearance-apple.git",
         "state": {
           "branch": null,
-          "revision": "80ebf882d46451001c1fd7d3e21baa264ad88477",
-          "version": "3.0.1"
+          "revision": "1e635509b57626073cfff3d74037214e2e42e6e5",
+          "version": "3.0.2"
         }
       },
       {
         "package": "SRGContentProtection",
         "repositoryURL": "https://github.com/SRGSSR/srgcontentprotection-apple.git",
         "state": {
           "branch": null,
-          "revision": "596f4161b4460fc648d30d5d3ca2c16f249863ef",
-          "version": "3.0.1"
+          "revision": "a839c5343c8789f33c34d07d2a24a7de6eb4c054",
+          "version": "3.0.3"
         }
       },
       {
         "package": "SRGDataProvider",
         "repositoryURL": "https://github.com/SRGSSR/srgdataprovider-apple.git",
         "state": {
           "branch": null,
-          "revision": "02673482b77adacbcdeac82db60116f893d2d817",
-          "version": "9.1.0"
+          "revision": "6556ac22f611b1f4913264ebb20f513165b0f748",
+          "version": "10.0.0"
         }
       },
       {
         "package": "SRGDiagnostics",
         "repositoryURL": "https://github.com/SRGSSR/srgdiagnostics-apple.git",
         "state": {
           "branch": null,
-          "revision": "5d2ef5c833a5cf6e56762a9c506e73f58ccad5e8",
-          "version": "3.0.0"
+          "revision": "ca2fe9329aa174281ac97bd4630096ff7cf41d58",
+          "version": "3.0.1"
         }
       },
       {
         "package": "SRGIdentity",
         "repositoryURL": "https://github.com/SRGSSR/srgidentity-apple.git",
         "state": {
           "branch": null,
-          "revision": "e1fe679ea1aefb5b4c80445ae70aa86b9a497aea",
-          "version": "3.0.0"
+          "revision": "4b5db1151c7f15364665cbfbc28dfce5b60cfceb",
+          "version": "3.0.3"
         }
       },
       {
         "package": "SRGLogger",
         "repositoryURL": "https://github.com/SRGSSR/srglogger-apple.git",
         "state": {
           "branch": null,
-          "revision": "cfc39d1223ed039aeb7df38c6c7570977b22d1aa",
-          "version": "3.0.0"
+          "revision": "9e5bf082222f5499996b931a8651aac6ea17ba4a",
+          "version": "3.0.1"
         }
       },
       {
         "package": "SRGMediaPlayer",
         "repositoryURL": "https://github.com/SRGSSR/srgmediaplayer-apple.git",
         "state": {
           "branch": null,
-          "revision": "a0f192296817d471fbe48dc8623ab851a9266369",
-          "version": "6.1.0"
+          "revision": "7ba6b8f78205ec9186d67aa9d1c40e376ffd4909",
+          "version": "6.1.2"
         }
       },
       {
         "package": "SRGNetwork",
         "repositoryURL": "https://github.com/SRGSSR/srgnetwork-apple.git",
         "state": {
           "branch": null,
-          "revision": "734fe399088b2f846e9e69d48a43118f6a8dc0d2",
-          "version": "3.0.0"
+          "revision": "76a83f3b6219f501b589317f8cc0a11556e0565a",
+          "version": "3.0.1"
         }
       },
       {

diff --git a/Demo/Sources/Application/AppDelegate.m b/Demo/Sources/Application/AppDelegate.m
@@ -33,8 +33,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 
     SRGAnalyticsConfiguration *configuration = [[SRGAnalyticsConfiguration alloc] initWithBusinessUnitIdentifier:SRGAnalyticsBusinessUnitIdentifierRTS
                                                                                                        container:10
-                                                                                                        siteName:@"rts-app-test-v"
-                                                                                             netMetrixIdentifier:@"test"];
+                                                                                                        siteName:@"rts-app-test-v"];
     [SRGAnalyticsTracker.sharedTracker startWithConfiguration:configuration identityService:SRGIdentityService.currentIdentityService];
 
     self.window.rootViewController = ApplicationRootViewController();

diff --git a/Gemfile b/Gemfile
@@ -7,6 +7,7 @@
 source 'https://rubygems.org'
 
 gem 'fastlane'
+gem 'xcode-install'
 
 plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
 eval_gemfile(plugins_path) if File.exist?(plugins_path)