From 98a0e9376b5c87c2e90d9cd889d19435fb66b16d Mon Sep 17 00:00:00 2001 From: Pierre-Yves Bertholon Date: Thu, 11 Aug 2022 22:01:12 +0200 Subject: [PATCH 1/5] 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 2d774a07..0d9f7e59 100644 --- a/Demo/Demo.xcconfig +++ b/Demo/Demo.xcconfig @@ -1,5 +1,5 @@ // Version information -MARKETING_VERSION = 7.9.0 +MARKETING_VERSION = 7.9.1 // Deployment targets IPHONEOS_DEPLOYMENT_TARGET = 12.0 diff --git a/Package.swift b/Package.swift index f0e267f4..7dce44ac 100644 --- a/Package.swift +++ b/Package.swift @@ -3,7 +3,7 @@ import PackageDescription struct ProjectSettings { - static let marketingVersion: String = "7.9.0" + static let marketingVersion: String = "7.9.1" } let package = Package( From 4c93126a693047934c3a445d1135d55afc0bc147 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Bertholon Date: Thu, 22 Sep 2022 19:41:39 +0200 Subject: [PATCH 2/5] Update Fastlane and use iPhone 14 for tests --- Gemfile.lock | 32 ++++++++++++++++---------------- fastlane/Fastfile | 6 +++--- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 426d0bc9..f3e0300e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,13 +3,13 @@ GEM specs: CFPropertyList (3.0.5) 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.634.0) + aws-sdk-core (3.152.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) @@ -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.92.5) + faraday (1.10.2) 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.210.1) 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.27.0) + google-apis-core (>= 0.7.2, < 2.a) + google-apis-core (0.9.0) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.16.2, < 2.a) httpclient (>= 2.8.1, < 3.a) @@ -117,8 +117,8 @@ GEM retriable (>= 2.0, < 4.a) rexml webrick - google-apis-iamcredentials_v1 (0.13.0) - google-apis-core (>= 0.7, < 2.a) + google-apis-iamcredentials_v1 (0.14.0) + google-apis-core (>= 0.7.2, < 2.a) google-apis-playcustomapp_v1 (0.10.0) google-apis-core (>= 0.7, < 2.a) google-apis-storage_v1 (0.17.0) @@ -128,8 +128,8 @@ GEM 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.42.0) addressable (~> 2.8) digest-crc (~> 0.4) google-apis-iamcredentials_v1 (~> 0.1) @@ -150,7 +150,7 @@ GEM httpclient (2.8.3) jmespath (1.6.1) json (2.6.2) - jwt (2.4.1) + jwt (2.5.0) memoist (0.16.2) mini_magick (4.11.0) mini_mime (1.1.2) @@ -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.0) rake (13.0.6) representable (3.2.0) declarative (< 0.1.0) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 94d1c4e6..46328e78 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.201.0' +fastlane_version '2.210.1' default_platform :ios @@ -25,9 +25,9 @@ platform :ios do clean_result_files clean_derived_data - iphone13 = Device.new('iOS', 'iPhone 13') + iphone14 = Device.new('iOS', 'iPhone 14') appletv = Device.new('tvOS', 'Apple TV') - devices = [iphone13, appletv] + devices = [iphone14, appletv] scheme = swift_package_name swift_package_tests = TestBuild.new(scheme, '-Package', false) From 9832d25cd8085be1d9c79ae7cbefebb301561b72 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Bertholon Date: Mon, 31 Oct 2022 14:22:28 +0100 Subject: [PATCH 3/5] Update DP dependency --- .../xcshareddata/swiftpm/Package.resolved | 6 +++--- Package.resolved | 10 +++++----- Package.swift | 2 +- .../xcshareddata/swiftpm/Package.resolved | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Demo/SRGAnalytics-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Demo/SRGAnalytics-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved index 7c122804..fb677275 100644 --- a/Demo/SRGAnalytics-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Demo/SRGAnalytics-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -68,9 +68,9 @@ "package": "SRGDataProvider", "repositoryURL": "https://github.com/SRGSSR/srgdataprovider-apple.git", "state": { - "branch": null, - "revision": "340c676f77eec1bd437bed91f30165736fc10abb", - "version": "16.1.0" + "branch": "develop", + "revision": "8580c922fdd1aa39c3fda8d011bd75c82bbb402b", + "version": null } }, { diff --git a/Package.resolved b/Package.resolved index 7c122804..28610eaf 100644 --- a/Package.resolved +++ b/Package.resolved @@ -51,8 +51,8 @@ "repositoryURL": "https://github.com/SRGSSR/srgappearance-apple.git", "state": { "branch": null, - "revision": "72d9475b46d97ecde0298b5bc80a654e8b424ebb", - "version": "5.2.0" + "revision": "37858eb83365f498d3861cc546ba86a51e061293", + "version": "5.2.1" } }, { @@ -68,9 +68,9 @@ "package": "SRGDataProvider", "repositoryURL": "https://github.com/SRGSSR/srgdataprovider-apple.git", "state": { - "branch": null, - "revision": "340c676f77eec1bd437bed91f30165736fc10abb", - "version": "16.1.0" + "branch": "develop", + "revision": "8580c922fdd1aa39c3fda8d011bd75c82bbb402b", + "version": null } }, { diff --git a/Package.swift b/Package.swift index 7dce44ac..286a0c8f 100644 --- a/Package.swift +++ b/Package.swift @@ -38,7 +38,7 @@ let package = Package( dependencies: [ .package(name: "ComScore", url: "https://github.com/comScore/Comscore-Swift-Package-Manager.git", .upToNextMinor(from: "6.10.0")), .package(name: "SRGContentProtection", url: "https://github.com/SRGSSR/srgcontentprotection-apple.git", .upToNextMinor(from: "3.1.0")), - .package(name: "SRGDataProvider", url: "https://github.com/SRGSSR/srgdataprovider-apple.git", .upToNextMinor(from: "16.1.0")), + .package(name: "SRGDataProvider", url: "https://github.com/SRGSSR/srgdataprovider-apple.git", .branch("develop")), .package(name: "SRGIdentity", url: "https://github.com/SRGSSR/srgidentity-apple.git", .upToNextMinor(from: "3.3.0")), .package(name: "SRGLogger", url: "https://github.com/SRGSSR/srglogger-apple.git", .upToNextMinor(from: "3.1.0")), .package(name: "SRGMediaPlayer", url: "https://github.com/SRGSSR/srgmediaplayer-apple.git", .upToNextMinor(from: "7.1.0")), diff --git a/Tests/SRGAnalyticsIdentity-tests.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Tests/SRGAnalyticsIdentity-tests.xcworkspace/xcshareddata/swiftpm/Package.resolved index 068a0bf8..89ad4ae8 100644 --- a/Tests/SRGAnalyticsIdentity-tests.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Tests/SRGAnalyticsIdentity-tests.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -77,9 +77,9 @@ "package": "SRGDataProvider", "repositoryURL": "https://github.com/SRGSSR/srgdataprovider-apple.git", "state": { - "branch": null, - "revision": "340c676f77eec1bd437bed91f30165736fc10abb", - "version": "16.1.0" + "branch": "develop", + "revision": "8580c922fdd1aa39c3fda8d011bd75c82bbb402b", + "version": null } }, { From b01ed9ec8b9732e085aae4beae702e9394c6d7f1 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Bertholon Date: Wed, 9 Nov 2022 18:08:05 +0100 Subject: [PATCH 4/5] Update dependencies to official tags --- .../xcshareddata/swiftpm/Package.resolved | 6 +++--- Package.resolved | 6 +++--- Package.swift | 2 +- .../xcshareddata/swiftpm/Package.resolved | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Demo/SRGAnalytics-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Demo/SRGAnalytics-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved index fb677275..24dfae5c 100644 --- a/Demo/SRGAnalytics-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Demo/SRGAnalytics-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -68,9 +68,9 @@ "package": "SRGDataProvider", "repositoryURL": "https://github.com/SRGSSR/srgdataprovider-apple.git", "state": { - "branch": "develop", - "revision": "8580c922fdd1aa39c3fda8d011bd75c82bbb402b", - "version": null + "branch": null, + "revision": "7b1c3e001213315ef1eed9892cb97651a3e03dfd", + "version": "17.0.0" } }, { diff --git a/Package.resolved b/Package.resolved index 28610eaf..7f014f3d 100644 --- a/Package.resolved +++ b/Package.resolved @@ -68,9 +68,9 @@ "package": "SRGDataProvider", "repositoryURL": "https://github.com/SRGSSR/srgdataprovider-apple.git", "state": { - "branch": "develop", - "revision": "8580c922fdd1aa39c3fda8d011bd75c82bbb402b", - "version": null + "branch": null, + "revision": "7b1c3e001213315ef1eed9892cb97651a3e03dfd", + "version": "17.0.0" } }, { diff --git a/Package.swift b/Package.swift index 286a0c8f..78a1911d 100644 --- a/Package.swift +++ b/Package.swift @@ -38,7 +38,7 @@ let package = Package( dependencies: [ .package(name: "ComScore", url: "https://github.com/comScore/Comscore-Swift-Package-Manager.git", .upToNextMinor(from: "6.10.0")), .package(name: "SRGContentProtection", url: "https://github.com/SRGSSR/srgcontentprotection-apple.git", .upToNextMinor(from: "3.1.0")), - .package(name: "SRGDataProvider", url: "https://github.com/SRGSSR/srgdataprovider-apple.git", .branch("develop")), + .package(name: "SRGDataProvider", url: "https://github.com/SRGSSR/srgdataprovider-apple.git", .upToNextMinor(from: "17.0.0")), .package(name: "SRGIdentity", url: "https://github.com/SRGSSR/srgidentity-apple.git", .upToNextMinor(from: "3.3.0")), .package(name: "SRGLogger", url: "https://github.com/SRGSSR/srglogger-apple.git", .upToNextMinor(from: "3.1.0")), .package(name: "SRGMediaPlayer", url: "https://github.com/SRGSSR/srgmediaplayer-apple.git", .upToNextMinor(from: "7.1.0")), diff --git a/Tests/SRGAnalyticsIdentity-tests.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Tests/SRGAnalyticsIdentity-tests.xcworkspace/xcshareddata/swiftpm/Package.resolved index 89ad4ae8..7f6bdf69 100644 --- a/Tests/SRGAnalyticsIdentity-tests.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Tests/SRGAnalyticsIdentity-tests.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -77,9 +77,9 @@ "package": "SRGDataProvider", "repositoryURL": "https://github.com/SRGSSR/srgdataprovider-apple.git", "state": { - "branch": "develop", - "revision": "8580c922fdd1aa39c3fda8d011bd75c82bbb402b", - "version": null + "branch": null, + "revision": "7b1c3e001213315ef1eed9892cb97651a3e03dfd", + "version": "17.0.0" } }, { From 3959d9ea0b69e6866de939628900b8bd858af9dc Mon Sep 17 00:00:00 2001 From: Pierre-Yves Bertholon Date: Wed, 9 Nov 2022 18:08:59 +0100 Subject: [PATCH 5/5] 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 0d9f7e59..a1dbd88e 100644 --- a/Demo/Demo.xcconfig +++ b/Demo/Demo.xcconfig @@ -1,5 +1,5 @@ // Version information -MARKETING_VERSION = 7.9.1 +MARKETING_VERSION = 7.10.0 // Deployment targets IPHONEOS_DEPLOYMENT_TARGET = 12.0 diff --git a/Package.swift b/Package.swift index 78a1911d..4a79dc76 100644 --- a/Package.swift +++ b/Package.swift @@ -3,7 +3,7 @@ import PackageDescription struct ProjectSettings { - static let marketingVersion: String = "7.9.1" + static let marketingVersion: String = "7.10.0" } let package = Package(