From 9177354f1c22fba5f76a0fa899ad2082adffcb52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20De=CC=81fago?= Date: Fri, 8 Jul 2022 11:30:27 +0200 Subject: [PATCH 1/6] 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 21f170b..7c7b59a 100644 --- a/Demo/Demo.xcconfig +++ b/Demo/Demo.xcconfig @@ -1,5 +1,5 @@ // Version information -MARKETING_VERSION = 5.1.1 +MARKETING_VERSION = 5.1.2 // Deployment targets IPHONEOS_DEPLOYMENT_TARGET = 12.0 diff --git a/Package.swift b/Package.swift index 2b9c675..dc9cd0a 100644 --- a/Package.swift +++ b/Package.swift @@ -3,7 +3,7 @@ import PackageDescription struct ProjectSettings { - static let marketingVersion: String = "5.1.1" + static let marketingVersion: String = "5.1.2" } let package = Package( From 5ff9459a36c345ccf63efafe7b3e5f47568aa04e Mon Sep 17 00:00:00 2001 From: Pierre-Yves Bertholon Date: Wed, 6 Jul 2022 19:37:39 +0200 Subject: [PATCH 2/6] Fastlane: build with Xcode 14 --- fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 9ac69b4..9ddb7ae 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 a9b83a6cfb3d3730007a88210ecf27bb6889564c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20De=CC=81fago?= Date: Fri, 8 Jul 2022 07:25:39 +0200 Subject: [PATCH 3/6] Modernize with Xcode 14 --- .swiftpm/xcode/xcshareddata/xcschemes/SRGAppearance.xcscheme | 2 +- Demo/SRGAppearance-demo.xcodeproj/project.pbxproj | 5 ++++- .../xcshareddata/xcschemes/SRGAppearance-demo.xcscheme | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/SRGAppearance.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/SRGAppearance.xcscheme index 4db2e1d..4fa5d47 100644 --- a/.swiftpm/xcode/xcshareddata/xcschemes/SRGAppearance.xcscheme +++ b/.swiftpm/xcode/xcshareddata/xcschemes/SRGAppearance.xcscheme @@ -1,6 +1,6 @@ Date: Thu, 14 Jul 2022 07:32:08 +0200 Subject: [PATCH 4/6] Fix Catalyst build --- Demo/Demo.xcconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/Demo/Demo.xcconfig b/Demo/Demo.xcconfig index 7c7b59a..14e6387 100644 --- a/Demo/Demo.xcconfig +++ b/Demo/Demo.xcconfig @@ -19,6 +19,7 @@ EXCLUDED_SOURCE_FILE_NAMES = $(IOS_FILES) $(TVOS_FILES) INCLUDED_SOURCE_FILE_NAMES = INCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = $(IOS_FILES) +INCLUDED_SOURCE_FILE_NAMES[sdk=mac*] = = $(IOS_FILES) INCLUDED_SOURCE_FILE_NAMES[sdk=appletv*] = $(TVOS_FILES) LAUNCH_SCREEN[sdk=iphone*] = LaunchScreen~ios From 6d86662b7e1440571452d649007a6ee0e10be02b Mon Sep 17 00:00:00 2001 From: Pierre-Yves Bertholon Date: Thu, 11 Aug 2022 16:11:20 +0200 Subject: [PATCH 5/6] 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 f77cc3ab7e96a314253ab0083e21b60f1b472fe7 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Bertholon Date: Thu, 11 Aug 2022 18:43:06 +0200 Subject: [PATCH 6/6] 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 14e6387..3958784 100644 --- a/Demo/Demo.xcconfig +++ b/Demo/Demo.xcconfig @@ -1,5 +1,5 @@ // Version information -MARKETING_VERSION = 5.1.2 +MARKETING_VERSION = 5.2.0 // Deployment targets IPHONEOS_DEPLOYMENT_TARGET = 12.0 diff --git a/Package.swift b/Package.swift index dc9cd0a..0867379 100644 --- a/Package.swift +++ b/Package.swift @@ -3,7 +3,7 @@ import PackageDescription struct ProjectSettings { - static let marketingVersion: String = "5.1.2" + static let marketingVersion: String = "5.2.0" } let package = Package(