From 3667c69377cba6fc728ca479d14a44ad3e5a5346 Mon Sep 17 00:00:00 2001 From: Jonathan Carifio Date: Mon, 6 Nov 2023 02:06:40 -0500 Subject: [PATCH 1/3] Bump version and build numbers in project file. --- Spellbook.xcodeproj/project.pbxproj | 8 +- .../xcshareddata/swiftpm/Package.resolved | 95 +++++++++---------- 2 files changed, 50 insertions(+), 53 deletions(-) diff --git a/Spellbook.xcodeproj/project.pbxproj b/Spellbook.xcodeproj/project.pbxproj index 6cd84cd..b864c95 100644 --- a/Spellbook.xcodeproj/project.pbxproj +++ b/Spellbook.xcodeproj/project.pbxproj @@ -1009,7 +1009,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; "CODE_SIGN_STYLE[sdk=iphoneos*]" = Automatic; - CURRENT_PROJECT_VERSION = 38; + CURRENT_PROJECT_VERSION = 39; DEFINES_MODULE = NO; DEVELOPMENT_TEAM = RSR87G74R7; EXCLUDED_ARCHS = ""; @@ -1019,7 +1019,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 3.1.0; + MARKETING_VERSION = 3.2.0; PRODUCT_BUNDLE_IDENTIFIER = dnd.jon.Spellbook; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1038,7 +1038,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; "CODE_SIGN_STYLE[sdk=iphoneos*]" = Automatic; - CURRENT_PROJECT_VERSION = 38; + CURRENT_PROJECT_VERSION = 39; DEFINES_MODULE = NO; DEVELOPMENT_TEAM = RSR87G74R7; EXCLUDED_ARCHS = ""; @@ -1048,7 +1048,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 3.1.0; + MARKETING_VERSION = 3.2.0; PRODUCT_BUNDLE_IDENTIFIER = dnd.jon.Spellbook; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/Spellbook.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Spellbook.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 86b3af1..d30fbcf 100644 --- a/Spellbook.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Spellbook.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,52 +1,49 @@ { - "object": { - "pins": [ - { - "package": "ActionSheetPicker-3.0", - "repositoryURL": "https://github.com/skywinder/ActionSheetPicker-3.0", - "state": { - "branch": null, - "revision": "8d82c21036c2f478a47908a7fc107ec7027abcab", - "version": null - } - }, - { - "package": "ReSwift", - "repositoryURL": "https://github.com/ReSwift/ReSwift.git", - "state": { - "branch": null, - "revision": "cb5c3c02f652420ef413dea41e13ac5a76b6c0fd", - "version": "6.1.1" - } - }, - { - "package": "SimpleCheckbox", - "repositoryURL": "https://github.com/BeauNouvelle/SimpleCheckbox.git", - "state": { - "branch": null, - "revision": "96cf25c98bd8e595018df6a2466a9a1eb348fdb8", - "version": "2.3.0" - } - }, - { - "package": "SWXMLHash", - "repositoryURL": "https://github.com/drmohundro/SWXMLHash.git", - "state": { - "branch": null, - "revision": "4d0f62f561458cbe1f732171e625f03195151b60", - "version": "7.0.1" - } - }, - { - "package": "Toast", - "repositoryURL": "https://github.com/scalessec/Toast-Swift", - "state": { - "branch": null, - "revision": "0c9493eeacb102cc614da385cfaaf475379f4ab4", - "version": "5.0.1" - } + "pins" : [ + { + "identity" : "actionsheetpicker-3.0", + "kind" : "remoteSourceControl", + "location" : "https://github.com/skywinder/ActionSheetPicker-3.0", + "state" : { + "revision" : "8d82c21036c2f478a47908a7fc107ec7027abcab" } - ] - }, - "version": 1 + }, + { + "identity" : "reswift", + "kind" : "remoteSourceControl", + "location" : "https://github.com/ReSwift/ReSwift.git", + "state" : { + "revision" : "cb5c3c02f652420ef413dea41e13ac5a76b6c0fd", + "version" : "6.1.1" + } + }, + { + "identity" : "simplecheckbox", + "kind" : "remoteSourceControl", + "location" : "https://github.com/BeauNouvelle/SimpleCheckbox.git", + "state" : { + "revision" : "96cf25c98bd8e595018df6a2466a9a1eb348fdb8", + "version" : "2.3.0" + } + }, + { + "identity" : "swxmlhash", + "kind" : "remoteSourceControl", + "location" : "https://github.com/drmohundro/SWXMLHash.git", + "state" : { + "revision" : "4d0f62f561458cbe1f732171e625f03195151b60", + "version" : "7.0.1" + } + }, + { + "identity" : "toast-swift", + "kind" : "remoteSourceControl", + "location" : "https://github.com/scalessec/Toast-Swift", + "state" : { + "revision" : "0c9493eeacb102cc614da385cfaaf475379f4ab4", + "version" : "5.0.1" + } + } + ], + "version" : 2 } From b9bf47cef24445f1cffd29c494cded9992e69522 Mon Sep 17 00:00:00 2001 From: Jonathan Carifio Date: Thu, 9 Nov 2023 00:39:39 -0500 Subject: [PATCH 2/3] Fix bug with initial selected index of text field chooser. Adjust cast button size and bump build number. --- Spellbook.xcodeproj/project.pbxproj | 4 +-- Spellbook/Base.lproj/Main.storyboard | 38 ++++++++++++------------ Spellbook/TextFieldChooserDelegate.swift | 3 +- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/Spellbook.xcodeproj/project.pbxproj b/Spellbook.xcodeproj/project.pbxproj index b864c95..ed1d7cc 100644 --- a/Spellbook.xcodeproj/project.pbxproj +++ b/Spellbook.xcodeproj/project.pbxproj @@ -1009,7 +1009,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; "CODE_SIGN_STYLE[sdk=iphoneos*]" = Automatic; - CURRENT_PROJECT_VERSION = 39; + CURRENT_PROJECT_VERSION = 40; DEFINES_MODULE = NO; DEVELOPMENT_TEAM = RSR87G74R7; EXCLUDED_ARCHS = ""; @@ -1038,7 +1038,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; "CODE_SIGN_STYLE[sdk=iphoneos*]" = Automatic; - CURRENT_PROJECT_VERSION = 39; + CURRENT_PROJECT_VERSION = 40; DEFINES_MODULE = NO; DEVELOPMENT_TEAM = RSR87G74R7; EXCLUDED_ARCHS = ""; diff --git a/Spellbook/Base.lproj/Main.storyboard b/Spellbook/Base.lproj/Main.storyboard index 34b5c2a..807ce3e 100644 --- a/Spellbook/Base.lproj/Main.storyboard +++ b/Spellbook/Base.lproj/Main.storyboard @@ -463,7 +463,7 @@ - + @@ -1962,7 +1962,7 @@ - + @@ -2020,7 +2020,7 @@ - + @@ -2110,7 +2110,7 @@ - + @@ -2169,7 +2169,7 @@ - + @@ -2256,7 +2256,7 @@ - + @@ -2407,7 +2407,7 @@ - + @@ -2529,7 +2529,7 @@ - + @@ -2643,7 +2643,7 @@ - + @@ -2753,7 +2753,7 @@ - + @@ -2897,7 +2897,7 @@ - + @@ -3036,7 +3036,7 @@ - + diff --git a/Spellbook/TextFieldChooserDelegate.swift b/Spellbook/TextFieldChooserDelegate.swift index 83ade28..398d3dc 100644 --- a/Spellbook/TextFieldChooserDelegate.swift +++ b/Spellbook/TextFieldChooserDelegate.swift @@ -50,15 +50,14 @@ class TextFieldChooserDelegate: NSObject, UITextFieldDel // Get the index of the selected option let selectedItem = self.itemProvider() - let selectedIndex: Int = items.firstIndex(of: selectedItem) ?? 0 var itemsToUse = self.items if (self.itemFilter != nil) { itemsToUse = self.items.filter(self.itemFilter!) } + let selectedIndex: Int = itemsToUse.firstIndex(of: selectedItem) ?? 0 let pickerData = itemsToUse.map(self.nameGetter) - // Create the action sheet picker let actionSheetPicker = ActionSheetStringPicker(title: title, rows: pickerData, From fd82ef2438ec024bce286c2519c35c9c71614417 Mon Sep 17 00:00:00 2001 From: Jonathan Carifio Date: Thu, 9 Nov 2023 00:54:32 -0500 Subject: [PATCH 3/3] Bump build number. --- Spellbook.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Spellbook.xcodeproj/project.pbxproj b/Spellbook.xcodeproj/project.pbxproj index ed1d7cc..d831929 100644 --- a/Spellbook.xcodeproj/project.pbxproj +++ b/Spellbook.xcodeproj/project.pbxproj @@ -1009,7 +1009,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; "CODE_SIGN_STYLE[sdk=iphoneos*]" = Automatic; - CURRENT_PROJECT_VERSION = 40; + CURRENT_PROJECT_VERSION = 41; DEFINES_MODULE = NO; DEVELOPMENT_TEAM = RSR87G74R7; EXCLUDED_ARCHS = ""; @@ -1038,7 +1038,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; "CODE_SIGN_STYLE[sdk=iphoneos*]" = Automatic; - CURRENT_PROJECT_VERSION = 40; + CURRENT_PROJECT_VERSION = 41; DEFINES_MODULE = NO; DEVELOPMENT_TEAM = RSR87G74R7; EXCLUDED_ARCHS = "";