Skip to content

Commit 2e2045a

Browse files
theospearstheospears
authored
Update minimum version to iOS15 (#416)
This updates the minimum version to iOS15 and removes codepaths to explicitly support lower versions. Also updates the project to be consistent with recommendations for the latest xcode, and makes a few changes to be consistent with this.
1 parent dbeb9ed commit 2e2045a

17 files changed

+49
-60
lines changed

‎.github/workflows/fastlane-tests.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,12 @@ on:
55

66
jobs:
77
build:
8-
runs-on: macos-12
8+
runs-on: macos-13
99

1010
steps:
11+
- uses: maxim-lobanov/setup-xcode@v1
12+
with:
13+
xcode-version: latest-stable
1114
- uses: actions/checkout@v4
1215
- name: Use sample configuration
1316
run: cp BeeSwift/Config.swift.sample BeeKit/Config.swift

‎BeeSwift.xcodeproj/project.pbxproj‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -963,7 +963,7 @@
963963
BuildIndependentTargetsInParallel = YES;
964964
LastSwiftMigration = 0710;
965965
LastSwiftUpdateCheck = 1240;
966-
LastUpgradeCheck = 1430;
966+
LastUpgradeCheck = 1500;
967967
ORGANIZATIONNAME = APB;
968968
TargetAttributes = {
969969
A12E694C1BD3EF0200AB94C2 = {
@@ -1415,7 +1415,7 @@
14151415
EXCLUDED_ARCHS = "";
14161416
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
14171417
INFOPLIST_FILE = BeeSwiftToday/Info.plist;
1418-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
1418+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
14191419
LD_RUNPATH_SEARCH_PATHS = (
14201420
"$(inherited)",
14211421
"@executable_path/Frameworks",
@@ -1442,7 +1442,7 @@
14421442
EXCLUDED_ARCHS = "";
14431443
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
14441444
INFOPLIST_FILE = BeeSwiftToday/Info.plist;
1445-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
1445+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
14461446
LD_RUNPATH_SEARCH_PATHS = (
14471447
"$(inherited)",
14481448
"@executable_path/Frameworks",
@@ -1462,6 +1462,7 @@
14621462
isa = XCBuildConfiguration;
14631463
buildSettings = {
14641464
ALWAYS_SEARCH_USER_PATHS = NO;
1465+
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
14651466
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
14661467
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
14671468
CLANG_CXX_LIBRARY = "libc++";
@@ -1493,6 +1494,7 @@
14931494
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
14941495
ENABLE_STRICT_OBJC_MSGSEND = YES;
14951496
ENABLE_TESTABILITY = YES;
1497+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
14961498
EXCLUDED_ARCHS = "";
14971499
GCC_C_LANGUAGE_STANDARD = gnu99;
14981500
GCC_DYNAMIC_NO_PIC = NO;
@@ -1509,7 +1511,7 @@
15091511
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
15101512
GCC_WARN_UNUSED_FUNCTION = YES;
15111513
GCC_WARN_UNUSED_VARIABLE = YES;
1512-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
1514+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
15131515
MTL_ENABLE_DEBUG_INFO = YES;
15141516
ONLY_ACTIVE_ARCH = YES;
15151517
PROVISIONING_PROFILE = "";
@@ -1523,6 +1525,7 @@
15231525
isa = XCBuildConfiguration;
15241526
buildSettings = {
15251527
ALWAYS_SEARCH_USER_PATHS = NO;
1528+
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
15261529
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
15271530
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
15281531
CLANG_CXX_LIBRARY = "libc++";
@@ -1554,6 +1557,7 @@
15541557
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
15551558
ENABLE_NS_ASSERTIONS = NO;
15561559
ENABLE_STRICT_OBJC_MSGSEND = YES;
1560+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
15571561
EXCLUDED_ARCHS = "";
15581562
GCC_C_LANGUAGE_STANDARD = gnu99;
15591563
GCC_NO_COMMON_BLOCKS = YES;
@@ -1563,7 +1567,7 @@
15631567
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
15641568
GCC_WARN_UNUSED_FUNCTION = YES;
15651569
GCC_WARN_UNUSED_VARIABLE = YES;
1566-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
1570+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
15671571
MTL_ENABLE_DEBUG_INFO = NO;
15681572
PROVISIONING_PROFILE = "";
15691573
SDKROOT = iphoneos;
@@ -1593,7 +1597,7 @@
15931597
);
15941598
INFOPLIST_FILE = BeeSwift/Info.plist;
15951599
INTENTS_CODEGEN_LANGUAGE = Swift;
1596-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
1600+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
15971601
LD_RUNPATH_SEARCH_PATHS = (
15981602
"$(inherited)",
15991603
"@executable_path/Frameworks",
@@ -1630,7 +1634,7 @@
16301634
GCC_OPTIMIZATION_LEVEL = s;
16311635
INFOPLIST_FILE = BeeSwift/Info.plist;
16321636
INTENTS_CODEGEN_LANGUAGE = Swift;
1633-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
1637+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
16341638
LD_RUNPATH_SEARCH_PATHS = (
16351639
"$(inherited)",
16361640
"@executable_path/Frameworks",
@@ -1720,7 +1724,7 @@
17201724
INFOPLIST_FILE = BeeKit/Info.plist;
17211725
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
17221726
INTENTS_CODEGEN_LANGUAGE = Swift;
1723-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
1727+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
17241728
LD_RUNPATH_SEARCH_PATHS = (
17251729
"$(inherited)",
17261730
"@executable_path/Frameworks",
@@ -1767,7 +1771,7 @@
17671771
INFOPLIST_FILE = BeeKit/Info.plist;
17681772
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
17691773
INTENTS_CODEGEN_LANGUAGE = Swift;
1770-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
1774+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
17711775
LD_RUNPATH_SEARCH_PATHS = (
17721776
"$(inherited)",
17731777
"@executable_path/Frameworks",
@@ -1802,7 +1806,7 @@
18021806
DEVELOPMENT_TEAM = 8TW9V9HVES;
18031807
GCC_C_LANGUAGE_STANDARD = gnu11;
18041808
INFOPLIST_FILE = BeeKitTests/Info.plist;
1805-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
1809+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
18061810
LD_RUNPATH_SEARCH_PATHS = (
18071811
"$(inherited)",
18081812
"@executable_path/Frameworks",
@@ -1832,7 +1836,7 @@
18321836
DEVELOPMENT_TEAM = 8TW9V9HVES;
18331837
GCC_C_LANGUAGE_STANDARD = gnu11;
18341838
INFOPLIST_FILE = BeeKitTests/Info.plist;
1835-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
1839+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
18361840
LD_RUNPATH_SEARCH_PATHS = (
18371841
"$(inherited)",
18381842
"@executable_path/Frameworks",
@@ -1866,7 +1870,7 @@
18661870
GCC_C_LANGUAGE_STANDARD = gnu11;
18671871
INFOPLIST_FILE = BeeSwiftIntents/Info.plist;
18681872
INTENTS_CODEGEN_LANGUAGE = Swift;
1869-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
1873+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
18701874
LD_RUNPATH_SEARCH_PATHS = (
18711875
"$(inherited)",
18721876
"@executable_path/Frameworks",
@@ -1901,7 +1905,7 @@
19011905
GCC_C_LANGUAGE_STANDARD = gnu11;
19021906
INFOPLIST_FILE = BeeSwiftIntents/Info.plist;
19031907
INTENTS_CODEGEN_LANGUAGE = Swift;
1904-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
1908+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
19051909
LD_RUNPATH_SEARCH_PATHS = (
19061910
"$(inherited)",
19071911
"@executable_path/Frameworks",
@@ -1930,7 +1934,7 @@
19301934
DEVELOPMENT_TEAM = 8TW9V9HVES;
19311935
GCC_C_LANGUAGE_STANDARD = gnu11;
19321936
INFOPLIST_FILE = BeeSwiftUITests/Info.plist;
1933-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
1937+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
19341938
LD_RUNPATH_SEARCH_PATHS = (
19351939
"$(inherited)",
19361940
"@executable_path/Frameworks",
@@ -1960,7 +1964,7 @@
19601964
DEVELOPMENT_TEAM = 8TW9V9HVES;
19611965
GCC_C_LANGUAGE_STANDARD = gnu11;
19621966
INFOPLIST_FILE = BeeSwiftUITests/Info.plist;
1963-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
1967+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
19641968
LD_RUNPATH_SEARCH_PATHS = (
19651969
"$(inherited)",
19661970
"@executable_path/Frameworks",

‎BeeSwift.xcodeproj/xcshareddata/xcschemes/BeeSwift.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1430"
3+
LastUpgradeVersion = "1500"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎BeeSwift.xcodeproj/xcshareddata/xcschemes/BeeSwiftIntents.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1430"
3+
LastUpgradeVersion = "1500"
44
wasCreatedForAppExtension = "YES"
55
version = "2.0">
66
<BuildAction

‎BeeSwift.xcodeproj/xcshareddata/xcschemes/BeeSwiftTests.xcscheme‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1430"
3+
LastUpgradeVersion = "1500"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -67,15 +67,6 @@
6767
savedToolIdentifier = ""
6868
useCustomWorkingDirectory = "NO"
6969
debugDocumentVersioning = "YES">
70-
<MacroExpansion>
71-
<BuildableReference
72-
BuildableIdentifier = "primary"
73-
BlueprintIdentifier = "A196CB2B1AE4142F00B90A3E"
74-
BuildableName = "BeeSwiftTests.xctest"
75-
BlueprintName = "BeeSwiftTests"
76-
ReferencedContainer = "container:BeeSwift.xcodeproj">
77-
</BuildableReference>
78-
</MacroExpansion>
7970
</ProfileAction>
8071
<AnalyzeAction
8172
buildConfiguration = "Debug">

‎BeeSwift.xcodeproj/xcshareddata/xcschemes/BeeSwiftToday.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1430"
3+
LastUpgradeVersion = "1500"
44
wasCreatedForAppExtension = "YES"
55
version = "2.0">
66
<BuildAction

‎BeeSwift.xcodeproj/xcshareddata/xcschemes/BeeSwiftUITests.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1430"
3+
LastUpgradeVersion = "1500"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎BeeSwift/ConfigureHKMetricViewController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ class ConfigureHKMetricViewController : UIViewController {
157157
do {
158158
let _ = try await ServiceLocator.requestManager.put(url: "api/v1/users/\(ServiceLocator.currentUserManager.username!)/goals/\(self.goal.slug).json", parameters: params)
159159
hud.mode = .customView
160-
hud.customView = UIImageView(image: UIImage(named: "checkmark"))
160+
hud.customView = UIImageView(image: UIImage(named: "BasicCheckmark"))
161161
hud.hide(animated: true, afterDelay: 2)
162162
DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
163163
guard let healthKitConfigController = self.navigationController?.viewControllers.first(where: { vc in vc is HealthKitConfigViewController }) else {

‎BeeSwift/DatapointValueAccessory.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class DatapointValueAccessory : UIInputView {
3434
switch UIDevice.current.userInterfaceIdiom {
3535
case .pad, .mac:
3636
return false
37-
case .phone, .carPlay, .tv, .unspecified:
37+
case .phone, .carPlay, .tv, .vision, .unspecified:
3838
return true
3939
@unknown default:
4040
return true

‎BeeSwift/EditDatapointViewController.swift‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,7 @@ class EditDatapointViewController: UIViewController, UITextFieldDelegate {
131131
let updateButton = UIButton(type: .system)
132132
self.view.addSubview(updateButton)
133133
updateButton.setTitle("Update", for: .normal)
134-
if #available(iOS 15.0, *) {
135-
updateButton.configuration = .filled()
136-
}
134+
updateButton.configuration = .filled()
137135
updateButton.addTarget(self, action: #selector(self.updateButtonPressed), for: .touchUpInside)
138136
updateButton.snp.makeConstraints { (make) in
139137
make.left.right.equalTo(formView)
@@ -215,7 +213,7 @@ class EditDatapointViewController: UIViewController, UITextFieldDelegate {
215213
let _ = try await ServiceLocator.requestManager.put(url: "api/v1/users/\(ServiceLocator.currentUserManager.username!)/goals/\(self.goalSlug)/datapoints/\(self.datapoint.id).json", parameters: params)
216214
let hud = MBProgressHUD.forView(self.view)
217215
hud?.mode = .customView
218-
hud?.customView = UIImageView(image: UIImage(named: "checkmark"))
216+
hud?.customView = UIImageView(image: UIImage(named: "BasicCheckmark"))
219217
hud?.hide(animated: true, afterDelay: 2)
220218
} catch {
221219
logger.error("Error updating datapoint for goal \(self.goalSlug): \(error)")
@@ -234,7 +232,7 @@ class EditDatapointViewController: UIViewController, UITextFieldDelegate {
234232

235233
let hud = MBProgressHUD.forView(self.view)
236234
hud?.mode = .customView
237-
hud?.customView = UIImageView(image: UIImage(named: "checkmark"))
235+
hud?.customView = UIImageView(image: UIImage(named: "BasicCheckmark"))
238236
hud?.hide(animated: true, afterDelay: 2)
239237
DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
240238
self.navigationController?.popViewController(animated: true)

0 commit comments

Comments
 (0)