Skip to content

Feature/swift 6 #7

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

Merged
lukepistrol merged 3 commits into from
Nov 26, 2024
Merged

Feature/swift 6 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9dfed67
use Swift 6
lukepistrol Nov 26, 2024
99c130f
Actions: use macos-15 & Xcode 16.1
lukepistrol Nov 26, 2024
40d2a0c
mark compatible with visionOS
lukepistrol Nov 26, 2024
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
10 changes: 5 additions & 5 deletions .github/scripts/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ SCHEME="TaskTrigger"
DESTINATION=$1

if [ -z "$DESTINATION" ]; then
echo "Missing argument: destination"
echo "Usage: $0 <destination>"
echo "destination: [iOS|macOS|watchOS|tvOS]"
exit 1
echo "Missing argument: destination"
echo "Usage: $0 <destination>"
echo "destination: [iOS|macOS|watchOS|tvOS|visionOS]"
exit 1
fi

set -o pipefail && xcodebuild clean build -scheme $SCHEME \
-destination "generic/platform=$DESTINATION" | xcpretty
-destination "generic/platform=$DESTINATION" | xcpretty
5 changes: 4 additions & 1 deletion .github/workflows/build-documentation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@ on:
workflow_dispatch:
workflow_call:

env:
DEVELOPER_DIR: /Applications/Xcode_16.1.app/Contents/Developer

jobs:
build-documentation:
runs-on: macos-14
runs-on: macos-15
steps:
- name: Checkout Repository
uses: actions/checkout@v4
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@ on:
workflow_dispatch:
workflow_call:

env:
DEVELOPER_DIR: /Applications/Xcode_16.1.app/Contents/Developer

jobs:
build:
runs-on: macos-14
runs-on: macos-15
steps:
- name: Checkout Repository
uses: actions/checkout@v4
Expand All @@ -17,3 +20,5 @@ jobs:
run: exec ./.github/scripts/build.sh tvOS
- name: Build watchOS
run: exec ./.github/scripts/build.sh watchOS
- name: Build visionOS
run: exec ./.github/scripts/build.sh visionOS
3 changes: 2 additions & 1 deletion 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.8
// swift-tools-version: 6.0

import PackageDescription

Expand All @@ -12,6 +12,7 @@ let package = Package(
.watchOS(.v8),
.tvOS(.v15),
.macCatalyst(.v15),
.visionOS(.v1),
],
products: [
.library(
Expand Down
4 changes: 2 additions & 2 deletions TaskTriggerDemo/TaskTriggerDemo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.lukaspistrol.TaskTriggerDemo;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
SWIFT_VERSION = 6.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand Down Expand Up @@ -332,7 +332,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.lukaspistrol.TaskTriggerDemo;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
SWIFT_VERSION = 6.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
Expand Down