Skip to content

feat: swift 6 language mode #92

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.

Sign up for GitHub

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

Draft
kieran-osgood-shopify wants to merge 1 commit into
base: kieran-osgood/swift6/test-compile-cleanup
Choose a base branch
from
+11 −10
Draft

feat: swift 6 language mode #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version: 5.9
// swift-tools-version: 6.0
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription
Expand Down Expand Up @@ -66,5 +66,6 @@ let package = Package(
],
path: "platforms/swift/Tests/ShopifyAcceleratedCheckoutsTests"
)
]
],
swiftLanguageModes: [.v6]
)
2 changes: 1 addition & 1 deletion platforms/swift/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

## Requirements

- Swift 5.7+
- Swift 6.0+
- iOS 13.0+ for Checkout Kit, iOS 16+ for Accelerated Checkouts

## Getting Started
Expand Down
12 changes: 6 additions & 6 deletions ...s/ShopifyAcceleratedCheckoutsApp/ShopifyAcceleratedCheckoutsApp.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
SWIFT_VERSION = 6.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand Down Expand Up @@ -514,7 +514,7 @@
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
SWIFT_VERSION = 6.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
Expand All @@ -531,7 +531,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.shopify.example.ShopifyAcceleratedCheckoutsAppTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_VERSION = 5.0;
SWIFT_VERSION = 6.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand All @@ -548,7 +548,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.shopify.example.ShopifyAcceleratedCheckoutsAppTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_VERSION = 5.0;
SWIFT_VERSION = 6.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
Expand All @@ -564,7 +564,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.shopify.example.ShopifyAcceleratedCheckoutsAppUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_VERSION = 5.0;
SWIFT_VERSION = 6.0;
TARGETED_DEVICE_FAMILY = "1,2";
TEST_TARGET_NAME = ShopifyAcceleratedCheckoutsApp;
};
Expand All @@ -581,7 +581,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.shopify.example.ShopifyAcceleratedCheckoutsAppUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_VERSION = 5.0;
SWIFT_VERSION = 6.0;
TARGETED_DEVICE_FAMILY = "1,2";
TEST_TARGET_NAME = ShopifyAcceleratedCheckoutsApp;
};
Expand Down
2 changes: 1 addition & 1 deletion platforms/swift/ShopifyCheckoutKit.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Pod::Spec.new do |s|
:git => "https://github.com/Shopify/checkout-kit.git", :tag => s.version.to_s
}

s.swift_version = "5.0"
s.swift_version = "6.0"

s.ios.deployment_target = "13.0"

Expand Down
Loading