From 16f7eaab2cdd4ae22d0f2a6cb3799c51559cc799 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 3 Jan 2024 16:53:31 +0100 Subject: [PATCH 1/3] Bump version --- CHANGELOG.md | 3 +++ Presentation.xcodeproj/project.pbxproj | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7fd2e17..d12cb1b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# 1.15.3 +- Support Xcode 15 + # 1.15.2 - Xcode 13.2 compatibility - [Change] Replace `Carthage` with `SPM` diff --git a/Presentation.xcodeproj/project.pbxproj b/Presentation.xcodeproj/project.pbxproj index e0c984a..29f4f2b 100644 --- a/Presentation.xcodeproj/project.pbxproj +++ b/Presentation.xcodeproj/project.pbxproj @@ -472,7 +472,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.15.2; + MARKETING_VERSION = 1.15.3; PRODUCT_BUNDLE_IDENTIFIER = com.iZettle.Presentation; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -498,7 +498,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.15.2; + MARKETING_VERSION = 1.15.3; PRODUCT_BUNDLE_IDENTIFIER = com.iZettle.Presentation; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; From 8f7ed703c1685f346893e41a32141d5994883d37 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 3 Jan 2024 16:54:26 +0100 Subject: [PATCH 2/3] Update Flow --- .../xcshareddata/swiftpm/Package.resolved | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/Presentation.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Presentation.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index d0e0a81..1af658f 100644 --- a/Presentation.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Presentation.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,16 +1,14 @@ { - "object": { - "pins": [ - { - "package": "Flow", - "repositoryURL": "https://github.com/iZettle/Flow.git", - "state": { - "branch": null, - "revision": "ad38c734f16a404de8895236424bc4acc5355a3d", - "version": "1.10.1" - } + "pins" : [ + { + "identity" : "flow", + "kind" : "remoteSourceControl", + "location" : "https://github.com/iZettle/Flow.git", + "state" : { + "revision" : "7ca28339de290e1b74de5cbf0def562810c07154", + "version" : "1.11.1" } - ] - }, - "version": 1 + } + ], + "version" : 2 } From 5c2348b28d955b3b536b3c46b6e597ca63d4d535 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 4 Jan 2024 12:57:48 +0100 Subject: [PATCH 3/3] Revert "Update Flow" This reverts commit 8f7ed703c1685f346893e41a32141d5994883d37. --- .../xcshareddata/swiftpm/Package.resolved | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/Presentation.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Presentation.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 1af658f..d0e0a81 100644 --- a/Presentation.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Presentation.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,14 +1,16 @@ { - "pins" : [ - { - "identity" : "flow", - "kind" : "remoteSourceControl", - "location" : "https://github.com/iZettle/Flow.git", - "state" : { - "revision" : "7ca28339de290e1b74de5cbf0def562810c07154", - "version" : "1.11.1" + "object": { + "pins": [ + { + "package": "Flow", + "repositoryURL": "https://github.com/iZettle/Flow.git", + "state": { + "branch": null, + "revision": "ad38c734f16a404de8895236424bc4acc5355a3d", + "version": "1.10.1" + } } - } - ], - "version" : 2 + ] + }, + "version": 1 }