Skip to content

Commit

Permalink
!chore: add watchOS support to ViewEnvironment and bump iOS to 15.0 (#…
Browse files Browse the repository at this point in the history
…271)

* !chore: add watchOS support to ViewEnvironment and bump iOS to 15.0

* Changed Tutorial deployment target (#272)

Changed Tutorial deployment target to iOS 15 to fix build issue

* Use version presets for Package.swift platform versions and add catalyst/tvos

---------

Co-authored-by: Mark Johnson <[email protected]>
  • Loading branch information
n8chur and mjohnson12 authored Feb 20, 2024
1 parent 427bfe6 commit a685478
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 6 deletions.
7 changes: 5 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,11 @@ import PackageDescription
let package = Package(
name: "Workflow",
platforms: [
.iOS("14.0"),
.macOS("10.15"),
.iOS(.v15),
.macOS(.v12),
.watchOS(.v8),
.macCatalyst(.v15),
.tvOS(.v12),
],
products: [
// MARK: Workflow
Expand Down
6 changes: 3 additions & 3 deletions Samples/Tutorial/Tutorial.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 51;
objectVersion = 54;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -466,7 +466,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
INFOPLIST_FILE = "$(SRCROOT)/AppHost/Configuration/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -485,7 +485,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
INFOPLIST_FILE = "$(SRCROOT)/AppHost/Configuration/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down
1 change: 1 addition & 0 deletions ViewEnvironment.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Pod::Spec.new do |s|
s.swift_versions = [WORKFLOW_SWIFT_VERSION]
s.ios.deployment_target = WORKFLOW_IOS_DEPLOYMENT_TARGET
s.osx.deployment_target = WORKFLOW_MACOS_DEPLOYMENT_TARGET
s.watchos.deployment_target = WORKFLOW_WATCHOS_DEPLOYMENT_TARGET

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

Expand Down
5 changes: 4 additions & 1 deletion version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@
WORKFLOW_VERSION ||= "#{WORKFLOW_MAJOR_VERSION}.#{WORKFLOW_MINOR_VERSION}.#{WORKFLOW_PATCH_VERSION}"

# iOS deployment target
WORKFLOW_IOS_DEPLOYMENT_TARGET ||= '14.0'
WORKFLOW_IOS_DEPLOYMENT_TARGET ||= '15.0'

# macOS deployment target
WORKFLOW_MACOS_DEPLOYMENT_TARGET ||= '10.15'

# watchOS deployment target
WORKFLOW_WATCHOS_DEPLOYMENT_TARGET ||= '8.0'

# Required Swift version
WORKFLOW_SWIFT_VERSION ||= '5.7'

0 comments on commit a685478

Please sign in to comment.