From ba048a12bd726c7a2672481e7f39b5c75f534aba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20De=CC=81fago?= Date: Fri, 24 Sep 2021 14:03:31 +0200 Subject: [PATCH 01/25] 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 3fd65c1..0c4c7ea 100644 --- a/Demo/Demo.xcconfig +++ b/Demo/Demo.xcconfig @@ -1,5 +1,5 @@ // Version information -MARKETING_VERSION = 3.2.0 +MARKETING_VERSION = 3.2.1 // Deployment targets IPHONEOS_DEPLOYMENT_TARGET = 12.0 diff --git a/Package.swift b/Package.swift index d7b8920..574121d 100644 --- a/Package.swift +++ b/Package.swift @@ -3,7 +3,7 @@ import PackageDescription struct ProjectSettings { - static let marketingVersion: String = "3.2.0" + static let marketingVersion: String = "3.2.1" } let package = Package( From 02457bae9c384060c6aea875492b9662a02e7d76 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Bertholon Date: Fri, 10 Dec 2021 17:40:58 +0100 Subject: [PATCH 02/25] Update SRG dependencies --- .../project.pbxproj | 2 +- .../xcshareddata/swiftpm/Package.resolved | 24 +++++++++---------- Package.resolved | 8 +++---- Package.swift | 2 +- .../xcshareddata/swiftpm/Package.resolved | 8 +++---- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Demo/SRGUserData-demo.xcodeproj/project.pbxproj b/Demo/SRGUserData-demo.xcodeproj/project.pbxproj index fe7fdcb..b28e09c 100644 --- a/Demo/SRGUserData-demo.xcodeproj/project.pbxproj +++ b/Demo/SRGUserData-demo.xcodeproj/project.pbxproj @@ -561,7 +561,7 @@ repositoryURL = "https://github.com/SRGSSR/srgletterbox-apple.git"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 7.3.0; + minimumVersion = 7.3.2; }; }; /* End XCRemoteSwiftPackageReference section */ diff --git a/Demo/SRGUserData-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Demo/SRGUserData-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved index 51dc3bc..428fb9d 100644 --- a/Demo/SRGUserData-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Demo/SRGUserData-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -51,8 +51,8 @@ "repositoryURL": "https://github.com/Mantle/Mantle.git", "state": { "branch": null, - "revision": "bbe0cbe68582a18a6df7516778196ba3cf420ad3", - "version": "2.1.7" + "revision": "16f72bfe72a2ab29654ba894da1c32b17524e1a6", + "version": "2.2.0" } }, { @@ -60,8 +60,8 @@ "repositoryURL": "https://github.com/SRGSSR/srganalytics-apple.git", "state": { "branch": null, - "revision": "77088eb09c546a4d98c40e990403dd1c222f9ad7", - "version": "7.2.0" + "revision": "26c38b56c51a1a4b84b01fec6ec0f067a6eab5d7", + "version": "7.3.1" } }, { @@ -87,8 +87,8 @@ "repositoryURL": "https://github.com/SRGSSR/srgdataprovider-apple.git", "state": { "branch": null, - "revision": "bba4ff76662a5b2987b7783152c56d1341430a81", - "version": "12.0.0" + "revision": "71aa1b756792f90e7cb8d979c48d48d73d21ca3b", + "version": "12.2.0" } }, { @@ -105,8 +105,8 @@ "repositoryURL": "https://github.com/SRGSSR/srgidentity-apple.git", "state": { "branch": null, - "revision": "c4eb6fbb3e84f8cdc340a55b50475eeddd1db011", - "version": "3.2.0" + "revision": "a64f00d6dc5929b3d9b79d45f5a9479cf406937a", + "version": "3.2.1" } }, { @@ -114,8 +114,8 @@ "repositoryURL": "https://github.com/SRGSSR/srgletterbox-apple.git", "state": { "branch": null, - "revision": "1ef04daa5d3e5478cc8d6e05f8f315e0acca25d4", - "version": "7.3.0" + "revision": "15b968f93cf93ab2e5e1f24c907e51804c67b638", + "version": "7.3.2" } }, { @@ -132,8 +132,8 @@ "repositoryURL": "https://github.com/SRGSSR/srgmediaplayer-apple.git", "state": { "branch": null, - "revision": "c2330ee4819aa7f987ec18320022f66f68f53ad6", - "version": "6.1.4" + "revision": "c41bf436de066e97757b495f0c908d2f8c043cd3", + "version": "6.2.0" } }, { diff --git a/Package.resolved b/Package.resolved index cee3990..e93e6df 100644 --- a/Package.resolved +++ b/Package.resolved @@ -33,8 +33,8 @@ "repositoryURL": "https://github.com/Mantle/Mantle.git", "state": { "branch": null, - "revision": "bbe0cbe68582a18a6df7516778196ba3cf420ad3", - "version": "2.1.7" + "revision": "16f72bfe72a2ab29654ba894da1c32b17524e1a6", + "version": "2.2.0" } }, { @@ -51,8 +51,8 @@ "repositoryURL": "https://github.com/SRGSSR/srgidentity-apple.git", "state": { "branch": null, - "revision": "c4eb6fbb3e84f8cdc340a55b50475eeddd1db011", - "version": "3.2.0" + "revision": "a64f00d6dc5929b3d9b79d45f5a9479cf406937a", + "version": "3.2.1" } }, { diff --git a/Package.swift b/Package.swift index 574121d..0522015 100644 --- a/Package.swift +++ b/Package.swift @@ -20,7 +20,7 @@ let package = Package( ) ], dependencies: [ - .package(name: "SRGIdentity", url: "https://github.com/SRGSSR/srgidentity-apple.git", .upToNextMinor(from: "3.2.0")) + .package(name: "SRGIdentity", url: "https://github.com/SRGSSR/srgidentity-apple.git", .upToNextMinor(from: "3.2.1")) ], targets: [ .target( diff --git a/Tests/SRGUserData-tests.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Tests/SRGUserData-tests.xcworkspace/xcshareddata/swiftpm/Package.resolved index f672417..e4da0cb 100644 --- a/Tests/SRGUserData-tests.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Tests/SRGUserData-tests.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -33,8 +33,8 @@ "repositoryURL": "https://github.com/Mantle/Mantle.git", "state": { "branch": null, - "revision": "bbe0cbe68582a18a6df7516778196ba3cf420ad3", - "version": "2.1.7" + "revision": "16f72bfe72a2ab29654ba894da1c32b17524e1a6", + "version": "2.2.0" } }, { @@ -60,8 +60,8 @@ "repositoryURL": "https://github.com/SRGSSR/srgidentity-apple.git", "state": { "branch": null, - "revision": "c4eb6fbb3e84f8cdc340a55b50475eeddd1db011", - "version": "3.2.0" + "revision": "a64f00d6dc5929b3d9b79d45f5a9479cf406937a", + "version": "3.2.1" } }, { From 9d9db677069a04d63ecdb9efb293e6223b993f05 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Bertholon Date: Thu, 27 Jan 2022 17:17:28 +0100 Subject: [PATCH 03/25] Fastlane: Apply new rubocop cops --- .rubocop.yml | 5 ++--- fastlane/Fastfile | 30 ++++++++++++++---------------- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index ec08ab7..038455e 100644 --- a/.rubocop.yml +++ b/.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: diff --git a/fastlane/Fastfile b/fastlane/Fastfile index da57af0..ca1f371 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -25,9 +25,6 @@ platform :ios do clean_result_files clean_derived_data - Device = Struct.new(:platform, :name) - TestBuild = Struct.new(:scheme, :scheme_suffix, :in_workspace) - iphone11 = Device.new('iOS', 'iPhone 11') appletv = Device.new('tvOS', 'Apple TV') devices = [iphone11, appletv] @@ -54,6 +51,9 @@ platform :ios do end end +Device = Struct.new :platform, :name +TestBuild = Struct.new :scheme, :scheme_suffix, :in_workspace + def swift_package_name JSON.parse((sh 'swift package dump-package'))['name'] end @@ -70,13 +70,11 @@ end def srg_run_tests(devices, test_builds) devices.each do |device| test_builds.each do |test_build| - begin - srg_xcodebuild(device, test_build) - rescue StandardError => e - raise e unless e.message.include? '** TEST FAILED **' + srg_xcodebuild(device, test_build) + rescue StandardError => e + raise e unless e.message.include? '** TEST FAILED **' - UI.important('One or more tests failed on ' + device.platform + ' (' + srg_xcodebuild_scheme(test_build) + '). ⚠️') - end + UI.important("One or more tests failed on #{device.platform} (#{srg_xcodebuild_scheme(test_build)}). ⚠️") end end end @@ -93,7 +91,7 @@ def srg_xcodebuild(device, test_build) end def srg_xcodebuild_workspace(test_build) - test_build.in_workspace ? 'Tests/' + srg_xcodebuild_scheme(test_build) + '.xcworkspace' : nil + test_build.in_workspace ? "Tests/#{srg_xcodebuild_scheme(test_build)}.xcworkspace" : nil end def srg_xcodebuild_scheme(test_build) @@ -101,11 +99,11 @@ def srg_xcodebuild_scheme(test_build) end def srg_xcodebuild_destination(device) - 'platform=' + device.platform + ' Simulator,name=' + device.name + "platform=#{device.platform} Simulator,name=#{device.name}" end def srg_xcodebuild_result_bundle_path(device, test_build) - result_bundle_folder_path + test_build.scheme + '-' + device.platform + "#{result_bundle_folder_path}#{test_build.scheme}-#{device.platform}" end def srg_xcodebuild_derived_data_path @@ -128,7 +126,7 @@ end # Override JUnit test suite names to split iOS and tvOS test results def override_junit_test_suite_names(test_builds) test_builds.each do |test_build| - Dir[test_build.scheme + '-*.xml'].each do |file_name| + Dir["#{test_build.scheme}-*.xml"].each do |file_name| override_junit_test_suite_name(file_name) end end @@ -137,9 +135,9 @@ end def override_junit_test_suite_name(file_name) platform = file_name.split('.').first.split('-').last file = File.open(file_name, 'r') - xml = file.read.gsub('Tests" tests="', '-' + platform + '" tests="') - xml = xml.gsub('-tests" tests="', '-' + platform + '" tests="') - File.open(file_name, 'w') { |f| f.write(xml) } + xml = file.read.gsub('Tests" tests="', "-#{platform}\" tests=\"") + xml = xml.gsub('-tests" tests="', "-#{platform}\" tests=\"") + File.write(file_name, xml) end # More information about multiple platforms in fastlane: https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Platforms.md From c2420ece808a2c6b8a18aab78048b8025bb51545 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Bertholon Date: Fri, 11 Feb 2022 19:39:08 +0100 Subject: [PATCH 04/25] Update fastlane with trainer included --- Gemfile | 3 -- Gemfile.lock | 77 ++++++++++++++++++++++----------------------- fastlane/Fastfile | 2 +- fastlane/Pluginfile | 7 ----- fastlane/README.md | 25 ++++++++------- 5 files changed, 53 insertions(+), 61 deletions(-) delete mode 100644 fastlane/Pluginfile diff --git a/Gemfile b/Gemfile index 5d378ba..aa3838f 100644 --- a/Gemfile +++ b/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) diff --git a/Gemfile.lock b/Gemfile.lock index a835d13..a68c0bb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,23 +1,24 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.3) + CFPropertyList (3.0.5) + rexml addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.2.0) - aws-partitions (1.502.0) - aws-sdk-core (3.121.0) + aws-partitions (1.554.0) + aws-sdk-core (3.126.0) aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.239.0) + aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.48.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-kms (1.54.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.103.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-s3 (1.112.0) + aws-sdk-core (~> 3, >= 3.126.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) aws-sigv4 (1.4.0) @@ -34,18 +35,19 @@ GEM domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) dotenv (2.7.6) - emoji_regex (3.2.2) - excon (0.85.0) - faraday (1.7.2) + emoji_regex (3.2.3) + excon (0.91.0) + faraday (1.9.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.1) + faraday-net_http_persistent (~> 1.0) faraday-patron (~> 1.0) faraday-rack (~> 1.0) - multipart-post (>= 1.2, < 3) + faraday-retry (~> 1.0) ruby2_keywords (>= 0.0.4) faraday-cookie_jar (0.0.7) faraday (>= 0.8.0) @@ -54,14 +56,17 @@ GEM faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) + faraday-multipart (1.0.3) + multipart-post (>= 1.2, < 3) faraday-net_http (1.0.1) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) - faraday_middleware (1.1.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.0) faraday (~> 1.0) - fastimage (2.2.5) - fastlane (2.194.0) + fastimage (2.2.6) + fastlane (2.204.2) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -100,12 +105,10 @@ GEM xcodeproj (>= 1.13.0, < 2.0.0) xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) - fastlane-plugin-trainer (0.4.1) - trainer (>= 0.7.0) gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.11.0) + google-apis-androidpublisher_v3 (0.16.0) google-apis-core (>= 0.4, < 2.a) - google-apis-core (0.4.1) + google-apis-core (0.4.2) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.16.2, < 2.a) httpclient (>= 2.8.1, < 3.a) @@ -114,49 +117,49 @@ GEM retriable (>= 2.0, < 4.a) rexml webrick - google-apis-iamcredentials_v1 (0.7.0) + google-apis-iamcredentials_v1 (0.10.0) google-apis-core (>= 0.4, < 2.a) - google-apis-playcustomapp_v1 (0.5.0) + google-apis-playcustomapp_v1 (0.7.0) google-apis-core (>= 0.4, < 2.a) - google-apis-storage_v1 (0.6.0) + google-apis-storage_v1 (0.11.0) google-apis-core (>= 0.4, < 2.a) google-cloud-core (1.6.0) google-cloud-env (~> 1.0) google-cloud-errors (~> 1.0) google-cloud-env (1.5.0) faraday (>= 0.17.3, < 2.0) - google-cloud-errors (1.1.0) - google-cloud-storage (1.34.1) - addressable (~> 2.5) + google-cloud-errors (1.2.0) + google-cloud-storage (1.36.1) + addressable (~> 2.8) digest-crc (~> 0.4) google-apis-iamcredentials_v1 (~> 0.1) google-apis-storage_v1 (~> 0.1) google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (0.17.1) + googleauth (1.1.0) faraday (>= 0.17.3, < 2.0) jwt (>= 1.4, < 3.0) memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) - signet (~> 0.15) + signet (>= 0.16, < 2.a) highline (2.0.3) http-cookie (1.0.4) domain_name (~> 0.5) httpclient (2.8.3) - jmespath (1.4.0) - json (2.5.1) - jwt (2.2.3) + jmespath (1.5.0) + json (2.6.1) + jwt (2.3.0) memoist (0.16.2) mini_magick (4.11.0) - mini_mime (1.1.1) + mini_mime (1.1.2) multi_json (1.15.0) multipart-post (2.0.0) nanaimo (0.3.0) naturally (2.2.1) optparse (0.1.1) - os (1.1.1) + os (1.1.4) plist (3.6.0) public_suffix (4.0.6) rake (13.0.6) @@ -181,10 +184,7 @@ GEM terminal-notifier (2.0.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) - trailblazer-option (0.1.1) - trainer (0.9.1) - fastlane (>= 2.25.0) - plist (>= 3.1.0, < 4.0.0) + trailblazer-option (0.1.2) tty-cursor (0.7.1) tty-screen (0.8.1) tty-spinner (0.9.3) @@ -216,7 +216,6 @@ PLATFORMS DEPENDENCIES fastlane - fastlane-plugin-trainer xcode-install BUNDLED WITH diff --git a/fastlane/Fastfile b/fastlane/Fastfile index ca1f371..d1e8e36 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -9,7 +9,7 @@ # All lines starting with a # are ignored when running `fastlane` # This is the minimum version number required. -fastlane_version '2.96.0' +fastlane_version '2.201.0' default_platform :ios diff --git a/fastlane/Pluginfile b/fastlane/Pluginfile deleted file mode 100644 index 72dfbbd..0000000 --- a/fastlane/Pluginfile +++ /dev/null @@ -1,7 +0,0 @@ -# frozen_string_literal: true - -# Autogenerated by fastlane -# -# Ensure this file is checked in to source control! - -gem 'fastlane-plugin-trainer' diff --git a/fastlane/README.md b/fastlane/README.md index 45a7da7..d812e80 100644 --- a/fastlane/README.md +++ b/fastlane/README.md @@ -1,29 +1,32 @@ fastlane documentation -================ +---- + # Installation Make sure you have the latest version of the Xcode command line tools installed: -``` +```sh xcode-select --install ``` -Install _fastlane_ using -``` -[sudo] gem install fastlane -NV -``` -or alternatively using `brew install fastlane` +For _fastlane_ installation instructions, see [Installing _fastlane_](https://docs.fastlane.tools/#installing-fastlane) # Available Actions + ## iOS + ### ios tests + +```sh +[bundle exec] fastlane ios tests ``` -fastlane ios tests -``` + Run library tests ---- This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run. -More information about fastlane can be found on [fastlane.tools](https://fastlane.tools). -The documentation of fastlane can be found on [docs.fastlane.tools](https://docs.fastlane.tools). + +More information about _fastlane_ can be found on [fastlane.tools](https://fastlane.tools). + +The documentation of _fastlane_ can be found on [docs.fastlane.tools](https://docs.fastlane.tools). From 052fd5ffe36a8e6d0fd1ade9381ec45a2effc2f2 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Bertholon Date: Fri, 11 Feb 2022 21:21:54 +0100 Subject: [PATCH 05/25] Update iPhone test device --- fastlane/Fastfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index d1e8e36..3cabbba 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -25,9 +25,9 @@ platform :ios do clean_result_files clean_derived_data - iphone11 = Device.new('iOS', 'iPhone 11') + iphone13 = Device.new('iOS', 'iPhone 13') appletv = Device.new('tvOS', 'Apple TV') - devices = [iphone11, appletv] + devices = [iphone13, appletv] scheme = swift_package_name workspace_tests = TestBuild.new(scheme, '-tests', true) From ad0dadff26bca03931a588173d7b9624df413874 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Bertholon Date: Sat, 12 Feb 2022 18:20:24 +0100 Subject: [PATCH 06/25] Fastlane: expose JUnit files when updated Avoid CI to read files before test suite name override --- fastlane/Fastfile | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 3cabbba..181828e 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -37,8 +37,7 @@ platform :ios do srg_run_tests(devices, test_builds) # Produce JUnit files for CI - srg_trainer - override_junit_test_suite_names(test_builds) + srg_junit_files end after_all do @@ -110,11 +109,18 @@ def srg_xcodebuild_derived_data_path '.build/DerivedData' end +def srg_junit_files + srg_trainer + override_junit_test_suite_names + expose_junit_files +end + # Convert xcresults to JUnit files def srg_trainer trainer( path: result_bundle_folder_path, output_directory: './fastlane', + extension: raw_extension, fail_build: false ) end @@ -123,12 +129,14 @@ def result_bundle_folder_path './fastlane/xcresult/' end +def raw_extension + '.rawjunit' +end + # Override JUnit test suite names to split iOS and tvOS test results -def override_junit_test_suite_names(test_builds) - test_builds.each do |test_build| - Dir["#{test_build.scheme}-*.xml"].each do |file_name| - override_junit_test_suite_name(file_name) - end +def override_junit_test_suite_names + Dir["*#{raw_extension}"].each do |file_name| + override_junit_test_suite_name(file_name) end end @@ -140,6 +148,14 @@ def override_junit_test_suite_name(file_name) File.write(file_name, xml) end +def expose_junit_files + Dir["*#{raw_extension}"].each do |file_name| + # Rename JUnit files with correct extension + new_file_name = file_name.gsub(raw_extension, '.xml') + File.rename(file_name, new_file_name) unless File.exist?(new_file_name) + end +end + # More information about multiple platforms in fastlane: https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Platforms.md # All available actions: https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Actions.md From 0dde9cc65f508c89af8a89d9b6029a4ee743d073 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Bertholon Date: Fri, 11 Feb 2022 22:12:00 +0100 Subject: [PATCH 07/25] Fastlane: Add 2 retries for unit tests --- Gemfile.lock | 6 +++--- fastlane/Fastfile | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a68c0bb..80005d6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -66,7 +66,7 @@ GEM faraday_middleware (1.2.0) faraday (~> 1.0) fastimage (2.2.6) - fastlane (2.204.2) + fastlane (2.204.3) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -137,7 +137,7 @@ GEM google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (1.1.0) + googleauth (1.1.1) faraday (>= 0.17.3, < 2.0) jwt (>= 1.4, < 3.0) memoist (~> 0.16) @@ -148,7 +148,7 @@ GEM http-cookie (1.0.4) domain_name (~> 0.5) httpclient (2.8.3) - jmespath (1.5.0) + jmespath (1.6.0) json (2.6.1) jwt (2.3.0) memoist (0.16.2) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 181828e..f0416ea 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -81,6 +81,7 @@ end def srg_xcodebuild(device, test_build) xcodebuild( test: true, + xcargs: srg_test_xcargs, workspace: srg_xcodebuild_workspace(test_build), scheme: srg_xcodebuild_scheme(test_build), destination: srg_xcodebuild_destination(device), @@ -89,6 +90,10 @@ def srg_xcodebuild(device, test_build) ) end +def srg_test_xcargs + '-retry-tests-on-failure' +end + def srg_xcodebuild_workspace(test_build) test_build.in_workspace ? "Tests/#{srg_xcodebuild_scheme(test_build)}.xcworkspace" : nil end @@ -121,6 +126,7 @@ def srg_trainer path: result_bundle_folder_path, output_directory: './fastlane', extension: raw_extension, + output_remove_retry_attempts: true, fail_build: false ) end From 9b8271dfa478c32ce447c65a07c7370272ce4d50 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Bertholon Date: Tue, 1 Mar 2022 13:44:12 +0100 Subject: [PATCH 08/25] Add Swift linter --- .swiftlint.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .swiftlint.yml diff --git a/.swiftlint.yml b/.swiftlint.yml new file mode 100644 index 0000000..78548db --- /dev/null +++ b/.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 From 7cd31d57e69f9b532ef1b633393a4233816983dc Mon Sep 17 00:00:00 2001 From: Pierre-Yves Bertholon Date: Tue, 1 Mar 2022 14:19:19 +0100 Subject: [PATCH 09/25] Fix linter issue --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 0522015..2f80722 100644 --- a/Package.swift +++ b/Package.swift @@ -28,7 +28,7 @@ let package = Package( dependencies: ["SRGIdentity"], resources: [ .process("Data"), - .process("Resources"), + .process("Resources") ], cSettings: [ .define("MARKETING_VERSION", to: "\"\(ProjectSettings.marketingVersion)\""), From bda2f1e90af830a1b26cbece1126476b9ef0a0f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20De=CC=81fago?= Date: Mon, 14 Mar 2022 14:05:18 +0100 Subject: [PATCH 10/25] Update dependencies with Xcode 13.3 --- .../project.pbxproj | 4 ++-- .../xcschemes/SRGUserData-demo.xcscheme | 2 +- .../xcshareddata/swiftpm/Package.resolved | 20 +++++++++---------- .../project.pbxproj | 2 +- .../xcschemes/SRGUserData-tests.xcscheme | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Demo/SRGUserData-demo.xcodeproj/project.pbxproj b/Demo/SRGUserData-demo.xcodeproj/project.pbxproj index b28e09c..9893320 100644 --- a/Demo/SRGUserData-demo.xcodeproj/project.pbxproj +++ b/Demo/SRGUserData-demo.xcodeproj/project.pbxproj @@ -272,7 +272,7 @@ 6F0EB52820FC7F58009C02CF /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1330; ORGANIZATIONNAME = "SRG SSR"; TargetAttributes = { 6F8A93D720FDCA0800AA6434 = { @@ -561,7 +561,7 @@ repositoryURL = "https://github.com/SRGSSR/srgletterbox-apple.git"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 7.3.2; + minimumVersion = 7.4.0; }; }; /* End XCRemoteSwiftPackageReference section */ diff --git a/Demo/SRGUserData-demo.xcodeproj/xcshareddata/xcschemes/SRGUserData-demo.xcscheme b/Demo/SRGUserData-demo.xcodeproj/xcshareddata/xcschemes/SRGUserData-demo.xcscheme index fc6009e..f43cedd 100644 --- a/Demo/SRGUserData-demo.xcodeproj/xcshareddata/xcschemes/SRGUserData-demo.xcscheme +++ b/Demo/SRGUserData-demo.xcodeproj/xcshareddata/xcschemes/SRGUserData-demo.xcscheme @@ -1,6 +1,6 @@ Date: Tue, 19 Apr 2022 17:20:21 +0200 Subject: [PATCH 11/25] Update demo dependencies --- .../xcshareddata/swiftpm/Package.resolved | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Demo/SRGUserData-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Demo/SRGUserData-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved index 42529ab..afc2278 100644 --- a/Demo/SRGUserData-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Demo/SRGUserData-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -60,8 +60,8 @@ "repositoryURL": "https://github.com/SRGSSR/srganalytics-apple.git", "state": { "branch": null, - "revision": "1ff6704dca7b29fc3f436fd2cc4f10bf652dd88d", - "version": "7.4.0" + "revision": "99f726822dcc5045cd5e2b48df3f56fdd191fed8", + "version": "7.5.0" } }, { @@ -87,8 +87,8 @@ "repositoryURL": "https://github.com/SRGSSR/srgdataprovider-apple.git", "state": { "branch": null, - "revision": "04d1d4a45fd83044116c77ba7f2c64e2618aea94", - "version": "13.0.0" + "revision": "9cf7768024d11194c42734b22460ab5f7272f7d1", + "version": "13.1.0" } }, { @@ -114,8 +114,8 @@ "repositoryURL": "https://github.com/SRGSSR/srgletterbox-apple.git", "state": { "branch": null, - "revision": "5c4461eefa4976a56ac9b308f15259b95541313f", - "version": "7.4.0" + "revision": "6490f6c76516c82f00e314dcc8df2ae2d72578df", + "version": "7.5.0" } }, { @@ -132,8 +132,8 @@ "repositoryURL": "https://github.com/SRGSSR/srgmediaplayer-apple.git", "state": { "branch": null, - "revision": "83dc2f50050327e0b353f4e5372a674f90e3f5fc", - "version": "6.2.2" + "revision": "44836cc4218855e3bc70a29258dab61212cfa4de", + "version": "7.0.0" } }, { From e8969c777bf971e37aa1bbccd9c11c98ca296316 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Bertholon Date: Tue, 19 Apr 2022 16:57:13 +0200 Subject: [PATCH 12/25] Use active constraints --- Demo/Sources/Helpers/DataViewController.m | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Demo/Sources/Helpers/DataViewController.m b/Demo/Sources/Helpers/DataViewController.m index 7030e86..533d6d8 100644 --- a/Demo/Sources/Helpers/DataViewController.m +++ b/Demo/Sources/Helpers/DataViewController.m @@ -25,12 +25,19 @@ - (void)viewDidLoad [super viewDidLoad]; UITableView *tableView = [[UITableView alloc] initWithFrame:self.view.bounds]; - tableView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; tableView.dataSource = self; tableView.delegate = self; [self.view addSubview:tableView]; self.tableView = tableView; + tableView.translatesAutoresizingMaskIntoConstraints = NO; + [NSLayoutConstraint activateConstraints:@[ + [tableView.topAnchor constraintEqualToAnchor:self.view.topAnchor], + [tableView.bottomAnchor constraintEqualToAnchor:self.view.bottomAnchor], + [tableView.leadingAnchor constraintEqualToAnchor:self.view.leadingAnchor], + [tableView.trailingAnchor constraintEqualToAnchor:self.view.trailingAnchor] + ]]; + #if TARGET_OS_TV if (@available(tvOS 13, *)) { // Automatically enabled for UITableViewController by default. Adopt the same behavior. From 37811208a728d5cd5816856867870d5a48f0f6a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20De=CC=81fago?= Date: Wed, 20 Apr 2022 13:39:37 +0200 Subject: [PATCH 13/25] Improve constraint code consistency --- Demo/Sources/Helpers/DataViewController.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Demo/Sources/Helpers/DataViewController.m b/Demo/Sources/Helpers/DataViewController.m index 533d6d8..45dbd6e 100644 --- a/Demo/Sources/Helpers/DataViewController.m +++ b/Demo/Sources/Helpers/DataViewController.m @@ -24,7 +24,7 @@ - (void)viewDidLoad { [super viewDidLoad]; - UITableView *tableView = [[UITableView alloc] initWithFrame:self.view.bounds]; + UITableView *tableView = [[UITableView alloc] init]; tableView.dataSource = self; tableView.delegate = self; [self.view addSubview:tableView]; From f49a9376884b7a1e33994b49b1e23899d427397d Mon Sep 17 00:00:00 2001 From: Pierre-Yves Bertholon Date: Wed, 8 Jun 2022 10:29:49 +0200 Subject: [PATCH 14/25] Update fastlane --- Gemfile.lock | 60 ++++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 80005d6..ba734c7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,20 +8,20 @@ GEM artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.2.0) - aws-partitions (1.554.0) - aws-sdk-core (3.126.0) + aws-partitions (1.597.0) + aws-sdk-core (3.131.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) - jmespath (~> 1.0) - aws-sdk-kms (1.54.0) - aws-sdk-core (~> 3, >= 3.126.0) + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.57.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.112.0) - aws-sdk-core (~> 3, >= 3.126.0) + aws-sdk-s3 (1.114.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) - aws-sigv4 (1.4.0) + aws-sigv4 (1.5.0) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) claide (1.0.3) @@ -36,8 +36,8 @@ GEM unf (>= 0.0.5, < 1.0.0) dotenv (2.7.6) emoji_regex (3.2.3) - excon (0.91.0) - faraday (1.9.3) + excon (0.92.3) + faraday (1.10.0) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -56,8 +56,8 @@ GEM faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) - faraday-multipart (1.0.3) - multipart-post (>= 1.2, < 3) + faraday-multipart (1.0.4) + multipart-post (~> 2) faraday-net_http (1.0.1) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) @@ -66,7 +66,7 @@ GEM faraday_middleware (1.2.0) faraday (~> 1.0) fastimage (2.2.6) - fastlane (2.204.3) + fastlane (2.206.2) 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.16.0) + google-apis-androidpublisher_v3 (0.21.0) google-apis-core (>= 0.4, < 2.a) - google-apis-core (0.4.2) + google-apis-core (0.5.0) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.16.2, < 2.a) httpclient (>= 2.8.1, < 3.a) @@ -121,15 +121,15 @@ GEM google-apis-core (>= 0.4, < 2.a) google-apis-playcustomapp_v1 (0.7.0) google-apis-core (>= 0.4, < 2.a) - google-apis-storage_v1 (0.11.0) + google-apis-storage_v1 (0.14.0) google-apis-core (>= 0.4, < 2.a) google-cloud-core (1.6.0) google-cloud-env (~> 1.0) google-cloud-errors (~> 1.0) - google-cloud-env (1.5.0) - faraday (>= 0.17.3, < 2.0) + google-cloud-env (1.6.0) + faraday (>= 0.17.3, < 3.0) google-cloud-errors (1.2.0) - google-cloud-storage (1.36.1) + google-cloud-storage (1.36.2) addressable (~> 2.8) digest-crc (~> 0.4) google-apis-iamcredentials_v1 (~> 0.1) @@ -137,20 +137,20 @@ GEM google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (1.1.1) - faraday (>= 0.17.3, < 2.0) + googleauth (1.1.3) + faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) highline (2.0.3) - http-cookie (1.0.4) + http-cookie (1.0.5) domain_name (~> 0.5) httpclient (2.8.3) - jmespath (1.6.0) - json (2.6.1) - jwt (2.3.0) + jmespath (1.6.1) + json (2.6.2) + jwt (2.4.1) memoist (0.16.2) mini_magick (4.11.0) mini_mime (1.1.2) @@ -161,9 +161,9 @@ GEM optparse (0.1.1) os (1.1.4) plist (3.6.0) - public_suffix (4.0.6) + public_suffix (4.0.7) rake (13.0.6) - representable (3.1.1) + representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) @@ -173,9 +173,9 @@ GEM ruby2_keywords (0.0.5) rubyzip (2.3.2) security (0.1.3) - signet (0.16.0) + signet (0.16.1) addressable (~> 2.8) - faraday (>= 0.17.3, < 2.0) + faraday (>= 0.17.5, < 3.0) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) simctl (1.6.8) @@ -192,7 +192,7 @@ GEM uber (0.1.0) unf (0.1.4) unf_ext - unf_ext (0.0.8) + unf_ext (0.0.8.2) unicode-display_width (1.8.0) webrick (1.7.0) word_wrap (1.0.0) From fe857b6bb1d0aaa2e1d5ec364f77af0c41090f05 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Bertholon Date: Mon, 13 Jun 2022 18:17:41 +0200 Subject: [PATCH 15/25] Fastlane: set test language and test region --- fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index f0416ea..e93ec93 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -91,7 +91,7 @@ def srg_xcodebuild(device, test_build) end def srg_test_xcargs - '-retry-tests-on-failure' + '-retry-tests-on-failure -testLanguage en -testRegion en-US' end def srg_xcodebuild_workspace(test_build) From fe06da0504e466e3c38ff897fdb56c4757037adb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20De=CC=81fago?= Date: Tue, 5 Jul 2022 07:10:03 +0200 Subject: [PATCH 16/25] Update gitignore with VS Code files --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 3882e93..c6c703c 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,6 @@ xcuserdata /fastlane/*.xml /vendor -/.bundle \ No newline at end of file +/.bundle + +.vscode \ No newline at end of file From 459aa3a7a96c1b7ed94f227f1e48707898cefd1f Mon Sep 17 00:00:00 2001 From: Pierre-Yves Bertholon Date: Wed, 6 Jul 2022 19:37:39 +0200 Subject: [PATCH 17/25] Fastlane: build with Xcode 14 --- fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index e93ec93..163aca9 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -17,7 +17,7 @@ platform :ios do before_all do ensure_git_status_clean - xcversion(version: '~> 13') + xcversion(version: '~> 14') end desc 'Run library tests' From d2914b3de4e2e6a27b3451f2f2747fdf738b86ac Mon Sep 17 00:00:00 2001 From: Pierre-Yves Bertholon Date: Thu, 7 Jul 2022 16:23:56 +0200 Subject: [PATCH 18/25] Update Xcode version --- Demo/SRGUserData-demo.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/SRGUserData-demo.xcscheme | 2 +- Tests/SRGUserData-tests.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/SRGUserData-tests.xcscheme | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Demo/SRGUserData-demo.xcodeproj/project.pbxproj b/Demo/SRGUserData-demo.xcodeproj/project.pbxproj index 9893320..e03f593 100644 --- a/Demo/SRGUserData-demo.xcodeproj/project.pbxproj +++ b/Demo/SRGUserData-demo.xcodeproj/project.pbxproj @@ -272,7 +272,7 @@ 6F0EB52820FC7F58009C02CF /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1330; + LastUpgradeCheck = 1400; ORGANIZATIONNAME = "SRG SSR"; TargetAttributes = { 6F8A93D720FDCA0800AA6434 = { diff --git a/Demo/SRGUserData-demo.xcodeproj/xcshareddata/xcschemes/SRGUserData-demo.xcscheme b/Demo/SRGUserData-demo.xcodeproj/xcshareddata/xcschemes/SRGUserData-demo.xcscheme index f43cedd..818b990 100644 --- a/Demo/SRGUserData-demo.xcodeproj/xcshareddata/xcschemes/SRGUserData-demo.xcscheme +++ b/Demo/SRGUserData-demo.xcodeproj/xcshareddata/xcschemes/SRGUserData-demo.xcscheme @@ -1,6 +1,6 @@ Date: Thu, 7 Jul 2022 16:27:07 +0200 Subject: [PATCH 19/25] Apply recommend settings DEAD_CODE_STRIPPING and CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER --- Demo/SRGUserData-demo.xcodeproj/project.pbxproj | 13 ++++++++++--- Tests/SRGUserData-tests.xcodeproj/project.pbxproj | 6 ++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Demo/SRGUserData-demo.xcodeproj/project.pbxproj b/Demo/SRGUserData-demo.xcodeproj/project.pbxproj index e03f593..cda9229 100644 --- a/Demo/SRGUserData-demo.xcodeproj/project.pbxproj +++ b/Demo/SRGUserData-demo.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 52; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -323,6 +323,7 @@ /* Begin PBXShellScriptBuildPhase section */ 0881B5972523D3E5003F6FD5 /* Extract Signing Identity */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -396,6 +397,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -405,6 +407,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; @@ -457,6 +460,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -466,6 +470,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; @@ -491,14 +496,15 @@ isa = XCBuildConfiguration; baseConfigurationReference = 6FC7C58B23A2A59B0058349C /* Demo.xcconfig */; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = "$(APP_ICONS_SOURCE)"; CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = VMGRRW6SG7; INFOPLIST_FILE = Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); + MARKETING_VERSION = 3.2.1; SDKROOT = iphoneos; SWIFT_OBJC_BRIDGING_HEADER = "Sources/Bridges/SRGUserData-demo-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -510,14 +516,15 @@ isa = XCBuildConfiguration; baseConfigurationReference = 6FC7C58B23A2A59B0058349C /* Demo.xcconfig */; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = "$(APP_ICONS_SOURCE)"; CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = VMGRRW6SG7; INFOPLIST_FILE = Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); + MARKETING_VERSION = 3.2.1; SDKROOT = iphoneos; SWIFT_OBJC_BRIDGING_HEADER = "Sources/Bridges/SRGUserData-demo-Bridging-Header.h"; SWIFT_VERSION = 5.0; diff --git a/Tests/SRGUserData-tests.xcodeproj/project.pbxproj b/Tests/SRGUserData-tests.xcodeproj/project.pbxproj index 9ff9e49..4f5406f 100644 --- a/Tests/SRGUserData-tests.xcodeproj/project.pbxproj +++ b/Tests/SRGUserData-tests.xcodeproj/project.pbxproj @@ -512,6 +512,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -521,6 +522,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; @@ -573,6 +575,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -582,6 +585,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; @@ -641,6 +645,7 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_IDENTITY = "-"; + DEAD_CODE_STRIPPING = YES; INFOPLIST_FILE = SRGUserDataTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -656,6 +661,7 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_IDENTITY = "-"; + DEAD_CODE_STRIPPING = YES; INFOPLIST_FILE = SRGUserDataTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", From aa583c0f474d746c2770a3ec1f7772d23491eb67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20De=CC=81fago?= Date: Fri, 8 Jul 2022 09:12:45 +0200 Subject: [PATCH 20/25] Update dependencies --- .../project.pbxproj | 4 +- .../xcshareddata/swiftpm/Package.resolved | 78 +++++++++---------- Package.resolved | 42 +++++----- Package.swift | 2 +- .../xcshareddata/swiftpm/Package.resolved | 42 +++++----- 5 files changed, 84 insertions(+), 84 deletions(-) diff --git a/Demo/SRGUserData-demo.xcodeproj/project.pbxproj b/Demo/SRGUserData-demo.xcodeproj/project.pbxproj index cda9229..caf7618 100644 --- a/Demo/SRGUserData-demo.xcodeproj/project.pbxproj +++ b/Demo/SRGUserData-demo.xcodeproj/project.pbxproj @@ -567,8 +567,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/SRGSSR/srgletterbox-apple.git"; requirement = { - kind = upToNextMajorVersion; - minimumVersion = 7.4.0; + branch = "feature/ios16-tvos16-xcode14"; + kind = branch; }; }; /* End XCRemoteSwiftPackageReference section */ diff --git a/Demo/SRGUserData-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Demo/SRGUserData-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved index afc2278..2a34bde 100644 --- a/Demo/SRGUserData-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Demo/SRGUserData-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -23,27 +23,27 @@ "package": "FXReachability", "repositoryURL": "https://github.com/SRGSSR/FXReachability.git", "state": { - "branch": null, - "revision": "1eac916df0045630e779fa60eef22ed0d185e15f", - "version": "1.3.2-srg5" + "branch": "master", + "revision": "b8d60cfbe6eddf1a622476548465efed88afb564", + "version": null } }, { "package": "libextobjc", "repositoryURL": "https://github.com/SRGSSR/libextobjc.git", "state": { - "branch": null, - "revision": "30ee5b73bdf57a826978aa146881277f22369be1", - "version": "0.6.0-srg3" + "branch": "master", + "revision": "9c9a7327410fe3f7cdb695965ced43b9a7766ee0", + "version": null } }, { "package": "MAKVONotificationCenter", "repositoryURL": "https://github.com/SRGSSR/MAKVONotificationCenter.git", "state": { - "branch": null, - "revision": "60395e0601ffd4a784856b423d4cac558366276d", - "version": "1.0.0-srg5" + "branch": "master", + "revision": "8bde3cdc872085bd31f4cfe546bdf8e6932a0806", + "version": null } }, { @@ -59,90 +59,90 @@ "package": "SRGAnalytics", "repositoryURL": "https://github.com/SRGSSR/srganalytics-apple.git", "state": { - "branch": null, - "revision": "99f726822dcc5045cd5e2b48df3f56fdd191fed8", - "version": "7.5.0" + "branch": "feature/ios16-tvos16-xcode14", + "revision": "99a5f3a5b7895a6a0feead33c47266757d7eb60e", + "version": null } }, { "package": "SRGAppearance", "repositoryURL": "https://github.com/SRGSSR/srgappearance-apple.git", "state": { - "branch": null, - "revision": "cfd2b130277502b1355863ac4a105fd9922be752", - "version": "5.0.0" + "branch": "feature/ios16-tvos16-xcode14", + "revision": "a08d0704a6c171aed77b3291f233333b0aac30b2", + "version": null } }, { "package": "SRGContentProtection", "repositoryURL": "https://github.com/SRGSSR/srgcontentprotection-apple.git", "state": { - "branch": null, - "revision": "6bbd897663e516edbfa42c90bc35c5fd28a86ce6", - "version": "3.0.4" + "branch": "feature/ios16-tvos16-xcode14", + "revision": "bdff8723d8cfbe57de58d1e9c441d06979ddb259", + "version": null } }, { "package": "SRGDataProvider", "repositoryURL": "https://github.com/SRGSSR/srgdataprovider-apple.git", "state": { - "branch": null, - "revision": "9cf7768024d11194c42734b22460ab5f7272f7d1", - "version": "13.1.0" + "branch": "feature/ios16-tvos16-xcode14", + "revision": "65854c4a8538be50550713d242da6b615141da5c", + "version": null } }, { "package": "SRGDiagnostics", "repositoryURL": "https://github.com/SRGSSR/srgdiagnostics-apple.git", "state": { - "branch": null, - "revision": "9921cec150a83df60fe4cde41ffb9e3209b21e92", - "version": "3.0.2" + "branch": "feature/ios16-tvos16-xcode14", + "revision": "5aade8a4fdeff3b6be17d620f3ebd746dae75112", + "version": null } }, { "package": "SRGIdentity", "repositoryURL": "https://github.com/SRGSSR/srgidentity-apple.git", "state": { - "branch": null, - "revision": "a64f00d6dc5929b3d9b79d45f5a9479cf406937a", - "version": "3.2.1" + "branch": "feature/ios16-tvos16-xcode14", + "revision": "e19abad8cd63f8e880d6613589b81d83fd6ecbfe", + "version": null } }, { "package": "SRGLetterbox", "repositoryURL": "https://github.com/SRGSSR/srgletterbox-apple.git", "state": { - "branch": null, - "revision": "6490f6c76516c82f00e314dcc8df2ae2d72578df", - "version": "7.5.0" + "branch": "feature/ios16-tvos16-xcode14", + "revision": "92eef722634e5a29b2d3a731f1424c67a3827fde", + "version": null } }, { "package": "SRGLogger", "repositoryURL": "https://github.com/SRGSSR/srglogger-apple.git", "state": { - "branch": null, - "revision": "5840af9ccbbc23a1269ff53feb3832f56ffde1eb", - "version": "3.0.2" + "branch": "feature/ios16-tvos16-xcode14", + "revision": "36fd041b78224b77d8dd348511dbf6ed8cd88d68", + "version": null } }, { "package": "SRGMediaPlayer", "repositoryURL": "https://github.com/SRGSSR/srgmediaplayer-apple.git", "state": { - "branch": null, - "revision": "44836cc4218855e3bc70a29258dab61212cfa4de", - "version": "7.0.0" + "branch": "feature/ios16-tvos16-xcode14", + "revision": "dd87fa068ddccc01721c546c74dad442eec987d4", + "version": null } }, { "package": "SRGNetwork", "repositoryURL": "https://github.com/SRGSSR/srgnetwork-apple.git", "state": { - "branch": null, - "revision": "9d79d6649de885876577c28e7b19f24f7ce16399", - "version": "3.0.3" + "branch": "feature/ios16-tvos16-xcode14", + "revision": "ac107207c25f65060c13688239e0f0cdf3724e60", + "version": null } }, { diff --git a/Package.resolved b/Package.resolved index e93e6df..27b1446 100644 --- a/Package.resolved +++ b/Package.resolved @@ -5,27 +5,27 @@ "package": "FXReachability", "repositoryURL": "https://github.com/SRGSSR/FXReachability.git", "state": { - "branch": null, - "revision": "1eac916df0045630e779fa60eef22ed0d185e15f", - "version": "1.3.2-srg5" + "branch": "master", + "revision": "b8d60cfbe6eddf1a622476548465efed88afb564", + "version": null } }, { "package": "libextobjc", "repositoryURL": "https://github.com/SRGSSR/libextobjc.git", "state": { - "branch": null, - "revision": "30ee5b73bdf57a826978aa146881277f22369be1", - "version": "0.6.0-srg3" + "branch": "master", + "revision": "9c9a7327410fe3f7cdb695965ced43b9a7766ee0", + "version": null } }, { "package": "MAKVONotificationCenter", "repositoryURL": "https://github.com/SRGSSR/MAKVONotificationCenter.git", "state": { - "branch": null, - "revision": "60395e0601ffd4a784856b423d4cac558366276d", - "version": "1.0.0-srg5" + "branch": "master", + "revision": "8bde3cdc872085bd31f4cfe546bdf8e6932a0806", + "version": null } }, { @@ -41,36 +41,36 @@ "package": "SRGAppearance", "repositoryURL": "https://github.com/SRGSSR/srgappearance-apple.git", "state": { - "branch": null, - "revision": "cfd2b130277502b1355863ac4a105fd9922be752", - "version": "5.0.0" + "branch": "feature/ios16-tvos16-xcode14", + "revision": "a08d0704a6c171aed77b3291f233333b0aac30b2", + "version": null } }, { "package": "SRGIdentity", "repositoryURL": "https://github.com/SRGSSR/srgidentity-apple.git", "state": { - "branch": null, - "revision": "a64f00d6dc5929b3d9b79d45f5a9479cf406937a", - "version": "3.2.1" + "branch": "feature/ios16-tvos16-xcode14", + "revision": "e19abad8cd63f8e880d6613589b81d83fd6ecbfe", + "version": null } }, { "package": "SRGLogger", "repositoryURL": "https://github.com/SRGSSR/srglogger-apple.git", "state": { - "branch": null, - "revision": "5840af9ccbbc23a1269ff53feb3832f56ffde1eb", - "version": "3.0.2" + "branch": "feature/ios16-tvos16-xcode14", + "revision": "36fd041b78224b77d8dd348511dbf6ed8cd88d68", + "version": null } }, { "package": "SRGNetwork", "repositoryURL": "https://github.com/SRGSSR/srgnetwork-apple.git", "state": { - "branch": null, - "revision": "9d79d6649de885876577c28e7b19f24f7ce16399", - "version": "3.0.3" + "branch": "feature/ios16-tvos16-xcode14", + "revision": "ac107207c25f65060c13688239e0f0cdf3724e60", + "version": null } }, { diff --git a/Package.swift b/Package.swift index 2f80722..1656326 100644 --- a/Package.swift +++ b/Package.swift @@ -20,7 +20,7 @@ let package = Package( ) ], dependencies: [ - .package(name: "SRGIdentity", url: "https://github.com/SRGSSR/srgidentity-apple.git", .upToNextMinor(from: "3.2.1")) + .package(name: "SRGIdentity", url: "https://github.com/SRGSSR/srgidentity-apple.git", .branch("feature/ios16-tvos16-xcode14")) ], targets: [ .target( diff --git a/Tests/SRGUserData-tests.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Tests/SRGUserData-tests.xcworkspace/xcshareddata/swiftpm/Package.resolved index e4da0cb..6509dcd 100644 --- a/Tests/SRGUserData-tests.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Tests/SRGUserData-tests.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -5,27 +5,27 @@ "package": "FXReachability", "repositoryURL": "https://github.com/SRGSSR/FXReachability.git", "state": { - "branch": null, - "revision": "1eac916df0045630e779fa60eef22ed0d185e15f", - "version": "1.3.2-srg5" + "branch": "master", + "revision": "b8d60cfbe6eddf1a622476548465efed88afb564", + "version": null } }, { "package": "libextobjc", "repositoryURL": "https://github.com/SRGSSR/libextobjc.git", "state": { - "branch": null, - "revision": "30ee5b73bdf57a826978aa146881277f22369be1", - "version": "0.6.0-srg3" + "branch": "master", + "revision": "9c9a7327410fe3f7cdb695965ced43b9a7766ee0", + "version": null } }, { "package": "MAKVONotificationCenter", "repositoryURL": "https://github.com/SRGSSR/MAKVONotificationCenter.git", "state": { - "branch": null, - "revision": "60395e0601ffd4a784856b423d4cac558366276d", - "version": "1.0.0-srg5" + "branch": "master", + "revision": "8bde3cdc872085bd31f4cfe546bdf8e6932a0806", + "version": null } }, { @@ -50,36 +50,36 @@ "package": "SRGAppearance", "repositoryURL": "https://github.com/SRGSSR/srgappearance-apple.git", "state": { - "branch": null, - "revision": "cfd2b130277502b1355863ac4a105fd9922be752", - "version": "5.0.0" + "branch": "feature/ios16-tvos16-xcode14", + "revision": "a08d0704a6c171aed77b3291f233333b0aac30b2", + "version": null } }, { "package": "SRGIdentity", "repositoryURL": "https://github.com/SRGSSR/srgidentity-apple.git", "state": { - "branch": null, - "revision": "a64f00d6dc5929b3d9b79d45f5a9479cf406937a", - "version": "3.2.1" + "branch": "feature/ios16-tvos16-xcode14", + "revision": "e19abad8cd63f8e880d6613589b81d83fd6ecbfe", + "version": null } }, { "package": "SRGLogger", "repositoryURL": "https://github.com/SRGSSR/srglogger-apple.git", "state": { - "branch": null, - "revision": "5840af9ccbbc23a1269ff53feb3832f56ffde1eb", - "version": "3.0.2" + "branch": "feature/ios16-tvos16-xcode14", + "revision": "36fd041b78224b77d8dd348511dbf6ed8cd88d68", + "version": null } }, { "package": "SRGNetwork", "repositoryURL": "https://github.com/SRGSSR/srgnetwork-apple.git", "state": { - "branch": null, - "revision": "9d79d6649de885876577c28e7b19f24f7ce16399", - "version": "3.0.3" + "branch": "feature/ios16-tvos16-xcode14", + "revision": "ac107207c25f65060c13688239e0f0cdf3724e60", + "version": null } }, { From da3129286116c980e6c897376424989c1442c113 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20De=CC=81fago?= Date: Thu, 14 Jul 2022 11:07:51 +0200 Subject: [PATCH 21/25] Update dependencies --- .../project.pbxproj | 2 +- .../xcshareddata/swiftpm/Package.resolved | 40 +++++++++---------- Package.resolved | 16 ++++---- Package.swift | 2 +- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Demo/SRGUserData-demo.xcodeproj/project.pbxproj b/Demo/SRGUserData-demo.xcodeproj/project.pbxproj index caf7618..cf7abab 100644 --- a/Demo/SRGUserData-demo.xcodeproj/project.pbxproj +++ b/Demo/SRGUserData-demo.xcodeproj/project.pbxproj @@ -567,7 +567,7 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/SRGSSR/srgletterbox-apple.git"; requirement = { - branch = "feature/ios16-tvos16-xcode14"; + branch = develop; kind = branch; }; }; diff --git a/Demo/SRGUserData-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Demo/SRGUserData-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved index 2a34bde..a31807f 100644 --- a/Demo/SRGUserData-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Demo/SRGUserData-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -59,8 +59,8 @@ "package": "SRGAnalytics", "repositoryURL": "https://github.com/SRGSSR/srganalytics-apple.git", "state": { - "branch": "feature/ios16-tvos16-xcode14", - "revision": "99a5f3a5b7895a6a0feead33c47266757d7eb60e", + "branch": "develop", + "revision": "5ee181ee5dc9d696426dcc8fa14efca999895f37", "version": null } }, @@ -68,8 +68,8 @@ "package": "SRGAppearance", "repositoryURL": "https://github.com/SRGSSR/srgappearance-apple.git", "state": { - "branch": "feature/ios16-tvos16-xcode14", - "revision": "a08d0704a6c171aed77b3291f233333b0aac30b2", + "branch": "develop", + "revision": "108eb3aa7cbd61bfc585d15e68bc1cee8f08c22b", "version": null } }, @@ -77,8 +77,8 @@ "package": "SRGContentProtection", "repositoryURL": "https://github.com/SRGSSR/srgcontentprotection-apple.git", "state": { - "branch": "feature/ios16-tvos16-xcode14", - "revision": "bdff8723d8cfbe57de58d1e9c441d06979ddb259", + "branch": "develop", + "revision": "c0abcc619de447ce9bed497e7563a53cb27fdcc3", "version": null } }, @@ -86,8 +86,8 @@ "package": "SRGDataProvider", "repositoryURL": "https://github.com/SRGSSR/srgdataprovider-apple.git", "state": { - "branch": "feature/ios16-tvos16-xcode14", - "revision": "65854c4a8538be50550713d242da6b615141da5c", + "branch": "develop", + "revision": "c0996dec6271cca7892f8260a493d92b607bbd5c", "version": null } }, @@ -95,8 +95,8 @@ "package": "SRGDiagnostics", "repositoryURL": "https://github.com/SRGSSR/srgdiagnostics-apple.git", "state": { - "branch": "feature/ios16-tvos16-xcode14", - "revision": "5aade8a4fdeff3b6be17d620f3ebd746dae75112", + "branch": "develop", + "revision": "7a69fbcd1577a4317aa829b2d0afd9c061d279d8", "version": null } }, @@ -104,8 +104,8 @@ "package": "SRGIdentity", "repositoryURL": "https://github.com/SRGSSR/srgidentity-apple.git", "state": { - "branch": "feature/ios16-tvos16-xcode14", - "revision": "e19abad8cd63f8e880d6613589b81d83fd6ecbfe", + "branch": "develop", + "revision": "5c3f647b9d11b8ab9dfe5722a02b964f16db0b22", "version": null } }, @@ -113,8 +113,8 @@ "package": "SRGLetterbox", "repositoryURL": "https://github.com/SRGSSR/srgletterbox-apple.git", "state": { - "branch": "feature/ios16-tvos16-xcode14", - "revision": "92eef722634e5a29b2d3a731f1424c67a3827fde", + "branch": "develop", + "revision": "bb7202c752410d103f5b26d164f16337e7271106", "version": null } }, @@ -122,8 +122,8 @@ "package": "SRGLogger", "repositoryURL": "https://github.com/SRGSSR/srglogger-apple.git", "state": { - "branch": "feature/ios16-tvos16-xcode14", - "revision": "36fd041b78224b77d8dd348511dbf6ed8cd88d68", + "branch": "develop", + "revision": "3b7c04bccfb6714d2ea9589e98591ed9088d128e", "version": null } }, @@ -131,8 +131,8 @@ "package": "SRGMediaPlayer", "repositoryURL": "https://github.com/SRGSSR/srgmediaplayer-apple.git", "state": { - "branch": "feature/ios16-tvos16-xcode14", - "revision": "dd87fa068ddccc01721c546c74dad442eec987d4", + "branch": "develop", + "revision": "5897da5091bf866ed9384d1c45e992b43e5d9142", "version": null } }, @@ -140,8 +140,8 @@ "package": "SRGNetwork", "repositoryURL": "https://github.com/SRGSSR/srgnetwork-apple.git", "state": { - "branch": "feature/ios16-tvos16-xcode14", - "revision": "ac107207c25f65060c13688239e0f0cdf3724e60", + "branch": "develop", + "revision": "dedfb9032837c72ec1c3365f3dfb3ff04d65ec75", "version": null } }, diff --git a/Package.resolved b/Package.resolved index 27b1446..5185cf3 100644 --- a/Package.resolved +++ b/Package.resolved @@ -41,8 +41,8 @@ "package": "SRGAppearance", "repositoryURL": "https://github.com/SRGSSR/srgappearance-apple.git", "state": { - "branch": "feature/ios16-tvos16-xcode14", - "revision": "a08d0704a6c171aed77b3291f233333b0aac30b2", + "branch": "develop", + "revision": "108eb3aa7cbd61bfc585d15e68bc1cee8f08c22b", "version": null } }, @@ -50,8 +50,8 @@ "package": "SRGIdentity", "repositoryURL": "https://github.com/SRGSSR/srgidentity-apple.git", "state": { - "branch": "feature/ios16-tvos16-xcode14", - "revision": "e19abad8cd63f8e880d6613589b81d83fd6ecbfe", + "branch": "develop", + "revision": "5c3f647b9d11b8ab9dfe5722a02b964f16db0b22", "version": null } }, @@ -59,8 +59,8 @@ "package": "SRGLogger", "repositoryURL": "https://github.com/SRGSSR/srglogger-apple.git", "state": { - "branch": "feature/ios16-tvos16-xcode14", - "revision": "36fd041b78224b77d8dd348511dbf6ed8cd88d68", + "branch": "develop", + "revision": "3b7c04bccfb6714d2ea9589e98591ed9088d128e", "version": null } }, @@ -68,8 +68,8 @@ "package": "SRGNetwork", "repositoryURL": "https://github.com/SRGSSR/srgnetwork-apple.git", "state": { - "branch": "feature/ios16-tvos16-xcode14", - "revision": "ac107207c25f65060c13688239e0f0cdf3724e60", + "branch": "develop", + "revision": "dedfb9032837c72ec1c3365f3dfb3ff04d65ec75", "version": null } }, diff --git a/Package.swift b/Package.swift index 1656326..c93a38f 100644 --- a/Package.swift +++ b/Package.swift @@ -20,7 +20,7 @@ let package = Package( ) ], dependencies: [ - .package(name: "SRGIdentity", url: "https://github.com/SRGSSR/srgidentity-apple.git", .branch("feature/ios16-tvos16-xcode14")) + .package(name: "SRGIdentity", url: "https://github.com/SRGSSR/srgidentity-apple.git", .branch("develop")) ], targets: [ .target( From 74349020996cfcdc86f2e2364a7b5a066248c7f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20De=CC=81fago?= Date: Thu, 14 Jul 2022 11:10:48 +0200 Subject: [PATCH 22/25] Fix demo version --- Demo/SRGUserData-demo.xcodeproj/project.pbxproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Demo/SRGUserData-demo.xcodeproj/project.pbxproj b/Demo/SRGUserData-demo.xcodeproj/project.pbxproj index cf7abab..7d63f27 100644 --- a/Demo/SRGUserData-demo.xcodeproj/project.pbxproj +++ b/Demo/SRGUserData-demo.xcodeproj/project.pbxproj @@ -497,14 +497,12 @@ baseConfigurationReference = 6FC7C58B23A2A59B0058349C /* Demo.xcconfig */; buildSettings = { CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = VMGRRW6SG7; INFOPLIST_FILE = Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 3.2.1; SDKROOT = iphoneos; SWIFT_OBJC_BRIDGING_HEADER = "Sources/Bridges/SRGUserData-demo-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -517,14 +515,12 @@ baseConfigurationReference = 6FC7C58B23A2A59B0058349C /* Demo.xcconfig */; buildSettings = { CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = VMGRRW6SG7; INFOPLIST_FILE = Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 3.2.1; SDKROOT = iphoneos; SWIFT_OBJC_BRIDGING_HEADER = "Sources/Bridges/SRGUserData-demo-Bridging-Header.h"; SWIFT_VERSION = 5.0; From be4de928cf50e9e36560aa21b78bd42a302c04cd Mon Sep 17 00:00:00 2001 From: Pierre-Yves Bertholon Date: Thu, 11 Aug 2022 16:11:20 +0200 Subject: [PATCH 23/25] Update fastlane to 2.208.0 --- Gemfile.lock | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ba734c7..426d0bc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,23 +8,23 @@ GEM artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.2.0) - aws-partitions (1.597.0) - aws-sdk-core (3.131.1) + aws-partitions (1.616.0) + aws-sdk-core (3.132.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.57.0) + aws-sdk-kms (1.58.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-s3 (1.114.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) - aws-sigv4 (1.5.0) + aws-sigv4 (1.5.1) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) - claide (1.0.3) + claide (1.1.0) colored (1.2) colored2 (3.1.2) commander (4.6.0) @@ -34,10 +34,10 @@ GEM rake (>= 12.0.0, < 14.0.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - dotenv (2.7.6) + dotenv (2.8.1) emoji_regex (3.2.3) - excon (0.92.3) - faraday (1.10.0) + excon (0.92.4) + faraday (1.10.1) 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.206.2) + fastlane (2.208.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.21.0) - google-apis-core (>= 0.4, < 2.a) - google-apis-core (0.5.0) + google-apis-androidpublisher_v3 (0.25.0) + google-apis-core (>= 0.7, < 2.a) + google-apis-core (0.7.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.10.0) - google-apis-core (>= 0.4, < 2.a) - google-apis-playcustomapp_v1 (0.7.0) - google-apis-core (>= 0.4, < 2.a) - google-apis-storage_v1 (0.14.0) - google-apis-core (>= 0.4, < 2.a) + 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-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.36.2) + google-cloud-storage (1.38.0) addressable (~> 2.8) digest-crc (~> 0.4) google-apis-iamcredentials_v1 (~> 0.1) - google-apis-storage_v1 (~> 0.1) + google-apis-storage_v1 (~> 0.17.0) google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (1.1.3) + googleauth (1.2.0) faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) memoist (~> 0.16) @@ -173,9 +173,9 @@ GEM ruby2_keywords (0.0.5) rubyzip (2.3.2) security (0.1.3) - signet (0.16.1) + signet (0.17.0) addressable (~> 2.8) - faraday (>= 0.17.5, < 3.0) + faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) simctl (1.6.8) @@ -196,10 +196,10 @@ GEM unicode-display_width (1.8.0) webrick (1.7.0) word_wrap (1.0.0) - xcode-install (2.8.0) - claide (>= 0.9.1, < 1.1.0) + xcode-install (2.8.1) + claide (>= 0.9.1) fastlane (>= 2.1.0, < 3.0.0) - xcodeproj (1.21.0) + xcodeproj (1.22.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) From c6303837dfe02e16aa5bda279f4466f94764c12f Mon Sep 17 00:00:00 2001 From: Pierre-Yves Bertholon Date: Thu, 11 Aug 2022 23:15:58 +0200 Subject: [PATCH 24/25] Update dependencies to official tags --- .../project.pbxproj | 4 +- .../xcshareddata/swiftpm/Package.resolved | 72 +++++++++---------- Package.resolved | 36 +++++----- Package.swift | 2 +- .../xcshareddata/swiftpm/Package.resolved | 36 +++++----- 5 files changed, 75 insertions(+), 75 deletions(-) diff --git a/Demo/SRGUserData-demo.xcodeproj/project.pbxproj b/Demo/SRGUserData-demo.xcodeproj/project.pbxproj index 7d63f27..351cf1a 100644 --- a/Demo/SRGUserData-demo.xcodeproj/project.pbxproj +++ b/Demo/SRGUserData-demo.xcodeproj/project.pbxproj @@ -563,8 +563,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/SRGSSR/srgletterbox-apple.git"; requirement = { - branch = develop; - kind = branch; + kind = upToNextMajorVersion; + minimumVersion = 8.3.0; }; }; /* End XCRemoteSwiftPackageReference section */ diff --git a/Demo/SRGUserData-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Demo/SRGUserData-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved index a31807f..57eb587 100644 --- a/Demo/SRGUserData-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Demo/SRGUserData-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -23,27 +23,27 @@ "package": "FXReachability", "repositoryURL": "https://github.com/SRGSSR/FXReachability.git", "state": { - "branch": "master", + "branch": null, "revision": "b8d60cfbe6eddf1a622476548465efed88afb564", - "version": null + "version": "1.3.2-srg6" } }, { "package": "libextobjc", "repositoryURL": "https://github.com/SRGSSR/libextobjc.git", "state": { - "branch": "master", + "branch": null, "revision": "9c9a7327410fe3f7cdb695965ced43b9a7766ee0", - "version": null + "version": "0.6.0-srg4" } }, { "package": "MAKVONotificationCenter", "repositoryURL": "https://github.com/SRGSSR/MAKVONotificationCenter.git", "state": { - "branch": "master", + "branch": null, "revision": "8bde3cdc872085bd31f4cfe546bdf8e6932a0806", - "version": null + "version": "1.0.0-srg6" } }, { @@ -59,90 +59,90 @@ "package": "SRGAnalytics", "repositoryURL": "https://github.com/SRGSSR/srganalytics-apple.git", "state": { - "branch": "develop", - "revision": "5ee181ee5dc9d696426dcc8fa14efca999895f37", - "version": null + "branch": null, + "revision": "1ae66aa9dc392c5dbf2cd9dd7be72d277c73c685", + "version": "7.9.0" } }, { "package": "SRGAppearance", "repositoryURL": "https://github.com/SRGSSR/srgappearance-apple.git", "state": { - "branch": "develop", - "revision": "108eb3aa7cbd61bfc585d15e68bc1cee8f08c22b", - "version": null + "branch": null, + "revision": "72d9475b46d97ecde0298b5bc80a654e8b424ebb", + "version": "5.2.0" } }, { "package": "SRGContentProtection", "repositoryURL": "https://github.com/SRGSSR/srgcontentprotection-apple.git", "state": { - "branch": "develop", - "revision": "c0abcc619de447ce9bed497e7563a53cb27fdcc3", - "version": null + "branch": null, + "revision": "69420d0f2a89ae88d392385422c24acd2e5f450c", + "version": "3.1.0" } }, { "package": "SRGDataProvider", "repositoryURL": "https://github.com/SRGSSR/srgdataprovider-apple.git", "state": { - "branch": "develop", - "revision": "c0996dec6271cca7892f8260a493d92b607bbd5c", - "version": null + "branch": null, + "revision": "340c676f77eec1bd437bed91f30165736fc10abb", + "version": "16.1.0" } }, { "package": "SRGDiagnostics", "repositoryURL": "https://github.com/SRGSSR/srgdiagnostics-apple.git", "state": { - "branch": "develop", - "revision": "7a69fbcd1577a4317aa829b2d0afd9c061d279d8", - "version": null + "branch": null, + "revision": "c595e8f186eb41335f0ea48848543ab3804ea22e", + "version": "3.1.0" } }, { "package": "SRGIdentity", "repositoryURL": "https://github.com/SRGSSR/srgidentity-apple.git", "state": { - "branch": "develop", - "revision": "5c3f647b9d11b8ab9dfe5722a02b964f16db0b22", - "version": null + "branch": null, + "revision": "10368fd1679eeaffb05d84bcdc1002f3d66c2d12", + "version": "3.3.0" } }, { "package": "SRGLetterbox", "repositoryURL": "https://github.com/SRGSSR/srgletterbox-apple.git", "state": { - "branch": "develop", - "revision": "bb7202c752410d103f5b26d164f16337e7271106", - "version": null + "branch": null, + "revision": "2db25a0d0729b7f93c137906ea9f921a107d8334", + "version": "8.3.0" } }, { "package": "SRGLogger", "repositoryURL": "https://github.com/SRGSSR/srglogger-apple.git", "state": { - "branch": "develop", - "revision": "3b7c04bccfb6714d2ea9589e98591ed9088d128e", - "version": null + "branch": null, + "revision": "dd98468422044b53e283d970809b8502e1ef5b8d", + "version": "3.1.0" } }, { "package": "SRGMediaPlayer", "repositoryURL": "https://github.com/SRGSSR/srgmediaplayer-apple.git", "state": { - "branch": "develop", - "revision": "5897da5091bf866ed9384d1c45e992b43e5d9142", - "version": null + "branch": null, + "revision": "0e5993756dc0fdfa892205fcf5bf3b9e62dd22ac", + "version": "7.1.0" } }, { "package": "SRGNetwork", "repositoryURL": "https://github.com/SRGSSR/srgnetwork-apple.git", "state": { - "branch": "develop", - "revision": "dedfb9032837c72ec1c3365f3dfb3ff04d65ec75", - "version": null + "branch": null, + "revision": "153a2544391c1aaccae2d38d8b113fd0a03421b8", + "version": "3.1.0" } }, { diff --git a/Package.resolved b/Package.resolved index 5185cf3..4d0ea5d 100644 --- a/Package.resolved +++ b/Package.resolved @@ -5,27 +5,27 @@ "package": "FXReachability", "repositoryURL": "https://github.com/SRGSSR/FXReachability.git", "state": { - "branch": "master", + "branch": null, "revision": "b8d60cfbe6eddf1a622476548465efed88afb564", - "version": null + "version": "1.3.2-srg6" } }, { "package": "libextobjc", "repositoryURL": "https://github.com/SRGSSR/libextobjc.git", "state": { - "branch": "master", + "branch": null, "revision": "9c9a7327410fe3f7cdb695965ced43b9a7766ee0", - "version": null + "version": "0.6.0-srg4" } }, { "package": "MAKVONotificationCenter", "repositoryURL": "https://github.com/SRGSSR/MAKVONotificationCenter.git", "state": { - "branch": "master", + "branch": null, "revision": "8bde3cdc872085bd31f4cfe546bdf8e6932a0806", - "version": null + "version": "1.0.0-srg6" } }, { @@ -41,36 +41,36 @@ "package": "SRGAppearance", "repositoryURL": "https://github.com/SRGSSR/srgappearance-apple.git", "state": { - "branch": "develop", - "revision": "108eb3aa7cbd61bfc585d15e68bc1cee8f08c22b", - "version": null + "branch": null, + "revision": "72d9475b46d97ecde0298b5bc80a654e8b424ebb", + "version": "5.2.0" } }, { "package": "SRGIdentity", "repositoryURL": "https://github.com/SRGSSR/srgidentity-apple.git", "state": { - "branch": "develop", - "revision": "5c3f647b9d11b8ab9dfe5722a02b964f16db0b22", - "version": null + "branch": null, + "revision": "10368fd1679eeaffb05d84bcdc1002f3d66c2d12", + "version": "3.3.0" } }, { "package": "SRGLogger", "repositoryURL": "https://github.com/SRGSSR/srglogger-apple.git", "state": { - "branch": "develop", - "revision": "3b7c04bccfb6714d2ea9589e98591ed9088d128e", - "version": null + "branch": null, + "revision": "dd98468422044b53e283d970809b8502e1ef5b8d", + "version": "3.1.0" } }, { "package": "SRGNetwork", "repositoryURL": "https://github.com/SRGSSR/srgnetwork-apple.git", "state": { - "branch": "develop", - "revision": "dedfb9032837c72ec1c3365f3dfb3ff04d65ec75", - "version": null + "branch": null, + "revision": "153a2544391c1aaccae2d38d8b113fd0a03421b8", + "version": "3.1.0" } }, { diff --git a/Package.swift b/Package.swift index c93a38f..95bb017 100644 --- a/Package.swift +++ b/Package.swift @@ -20,7 +20,7 @@ let package = Package( ) ], dependencies: [ - .package(name: "SRGIdentity", url: "https://github.com/SRGSSR/srgidentity-apple.git", .branch("develop")) + .package(name: "SRGIdentity", url: "https://github.com/SRGSSR/srgidentity-apple.git", .upToNextMinor(from: "3.3.0")) ], targets: [ .target( diff --git a/Tests/SRGUserData-tests.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Tests/SRGUserData-tests.xcworkspace/xcshareddata/swiftpm/Package.resolved index 6509dcd..50845fd 100644 --- a/Tests/SRGUserData-tests.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Tests/SRGUserData-tests.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -5,27 +5,27 @@ "package": "FXReachability", "repositoryURL": "https://github.com/SRGSSR/FXReachability.git", "state": { - "branch": "master", + "branch": null, "revision": "b8d60cfbe6eddf1a622476548465efed88afb564", - "version": null + "version": "1.3.2-srg6" } }, { "package": "libextobjc", "repositoryURL": "https://github.com/SRGSSR/libextobjc.git", "state": { - "branch": "master", + "branch": null, "revision": "9c9a7327410fe3f7cdb695965ced43b9a7766ee0", - "version": null + "version": "0.6.0-srg4" } }, { "package": "MAKVONotificationCenter", "repositoryURL": "https://github.com/SRGSSR/MAKVONotificationCenter.git", "state": { - "branch": "master", + "branch": null, "revision": "8bde3cdc872085bd31f4cfe546bdf8e6932a0806", - "version": null + "version": "1.0.0-srg6" } }, { @@ -50,36 +50,36 @@ "package": "SRGAppearance", "repositoryURL": "https://github.com/SRGSSR/srgappearance-apple.git", "state": { - "branch": "feature/ios16-tvos16-xcode14", - "revision": "a08d0704a6c171aed77b3291f233333b0aac30b2", - "version": null + "branch": null, + "revision": "72d9475b46d97ecde0298b5bc80a654e8b424ebb", + "version": "5.2.0" } }, { "package": "SRGIdentity", "repositoryURL": "https://github.com/SRGSSR/srgidentity-apple.git", "state": { - "branch": "feature/ios16-tvos16-xcode14", - "revision": "e19abad8cd63f8e880d6613589b81d83fd6ecbfe", - "version": null + "branch": null, + "revision": "10368fd1679eeaffb05d84bcdc1002f3d66c2d12", + "version": "3.3.0" } }, { "package": "SRGLogger", "repositoryURL": "https://github.com/SRGSSR/srglogger-apple.git", "state": { - "branch": "feature/ios16-tvos16-xcode14", - "revision": "36fd041b78224b77d8dd348511dbf6ed8cd88d68", - "version": null + "branch": null, + "revision": "dd98468422044b53e283d970809b8502e1ef5b8d", + "version": "3.1.0" } }, { "package": "SRGNetwork", "repositoryURL": "https://github.com/SRGSSR/srgnetwork-apple.git", "state": { - "branch": "feature/ios16-tvos16-xcode14", - "revision": "ac107207c25f65060c13688239e0f0cdf3724e60", - "version": null + "branch": null, + "revision": "153a2544391c1aaccae2d38d8b113fd0a03421b8", + "version": "3.1.0" } }, { From c72e926a4590a030265b4d79ace8e93007aef857 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Bertholon Date: Thu, 11 Aug 2022 23:25:24 +0200 Subject: [PATCH 25/25] 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 0c4c7ea..93cbc12 100644 --- a/Demo/Demo.xcconfig +++ b/Demo/Demo.xcconfig @@ -1,5 +1,5 @@ // Version information -MARKETING_VERSION = 3.2.1 +MARKETING_VERSION = 3.3.0 // Deployment targets IPHONEOS_DEPLOYMENT_TARGET = 12.0 diff --git a/Package.swift b/Package.swift index 95bb017..96223c7 100644 --- a/Package.swift +++ b/Package.swift @@ -3,7 +3,7 @@ import PackageDescription struct ProjectSettings { - static let marketingVersion: String = "3.2.1" + static let marketingVersion: String = "3.3.0" } let package = Package(