.gitignore

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

.rubocop.yml

@@ -4,16 +4,15 @@ inherit_mode:
 
 AllCops:
   Exclude:
-    - 'Carthage/**/*'
-    - 'Demo/Carthage/**/*'
     - 'vendor/**/*'
   Include:
     - 'fastlane/Pluginfile'
+  NewCops: enable
 
 # this would cause errors with long lanes
 Metrics/BlockLength:
   Enabled: true
-  ExcludedMethods: ['platform', 'for_platform']
+  IgnoredMethods: ['platform', 'for_platform']
 
 # Lane description and gem lines can be long
 Layout/LineLength:

.swiftlint.yml

@@ -0,0 +1,17 @@
+disabled_rules:
+    - identifier_name
+    - statement_position
+    - todo
+
+line_length: 300
+
+trailing_whitespace:
+  ignores_empty_lines: true
+  severity: warning
+
+nesting:
+  type_level: 2
+
+excluded:
+  - .build
+  - vendor

Demo/Demo.xcconfig

@@ -1,8 +1,8 @@
 // Version information
-MARKETING_VERSION = 3.0.4
+MARKETING_VERSION = 3.3.0
 
 // Deployment targets
-IPHONEOS_DEPLOYMENT_TARGET = 9.0
+IPHONEOS_DEPLOYMENT_TARGET = 12.0
 TVOS_DEPLOYMENT_TARGET = 12.0
 
 // Configuration to have a single target built for all platforms

Demo/SRGIdentity-demo.xcodeproj/project.pbxproj

@@ -186,7 +186,7 @@
 		6F0EB52820FC7F58009C02CF /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1240;
+				LastUpgradeCheck = 1400;
 				ORGANIZATIONNAME = "SRG SSR";
 				TargetAttributes = {
 					6F8A93D720FDCA0800AA6434 = {
@@ -288,6 +288,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -350,6 +351,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -374,7 +376,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 6F0402F4233131AE00DA4D97 /* Demo.xcconfig */;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = "$(APP_ICONS_SOURCE)";
 				CODE_SIGN_ENTITLEMENTS = Demo.entitlements;
 				DEVELOPMENT_TEAM = VMGRRW6SG7;
 				INFOPLIST_FILE = Info.plist;
@@ -391,7 +392,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 6F0402F4233131AE00DA4D97 /* Demo.xcconfig */;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = "$(APP_ICONS_SOURCE)";
 				CODE_SIGN_ENTITLEMENTS = Demo.entitlements;
 				DEVELOPMENT_TEAM = VMGRRW6SG7;
 				INFOPLIST_FILE = Info.plist;

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

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

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

@@ -6,62 +6,62 @@
         "repositoryURL": "https://github.com/SRGSSR/FXReachability.git",
         "state": {
           "branch": null,
-          "revision": "1eac916df0045630e779fa60eef22ed0d185e15f",
-          "version": "1.3.2-srg5"
+          "revision": "b8d60cfbe6eddf1a622476548465efed88afb564",
+          "version": "1.3.2-srg6"
         }
       },
       {
         "package": "libextobjc",
         "repositoryURL": "https://github.com/SRGSSR/libextobjc.git",
         "state": {
           "branch": null,
-          "revision": "30ee5b73bdf57a826978aa146881277f22369be1",
-          "version": "0.6.0-srg3"
+          "revision": "9c9a7327410fe3f7cdb695965ced43b9a7766ee0",
+          "version": "0.6.0-srg4"
         }
       },
       {
         "package": "MAKVONotificationCenter",
         "repositoryURL": "https://github.com/SRGSSR/MAKVONotificationCenter.git",
         "state": {
           "branch": null,
-          "revision": "60395e0601ffd4a784856b423d4cac558366276d",
-          "version": "1.0.0-srg5"
+          "revision": "8bde3cdc872085bd31f4cfe546bdf8e6932a0806",
+          "version": "1.0.0-srg6"
         }
       },
       {
         "package": "Mantle",
         "repositoryURL": "https://github.com/Mantle/Mantle.git",
         "state": {
           "branch": null,
-          "revision": "eb4ad298d81c023bcba20810ceffba695378ded4",
-          "version": "2.1.6"
+          "revision": "16f72bfe72a2ab29654ba894da1c32b17524e1a6",
+          "version": "2.2.0"
         }
       },
       {
         "package": "SRGAppearance",
         "repositoryURL": "https://github.com/SRGSSR/srgappearance-apple.git",
         "state": {
           "branch": null,
-          "revision": "48258a788952348c7fa38b5b8e9181b25f3c87b8",
-          "version": "3.0.0"
+          "revision": "72d9475b46d97ecde0298b5bc80a654e8b424ebb",
+          "version": "5.2.0"
         }
       },
       {
         "package": "SRGLogger",
         "repositoryURL": "https://github.com/SRGSSR/srglogger-apple.git",
         "state": {
           "branch": null,
-          "revision": "cfc39d1223ed039aeb7df38c6c7570977b22d1aa",
-          "version": "3.0.0"
+          "revision": "dd98468422044b53e283d970809b8502e1ef5b8d",
+          "version": "3.1.0"
         }
       },
       {
         "package": "SRGNetwork",
         "repositoryURL": "https://github.com/SRGSSR/srgnetwork-apple.git",
         "state": {
           "branch": null,
-          "revision": "734fe399088b2f846e9e69d48a43118f6a8dc0d2",
-          "version": "3.0.0"
+          "revision": "153a2544391c1aaccae2d38d8b113fd0a03421b8",
+          "version": "3.1.0"
         }
       },
       {

Demo/Sources/Application/AppDelegate.h

@@ -10,6 +10,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface AppDelegate : UIResponder <UIApplicationDelegate>
 
+// TODO: Remove when SRG Analytics demo requires iOS 13
 @property (nonatomic) UIWindow *window;
 
 @end

Demo/Sources/Application/AppDelegate.m

@@ -16,9 +16,6 @@ @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
-    self.window = [[UIWindow alloc] initWithFrame:UIScreen.mainScreen.bounds];
-    [self.window makeKeyAndVisible];
-
     SRGIdentityService.currentIdentityService = [[SRGIdentityService alloc] initWithWebserviceURL:[NSURL URLWithString:@"https://hummingbird.rts.ch/api/profile"]
                                                                                        websiteURL:[NSURL URLWithString:@"https://www.rts.ch/profile"]];
 
@@ -27,7 +24,12 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
                                                name:SRGIdentityServiceUserDidLogoutNotification
                                              object:SRGIdentityService.currentIdentityService];
 
-    self.window.rootViewController = ApplicationRootViewController();
+    if (@available(iOS 13, tvOS 13, *)) {}
+    else {
+        self.window = [[UIWindow alloc] initWithFrame:UIScreen.mainScreen.bounds];
+        [self.window makeKeyAndVisible];
+        self.window.rootViewController = ApplicationRootViewController();
+    }
     return YES;
 }
 

Gemfile

@@ -8,6 +8,3 @@ 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)