Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Updated minimum deployment target from iOS 14 to iOS 15 [UI-5185] #479

Merged
merged 3 commits into from
Feb 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion BlueprintUI.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Pod::Spec.new do |s|

s.swift_version = SWIFT_VERSION

s.ios.deployment_target = '14.0'
s.ios.deployment_target = BLUEPRINT_IOS_DEPLOYMENT_TARGET

s.source_files = 'BlueprintUI/Sources/**/*.swift'

Expand Down
2 changes: 1 addition & 1 deletion BlueprintUICommonControls.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Pod::Spec.new do |s|

s.swift_version = SWIFT_VERSION

s.ios.deployment_target = '14.0'
s.ios.deployment_target = BLUEPRINT_IOS_DEPLOYMENT_TARGET

s.source_files = 'BlueprintUICommonControls/Sources/**/*.swift'

Expand Down
22 changes: 0 additions & 22 deletions BlueprintUICommonControls/Sources/EditingMenu.swift
Original file line number Diff line number Diff line change
Expand Up @@ -238,17 +238,10 @@ extension EditingMenuItem {
case toggleUnderline
case increaseSize
case decreaseSize

#if swift(>=5.5)
@available(iOS 15.0, *)
case printContent
@available(iOS 15.0, *)
case pasteAndGo
@available(iOS 15.0, *)
case pasteAndMatchStyle
@available(iOS 15.0, *)
case pasteAndSearch
#endif
}
}
}
Expand Down Expand Up @@ -371,21 +364,14 @@ extension EditingMenuItem.Kind.System {
return #selector(actions.increaseSize)
case .decreaseSize:
return #selector(actions.decreaseSize)

#if swift(>=5.5)
case .printContent:
guard #available(iOS 15.0, *) else { fatalError() }
return #selector(actions.printContent)
case .pasteAndGo:
guard #available(iOS 15.0, *) else { fatalError() }
return #selector(actions.pasteAndGo)
case .pasteAndMatchStyle:
guard #available(iOS 15.0, *) else { fatalError() }
return #selector(actions.pasteAndMatchStyle)
case .pasteAndSearch:
guard #available(iOS 15.0, *) else { fatalError() }
return #selector(actions.pasteAndSearch)
#endif
}
}
}
Expand Down Expand Up @@ -524,30 +510,22 @@ extension EditingMenu {
perform(kind: .decreaseSize)
}

#if swift(>=5.5)

@available(iOS 15.0, *)
@objc override func printContent(_ any: Any?) {
perform(kind: .printContent)
}

@available(iOS 15.0, *)
@objc override func pasteAndGo(_ any: Any?) {
perform(kind: .pasteAndGo)
}

@available(iOS 15.0, *)
@objc override func pasteAndMatchStyle(_ any: Any?) {
perform(kind: .pasteAndMatchStyle)
}

@available(iOS 15.0, *)
@objc override func pasteAndSearch(_ any: Any?) {
perform(kind: .pasteAndSearch)
}

#endif

@objc func customAction0() {
perform(custom: 0)
}
Expand Down
2 changes: 1 addition & 1 deletion BlueprintUICommonControls/Sources/Image.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public struct Image: Element {
public var contentMode: ContentMode

/// iOS 14 added support for Image Descriptions using VoiceOver. This is not always appropriate.
/// Set this to `true` to prevent VoiceOver from discribing the displayed image.
/// Set this to `true` to prevent VoiceOver from describing the displayed image.
public var blockAccessibilityDescription: Bool

/// Initializes an image element with the given `UIImage` instance.
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

- Updated minimum deployment target from iOS 14 to iOS 15.

### Deprecated

### Security
Expand Down
4 changes: 2 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import PackageDescription
let package = Package(
name: "BlueprintUI",
platforms: [
.iOS(.v14),
.macCatalyst(.v14),
.iOS(.v15),
.macCatalyst(.v15),
],
products: [
.library(
Expand Down
2 changes: 1 addition & 1 deletion SampleApp/Podfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
platform :ios, '14.0'
platform :ios, '15.0'

project 'SampleApp.xcodeproj'

Expand Down
6 changes: 3 additions & 3 deletions SampleApp/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ EXTERNAL SOURCES:
:path: "../BlueprintUICommonControls.podspec"

SPEC CHECKSUMS:
BlueprintUI: 46ff8ea0328a66a4f6672fbdb606b947a1567c5f
BlueprintUICommonControls: 8f3824d01d4056dd4d9c44bba24ad1541e42c26e
BlueprintUI: 93a1d72fb4f987818dc2aa63754b4f954c76705f
BlueprintUICommonControls: 071ae9df5220ce4f441e5b61af3c89f2e012ca43

PODFILE CHECKSUM: c795e247aa1c5eb825186ef8192821306c59c891
PODFILE CHECKSUM: 1cffac4623851f31dc42270ba99701e3825e6d67

COCOAPODS: 1.14.3
11 changes: 7 additions & 4 deletions SampleApp/SampleApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 50;
objectVersion = 54;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -370,8 +370,9 @@
975454F2223C1289003E353F /* Project object */ = {
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = YES;
LastSwiftUpdateCheck = 1010;
LastUpgradeCheck = 1300;
LastUpgradeCheck = 1510;
ORGANIZATIONNAME = Square;
TargetAttributes = {
975454F9223C1289003E353F = {
Expand Down Expand Up @@ -684,6 +685,7 @@
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
Expand All @@ -698,7 +700,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
Expand Down Expand Up @@ -746,6 +748,7 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand All @@ -754,7 +757,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = iphoneos;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1300"
LastUpgradeVersion = "1510"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1300"
LastUpgradeVersion = "1510"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1300"
LastUpgradeVersion = "1510"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 2 additions & 0 deletions version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@
BLUEPRINT_VERSION ||= '2.2.0'

SWIFT_VERSION ||= File.read(File.join(__dir__, '.swift-version'))

BLUEPRINT_IOS_DEPLOYMENT_TARGET ||= '15.0'
Loading